* [PATCH] arm64/sve: <uapi/asm/ptrace.h> should not depend on <uapi/linux/prctl.h> @ 2019-06-13 16:38 Anisse Astier 2019-06-13 17:14 ` Dave Martin 2019-06-14 16:46 ` [PATCH v2] " Anisse Astier 0 siblings, 2 replies; 7+ messages in thread From: Anisse Astier @ 2019-06-13 16:38 UTC (permalink / raw) To: Catalin Marinas, Will Deacon, Dave Martin, linux-arm-kernel Cc: Kristina Martsenko, Richard Henderson, Mark Rutland, linux-kernel, Rich Felker, Dmitry V . Levin, Ricardo Salveti, Anisse Astier Otherwise this will create userspace build issues for any program (strace, qemu) that includes both <sys/prctl.h> (with musl libc) and <linux/ptrace.h> (which then includes <asm/ptrace.h>), like this: error: redefinition of 'struct prctl_mm_map' struct prctl_mm_map { See https://github.com/foundriesio/meta-lmp/commit/6d4a106e191b5d79c41b9ac78fd321316d3013c0 for a public example of people working around this issue. This fixes an UAPI regression introduced in commit 43d4da2c45b2 ("arm64/sve: ptrace and ELF coredump support"). Cc: stable@vger.kernel.org Signed-off-by: Anisse Astier <aastier@freebox.fr> --- arch/arm64/include/uapi/asm/ptrace.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/arch/arm64/include/uapi/asm/ptrace.h b/arch/arm64/include/uapi/asm/ptrace.h index d78623acb649..03b6d6f029fc 100644 --- a/arch/arm64/include/uapi/asm/ptrace.h +++ b/arch/arm64/include/uapi/asm/ptrace.h @@ -65,8 +65,6 @@ #ifndef __ASSEMBLY__ -#include <linux/prctl.h> - /* * User structures for general purpose, floating point and debug registers. */ @@ -113,10 +111,10 @@ struct user_sve_header { /* * Common SVE_PT_* flags: - * These must be kept in sync with prctl interface in <linux/ptrace.h> + * These must be kept in sync with prctl interface in <linux/prctl.h> */ -#define SVE_PT_VL_INHERIT (PR_SVE_VL_INHERIT >> 16) -#define SVE_PT_VL_ONEXEC (PR_SVE_SET_VL_ONEXEC >> 16) +#define SVE_PT_VL_INHERIT (1 << 1) /* PR_SVE_VL_INHERIT */ +#define SVE_PT_VL_ONEXEC (1 << 2) /* PR_SVE_SET_VL_ONEXEC */ /* -- 2.19.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] arm64/sve: <uapi/asm/ptrace.h> should not depend on <uapi/linux/prctl.h> 2019-06-13 16:38 [PATCH] arm64/sve: <uapi/asm/ptrace.h> should not depend on <uapi/linux/prctl.h> Anisse Astier @ 2019-06-13 17:14 ` Dave Martin 2019-06-14 10:23 ` Will Deacon 2019-06-14 11:22 ` Anisse Astier 2019-06-14 16:46 ` [PATCH v2] " Anisse Astier 1 sibling, 2 replies; 7+ messages in thread From: Dave Martin @ 2019-06-13 17:14 UTC (permalink / raw) To: Anisse Astier Cc: Catalin Marinas, Will Deacon, linux-arm-kernel, Mark Rutland, Richard Henderson, Rich Felker, linux-kernel, Kristina Martsenko, Dmitry V . Levin, Ricardo Salveti On Thu, Jun 13, 2019 at 06:38:01PM +0200, Anisse Astier wrote: > Otherwise this will create userspace build issues for any program > (strace, qemu) that includes both <sys/prctl.h> (with musl libc) and > <linux/ptrace.h> (which then includes <asm/ptrace.h>), like this: > > error: redefinition of 'struct prctl_mm_map' > struct prctl_mm_map { > > See https://github.com/foundriesio/meta-lmp/commit/6d4a106e191b5d79c41b9ac78fd321316d3013c0 > for a public example of people working around this issue. > > This fixes an UAPI regression introduced in commit 43d4da2c45b2 > ("arm64/sve: ptrace and ELF coredump support"). > > Cc: stable@vger.kernel.org Consider adding a Fixes: tag. > Signed-off-by: Anisse Astier <aastier@freebox.fr> > --- > arch/arm64/include/uapi/asm/ptrace.h | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/arch/arm64/include/uapi/asm/ptrace.h b/arch/arm64/include/uapi/asm/ptrace.h > index d78623acb649..03b6d6f029fc 100644 > --- a/arch/arm64/include/uapi/asm/ptrace.h > +++ b/arch/arm64/include/uapi/asm/ptrace.h > @@ -65,8 +65,6 @@ > > #ifndef __ASSEMBLY__ > > -#include <linux/prctl.h> > - > /* > * User structures for general purpose, floating point and debug registers. > */ > @@ -113,10 +111,10 @@ struct user_sve_header { > > /* > * Common SVE_PT_* flags: > - * These must be kept in sync with prctl interface in <linux/ptrace.h> > + * These must be kept in sync with prctl interface in <linux/prctl.h> Ack > */ > -#define SVE_PT_VL_INHERIT (PR_SVE_VL_INHERIT >> 16) > -#define SVE_PT_VL_ONEXEC (PR_SVE_SET_VL_ONEXEC >> 16) > +#define SVE_PT_VL_INHERIT (1 << 1) /* PR_SVE_VL_INHERIT */ > +#define SVE_PT_VL_ONEXEC (1 << 2) /* PR_SVE_SET_VL_ONEXEC */ Makes sense, but... Since sve_context.h was already introduced to solve a closely related problem, I wonder whether we can provide shadow definitions there, similarly to way the arm64/include/uapi/asm/ptrace.h definitions are derived. Although it's a slight abuse of that header, I think that would be my preferred approach. Otherwise, at least make the required relationship between ptrace.h and prctl.h constants a bit more obvious, say, #define SVE_PT_VL_INHERIT ((1 << 17) /* PR_SVE_SET_VL_INHERIT */ >> 16) etc. Cheers ---Dave ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] arm64/sve: <uapi/asm/ptrace.h> should not depend on <uapi/linux/prctl.h> 2019-06-13 17:14 ` Dave Martin @ 2019-06-14 10:23 ` Will Deacon 2019-06-14 11:22 ` Anisse Astier 1 sibling, 0 replies; 7+ messages in thread From: Will Deacon @ 2019-06-14 10:23 UTC (permalink / raw) To: Dave Martin Cc: Anisse Astier, Catalin Marinas, linux-arm-kernel, Mark Rutland, Richard Henderson, Rich Felker, linux-kernel, Kristina Martsenko, Dmitry V . Levin, Ricardo Salveti On Thu, Jun 13, 2019 at 06:14:44PM +0100, Dave Martin wrote: > On Thu, Jun 13, 2019 at 06:38:01PM +0200, Anisse Astier wrote: > > */ > > -#define SVE_PT_VL_INHERIT (PR_SVE_VL_INHERIT >> 16) > > -#define SVE_PT_VL_ONEXEC (PR_SVE_SET_VL_ONEXEC >> 16) > > +#define SVE_PT_VL_INHERIT (1 << 1) /* PR_SVE_VL_INHERIT */ > > +#define SVE_PT_VL_ONEXEC (1 << 2) /* PR_SVE_SET_VL_ONEXEC */ > > Makes sense, but... > > Since sve_context.h was already introduced to solve a closely related > problem, I wonder whether we can provide shadow definitions there, > similarly to way the arm64/include/uapi/asm/ptrace.h definitions are > derived. Although it's a slight abuse of that header, I think that > would be my preferred approach. Yes, that sounds better to me as well. Please send a v2! Will ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] arm64/sve: <uapi/asm/ptrace.h> should not depend on <uapi/linux/prctl.h> 2019-06-13 17:14 ` Dave Martin 2019-06-14 10:23 ` Will Deacon @ 2019-06-14 11:22 ` Anisse Astier 2019-06-14 14:22 ` Will Deacon 1 sibling, 1 reply; 7+ messages in thread From: Anisse Astier @ 2019-06-14 11:22 UTC (permalink / raw) To: Dave Martin, Will Deacon Cc: Catalin Marinas, Will Deacon, linux-arm-kernel, Mark Rutland, Richard Henderson, Rich Felker, linux-kernel, Kristina Martsenko, Dmitry V . Levin, Ricardo Salveti Hi Dave, Thanks for taking the time to review this patch, On Thu, Jun 13, 2019 at 06:14:44PM +0100, Dave Martin wrote: > On Thu, Jun 13, 2019 at 06:38:01PM +0200, Anisse Astier wrote: > > Otherwise this will create userspace build issues for any program > > (strace, qemu) that includes both <sys/prctl.h> (with musl libc) and > > <linux/ptrace.h> (which then includes <asm/ptrace.h>), like this: > > > > error: redefinition of 'struct prctl_mm_map' > > struct prctl_mm_map { > > > > See https://github.com/foundriesio/meta-lmp/commit/6d4a106e191b5d79c41b9ac78fd321316d3013c0 > > for a public example of people working around this issue. > > > > This fixes an UAPI regression introduced in commit 43d4da2c45b2 > > ("arm64/sve: ptrace and ELF coredump support"). > > > > Cc: stable@vger.kernel.org > > Consider adding a Fixes: tag. Will do in v2. > > > Signed-off-by: Anisse Astier <aastier@freebox.fr> > > --- > > arch/arm64/include/uapi/asm/ptrace.h | 8 +++----- > > 1 file changed, 3 insertions(+), 5 deletions(-) > > > > diff --git a/arch/arm64/include/uapi/asm/ptrace.h b/arch/arm64/include/uapi/asm/ptrace.h > > index d78623acb649..03b6d6f029fc 100644 > > --- a/arch/arm64/include/uapi/asm/ptrace.h > > +++ b/arch/arm64/include/uapi/asm/ptrace.h > > @@ -65,8 +65,6 @@ > > > > #ifndef __ASSEMBLY__ > > > > -#include <linux/prctl.h> > > - > > /* > > * User structures for general purpose, floating point and debug registers. > > */ > > @@ -113,10 +111,10 @@ struct user_sve_header { > > > > /* > > * Common SVE_PT_* flags: > > - * These must be kept in sync with prctl interface in <linux/ptrace.h> > > + * These must be kept in sync with prctl interface in <linux/prctl.h> > > Ack > > > */ > > -#define SVE_PT_VL_INHERIT (PR_SVE_VL_INHERIT >> 16) > > -#define SVE_PT_VL_ONEXEC (PR_SVE_SET_VL_ONEXEC >> 16) > > +#define SVE_PT_VL_INHERIT (1 << 1) /* PR_SVE_VL_INHERIT */ > > +#define SVE_PT_VL_ONEXEC (1 << 2) /* PR_SVE_SET_VL_ONEXEC */ > > Makes sense, but... > > Since sve_context.h was already introduced to solve a closely related > problem, I wonder whether we can provide shadow definitions there, > similarly to way the arm64/include/uapi/asm/ptrace.h definitions are > derived. Although it's a slight abuse of that header, I think that > would be my preferred approach. Yes I saw this, and I considered doing something similar. But, those defines are in uapi/linux/prctl.h, which does not include any asm/*.h header. This would have then required adding a full infrastructure for asm/prctl.h (that could then include sve_context.h for example), which does not exist yet, instead of copying these two values. Since this is part of the kernel-userspace ABI, I don't see this values changing anytime soon, which is why I thought copying them shouldn't be a big issue. A simple solution would be to to include sve_context.h or a third header, maybe linux/prctl_arm64_sve.h (with only these two/five defines), in linux/prctl.h, and reuse it in uapi/asm/ptrace.h; but this would break the self-contained nature of linux/prctl.h. > > Otherwise, at least make the required relationship between ptrace.h and > prctl.h constants a bit more obvious, say, > > #define SVE_PT_VL_INHERIT ((1 << 17) /* PR_SVE_SET_VL_INHERIT */ >> 16) This one is much simpler and closer to what I had in mind with this patch. Will, what do you think of this second approach Dave proposed ? Regards, Anisse ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] arm64/sve: <uapi/asm/ptrace.h> should not depend on <uapi/linux/prctl.h> 2019-06-14 11:22 ` Anisse Astier @ 2019-06-14 14:22 ` Will Deacon 0 siblings, 0 replies; 7+ messages in thread From: Will Deacon @ 2019-06-14 14:22 UTC (permalink / raw) To: Anisse Astier Cc: Dave Martin, Catalin Marinas, linux-arm-kernel, Mark Rutland, Richard Henderson, Rich Felker, linux-kernel, Kristina Martsenko, Dmitry V . Levin, Ricardo Salveti Hi Anisse, Dave, On Fri, Jun 14, 2019 at 01:22:22PM +0200, Anisse Astier wrote: > On Thu, Jun 13, 2019 at 06:14:44PM +0100, Dave Martin wrote: > > On Thu, Jun 13, 2019 at 06:38:01PM +0200, Anisse Astier wrote: > > > -#define SVE_PT_VL_INHERIT (PR_SVE_VL_INHERIT >> 16) > > > -#define SVE_PT_VL_ONEXEC (PR_SVE_SET_VL_ONEXEC >> 16) > > > +#define SVE_PT_VL_INHERIT (1 << 1) /* PR_SVE_VL_INHERIT */ > > > +#define SVE_PT_VL_ONEXEC (1 << 2) /* PR_SVE_SET_VL_ONEXEC */ > > > > Makes sense, but... > > > > Since sve_context.h was already introduced to solve a closely related > > problem, I wonder whether we can provide shadow definitions there, > > similarly to way the arm64/include/uapi/asm/ptrace.h definitions are > > derived. Although it's a slight abuse of that header, I think that > > would be my preferred approach. > > Yes I saw this, and I considered doing something similar. But, those > defines are in uapi/linux/prctl.h, which does not include any asm/*.h > header. This would have then required adding a full infrastructure for > asm/prctl.h (that could then include sve_context.h for example), which > does not exist yet, instead of copying these two values. x86 appears to have an asm/prctl.h implementation, but it's not included by anybody so I guess that doesn't really help us here. > Since this is part of the kernel-userspace ABI, I don't see this values > changing anytime soon, which is why I thought copying them shouldn't be > a big issue. Certainly not a big issue, just that the harder we make this to change the better. > A simple solution would be to to include sve_context.h or a third > header, maybe linux/prctl_arm64_sve.h (with only these two/five > defines), in linux/prctl.h, and reuse it in uapi/asm/ptrace.h; but this > would break the self-contained nature of linux/prctl.h. > > > > Otherwise, at least make the required relationship between ptrace.h and > > prctl.h constants a bit more obvious, say, > > > > #define SVE_PT_VL_INHERIT ((1 << 17) /* PR_SVE_SET_VL_INHERIT */ >> 16) > > This one is much simpler and closer to what I had in mind with this > patch. > > Will, what do you think of this second approach Dave proposed ? Duplication is grotty, but it does the job so I'm ok with it. I don't have any better ideas. Thanks, Will ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2] arm64/sve: <uapi/asm/ptrace.h> should not depend on <uapi/linux/prctl.h> 2019-06-13 16:38 [PATCH] arm64/sve: <uapi/asm/ptrace.h> should not depend on <uapi/linux/prctl.h> Anisse Astier 2019-06-13 17:14 ` Dave Martin @ 2019-06-14 16:46 ` Anisse Astier 2019-06-18 13:40 ` Dave Martin 1 sibling, 1 reply; 7+ messages in thread From: Anisse Astier @ 2019-06-14 16:46 UTC (permalink / raw) To: Will Deacon, Dave Martin, linux-arm-kernel Cc: Catalin Marinas, Kristina Martsenko, Richard Henderson, Mark Rutland, linux-kernel, Rich Felker, Dmitry V . Levin, Ricardo Salveti, Anisse Astier Otherwise this will create userspace build issues for any program (strace, qemu) that includes both <sys/prctl.h> (with musl libc) and <linux/ptrace.h> (which then includes <asm/ptrace.h>), like this: error: redefinition of 'struct prctl_mm_map' struct prctl_mm_map { See https://github.com/foundriesio/meta-lmp/commit/6d4a106e191b5d79c41b9ac78fd321316d3013c0 for a public example of people working around this issue. Copying the defines is a bit imperfect here, but better than creating a whole other header for just two defines that would never change, as part of the kernel ABI. Fixes: 43d4da2c45b2 ("arm64/sve: ptrace and ELF coredump support") Cc: stable@vger.kernel.org Signed-off-by: Anisse Astier <aastier@freebox.fr> --- Changes since v1: - made a bit more explicit that we copied defined symbols, in commit and code. - Use Fixes: tag in commit message Thanks to Dave Martin and Will Deacon for the review. --- arch/arm64/include/uapi/asm/ptrace.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/arch/arm64/include/uapi/asm/ptrace.h b/arch/arm64/include/uapi/asm/ptrace.h index d78623acb649..438759e7e8a7 100644 --- a/arch/arm64/include/uapi/asm/ptrace.h +++ b/arch/arm64/include/uapi/asm/ptrace.h @@ -65,8 +65,6 @@ #ifndef __ASSEMBLY__ -#include <linux/prctl.h> - /* * User structures for general purpose, floating point and debug registers. */ @@ -113,10 +111,10 @@ struct user_sve_header { /* * Common SVE_PT_* flags: - * These must be kept in sync with prctl interface in <linux/ptrace.h> + * These must be kept in sync with prctl interface in <linux/prctl.h> */ -#define SVE_PT_VL_INHERIT (PR_SVE_VL_INHERIT >> 16) -#define SVE_PT_VL_ONEXEC (PR_SVE_SET_VL_ONEXEC >> 16) +#define SVE_PT_VL_INHERIT ((1 << 17) /* PR_SVE_VL_INHERIT */ >> 16) +#define SVE_PT_VL_ONEXEC ((1 << 18) /* PR_SVE_SET_VL_ONEXEC */ >> 16) /* -- 2.19.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v2] arm64/sve: <uapi/asm/ptrace.h> should not depend on <uapi/linux/prctl.h> 2019-06-14 16:46 ` [PATCH v2] " Anisse Astier @ 2019-06-18 13:40 ` Dave Martin 0 siblings, 0 replies; 7+ messages in thread From: Dave Martin @ 2019-06-18 13:40 UTC (permalink / raw) To: Anisse Astier Cc: Will Deacon, linux-arm-kernel, Mark Rutland, Catalin Marinas, Rich Felker, linux-kernel, Kristina Martsenko, Dmitry V . Levin, Ricardo Salveti, Richard Henderson On Fri, Jun 14, 2019 at 06:46:00PM +0200, Anisse Astier wrote: > Otherwise this will create userspace build issues for any program > (strace, qemu) that includes both <sys/prctl.h> (with musl libc) and > <linux/ptrace.h> (which then includes <asm/ptrace.h>), like this: > > error: redefinition of 'struct prctl_mm_map' > struct prctl_mm_map { > > See https://github.com/foundriesio/meta-lmp/commit/6d4a106e191b5d79c41b9ac78fd321316d3013c0 > for a public example of people working around this issue. > > Copying the defines is a bit imperfect here, but better than creating a > whole other header for just two defines that would never change, as part > of the kernel ABI. > > Fixes: 43d4da2c45b2 ("arm64/sve: ptrace and ELF coredump support") > Cc: stable@vger.kernel.org > Signed-off-by: Anisse Astier <aastier@freebox.fr> > --- > Changes since v1: > - made a bit more explicit that we copied defined symbols, in commit > and code. > - Use Fixes: tag in commit message > > Thanks to Dave Martin and Will Deacon for the review. > > --- > arch/arm64/include/uapi/asm/ptrace.h | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/arch/arm64/include/uapi/asm/ptrace.h b/arch/arm64/include/uapi/asm/ptrace.h > index d78623acb649..438759e7e8a7 100644 > --- a/arch/arm64/include/uapi/asm/ptrace.h > +++ b/arch/arm64/include/uapi/asm/ptrace.h > @@ -65,8 +65,6 @@ > > #ifndef __ASSEMBLY__ > > -#include <linux/prctl.h> > - > /* > * User structures for general purpose, floating point and debug registers. > */ > @@ -113,10 +111,10 @@ struct user_sve_header { > > /* > * Common SVE_PT_* flags: > - * These must be kept in sync with prctl interface in <linux/ptrace.h> > + * These must be kept in sync with prctl interface in <linux/prctl.h> > */ > -#define SVE_PT_VL_INHERIT (PR_SVE_VL_INHERIT >> 16) > -#define SVE_PT_VL_ONEXEC (PR_SVE_SET_VL_ONEXEC >> 16) > +#define SVE_PT_VL_INHERIT ((1 << 17) /* PR_SVE_VL_INHERIT */ >> 16) > +#define SVE_PT_VL_ONEXEC ((1 << 18) /* PR_SVE_SET_VL_ONEXEC */ >> 16) FWIW, Acked-by: Dave Martin <Dave.Martin@arm.com> Ideally we would create a common <uapi/asm/prctl.h> that arm64 could specialise as appropriate, but since x86 already has a similar header shadowing this, it may be more trouble than it's worth to generalise it. Cheers ---Dave ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2019-06-18 13:40 UTC | newest] Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-06-13 16:38 [PATCH] arm64/sve: <uapi/asm/ptrace.h> should not depend on <uapi/linux/prctl.h> Anisse Astier 2019-06-13 17:14 ` Dave Martin 2019-06-14 10:23 ` Will Deacon 2019-06-14 11:22 ` Anisse Astier 2019-06-14 14:22 ` Will Deacon 2019-06-14 16:46 ` [PATCH v2] " Anisse Astier 2019-06-18 13:40 ` Dave Martin
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).