From: Randy Dunlap <rdunlap@infradead.org>
To: Palmer Dabbelt <palmer@sifive.com>,
linux-riscv@lists.infradead.org,
Christoph Hellwig <hch@infradead.org>
Cc: aou@eecs.berkeley.edu, Arnd Bergmann <arnd@arndb.de>,
tklauser@distanz.ch, linux-kernel@vger.kernel.org,
Marcus Comstedt <marcus@mc.pp.se>
Subject: Re: [PATCH v2] RISC-V: Don't use a global include guard for uapi/asm/syscalls.h
Date: Mon, 6 Aug 2018 14:00:53 -0700 [thread overview]
Message-ID: <ba59adba-29d3-1559-e2f2-58f1149ba58c@infradead.org> (raw)
In-Reply-To: <20180806204258.22280-2-palmer@sifive.com>
On 08/06/2018 01:42 PM, Palmer Dabbelt wrote:
> This file is expected to be included multiple times in the same file in
> order to allow the __SYSCALL macro to generate system call tables. With
> a global include guard we end up missing __NR_riscv_flush_icache in the
> syscall table, which results in icache flushes that escape the vDSO call
> to not actually do anything.
>
> The fix is to move to per-#define include guards, which allows the
> system call tables to actually be populated. Thanks to Macrus Comstedt
> for finding and fixing the bug!
>
> I also went ahead and fixed the SPDX header to use a //-style comment,
> which I've been told is the canonical way to do it.
>
> Cc: Marcus Comstedt <marcus@mc.pp.se>
> Signed-off-by: Palmer Dabbelt <palmer@sifive.com>
> ---
> arch/riscv/include/asm/unistd.h | 5 +++++
> arch/riscv/include/uapi/asm/syscalls.h | 15 +++++++++------
> 2 files changed, 14 insertions(+), 6 deletions(-)
>
> diff --git a/arch/riscv/include/asm/unistd.h b/arch/riscv/include/asm/unistd.h
> index 080fb28061de..508be1780323 100644
> --- a/arch/riscv/include/asm/unistd.h
> +++ b/arch/riscv/include/asm/unistd.h
> @@ -11,6 +11,11 @@
> * GNU General Public License for more details.
> */
>
> +/*
> + * There is explicitly no include guard here because this file is expected to
to .. be .. included
> + * included multiple times. See uapi/asm/syscalls.h for more info.
> + */
> +
> #define __ARCH_WANT_SYS_CLONE
> #include <uapi/asm/unistd.h>
> #include <uapi/asm/syscalls.h>
> diff --git a/arch/riscv/include/uapi/asm/syscalls.h b/arch/riscv/include/uapi/asm/syscalls.h
> index 818655b0d535..690beb002d1d 100644
> --- a/arch/riscv/include/uapi/asm/syscalls.h
> +++ b/arch/riscv/include/uapi/asm/syscalls.h
> @@ -1,10 +1,13 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> +// SPDX-License-Identifier: GPL-2.0
> /*
> - * Copyright (C) 2017 SiFive
> + * Copyright (C) 2017-2018 SiFive
> */
>
> -#ifndef _ASM__UAPI__SYSCALLS_H
> -#define _ASM__UAPI__SYSCALLS_H
> +/*
> + * There is explicitly no include guard here because this file is expected to
> + * be included multiple times in order to define the syscall macros via
like that one :)
> + * __SYSCALL.
> + */
>
> /*
> * Allows the instruction cache to be flushed from userspace. Despite RISC-V
--
~Randy
next prev parent reply other threads:[~2018-08-06 21:00 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20180803195344.22271-1-palmer@sifive.com>
2018-08-04 8:54 ` [PATCH] RISC-V: Don't use a global include guard for uapi/asm/syscalls.h Christoph Hellwig
2018-08-06 20:42 ` Palmer Dabbelt
2018-08-06 20:42 ` [PATCH v2] " Palmer Dabbelt
2018-08-06 21:00 ` Randy Dunlap [this message]
2018-08-07 0:11 ` Palmer Dabbelt
2018-08-07 12:45 ` Christoph Hellwig
2018-08-09 5:58 ` Christoph Hellwig
2018-08-09 20:58 ` Palmer Dabbelt
2018-08-09 13:26 ` [PATCH] " Guenter Roeck
2018-08-09 20:58 ` Palmer Dabbelt
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=ba59adba-29d3-1559-e2f2-58f1149ba58c@infradead.org \
--to=rdunlap@infradead.org \
--cc=aou@eecs.berkeley.edu \
--cc=arnd@arndb.de \
--cc=hch@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=marcus@mc.pp.se \
--cc=palmer@sifive.com \
--cc=tklauser@distanz.ch \
/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).