The patch titled Subject: sparc64: define untagged_addr() has been added to the -mm tree. Its filename is sparc64-define-untagged_addr.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/sparc64-define-untagged_addr.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/sparc64-define-untagged_addr.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Christoph Hellwig <hch@xxxxxx> Subject: sparc64: define untagged_addr() Add a helper to untag a user pointer. This is needed for ADI support in get_user_pages_fast. Link: http://lkml.kernel.org/r/20190625143715.1689-9-hch@xxxxxx Signed-off-by: Christoph Hellwig <hch@xxxxxx> Reviewed-by: Khalid Aziz <khalid.aziz@xxxxxxxxxx> Cc: David Miller <davem@xxxxxxxxxxxxx> Cc: Andrey Konovalov <andreyknvl@xxxxxxxxxx> Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx> Cc: James Hogan <jhogan@xxxxxxxxxx> Cc: Jason Gunthorpe <jgg@xxxxxxxxxxxx> Cc: Michael Ellerman <mpe@xxxxxxxxxxxxxx> Cc: Nicholas Piggin <npiggin@xxxxxxxxx> Cc: Paul Burton <paul.burton@xxxxxxxx> Cc: Paul Mackerras <paulus@xxxxxxxxx> Cc: Ralf Baechle <ralf@xxxxxxxxxxxxxx> Cc: Rich Felker <dalias@xxxxxxxx> Cc: Yoshinori Sato <ysato@xxxxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/sparc/include/asm/pgtable_64.h | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) --- a/arch/sparc/include/asm/pgtable_64.h~sparc64-define-untagged_addr +++ a/arch/sparc/include/asm/pgtable_64.h @@ -1076,6 +1076,28 @@ static inline int io_remap_pfn_range(str } #define io_remap_pfn_range io_remap_pfn_range +static inline unsigned long untagged_addr(unsigned long start) +{ + if (adi_capable()) { + long addr = start; + + /* If userspace has passed a versioned address, kernel + * will not find it in the VMAs since it does not store + * the version tags in the list of VMAs. Storing version + * tags in list of VMAs is impractical since they can be + * changed any time from userspace without dropping into + * kernel. Any address search in VMAs will be done with + * non-versioned addresses. Ensure the ADI version bits + * are dropped here by sign extending the last bit before + * ADI bits. IOMMU does not implement version tags. + */ + return (addr << (long)adi_nbits()) >> (long)adi_nbits(); + } + + return start; +} +#define untagged_addr untagged_addr + #include <asm/tlbflush.h> #include <asm-generic/pgtable.h> _ Patches currently in -mm which might be from hch@xxxxxx are mm-remove-the-account_page_dirtied-export.patch mm-fix-an-overly-long-line-in-read_cache_page.patch mm-dont-cast-readpage-to-filler_t-for-do_read_cache_page.patch jffs2-pass-the-correct-prototype-to-read_cache_page.patch 9p-pass-the-correct-prototype-to-read_cache_page.patch mm-use-untagged_addr-for-get_user_pages_fast-addresses.patch mm-simplify-gup_fast_permitted.patch mm-lift-the-x86_32-pae-version-of-gup_get_pte-to-common-code.patch mips-use-the-generic-get_user_pages_fast-code.patch sh-add-the-missing-pud_page-definition.patch sh-use-the-generic-get_user_pages_fast-code.patch sparc64-add-the-missing-pgd_page-definition.patch sparc64-define-untagged_addr.patch sparc64-use-the-generic-get_user_pages_fast-code.patch mm-rename-config_have_generic_gup-to-config_have_fast_gup.patch mm-reorder-code-blocks-in-gupc.patch mm-consolidate-the-get_user_pages-implementations.patch mm-validate-get_user_pages_fast-flags.patch mm-move-the-powerpc-hugepd-code-to-mm-gupc.patch mm-switch-gup_hugepte-to-use-try_get_compound_head.patch mm-mark-the-page-referenced-in-gup_hugepte.patch