Hi,
The top of the master branch has been tagged [1] as part of the
integration drop 1.7.0.
Below is the changelog for kernel users, since the previous integration
drop (1.6.1).
PCuABI-related changes
----------------------
* [Issue #24] A pure-capability vDSO is now provided in PCuABI.
* [Issue #7] In a small number of situations, user-provided capabilities
are now explicitly checked (validity, bounds and read/write
permissions). This covers cases where user memory is accessed via a
kernel mapping, instead of the standard approach where user mappings
are used (uaccess). A section has also been added to the porting guide
[2], as porting some drivers may require adding explicit checking.
Note: patches have been posted on the list to enable capability
checking in uaccess, but they are yet to be merged.
* [Issue #46] The TCP_ZEROCOPY_RECEIVE getsockopt() option has been
modified to operate on capabilities in PCuABI. A corresponding section
has been added to the PCuABI specification [3].
* [Issue #51] MMC-related ioctl commands have been adapted to operate on
capabilities.
Other changes
-------------
* KSM (Kernel Samepage Merging) is now disabled to avoid false positives
when capability tags differ. It is unclear whether KSM would still be
worthwhile with the extra overhead of comparing capability tags (issue
#62 created to track this).
* Internal refactoring to assist with upcoming changes.
Contributions
-------------
Kudos to everyone who has contributed to Morello Linux! Here are the
contributors and number of patches since the previous integration drop:
10 Kevin Brodsky <kevin.brodsky(a)arm.com>
7 Luca Vizzarro <Luca.Vizzarro(a)arm.com>
6 Aditya Deshpande <aditya.deshpande(a)arm.com>
3 Harry Ramsey <harry.ramsey(a)arm.com>
2 Akram Ahmad <Akram.Ahmad(a)arm.com>
Special thanks are also extended to everyone who has assisted in
reviewing these patches.
Cheers,
Kevin
[1]
https://git.morello-project.org/morello/kernel/linux/-/commits/morello-rele…
[2]
https://git.morello-project.org/morello/kernel/linux/-/blob/morello-release…
[3]
https://git.morello-project.org/morello/kernel/linux/-/wikis/Morello-pure-c…
Just thought it's time to share the current state of drm purecap work:
Kernel:
https://git.morello-project.org/carhai01/linux-drm-purecap/-/commit/7ea169a…
DRM:
https://git.morello-project.org/carhai01/drm-linux-morello-purecap/-/commit…
All the DRM tests ow pass for compat and purecap.
I'm of 2 minds in the kernel code. I could go mimic the "copy field"
stuff from EBPF but it's still going to be a bit messy. DRM code calls
everything "compat" "32" so I'm keeping with that naming scheme (compat
for us is 64bit). I've kept the compat structs at the entry points. I
could copy to a local "native" struct I guess... It'd mean I carry more
local data than I actually need/use.
Anyway... comments?
Hello,
This patch series implements a pure-capability vDSO which purecap
userspace applications can directly use. It also fixes the vDSO
selftests so that they can be built as purecap binaries, therefore
allowing the new purecap vDSO to be tested. The existing aarch64 vDSO
implementation is unchanged - it has simply been redefined as the compat
vDSO. Therefore, processes using both the standard and purecap ABIs
will have a vDSO to use.
Main changes in v3:
* Series has now grown to 5 patches. The first patch duplicates an
unmerged upstream change (I forgot to include this in v2). Once it is
merged upstream and the fork is rebased this patch may disappear from
the log.
* Patch 3 adds some purecap-only code to linux/types.h to enable the
vDSO, which uses kernel headers, to be built for purecap.
* v2 removed the vdso-purecap/ directory, as it needlessly replicated
the code in vdso/. vdso/Makefile was instead changed so it could
build both vDSOs (regular and purecap) from the same source. This is
achieved by calling the Makefile twice with BUILD_PURECAP_VDSO=[y/n].
v3 further changes this Makefile; now all purecap generated files are
placed in a separate subdirectory (vdso/purecap.)
Aditya Deshpande (5):
selftests: vDSO: fix Makefile so that it uses lib.mk correctly
selftests/vDSO: Add support for purecap vDSO testing
linux/types.h: Redefine uintptr_t to __uintcap_t under purecap
arm64: vdso: Build a pure-capability vDSO
arm64: vDSO: Provide a purecap vDSO to userspace purecap programs
arch/arm64/Makefile | 6 ++
arch/arm64/include/asm/elf.h | 24 +++++---
arch/arm64/include/asm/vdso.h | 1 +
arch/arm64/include/asm/vdso/gettimeofday.h | 58 +++++++++++++++---
arch/arm64/kernel/Makefile | 2 +
arch/arm64/kernel/vdso-purecap-wrap.S | 22 +++++++
arch/arm64/kernel/vdso.c | 55 ++++++++++++++++-
arch/arm64/kernel/vdso/Makefile | 60 ++++++++++++++++---
fs/compat_binfmt_elf.c | 24 ++++----
include/linux/compiler.h | 3 +-
include/linux/types.h | 4 ++
tools/testing/selftests/vDSO/Makefile | 16 ++---
tools/testing/selftests/vDSO/parse_vdso.h | 16 +++++
tools/testing/selftests/vDSO/vdso_test_abi.c | 5 +-
.../selftests/vDSO/vdso_test_gettimeofday.c | 6 +-
15 files changed, 252 insertions(+), 50 deletions(-)
create mode 100644 arch/arm64/kernel/vdso-purecap-wrap.S
--
2.25.1
Hello,
I am running baremetal programs on FVP. I compiled using llvm toolchain
with baremetal support and created the .axf binaries under the debug
directory of the project folder. This .axf executable Is something I like
to test on morello board without any OS environment. when I tried to run
the .axf binary on the board using the ARM development studio IDE morello
edition, under the run> debug config> made the settings and when I I
started debugging it gets stuck at the HLT instruction (when performing
debug from symbol) or starting from the initial address and going into an
infinite loop when starting from entry point. while on the terminal console
I couldn't see the output of the printf statement which i was expecting.
even if I try to run directly or debug it step by step. (the program is
correct because I already tested on FVP) ..I am being redirected to the
debug configuration. and iterating thru the same process as described
without seeing the actual output on the terminal which I configured with
the /dev/ttyusb2 115200 command. Any suggestions please.
Hello,
I am running baremetal programs on FVP. I compiled using llvm toolchain
with baremetal support and created the .axf binaries under the debug
directory of the project folder. This .axf executable Is something I like
to test on morello board without any OS environment. when I tried to run
the .axf binary on the board using the ARM development studio IDE morello
edition, under the run> debug config> made the settings and when I I
started debugging it gets stuck at the HLT instruction (when performing
debug from symbol) or starting from the initial address and going into an
infinite loop when starting from entry point. while on the terminal console
I couldn't see the output of the printf statement which i was expecting.
even if I try to run directly or debug it step by step. (the program is
correct because I already tested on FVP) ..I am being redirected to the
debug configuration. and iterating thru the same process as described
without seeing the actual output on the terminal which I configured with
the /dev/ttyusb2 115200 command. Any suggestions please.
Syscalls operating on memory mappings manage their address space via
owning capabilities. They must adhere to a certain set of rules[1] in
order to ensure memory safety. Address space management syscalls are
only allowed to manipulate mappings that are within the range of the
owning capability and have the appropriate permissions. Tests to check
the capability's tag, bounds, range as well as permissions have been
added. Finally, as certain flags and syscalls conflict with the
reservation model or lack implementation, a check to verify appropriate
handling of the same has also been added.
The mincore() tests are expected to fail in this iteration as they are
not fully supported. The next iterations will contain representability
testcases.
Review branch:
https://git.morello-project.org/chaitanya_prakash/linux/-/tree/review/purec…
This patch series has been tested on:
https://git.morello-project.org/amitdaniel/linux/-/tree/review/purecap_mm_r…
[1] https://git.morello-project.org/morello/kernel/linux/-/wikis/Morello-pure-c…
Changes in V4:
- Corrected subject of cover letter
Changes in V3:
https://op-lists.linaro.org/archives/list/linux-morello@op-lists.linaro.org…
- Added get_pagesize() function and VERRIFY_ERRNO() macro
- Added LoadCap and StoreCap permissions testcase
- Added validity_tag_check testcases
- Added reservation tests
- Renamed variable "addr" to "ptr" to avoid confusion when manipulating
both addresses and capabilities
- Cleaned up syscall_mmap and syscall_mmap2 testcases
- Restructured code into testcases that check tags, range, bounds
and permissions
- Improved range_check testcases
- Improved commit messages
- Removed helper functions, tests directly written in testcase functions
- Removed signal handling and ddc register testcases
Changes in V2:
https://op-lists.linaro.org/archives/list/linux-morello@op-lists.linaro.org…
- Added link to the review branch
- Removed unnecessary whitespace
Changes in V1:
https://op-lists.linaro.org/archives/list/linux-morello@op-lists.linaro.org…
Chaitanya S Prakash (11):
kselftests/arm64: morello: Create wrapper functions for frequently
invoked syscalls
kselftests/arm64: morello: Add get_pagesize() function
kselftests/arm64: morello: Add VERIFY_ERRNO() macro
kselftests/arm64: morello: mmap: Clean up existing testcases
kselftests/arm64: morello: mmap: Add MAP_GROWSDOWN testcase
kselftests/arm64: morello: mmap: Add validity tag check testcases
kselftests/arm64: morello: mmap: Add capability range testcases
kselftests/arm64: morello: mmap: Add mmap() bounds check testcases
kselftests/arm64: morello: mmap: Add mremap() bounds check testcases
kselftests/arm64: morello: mmap: Add permission check testcases
kselftests/arm64: morello: mmap: Add brk() testcase
.../selftests/arm64/morello/bootstrap.c | 13 -
.../selftests/arm64/morello/freestanding.c | 16 +-
.../selftests/arm64/morello/freestanding.h | 74 ++-
tools/testing/selftests/arm64/morello/mmap.c | 547 +++++++++++++++++-
4 files changed, 606 insertions(+), 44 deletions(-)
--
2.25.1
Hi everyone,
This patch aims to enable purecap applications to make use of the MMC block
driver by adding PCuABI support to the MMC_IOC_CMD and MMC_IOC_MULTI_CMD
ioctls. This also includes compat64 support for the ioctls.
V6 -> V7: Clarify comments on ioctl numbering.
V5 -> V6: Fix for ioctl numbering based on struct size; minor corrections.
V4 -> V5: Improvement to readability and fix to user-space macro.
V3 -> V4: Minor corrections and improvements to readability of code.
- Remove unnecessary explicit checks on capabilities.
- Revert modification to struct mmc_ioc_multi_cmd.
- Remove unnecessary parentheses.
V2 -> V3:
- Implement support for capabilities in the ioctls.
- Correct formatting errors in patches.
- Correct formatting and syntax errors in code.
V1 -> V2: Various improvements to the code including:
- Preference for native structs over (void __user *)
- Complying with code styling guidelines
- Improvement in code readability via removing unnecessary casts
GitLab Issue:
https://git.morello-project.org/morello/kernel/linux/-/issues/51
Review branch:
https://git.morello-project.org/arkamnite/linux/-/commits/morello%2Fmmc_v7
Many thanks,
Akram
Akram Ahmad (2):
mmc: Implement compat handling for struct mmc_ioc_{multi_}cmd
mmc: Support capabilities in MMC_IOC_{MULTI_}CMD ioctls
drivers/mmc/core/block.c | 100 ++++++++++++++++++++++++++++++---
include/uapi/linux/mmc/ioctl.h | 19 ++++++-
2 files changed, 108 insertions(+), 11 deletions(-)
--
2.34.1
Hi,
Here's v5 of the bpf syscall patches, following on from the RFC[1],
v1[2], v2[3] and v3[4], v4[5].
The bpf syscall is updated to propagate user pointers as capabilities in
the pure-capability kernel-user ABI (PCuABI). It also includes an
approach to support the existing aarch64 ABI (compat64).
One complication here is from the fact this syscall supports many
multiplexed sub-commands, some of which are themselves multiplexed with
a number of further nested/multiplexed options.
Another complication is that the existing syscall uses a trick of
storing user pointers as u64 to avoid needing a compat handler for
32-bit systems. To retain compatibility with the aarch64 ABI and add
Morello support, special compat64 conversion and handling is
implemented.
Inbound (userspace->kernel) conversion between compat64/native struct
layouts is handled upfront on entry to the syscall (with the exception
of bpf_xyz_info structs). This minimises changes to subcommand handlers.
Some subcommands require conversion back out to userspace and that is by
necessity handled where it occurs.
Patch 1 is not essential to this series but it's a nice debug feature to
have and works[6]. It enables BPF_PROG_TYPE_TRACEPOINT which many eBPF
kselftests use.
Patches 5,6,8 implement the core compat64 handling. Each commit compiles
cleanly but relevant parts will be broken inbetween.
Patch 9 fixes the CHECK_ATTR macro to also check configs passed in via
compat64.
Patch 11 finally enables capabilities in the kernel.
Patches 12,13 handles uaccess that occurs in two eBPF helper functions.
The rest are setup/helper functions.
Testing wise, see associated LTP changes below as posted to LTP mailing
list[7]. The eBPF LTP tests are fairly minimal and test only a small
part of the changes here. There's a new test to test CHECK_ATTR from
patch 9.
The kernel kselftests contain many more extensive eBPF tests. They can
be built fairly easily natively on aarch64 which is useful for testing
compat64. More work needs to be done here though to:
a) enable out-of-tree cross-compilation for purecap as well as
x86->aarch64
b) replace ptr_to_u64() with casts to uintptr_t in tests
c) general libbpf/bpftool enablement and fixes since many tests rely
on this
d) CONFIG_DEBUG_INFO_BTF required for many tests but this requires the
build system to have a recent version of pahole tool
Next steps once we have the core kernel support would be porting libbpf
and bpftool for purecap plus work on enabling kselftests as above.
Kernel branch available at:
https://git.morello-project.org/zdleaf/linux/-/tree/morello/bpf_v5
Associated LTP test/changes at:
https://git.morello-project.org/zdleaf/morello-linux-test-project/-/tree/mo…
Thanks,
Zach
[1] [RFC PATCH 0/9] update bpf syscall for PCuABI/compat64
https://op-lists.linaro.org/archives/list/linux-morello@op-lists.linaro.org…
[2] [PATCH 00/10] update bpf syscall for PCuABI/compat64
https://op-lists.linaro.org/archives/list/linux-morello@op-lists.linaro.org…
[3] [PATCH v2 00/12] update bpf syscall for PCuABI/compat64
https://op-lists.linaro.org/archives/list/linux-morello@op-lists.linaro.org…
[4] [PATCH v3 00/12] update bpf syscall for PCuABI/compat64
https://op-lists.linaro.org/archives/list/linux-morello@op-lists.linaro.org…
[5] [PATCH v4 00/12] update bpf syscall for PCuABI/compat64
https://op-lists.linaro.org/archives/list/linux-morello@op-lists.linaro.org…
[6] [PATCH v3 0/5] Restore syscall tracing on Morello
https://op-lists.linaro.org/archives/list/linux-morello@op-lists.linaro.org…
[7] [PATCH 0/3] add eBPF support
https://op-lists.linaro.org/archives/list/linux-morello-ltp@op-lists.linaro…
-----------------------------------------------------------------------
v5:
- Simplify BPF_LINK_CREATE handling in bpf/syscall.c:convert_compat_bpf_attr()
- Add missing bpf_compat_ptr_field()
- Re-work/fix check_attr() to catch missing enum bpf_cmd values
v4:
- Return EFAULT in bpf_{prog,link}_get_info_by_fd, not err
- Fix multiline comment formatting
- Reduce number of in_compat_syscall() in copy_bpf_attr_from_user() + copy_bpf_{btf,prog,link}_from_user()
- copy_bpf_{btf,prog,link}_to_user() remains the same but s/target_info/src_info
- bpf_copy_from_user_with_ptr() helper removed
v3:
- Renamed all {is,in}_32bit_... to compat32, e.g. is_32bit_compat_task
-> is_compat32 task, same for 64bit versions
- Removed dispatch_bpf() + bpf_check_perms() and merged back into
__sys_bpf - they no longer need to be split now we have no separate
compat64 handler
- Ensured we memset(0)/zero initialise all compat/non-compat structs for
bpf_attr, bpf_{prog,link,btf}_info as appropriate when copying in/out
from userspace
- Switched order of first two arguments of bpf_put_uattr() to align with
bpfptr_put_uattr() and more closely match put_user()
- Moved #include <linux/bpf_compat.h> into bpf.h
- Moved bpf_copy_{to,from}_user_with_ptr to bpf.h
- Renamed bpf_uattr_compat_ptr macro to bpf_compat_ptr_field
- Removed const arguments for bpf_copy_from_user(_task) helpers
- Fixed pointer type mismatch warnings in void *ptr =
in_compat64_syscall() ? type1 : type2; pattern
- Replace temporary #define bpfptr_copy with in_compat64_syscall
conditional in bpfptr.h:copy_from_bpfptr_with_ptr - only use _with_ptr
in purecap
v2:
- Fixed copy_from_bpfptr_offset_with_ptr - this no longer uses sockptr
as of 6.1 (see patch 9)
- Rebase on 6.4 - new struct members need conversion/handling:
- New BPF_PROG_TYPE_NETFILTER + associated bpf_attr BPF_LINK_CREATE
members
- New bpf_link_info types BPF_LINK_TYPE_NETFILTER +
BPF_LINK_TYPE_STRUCT_OPS
- Renamed in_32bit_compat_syscall() to in_compat32_syscall() and added
in_compat64_syscall()
- Handled uaccess from bpf helper programs
bpf/helpers.c:bpf_copy_from_user + bpf_copy_from_user_task
- Added new stddef.h macro copy_field() to simplify conversion
assignments
- bpf: compat64: add handler and convert bpf_attr in
- Replaced #ifdef CONFIG_COMPAT64 with in_compat64_syscall() + use
copy_bpf_attr_from_user() helper function for inbound compat
conversion
- This removes the __sys_compat_bpf compat64 handler, now using the
existing __sys_bpf + in_compat64_syscall() for reduced diff size,
less duplication and clearer code
- Conversion now happens in copy_bpf_attr_from_user() for better
encapsulation + stack usage
- bpf: compat64: bpf_attr convert out
- Renamed PUT_USER_ATTR() to bpf_put_uattr() + moved to bpf.h
- Introduced bpfptr_put_uattr() in bpfptr.h
- Originally missed handling cases writing out to userspace with
copy_to_bpfptr_offset() - now replaced with new bpfptr_put_uattr()
macro
- 6.4 now has a new field showing what log size will be needed - see
47a71c1f9af0 ("bpf: Add log_true_size output field to return
necessary log buffer size")
- This also requires new macro bpf_field_exists() to handle compat64
when checking that userspace supports this new field
- bpf: compat64: handle bpf_xyz_info
- Simplified bpf_link_info conversion handling using memcpy
- Removed bpf_map_info patch since struct is the same in
compat64/native (no ptrs)
- Replaced #ifdef CONFIG_COMPAT64 with in_compat64_syscall() + use
copy_bpf_xyz_info_{from,to}_user() helper functions for compat
conversions
- Merged bpf_{btf,prog,link}_info into a single patch
- bpf: use user pointer types in uAPI structs
- Added new compat_uptr_to_kern() macro to simplify casting/converting
in compat ptrs
- Usage of copy_{to,from}_user_with_ptr variants now correctly applied
with new helpers
-----------------------------------------------------------------------
Zachary Leaf (13):
arm64: morello: enable syscall tracing
arch: rename 32bit_compat to compat32
arch: add compat helpers specific to 64-bit
stddef: introduce copy_field helper
bpf: compat64: add handler and convert bpf_attr in
bpf: compat64: bpf_attr convert out
bpf/btf: move zero check into btf.c
bpf: compat64: handle bpf_{btf,prog,link}_info
bpf: compat64: support CHECK_ATTR macro
bpf: copy_{to,from}_user_with_ptr helpers
bpf: use user pointer types in uAPI structs
bpf: use addr for bpf_copy_from_user_with_task
bpf: use addr for bpf_copy_from_user
.../morello_transitional_pcuabi_defconfig | 2 +-
arch/arm64/include/asm/compat.h | 11 +-
arch/arm64/include/asm/ftrace.h | 2 +-
arch/arm64/include/asm/mmu_context.h | 2 +-
arch/arm64/include/asm/syscall.h | 6 +-
arch/arm64/kernel/fpsimd.c | 6 +-
arch/arm64/kernel/hw_breakpoint.c | 2 +-
arch/arm64/kernel/perf_regs.c | 2 +-
arch/arm64/kernel/pointer_auth.c | 6 +-
arch/arm64/kernel/process.c | 16 +-
arch/arm64/kernel/ptrace.c | 10 +-
arch/arm64/kernel/signal.c | 2 +-
arch/arm64/kernel/syscall.c | 2 +-
arch/mips/include/asm/compat.h | 2 +-
arch/parisc/include/asm/compat.h | 2 +-
arch/powerpc/include/asm/compat.h | 2 +-
arch/s390/include/asm/compat.h | 2 +-
arch/sparc/include/asm/compat.h | 4 +-
arch/x86/include/asm/compat.h | 2 +-
drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 2 +-
drivers/gpu/drm/amd/amdkfd/kfd_process.c | 2 +-
drivers/input/input.c | 2 +-
drivers/media/rc/bpf-lirc.c | 6 +-
fs/ext4/dir.c | 2 +-
fs/nfs/dir.c | 2 +-
include/linux/bpf.h | 19 +
include/linux/bpf_compat.h | 415 +++++++++
include/linux/bpfptr.h | 28 +-
include/linux/compat.h | 16 +-
include/linux/stddef.h | 3 +
include/uapi/linux/bpf.h | 94 +-
kernel/bpf/bpf_iter.c | 2 +-
kernel/bpf/btf.c | 104 ++-
kernel/bpf/cgroup.c | 9 +-
kernel/bpf/hashtab.c | 12 +-
kernel/bpf/helpers.c | 9 +-
kernel/bpf/net_namespace.c | 6 +-
kernel/bpf/offload.c | 2 +-
kernel/bpf/syscall.c | 843 ++++++++++++++----
kernel/bpf/verifier.c | 20 +-
kernel/time/time.c | 2 +-
kernel/trace/bpf_trace.c | 6 +-
mm/util.c | 2 +-
net/bpf/bpf_dummy_struct_ops.c | 8 +-
net/bpf/test_run.c | 31 +-
net/core/sock_map.c | 6 +-
46 files changed, 1394 insertions(+), 342 deletions(-)
create mode 100644 include/linux/bpf_compat.h
--
2.34.1
Hi everyone,
This patch aims to enable purecap applications to make use of the MMC block
driver by adding PCuABI support to the MMC_IOC_CMD and MMC_IOC_MULTI_CMD
ioctls. This also includes compat64 support for the ioctls.
V5 -> V6: Fix for ioctl numbering based on struct size; minor corrections.
V4 -> V5: Improvement to readability and fix to user-space macro.
V3 -> V4: Minor corrections and improvements to readability of code.
- Remove unnecessary explicit checks on capabilities.
- Revert modification to struct mmc_ioc_multi_cmd.
- Remove unnecessary parentheses.
V2 -> V3:
- Implement support for capabilities in the ioctls.
- Correct formatting errors in patches.
- Correct formatting and syntax errors in code.
V1 -> V2: Various improvements to the code including:
- Preference for native structs over (void __user *)
- Complying with code styling guidelines
- Improvement in code readability via removing unnecessary casts
GitLab Issue:
https://git.morello-project.org/morello/kernel/linux/-/issues/51
Review branch:
https://git.morello-project.org/arkamnite/linux/-/commits/morello%2Fmmc_v6
Many thanks,
Akram
Akram Ahmad (2):
mmc: Implement compat handling for struct mmc_ioc_{multi_}cmd
mmc: Support capabilities in MMC_IOC_{MULTI_}CMD ioctls
drivers/mmc/core/block.c | 100 ++++++++++++++++++++++++++++++---
include/uapi/linux/mmc/ioctl.h | 16 ++++--
2 files changed, 104 insertions(+), 12 deletions(-)
--
2.34.1