sparc32: make copy_to/from_user_page() usable from modular code
PATCH 1/1 sparc32: make copy_to/from_user_page() usable from modular code
While copy_to/from_user_page() users are uncommon, there is one in drivers/staging/lustre/lustre/libcfs/linux/linux-curproc.c which leads to the following:
ERROR: "sparc32_cachetlb_ops" [drivers/staging/lustre/lustre/libcfs/libcfs.ko] undefined!
during routine allmodconfig build coverage. The reason this happens is as follows:
In arch/sparc/include/asm/cacheflush_32.h we have:
#define flush_cache_page(vma,addr,pfn) \
sparc32_cachetlb_ops->cache_page(vma, addr) #define copy_to_user_page(vma, page, vaddr, dst, src, len) \
do { \
flush_cache_page(vma, vaddr, page_to_pfn(page));\
memcpy(dst, src, len); \
} while (0)
#define copy_from_user_page(vma, page, vaddr, dst, src, len) \
do { \
flush_cache_page(vma, vaddr, page_to_pfn(page));\
memcpy(dst, src, len); \
} while (0)However, sparc32_cachetlb_ops isn't exported and hence the error.
--- arch/sparc/mm/srmmu.c | 2 ++ 1 file changed, 2 insertions(+)
arch/sparc/mm/srmmu.c +2 -0
@@ -14,6 +14,7 @@#include <linux/pagemap.h> #include <linux/vmalloc.h> #include <linux/kdebug.h> +#include <linux/export.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/log2.h>
@@ -62,6 +63,7 @@ extern unsigned long last_valid_pfn;static pgd_t *srmmu_swapper_pg_dir;const struct sparc32_cachetlb_ops *sparc32_cachetlb_ops; +EXPORT_SYMBOL (sparc32_cachetlb_ops);#ifdef CONFIG_SMP const struct sparc32_cachetlb_ops *local_ops;
Signature · 1 line
1.8.5.2
David Miller
maintainerFrom: Paul Gortmaker <[email protected]>
Date: Thu, 13 Feb 2014 16:15:01 -0500
Quoted 25 lines
While copy_to/from_user_page() users are uncommon, there is one in
drivers/staging/lustre/lustre/libcfs/linux/linux-curproc.cwhich leads to the following:ERROR: "
sparc32_cachetlb_ops" [drivers/staging/lustre/lustre/libcfs/libcfs.ko] undefined!during routine allmodconfig build coverage. The reason this happens is as follows:
In
arch/sparc/include/asm/cacheflush_32.hwe have:#define flush_cache_page(vma,addr,pfn) \ sparc32_cachetlb_ops->cache_page(vma, addr)#define copy_to_user_page(vma, page, vaddr, dst, src, len) \ do { \ flush_cache_page(vma, vaddr, page_to_pfn(page));\ memcpy(dst, src, len); \ } while (0) #define copy_from_user_page(vma, page, vaddr, dst, src, len) \ do { \ flush_cache_page(vma, vaddr, page_to_pfn(page));\ memcpy(dst, src, len); \ } while (0)
Quoted 3 lines
However,
sparc32_cachetlb_opsisn't exported and hence the error.Signed-off-by Paul Gortmaker <[email protected]>
Also applied.
Quoted 25 lines · Paul Gortmaker
While copy_to/from_user_page() users are uncommon, there is one in
drivers/staging/lustre/lustre/libcfs/linux/linux-curproc.cwhich leads to the following:ERROR: "
sparc32_cachetlb_ops" [drivers/staging/lustre/lustre/libcfs/libcfs.ko] undefined!during routine allmodconfig build coverage. The reason this happens is as follows:
In
arch/sparc/include/asm/cacheflush_32.hwe have:#define flush_cache_page(vma,addr,pfn) \ sparc32_cachetlb_ops->cache_page(vma, addr)#define copy_to_user_page(vma, page, vaddr, dst, src, len) \ do { \ flush_cache_page(vma, vaddr, page_to_pfn(page));\ memcpy(dst, src, len); \ } while (0) #define copy_from_user_page(vma, page, vaddr, dst, src, len) \ do { \ flush_cache_page(vma, vaddr, page_to_pfn(page));\ memcpy(dst, src, len); \ } while (0)
Quoted 3 lines
However,
sparc32_cachetlb_opsisn't exported and hence the error.Signed-off-by Paul Gortmaker <[email protected]>
Sorry for only noticing now. A similar fix for pa-risc was reverted:
"Christoph Hellwig <[email protected]> commented:
This one shouldn't go in - Geert sent it a bit prematurely, as Lustre shouldn't use it just to reimplement core VM functionality (which it shouldn't use either, but that's a separate story)."
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
Quoted 29 lines · Geert Uytterhoeven
Quoted 27 lines · Paul Gortmaker
While copy_to/from_user_page() users are uncommon, there is one in
drivers/staging/lustre/lustre/libcfs/linux/linux-curproc.cwhich leads to the following:ERROR: "
sparc32_cachetlb_ops" [drivers/staging/lustre/lustre/libcfs/libcfs.ko] undefined!during routine allmodconfig build coverage. The reason this happens is as follows:
In
arch/sparc/include/asm/cacheflush_32.hwe have:#define flush_cache_page(vma,addr,pfn) \ sparc32_cachetlb_ops->cache_page(vma, addr)#define copy_to_user_page(vma, page, vaddr, dst, src, len) \ do { \ flush_cache_page(vma, vaddr, page_to_pfn(page));\ memcpy(dst, src, len); \ } while (0) #define copy_from_user_page(vma, page, vaddr, dst, src, len) \ do { \ flush_cache_page(vma, vaddr, page_to_pfn(page));\ memcpy(dst, src, len); \ } while (0)However,
sparc32_cachetlb_opsisn't exported and hence the error.
Quoted 8 lines
Quoted 1 line
Signed-off-by Paul Gortmaker <[email protected]>Sorry for only noticing now. A similar fix for pa-risc was reverted:
"Christoph Hellwig <[email protected]> commented:
This one shouldn't go in - Geert sent it a bit prematurely, as Lustre shouldn't use it just to reimplement core VM functionality (which it shouldn't use either, but that's a separate story)."
Generally speaking I agree, and every time I touch lustre, I feel like I need to go home and have a shower. However, in this case, lustre wasn't actually directly calling flush_cache_page type core VM ops directly, and I couldn't convince myself of an argument of why a modular driver should be forbidden from using either of copy_to/from_user_page()...
Either way is fine with me. If a revert is desired and we want to make lustre depend on CONFIG_BROKEN (okay, a bit harsh) or don't allow lustre to be modular, that is also fine.
Paul.
--
Quoted 14 lines
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds