[linux-next:master 1155/11283] arch/arm/kernel/patch.c:40:2: error: implicit declaration of function 'set_fixmap'; did you mean 'set_fs'?
10:03 p.m.
tree: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git master
head: 702ccea170f07783bd002055a353a0866c062267
commit: 5a735583b764750726621b0396d03e4782911b77 [1155/11283] arm/ftrace: Use
__patch_text()
config: arm-randconfig-a001-20200126 (attached as .config)
compiler: arm-linux-gnueabi-gcc (GCC) 7.5.0
reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O
~/bin/make.cross
chmod +x ~/bin/make.cross
git checkout 5a735583b764750726621b0396d03e4782911b77
# save the attached .config to linux build tree
GCC_VERSION=7.5.0 make.cross ARCH=arm
If you fix the issue, kindly add following tag
Reported-by: kbuild test robot <lkp(a)intel.com>
All errors (new ones prefixed by >>):
arch/arm/kernel/patch.c: In function 'patch_map':
> arch/arm/kernel/patch.c:40:2: error: implicit declaration of
function 'set_fixmap'; did you mean 'set_fs'?
[-Werror=implicit-function-declaration]
set_fixmap(fixmap,
page_to_phys(page));
^~~~~~~~~~
set_fs
> arch/arm/kernel/patch.c:42:19: error: implicit declaration of
function '__fix_to_virt'; did you mean '__bus_to_virt'?
[-Werror=implicit-function-declaration]
return (void *) (__fix_to_virt(fixmap)
+ (uintaddr & ~PAGE_MASK));
^~~~~~~~~~~~~
__bus_to_virt
arch/arm/kernel/patch.c: In function 'patch_unmap':
> arch/arm/kernel/patch.c:48:2: error: implicit declaration of
function 'clear_fixmap'; did you mean 'clear_inode'?
[-Werror=implicit-function-declaration]
clear_fixmap(fixmap);
^~~~~~~~~~~~
clear_inode
cc1: some warnings being treated as errors
vim +40 arch/arm/kernel/patch.c
ab0615e2d6fb07 Rabin Vincent 2014-04-24 20
ab0615e2d6fb07 Rabin Vincent 2014-04-24 21 static void __kprobes *patch_map(void *addr,
int fixmap, unsigned long *flags)
ab0615e2d6fb07 Rabin Vincent 2014-04-24 22 __acquires(&patch_lock)
ab0615e2d6fb07 Rabin Vincent 2014-04-24 23 {
ab0615e2d6fb07 Rabin Vincent 2014-04-24 24 unsigned int uintaddr = (uintptr_t) addr;
ab0615e2d6fb07 Rabin Vincent 2014-04-24 25 bool module = !core_kernel_text(uintaddr);
ab0615e2d6fb07 Rabin Vincent 2014-04-24 26 struct page *page;
ab0615e2d6fb07 Rabin Vincent 2014-04-24 27
0f5bf6d0afe4be Laura Abbott 2017-02-06 28 if (module &&
IS_ENABLED(CONFIG_STRICT_MODULE_RWX))
ab0615e2d6fb07 Rabin Vincent 2014-04-24 29 page = vmalloc_to_page(addr);
0f5bf6d0afe4be Laura Abbott 2017-02-06 30 else if (!module &&
IS_ENABLED(CONFIG_STRICT_KERNEL_RWX))
ab0615e2d6fb07 Rabin Vincent 2014-04-24 31 page = virt_to_page(addr);
ab0615e2d6fb07 Rabin Vincent 2014-04-24 32 else
ab0615e2d6fb07 Rabin Vincent 2014-04-24 33 return addr;
ab0615e2d6fb07 Rabin Vincent 2014-04-24 34
ab0615e2d6fb07 Rabin Vincent 2014-04-24 35 if (flags)
143c2a89e0e5fd Yang Shi 2019-02-13 36 raw_spin_lock_irqsave(&patch_lock,
*flags);
ab0615e2d6fb07 Rabin Vincent 2014-04-24 37 else
ab0615e2d6fb07 Rabin Vincent 2014-04-24 38 __acquire(&patch_lock);
ab0615e2d6fb07 Rabin Vincent 2014-04-24 39
ab0615e2d6fb07 Rabin Vincent 2014-04-24 @40 set_fixmap(fixmap, page_to_phys(page));
ab0615e2d6fb07 Rabin Vincent 2014-04-24 41
ab0615e2d6fb07 Rabin Vincent 2014-04-24 @42 return (void *) (__fix_to_virt(fixmap) +
(uintaddr & ~PAGE_MASK));
ab0615e2d6fb07 Rabin Vincent 2014-04-24 43 }
ab0615e2d6fb07 Rabin Vincent 2014-04-24 44
ab0615e2d6fb07 Rabin Vincent 2014-04-24 45 static void __kprobes patch_unmap(int fixmap,
unsigned long *flags)
ab0615e2d6fb07 Rabin Vincent 2014-04-24 46 __releases(&patch_lock)
ab0615e2d6fb07 Rabin Vincent 2014-04-24 47 {
ab0615e2d6fb07 Rabin Vincent 2014-04-24 @48 clear_fixmap(fixmap);
ab0615e2d6fb07 Rabin Vincent 2014-04-24 49
ab0615e2d6fb07 Rabin Vincent 2014-04-24 50 if (flags)
143c2a89e0e5fd Yang Shi 2019-02-13 51 raw_spin_unlock_irqrestore(&patch_lock,
*flags);
ab0615e2d6fb07 Rabin Vincent 2014-04-24 52 else
ab0615e2d6fb07 Rabin Vincent 2014-04-24 53 __release(&patch_lock);
ab0615e2d6fb07 Rabin Vincent 2014-04-24 54 }
ab0615e2d6fb07 Rabin Vincent 2014-04-24 55
:::::: The code at line 40 was first introduced by commit
:::::: ab0615e2d6fb074764a3e4d05f1326fa2fdb4627 arm: use fixmap for text patching when
text is RO
:::::: TO: Rabin Vincent <rabin(a)rab.in>
:::::: CC: Kees Cook <keescook(a)chromium.org>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org Intel Corporation
3:56 p.m.
On Tue, Jan 28, 2020 at 06:03:06AM +0800, kbuild test robot wrote:
tree:
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git master
head: 702ccea170f07783bd002055a353a0866c062267
commit: 5a735583b764750726621b0396d03e4782911b77 [1155/11283] arm/ftrace: Use
__patch_text()
config: arm-randconfig-a001-20200126 (attached as .config)
compiler: arm-linux-gnueabi-gcc (GCC) 7.5.0
reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O
~/bin/make.cross
chmod +x ~/bin/make.cross
git checkout 5a735583b764750726621b0396d03e4782911b77
# save the attached .config to linux build tree
GCC_VERSION=7.5.0 make.cross ARCH=arm
If you fix the issue, kindly add following tag
Reported-by: kbuild test robot <lkp(a)intel.com>
All errors (new ones prefixed by >>):
arch/arm/kernel/patch.c: In function 'patch_map':
>> arch/arm/kernel/patch.c:40:2: error: implicit declaration of function
'set_fixmap'; did you mean 'set_fs'?
[-Werror=implicit-function-declaration]
set_fixmap(fixmap, page_to_phys(page));
^~~~~~~~~~
set_fs
Something like so I suppose..
diff --git a/arch/arm/kernel/patch.c b/arch/arm/kernel/patch.c
index d0a05a3bdb96..e9e828b6bb30 100644
--- a/arch/arm/kernel/patch.c
+++ b/arch/arm/kernel/patch.c
@@ -16,10 +16,10 @@ struct patch {
unsigned int insn;
};
+#ifdef CONFIG_MMU
static DEFINE_RAW_SPINLOCK(patch_lock);
static void __kprobes *patch_map(void *addr, int fixmap, unsigned long *flags)
- __acquires(&patch_lock)
{
unsigned int uintaddr = (uintptr_t) addr;
bool module = !core_kernel_text(uintaddr);
@@ -34,8 +34,6 @@ static void __kprobes *patch_map(void *addr, int fixmap, unsigned long
*flags)
if (flags)
raw_spin_lock_irqsave(&patch_lock, *flags);
- else
- __acquire(&patch_lock);
set_fixmap(fixmap, page_to_phys(page));
@@ -43,15 +41,19 @@ static void __kprobes *patch_map(void *addr, int fixmap, unsigned long
*flags)
}
static void __kprobes patch_unmap(int fixmap, unsigned long *flags)
- __releases(&patch_lock)
{
clear_fixmap(fixmap);
if (flags)
raw_spin_unlock_irqrestore(&patch_lock, *flags);
- else
- __release(&patch_lock);
}
+#else
+static void __kprobes *patch_map(void *addr, int fixmap, unsigned long *flags)
+{
+ return addr;
+}
+static void __kprobes patch_unmap(int fixmap, unsigned long *flags) { }
+#endif
void __kprobes __patch_text_real(void *addr, unsigned int insn, bool remap)
{
@@ -64,8 +66,6 @@ void __kprobes __patch_text_real(void *addr, unsigned int insn, bool
remap)
if (remap)
waddr = patch_map(addr, FIX_TEXT_POKE0, &flags);
- else
- __acquire(&patch_lock);
if (thumb2 && __opcode_is_thumb16(insn)) {
*(u16 *)waddr = __opcode_to_mem_thumb16(insn);
@@ -102,8 +102,7 @@ void __kprobes __patch_text_real(void *addr, unsigned int insn, bool
remap)
if (waddr != addr) {
flush_kernel_vmap_range(waddr, twopage ? size / 2 : size);
patch_unmap(FIX_TEXT_POKE0, &flags);
- } else
- __release(&patch_lock);
+ }
flush_icache_range((uintptr_t)(addr),
(uintptr_t)(addr) + size);
870
days inactive
880
days old
1 comments
2 participants
participants (2)
-
kbuild test robot -
Peter Zijlstra