Skip to content

powerpc: Implement masked user access

Christophe Leroy (CS GROUP) linuxppc-dev lkml 1 version Applied

Status from this message: Applied to powerpc/next.

Get series with b4
b4 am [email protected]

Versions newest first

  1. v5 Latest7 patches 2 repliesApplied

Changes in v5 from the cover letter

- Remove first 3 patches as they were merged in v6.19-rc1
- Rebase on top of v6.19-rc2

Patches in v5 Applied

#Subject and filesSizeRepliesApplied
1/7powerpc/uaccess: Move barrier_nospec() out of allow_read_{from/write}_user()arch/powerpc/include/asm/kup.h arch/powerpc/include/asm/uaccess.h+4 -20 replies
2/7powerpc/uaccess: Remove unused size and from parameters from allow_access_user()arch/powerpc/include/asm/book3s/32/kup.h arch/powerpc/include/asm/book3s/64/kup.h arch/powerpc/include/asm/kup.h +2 more+9 -150 replies
3/7powerpc/uaccess: Remove {allow/prevent}_{read/write/read_write}_{from/to/}_user()arch/powerpc/include/asm/kup.h arch/powerpc/include/asm/uaccess.h+15 -620 replies
4/7powerpc/uaccess: Refactor user_{read/write/}_access_begin()arch/powerpc/include/asm/barrier.h arch/powerpc/include/asm/uaccess.h+14 -340 replies
5/7powerpc/32s: Fix segments setup when TASK_SIZE is not a multiple of 256March/powerpc/include/asm/book3s/32/mmu-hash.h arch/powerpc/include/asm/task_size_32.h arch/powerpc/kernel/asm-offsets.c +3 more+11 -80 replies
6/7powerpc/32: Automatically adapt TASK_SIZE based on constraintsarch/powerpc/Kconfig arch/powerpc/include/asm/book3s/32/pgtable.h arch/powerpc/include/asm/nohash/32/mmu-8xx.h +4 more+27 -160 replies
7/7powerpc/uaccess: Implement masked user accessarch/powerpc/include/asm/task_size_32.h arch/powerpc/include/asm/uaccess.h+79 -31 reply

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v5 yet.

Read the v5 thread

Cover letter [PATCH v5 0/7] powerpc: Implement masked user access

This is a rebase on top of v6.19-rc2

Masked user access avoids the address/size verification by access_ok(). Allthough its main purpose is to skip the speculation in the verification of user address and size hence avoid the need of spec mitigation, it also has the advantage to reduce the amount of instructions needed so it also benefits to platforms that don't need speculation mitigation, especially when the size of the copy is not know at build time.

Patch 1 removes some redundant barrier_nospec()
introduced by commit 74e19ef0ff80 ("uaccess: Add speculation barrier to copy_from_user()") by removing the barrier in raw_copy_from_user() which is redundant with the one in copy_from_user().

Patches 2,3,4 are cleaning up powerpc uaccess functions.

Patches 5 and 6 prepare powerpc/32 for the necessary gap at the top of userspace.

Last patch implements masked user access.

Changes in v5:
- Remove first 3 patches as they were merged in v6.19-rc1
- Rebase on top of v6.19-rc2

Changes in v4:
- Rebased on top of commit 6ec821f050e2 (tag: core-scoped-uaccess) from tip tree
- Patch 3: Simplified as masked_user_read_access_begin() and masked_user_write_access_begin() are already there.
- Patch 10: Simplified mask_user_address_simple() as suggested by Gabriel.

Changes in v3:
- Rebased on top of v6.18-rc1
- Patch 3: Impact on recently modified net/core/scm.c
- Patch 10: Rewrite mask_user_address_simple() for a smaller result on powerpc64, suggested by Gabriel

Changes in v2:
- Converted copy_from_user_iter() to using masked user access.
- Cleaned up powerpc uaccess function to minimise code duplication when adding masked user access
- Automated TASK_SIZE calculation to minimise use of BUILD_BUG_ON()
- Tried to make some commit messages more clean based on feedback from version 1 of the series.

Christophe Leroy (7):
powerpc/uaccess: Move barrier_nospec() out of

    allow_read_{from/write}_user()
  powerpc/uaccess: Remove unused size and from parameters from
    allow_access_user()
  powerpc/uaccess: Remove
    {allow/prevent}_{read/write/read_write}_{from/to/}_user()
  powerpc/uaccess: Refactor user_{read/write/}_access_begin()
  powerpc/32s: Fix segments setup when TASK_SIZE is not a multiple of
    256M

powerpc/32: Automatically adapt TASK_SIZE based on constraints powerpc/uaccess: Implement masked user access

 arch/powerpc/Kconfig                          |   3 +-
 arch/powerpc/include/asm/barrier.h            |   2 +-
 arch/powerpc/include/asm/book3s/32/kup.h      |   3 +-
 arch/powerpc/include/asm/book3s/32/mmu-hash.h |   5 +-
 arch/powerpc/include/asm/book3s/32/pgtable.h  |   4 -
 arch/powerpc/include/asm/book3s/64/kup.h      |   6 +-
 arch/powerpc/include/asm/kup.h                |  52 +------
 arch/powerpc/include/asm/nohash/32/kup-8xx.h  |   3 +-
 arch/powerpc/include/asm/nohash/32/mmu-8xx.h  |   4 -
 arch/powerpc/include/asm/nohash/kup-booke.h   |   3 +-
 arch/powerpc/include/asm/task_size_32.h       |  28 +++-
 arch/powerpc/include/asm/uaccess.h            | 132 +++++++++++++-----
 arch/powerpc/kernel/asm-offsets.c             |   2 +-
 arch/powerpc/kernel/head_book3s_32.S          |   6 +-
 arch/powerpc/mm/book3s32/mmu.c                |   4 +-
 arch/powerpc/mm/mem.c                         |   2 -
 arch/powerpc/mm/nohash/8xx.c                  |   2 -
 arch/powerpc/mm/ptdump/segment_regs.c         |   2 +-
 18 files changed, 141 insertions(+), 122 deletions(-)
Signature · 1 line
2.49.0