January 2023 - linux-morello - op-lists.linaro.org

[PATCH 1/2] usb: hiddev: Use proper type for arg instead of long

by carsten.haitzler＠foss.arm.com

From: Carsten Haitzler <carsten.haitzler(a)foss.arm.com> Use proper type for arg to match other changes in kernel tree. Signed-off-by: Carsten Haitzler <Carsten.Haitzler(a)arm.com> --- drivers/hid/usbhid/hiddev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c index 2fb2991dbe4c..3a4478da66ca 100644 --- a/drivers/hid/usbhid/hiddev.c +++ b/drivers/hid/usbhid/hiddev.c @@ -591,7 +591,7 @@ static noinline int hiddev_ioctl_string(struct hiddev *hiddev, unsigned int cmd, return len; } -static long hiddev_ioctl(struct file *file, unsigned int cmd, unsigned long arg) +static long hiddev_ioctl(struct file *file, unsigned int cmd, user_uintptr_t arg) { struct hiddev_list *list = file->private_data; struct hiddev *hiddev = list->hiddev; -- 2.25.1

1 year, 10 months

4
10
0 0

[PATCH] enabling FUSE file system

by Zahra Tarkhani

The following is a small patch for enabling fuse file system. I tested it on my morello PC and FVP. branch: https://git.morello-project.org/zatkh/linux/-/tree/morello/fuse From 293351ba5a87beb4b20cc956025e5d7ab911a320 Mon Sep 17 00:00:00 2001 From: zatkh <ztarkhani(a)microsoft.com> Date: Wed, 11 Jan 2023 16:39:07 +0000 Subject: [PATCH 1/2] kernel fusefs enable --- arch/arm64/configs/morello_transitional_pcuabi_defconfig | 2 ++ fs/fuse/file.c | 2 +- fs/fuse/fuse_i.h | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm64/configs/morello_transitional_pcuabi_defconfig b/arch/arm64/configs/morello_transitional_pcuabi_defconfig index 2c0798c18553..af37f9ed4e36 100644 --- a/arch/arm64/configs/morello_transitional_pcuabi_defconfig +++ b/arch/arm64/configs/morello_transitional_pcuabi_defconfig @@ -130,6 +130,7 @@ CONFIG_VFAT_FS=y CONFIG_TMPFS=y CONFIG_HUGETLBFS=y CONFIG_CONFIGFS_FS=y +CONFIG_FUSE_FS=y # CONFIG_EFIVAR_FS is not set CONFIG_9P_FS=y CONFIG_NLS_CODEPAGE_437=y @@ -147,3 +148,4 @@ CONFIG_DEBUG_FS=y # CONFIG_DEBUG_PREEMPT is not set # CONFIG_FTRACE is not set CONFIG_MEMTEST=y + diff --git a/fs/fuse/file.c b/fs/fuse/file.c index 2318e66e7612..71b55bb83d25 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -1366,7 +1366,7 @@ static ssize_t fuse_cache_write_iter(struct kiocb *iocb, struct iov_iter *from) static inline unsigned long fuse_get_user_addr(const struct iov_iter *ii) { - return (unsigned long)ii->iov->iov_base + ii->iov_offset; + return (__cheri_addr long)ii->iov->iov_base + ii->iov_offset; } static inline size_t fuse_get_frag_size(const struct iov_iter *ii, diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h index 081fd8d0b45d..005801a8c07b 100644 --- a/fs/fuse/fuse_i.h +++ b/fs/fuse/fuse_i.h @@ -1302,7 +1302,7 @@ bool fuse_dax_check_alignment(struct fuse_conn *fc, unsigned int map_alignment); void fuse_dax_cancel_work(struct fuse_conn *fc); /* ioctl.c */ -long fuse_file_ioctl(struct file *file, unsigned int cmd, unsigned long arg); +long fuse_file_ioctl(struct file *file, unsigned int cmd, user_uintptr_t arg); long fuse_file_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg); int fuse_fileattr_get(struct dentry *dentry, struct fileattr *fa); -- 2.25.1 From d5af2386cd9802c77c3682fcc7459e4abe060737 Mon Sep 17 00:00:00 2001 From: ztarkhani <ztarkhani(a)microsoft.com> Date: Fri, 13 Jan 2023 12:17:11 +0000 Subject: [PATCH 2/2] enable CUSE --- arch/arm64/configs/morello_transitional_pcuabi_defconfig | 1 + fs/fuse/cuse.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm64/configs/morello_transitional_pcuabi_defconfig b/arch/arm64/configs/morello_transitional_pcuabi_defconfig index af37f9ed4e36..829432db9807 100644 --- a/arch/arm64/configs/morello_transitional_pcuabi_defconfig +++ b/arch/arm64/configs/morello_transitional_pcuabi_defconfig @@ -131,6 +131,7 @@ CONFIG_TMPFS=y CONFIG_HUGETLBFS=y CONFIG_CONFIGFS_FS=y CONFIG_FUSE_FS=y +CONFIG_CUSE=y # CONFIG_EFIVAR_FS is not set CONFIG_9P_FS=y CONFIG_NLS_CODEPAGE_437=y diff --git a/fs/fuse/cuse.c b/fs/fuse/cuse.c index c7d882a9fe33..5dc123f903a9 100644 --- a/fs/fuse/cuse.c +++ b/fs/fuse/cuse.c @@ -153,7 +153,7 @@ static int cuse_release(struct inode *inode, struct file *file) } static long cuse_file_ioctl(struct file *file, unsigned int cmd, - unsigned long arg) + user_uintptr_t arg) { struct fuse_file *ff = file->private_data; struct cuse_conn *cc = fc_to_cc(ff->fm->fc); -- 2.25.1

1 year, 10 months

2
1
0 0

[PATCH v3] linux/user_ptr.h: clear up as_user_ptr() usage

by Zachary Leaf

as_user_ptr() is intended to be used where an arbitrary integer e.g. an error code is stored in a __user ptr. The current implementation can be somewhat confusing in that it looks like it can be used as direct replacement for u64_to_user_ptr e.g. in PCuABI, where u64 addresses in the kernel-user interface are being replaced with capability containing types such as __kernel_uintptr_t. Currently, passing a valid capability e.g. a __kernel_uintptr_t, __uintcap_t or user_uintptr_t etc to as_user_ptr() will result in a cast to (void __user *) and a valid capability/pointer that can be dereferenced. This is contrary to the code comment and intended usage for as_user_ptr(). Add a cast to (u64) before the cast to (void __user *)(user_uintptr_t) to make clearer the intended usage. This also always results in a null capability that cannot be dereferenced. Signed-off-by: Zachary Leaf <zachary.leaf(a)arm.com> --- rendered version: https://git.morello-project.org/zdleaf/linux/-/blob/docs/as_user_ptr_v3/Doc… Documentation/core-api/user_ptr.rst | 16 +++++++++++++--- include/linux/user_ptr.h | 6 +++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/Documentation/core-api/user_ptr.rst b/Documentation/core-api/user_ptr.rst index 21e02d4bd11b..197bb198ede7 100644 --- a/Documentation/core-api/user_ptr.rst +++ b/Documentation/core-api/user_ptr.rst @@ -31,7 +31,8 @@ errors are likely to occur in PCuABI if it is omitted. In certain situations, it is more convenient to represent user pointers as integers. The type ``user_uintptr_t`` must be used for that purpose. It is **the only integer type** that may be directly cast to and from a -user pointer, for instance ``user_uintptr_t u = (user_uintptr_t)uptr``. +user pointer, for instance ``user_uintptr_t uint = (user_uintptr_t)uptr`` +or ``void __user *uptr = (void __user *)uint``. Note that ``(u)intptr_t`` is the recommended type to represent kernel pointers, but it cannot represent user pointers. @@ -106,6 +107,13 @@ Each function covers a particular category of input integer: - Integer of any type: ``as_user_ptr()`` - ``u64`` (deprecated): ``u64_to_user_ptr()`` +Note: ``as_user_ptr()`` nullifies any capability and is not a +replacement for most uses of ``u64_to_user_ptr()``. To convert an +integer representation of a user pointer i.e. ``user_uintptr_t`` back to +pointer type, a simple cast such as ``(void __user *)`` is sufficient. +See `Representing user pointers`_ and notes for ``as_user_ptr()`` and +``u64_to_user_ptr()`` below. + These functions are available in ``<linux/user_ptr.h>``, except ``compat_ptr()`` (``<linux/compat.h>``). @@ -142,8 +150,10 @@ derived from in the PCuABI case. | | | ``compat_*`` struct | | | +------------------------------+--------------------+------------------------+-----------------------------------+------------------------------------------------------+ | ``as_user_ptr()`` | Arbitrary integer | Error code | Null capability | This is a pure representation change, as suggested | -| | | | | by the ``as_`` prefix. The resulting pointer cannot | -| | | | | be dereferenced. | +| | | | | by the ``as_`` prefix. Returns up to 64 bits of an | +| | | | | arbitrary integer represented as a user pointer. The | +| | | | | result is not a valid pointer and cannot be | +| | | | | dereferenced. | +------------------------------+--------------------+------------------------+-----------------------------------+------------------------------------------------------+ | ``u64_to_user_ptr()`` | ``u64`` integer | [Deprecated] | Null capability | Legacy function, new callers should not be added. | | | | | | Existing callers should move to either | diff --git a/include/linux/user_ptr.h b/include/linux/user_ptr.h index 0942b58cfb6a..516024f3fead 100644 --- a/include/linux/user_ptr.h +++ b/include/linux/user_ptr.h @@ -12,10 +12,10 @@ * as_user_ptr - convert an arbitrary integer value to a user pointer * @x: the integer value to convert * - * Returns @x represented as a user pointer. The result is not a valid pointer - * and shall not be dereferenced. + * Returns up to 64 bits of @x represented as a user pointer. The result is + * not a valid pointer and shall not be dereferenced. */ -#define as_user_ptr(x) ((void __user *)(user_uintptr_t)(x)) +#define as_user_ptr(x) ((void __user *)(user_uintptr_t)(u64)(x)) /* Same semantics as as_user_ptr(), but also requires x to be of a given type */ #define as_user_ptr_strict(type, x) ( \ -- 2.34.1

1 year, 10 months

2
1
0 0

[PATCH v2] linux/user_ptr.h: clear up as_user_ptr() usage

by Zachary Leaf

as_user_ptr() is intended to be used where an arbitrary integer e.g. an error code is stored in a __user ptr. The current implementation can be somewhat confusing in that it looks like it can be used as direct replacement for u64_to_user_ptr e.g. in PCuABI, where u64 addresses in the kernel-user interface are being replaced with capability containing types such as __kernel_uintptr_t. Currently, passing a valid capability e.g. a __kernel_uintptr_t, __uintcap_t or user_uintptr_t etc to as_user_ptr() will result in a cast to (void __user *) and a valid capability/pointer that can be dereferenced. This is contrary to the code comment and intended usage for as_user_ptr(). Add a cast to (u64) before the cast to (void __user *)(user_uintptr_t) to make clearer the intended usage. This also always results in a null capability that cannot be dereferenced. Signed-off-by: Zachary Leaf <zachary.leaf(a)arm.com> --- rendered version: https://git.morello-project.org/zdleaf/linux/-/blob/dev/as_user_ptr/Documen… Documentation/core-api/user_ptr.rst | 22 +++++++++++++++++----- include/linux/user_ptr.h | 6 +++--- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/Documentation/core-api/user_ptr.rst b/Documentation/core-api/user_ptr.rst index 21e02d4bd11b..b4b9afe88095 100644 --- a/Documentation/core-api/user_ptr.rst +++ b/Documentation/core-api/user_ptr.rst @@ -31,7 +31,8 @@ errors are likely to occur in PCuABI if it is omitted. In certain situations, it is more convenient to represent user pointers as integers. The type ``user_uintptr_t`` must be used for that purpose. It is **the only integer type** that may be directly cast to and from a -user pointer, for instance ``user_uintptr_t u = (user_uintptr_t)uptr``. +user pointer, for instance ``user_uintptr_t uint = (user_uintptr_t)uptr`` +or ``void __user *uptr = (void __user *)uint``. Note that ``(u)intptr_t`` is the recommended type to represent kernel pointers, but it cannot represent user pointers. @@ -106,6 +107,13 @@ Each function covers a particular category of input integer: - Integer of any type: ``as_user_ptr()`` - ``u64`` (deprecated): ``u64_to_user_ptr()`` +Note: ``as_user_ptr()`` nullifies any capability and is not a +replacement for all uses of ``u64_to_user_ptr()``. To convert an integer +representation of a user pointer i.e. user_uintptr_t back to pointer +type, a simple cast such as ``(void __user *)`` is sufficient. See +`Representing user pointers`_ and notes for ``as_user_ptr()`` and +``u64_to_user_ptr()`` below. + These functions are available in ``<linux/user_ptr.h>``, except ``compat_ptr()`` (``<linux/compat.h>``). @@ -142,16 +150,20 @@ derived from in the PCuABI case. | | | ``compat_*`` struct | | | +------------------------------+--------------------+------------------------+-----------------------------------+------------------------------------------------------+ | ``as_user_ptr()`` | Arbitrary integer | Error code | Null capability | This is a pure representation change, as suggested | -| | | | | by the ``as_`` prefix. The resulting pointer cannot | -| | | | | be dereferenced. | +| | | | | by the ``as_`` prefix. Returns up to 64 bits of an | +| | | | | arbitrary integer represented as a user pointer. The | +| | | | | result is not a valid pointer and cannot be | +| | | | | dereferenced. | +------------------------------+--------------------+------------------------+-----------------------------------+------------------------------------------------------+ | ``u64_to_user_ptr()`` | ``u64`` integer | [Deprecated] | Null capability | Legacy function, new callers should not be added. | | | | | | Existing callers should move to either | | | | | | ``as_user_ptr()`` if the user pointer is not used to | | | | | | access memory, or ``uaddr_to_user_ptr()`` if the | | | | | | input is an address and the user pointer is | -| | | | | dereferenced (or ideally removed if the uapi can be | -| | | | | changed appropriately). | +| | | | | dereferenced (or ideally replace u64 with a | +| | | | | capability containing type such as | +| | | | | ``__kernel_uintptr_t`` if the uapi can be changed | +| | | | | appropriately). | +------------------------------+--------------------+------------------------+-----------------------------------+------------------------------------------------------+ diff --git a/include/linux/user_ptr.h b/include/linux/user_ptr.h index 0942b58cfb6a..516024f3fead 100644 --- a/include/linux/user_ptr.h +++ b/include/linux/user_ptr.h @@ -12,10 +12,10 @@ * as_user_ptr - convert an arbitrary integer value to a user pointer * @x: the integer value to convert * - * Returns @x represented as a user pointer. The result is not a valid pointer - * and shall not be dereferenced. + * Returns up to 64 bits of @x represented as a user pointer. The result is + * not a valid pointer and shall not be dereferenced. */ -#define as_user_ptr(x) ((void __user *)(user_uintptr_t)(x)) +#define as_user_ptr(x) ((void __user *)(user_uintptr_t)(u64)(x)) /* Same semantics as as_user_ptr(), but also requires x to be of a given type */ #define as_user_ptr_strict(type, x) ( \ -- 2.34.1

1 year, 10 months

2
2
0 0

[PATCH] tracing: Fix signature of unlocked_ioctl callback

by Zachary Leaf

Commit 01b2a5217173 ("tracing: Add ioctl() to force ring buffer waiters to wake up") added a callback to unlocked_ioctl, however in PCuABI the function signature of file_operations->unlocked_ioctl in include/linux/fs.h has been changed to take a user_uintptr_t arg as the third param. Update the signature of tracing_buffers_ioctl to avoid compilation errors as below when tracing is enabled. kernel/trace/trace.c:8396:20: error: incompatible function pointer types initializing 'long (*)(struct file *, unsigned int, user_uintptr_t)' (aka 'long (*)(struct file *, unsigned int, unsigned __intcap)') with an expression of type 'long (struct file *, unsigned int, unsigned long)' [-Werror,-Wincompatible-function-pointer-types] Reported-by: Teo Couprie Diaz <teo.coupriediaz(a)arm.com> Signed-off-by: Zachary Leaf <zachary.leaf(a)arm.com> --- note: this patch is for incoming rebase from 5.18->6.1 kernel/trace/trace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 5cfc95a52bc3..3ad1db4c4a3e 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -8367,7 +8367,7 @@ tracing_buffers_splice_read(struct file *file, loff_t *ppos, } /* An ioctl call with cmd 0 to the ring buffer file will wake up all waiters */ -static long tracing_buffers_ioctl(struct file *file, unsigned int cmd, unsigned long arg) +static long tracing_buffers_ioctl(struct file *file, unsigned int cmd, user_uintptr_t arg) { struct ftrace_buffer_info *info = file->private_data; struct trace_iterator *iter = &info->iter; -- 2.34.1

1 year, 10 months

2
1
0 0

[PATCH v7 1/3] arm64: compat: Remove defines now in asm-generic

by Teo Couprie Diaz

Some generic COMPAT definitions have been consolidated in asm-generic/compat.h: commit 84a0c977ab98 ("asm-generic: compat: Cleanup duplicate definitions") Remove those that are already defined to the same value there from arm64 asm/compat.h. Signed-off-by: Teo Couprie Diaz <teo.coupriediaz(a)arm.com> --- arch/arm64/include/asm/compat.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arch/arm64/include/asm/compat.h b/arch/arm64/include/asm/compat.h index a85a500148ac..2255df98fbcd 100644 --- a/arch/arm64/include/asm/compat.h +++ b/arch/arm64/include/asm/compat.h @@ -85,10 +85,6 @@ struct compat_statfs { compat_long_t f_spare[4]; }; -#define COMPAT_RLIM_INFINITY 0xffffffff - -#define COMPAT_OFF_T_MAX 0x7fffffff - static inline void __user *compat_ptr(compat_uptr_t uptr) { /* -- 2.25.1

1 year, 10 months

2
3
0 0

[PATCH v6 1/3] arm64: compat: Remove defines now in asm-generic

by Teo Couprie Diaz

Some generic COMPAT definitions have been consolidated in asm-generic/compat.h: commit 84a0c977ab98 ("asm-generic: compat: Cleanup duplicate definitions") Remove those that are already defined to the same value there from arm64 asm/compat.h. Signed-off-by: Teo Couprie Diaz <teo.coupriediaz(a)arm.com> --- arch/arm64/include/asm/compat.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arch/arm64/include/asm/compat.h b/arch/arm64/include/asm/compat.h index a85a500148ac..2255df98fbcd 100644 --- a/arch/arm64/include/asm/compat.h +++ b/arch/arm64/include/asm/compat.h @@ -85,10 +85,6 @@ struct compat_statfs { compat_long_t f_spare[4]; }; -#define COMPAT_RLIM_INFINITY 0xffffffff - -#define COMPAT_OFF_T_MAX 0x7fffffff - static inline void __user *compat_ptr(compat_uptr_t uptr) { /* -- 2.25.1

1 year, 10 months

2
6
0 0

[PATCH v5 0/2] arm64: compat: update compat defines to 64-bits

by Teo Couprie Diaz

This rebases the patch on kernel 6.1 and slightly reworks it. Indeed, it removes some defines that are now consolidated in the generic compat header, and now takes advantage that COMPAT_MINSIGSTKSZ is defined in linux/compat.h if it is not already. Teo Couprie Diaz (2): arm64: compat: Remove defines now in asm-generic compat: update compat defines to 64-bits arch/arm64/include/asm/compat.h | 6 ++---- include/asm-generic/compat.h | 10 ++++++++++ 2 files changed, 12 insertions(+), 4 deletions(-) -- 2.25.1

1 year, 10 months

2
6
0 0

[PATCH 0/4] Update in kselftests for Gcc

by Amit Daniel Kachhap

Hi All, This series are modifications in kselftests required to compile with alpha version of Morello Gnu toochain recently released [1]. The whole series can also be found here [2]. Thanks, Amit Daniel [1]: https://developer.arm.com/downloads/-/arm-gnu-toolchain-for-morello-downloa… [2]: git@git.morello-project.org:amitdaniel/linux.git gcc_kselftests_support_v1 Amit Daniel Kachhap (4): kselftests/arm64: morello: Fix the operand mismatch error kselftests/arm64: morello: Define uintcap_t if not defined kselftests/arm64: morello: Initialize the dynamic relocations kselftests/arm64: morello: Enable Gcc toolchain support .../testing/selftests/arm64/morello/Makefile | 12 +- .../selftests/arm64/morello/bootstrap.c | 4 +- .../selftests/arm64/morello/freestanding.c | 7 + .../selftests/arm64/morello/freestanding.h | 3 + .../arm64/morello/freestanding_init_globals.c | 149 +++++++++++++++++- .../arm64/morello/freestanding_start.S | 5 +- 6 files changed, 166 insertions(+), 14 deletions(-) -- 2.25.1

1 year, 10 months

2
8
0 0

[PATCH v4] arm64: compat: update compat defines to 64-bits

by Teo Couprie Diaz

Some compat defines are still using 32-bits values, update them to a 64-bits one (COMPAT_OFF_T_MAX) or use the native value in COMPAT64 (COMPAT_RLIM_INFINITY, COMPAT_MINSIGSTKSZ). Signed-off-by: Teo Couprie Diaz <teo.coupriediaz(a)arm.com> --- arch/arm64/include/asm/compat.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/arch/arm64/include/asm/compat.h b/arch/arm64/include/asm/compat.h index 9c6112ae942b..b2a8ccbeb4ef 100644 --- a/arch/arm64/include/asm/compat.h +++ b/arch/arm64/include/asm/compat.h @@ -15,6 +15,8 @@ typedef u16 compat_mode_t; /* * Architecture specific compatibility types */ +#include <asm/signal.h> +#include <linux/resource.h> #include <linux/types.h> #include <linux/sched.h> #include <linux/sched/task_stack.h> @@ -100,9 +102,15 @@ struct compat_statfs { compat_long_t f_spare[4]; }; +#ifdef CONFIG_COMPAT64 +#define COMPAT_RLIM_INFINITY RLIM_INFINITY + +#define COMPAT_OFF_T_MAX LONG_MAX +#else #define COMPAT_RLIM_INFINITY 0xffffffff #define COMPAT_OFF_T_MAX 0x7fffffff +#endif static inline void __user *compat_ptr(compat_uptr_t uptr) { @@ -115,7 +123,12 @@ static inline void __user *compat_ptr(compat_uptr_t uptr) #define compat_ptr(uptr) compat_ptr(uptr) #define compat_user_stack_pointer() (user_stack_pointer(task_pt_regs(current))) + +#ifdef CONFIG_COMPAT64 +#define COMPAT_MINSIGSTKSZ MINSIGSTKSZ +#else #define COMPAT_MINSIGSTKSZ 2048 +#endif #ifdef CONFIG_COMPAT64 #define COMPAT_USE_64BIT_TIME 1 -- 2.25.1

1 year, 10 months

2
1
0 0

2024

2023

2022

linux-morello January 2023