From: Mark Rutland <mark.rutland@arm.com>
To: Christoph Hellwig <hch@lst.de>,
Geert Uytterhoeven <geert@linux-m68k.org>
Cc: linux-arch@vger.kernel.org, Nick Hu <nickhu@andestech.com>,
linux-kernel@vger.kernel.org, Palmer Dabbelt <palmer@dabbelt.com>,
Greentime Hu <green.hu@gmail.com>,
Paul Walmsley <paul.walmsley@sifive.com>,
Andrew Morton <akpm@linux-foundation.org>,
Vincent Chen <deanbo422@gmail.com>,
Linus Torvalds <torvalds@linux-foundation.org>,
linux-riscv@lists.infradead.org
Subject: Re: [PATCH 5/6] uaccess: add force_uaccess_{begin,end} helpers
Date: Mon, 13 Jul 2020 13:21:48 +0100 [thread overview]
Message-ID: <20200713122148.GA51007@lakrids.cambridge.arm.com> (raw)
In-Reply-To: <20200710135706.537715-6-hch@lst.de>
On Fri, Jul 10, 2020 at 03:57:05PM +0200, Christoph Hellwig wrote:
> Add helpers to wraper the get_fs/set_fs magic for undoing any damange
> done by set_fs(KERNEL_DS). There is no real functional benefit, but this
> documents the intent of these calls better, and will allow stubbing the
> functions out easily for kernels builds that do not allow address space
> overrides in the future.
> diff --git a/arch/m68k/include/asm/tlbflush.h b/arch/m68k/include/asm/tlbflush.h
> index 191e75a6bb249e..30471549e1e224 100644
> --- a/arch/m68k/include/asm/tlbflush.h
> +++ b/arch/m68k/include/asm/tlbflush.h
> @@ -13,13 +13,13 @@ static inline void flush_tlb_kernel_page(void *addr)
> if (CPU_IS_COLDFIRE) {
> mmu_write(MMUOR, MMUOR_CNL);
> } else if (CPU_IS_040_OR_060) {
> - mm_segment_t old_fs = get_fs();
> - set_fs(KERNEL_DS);
> + mm_segment_t old_fs = force_uaccess_begin();
> +
This used to set KERNEL_DS, and now it sets USER_DS, which looks wrong
superficially.
If the new behaviour is fine it suggests that the old behaviour was
wrong, or that this is superfluous and could go entirely.
Geert?
Mark.
> __asm__ __volatile__(".chip 68040\n\t"
> "pflush (%0)\n\t"
> ".chip 68k"
> : : "a" (addr));
> - set_fs(old_fs);
> + force_uaccess_end(old_fs);
> } else if (CPU_IS_020_OR_030)
> __asm__ __volatile__("pflush #4,#4,(%0)" : : "a" (addr));
> +/*
> + * Force the uaccess routines to be wired up for actual userspace access,
> + * overriding any possible set_fs(KERNEL_DS) still lingering around. Undone
> + * using force_uaccess_end below.
> + */
> +static inline mm_segment_t force_uaccess_begin(void)
> +{
> + mm_segment_t fs = get_fs();
> +
> + set_fs(USER_DS);
> + return fs;
> +}
> +
> +static inline void force_uaccess_end(mm_segment_t oldfs)
> +{
> + set_fs(oldfs);
> +}
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
next prev parent reply other threads:[~2020-07-13 12:22 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-10 13:57 clean up address limit helpers Christoph Hellwig
2020-07-10 13:57 ` [PATCH 1/6] syscalls: use uaccess_kernel in addr_limit_user_check Christoph Hellwig
2020-07-10 13:57 ` [PATCH 2/6] nds32: use uaccess_kernel in show_regs Christoph Hellwig
2020-07-13 10:02 ` Greentime Hu
2020-07-10 13:57 ` [PATCH 3/6] riscv: include <asm/pgtable.h> in <asm/uaccess.h> Christoph Hellwig
2020-07-21 23:02 ` Palmer Dabbelt
2020-07-10 13:57 ` [PATCH 4/6] uaccess: remove segment_eq Christoph Hellwig
2020-07-13 9:16 ` Geert Uytterhoeven
2020-07-13 10:05 ` Greentime Hu
2020-07-10 13:57 ` [PATCH 5/6] uaccess: add force_uaccess_{begin,end} helpers Christoph Hellwig
2020-07-13 9:12 ` Geert Uytterhoeven
2020-07-13 10:06 ` Greentime Hu
2020-07-13 12:21 ` Mark Rutland [this message]
2020-07-13 13:19 ` Geert Uytterhoeven
2020-07-14 7:12 ` Christoph Hellwig
2020-07-13 12:26 ` Mark Rutland
2020-07-10 13:57 ` [PATCH 6/6] exec: use force_uaccess_begin during exec and exit Christoph Hellwig
2020-07-10 15:25 ` clean up address limit helpers Linus Torvalds
2020-07-14 7:09 ` Christoph Hellwig
2020-07-14 15:33 ` Linus Torvalds
2020-07-14 10:54 clean up address limit helpers v2 Christoph Hellwig
2020-07-14 10:55 ` [PATCH 5/6] uaccess: add force_uaccess_{begin,end} helpers Christoph Hellwig
2020-07-14 15:29 ` Linus Torvalds
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=20200713122148.GA51007@lakrids.cambridge.arm.com \
--to=mark.rutland@arm.com \
--cc=akpm@linux-foundation.org \
--cc=deanbo422@gmail.com \
--cc=geert@linux-m68k.org \
--cc=green.hu@gmail.com \
--cc=hch@lst.de \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=nickhu@andestech.com \
--cc=palmer@dabbelt.com \
--cc=paul.walmsley@sifive.com \
--cc=torvalds@linux-foundation.org \
/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).