From: Dave Martin <Dave.Martin@arm.com>
To: Anisse Astier <aastier@freebox.fr>
Cc: Mark Rutland <mark.rutland@arm.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Rich Felker <dalias@aerifal.cx>,
linux-kernel@vger.kernel.org, Will Deacon <will.deacon@arm.com>,
"Dmitry V . Levin" <ldv@altlinux.org>,
Ricardo Salveti <ricardo@foundries.io>,
Kristina Martsenko <kristina.martsenko@arm.com>,
Richard Henderson <richard.henderson@linaro.org>,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH v2] arm64/sve: <uapi/asm/ptrace.h> should not depend on <uapi/linux/prctl.h>
Date: Tue, 18 Jun 2019 14:40:29 +0100 [thread overview]
Message-ID: <20190618134029.GE2790@e103592.cambridge.arm.com> (raw)
In-Reply-To: <20190614164600.36966-1-aastier@freebox.fr>
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
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
prev parent reply other threads:[~2019-06-18 13:40 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190618134029.GE2790@e103592.cambridge.arm.com \
--to=dave.martin@arm.com \
--cc=aastier@freebox.fr \
--cc=catalin.marinas@arm.com \
--cc=dalias@aerifal.cx \
--cc=kristina.martsenko@arm.com \
--cc=ldv@altlinux.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=ricardo@foundries.io \
--cc=richard.henderson@linaro.org \
--cc=will.deacon@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).