| Message ID | 20221212003711.24977-10-laoar.shao@gmail.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | mm, bpf: Add BPF into /proc/meminfo | expand |
Greeting,
FYI, we noticed WARNING:suspicious_RCU_usage due to commit (built with gcc-11):
commit: 8f13ff79ed924e23a36eb5c610ce48998ed69fd5 ("[RFC PATCH bpf-next 9/9] bpf: Use active vm to account bpf map memory usage")
url: https://github.com/intel-lab-lkp/linux/commits/Yafang-Shao/mm-bpf-Add-BPF-into-proc-meminfo/20221212-083842
base: https://git.kernel.org/cgit/linux/kernel/git/bpf/bpf-next.git master
patch link: https://lore.kernel.org/all/20221212003711.24977-10-laoar.shao@gmail.com/
patch subject: [RFC PATCH bpf-next 9/9] bpf: Use active vm to account bpf map memory usage
in testcase: boot
on test machine: qemu-system-x86_64 -enable-kvm -cpu SandyBridge -smp 2 -m 16G
caused below changes (please refer to attached dmesg/kmsg for entire log/backtrace):
[ 31.975760][ T1] WARNING: suspicious RCU usage
[ 31.976682][ T1] 6.1.0-rc7-01609-g8f13ff79ed92 #5 Not tainted
[ 31.977802][ T1] -----------------------------
[ 31.978710][ T1] include/linux/rcupdate.h:376 Illegal context switch in RCU read-side critical section!
[ 31.980465][ T1]
[ 31.980465][ T1] other info that might help us debug this:
[ 31.980465][ T1]
[ 31.982355][ T1]
[ 31.982355][ T1] rcu_scheduler_active = 2, debug_locks = 1
[ 31.983818][ T1] 1 lock held by swapper/0/1:
[ 31.984695][ T1] #0: ffffffff853269a0 (rcu_read_lock){....}-{1:2}, at: page_ext_get (??:?)
[ 31.986346][ T1]
[ 31.986346][ T1] stack backtrace:
[ 31.987467][ T1] CPU: 0 PID: 1 Comm: swapper/0 Not tainted 6.1.0-rc7-01609-g8f13ff79ed92 #5
[ 31.989054][ T1] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.0-debian-1.16.0-4 04/01/2014
[ 31.990880][ T1] Call Trace:
[ 31.991554][ T1] <TASK>
[ 31.992173][ T1] dump_stack_lvl (??:?)
[ 31.993034][ T1] __might_resched (??:?)
[ 31.993970][ T1] __kmem_cache_alloc_node (??:?)
[ 31.994993][ T1] ? active_vm_slab_add (??:?)
[ 31.995976][ T1] ? active_vm_slab_add (??:?)
[ 31.996918][ T1] __kmalloc_node (??:?)
[ 31.997789][ T1] active_vm_slab_add (??:?)
[ 31.998727][ T1] ? kasan_unpoison (??:?)
[ 31.999615][ T1] __kmem_cache_alloc_node (??:?)
[ 32.000615][ T1] ? __bpf_map_area_alloc (syscall.c:?)
[ 32.001599][ T1] ? __bpf_map_area_alloc (syscall.c:?)
[ 32.002575][ T1] __kmalloc_node (??:?)
[ 32.003439][ T1] __bpf_map_area_alloc (syscall.c:?)
[ 32.004417][ T1] array_map_alloc (arraymap.c:?)
[ 32.005326][ T1] map_create (syscall.c:?)
[ 32.006173][ T1] __sys_bpf (syscall.c:?)
[ 32.006988][ T1] ? link_create (syscall.c:?)
[ 32.007873][ T1] ? lock_downgrade (lockdep.c:?)
[ 32.008790][ T1] kern_sys_bpf (??:?)
[ 32.009636][ T1] ? bpf_sys_bpf (??:?)
[ 32.010469][ T1] ? trace_hardirqs_on (??:?)
[ 32.011395][ T1] ? _raw_spin_unlock_irqrestore (??:?)
[ 32.012432][ T1] ? __stack_depot_save (??:?)
[ 32.013391][ T1] skel_map_create+0xba/0xeb
[ 32.014423][ T1] ? skel_map_update_elem+0xe3/0xe3
[ 32.015527][ T1] ? kasan_save_stack (??:?)
[ 32.016422][ T1] ? kasan_set_track (??:?)
[ 32.017308][ T1] ? __kasan_kmalloc (??:?)
[ 32.018233][ T1] ? kernel_init (main.c:?)
[ 32.019090][ T1] ? lock_acquire (??:?)
[ 32.019968][ T1] ? find_held_lock (lockdep.c:?)
[ 32.020858][ T1] ? __kmem_cache_alloc_node (??:?)
[ 32.021875][ T1] bpf_load_and_run+0x93/0x3f5
[ 32.022920][ T1] ? skel_map_create+0xeb/0xeb
[ 32.023959][ T1] ? lock_downgrade (lockdep.c:?)
[ 32.024885][ T1] ? __kmem_cache_alloc_node (??:?)
[ 32.025919][ T1] ? load_skel (bpf_preload_kern.c:?)
[ 32.026767][ T1] ? rcu_read_lock_sched_held (??:?)
[ 32.027781][ T1] ? __kmalloc_node (??:?)
[ 32.030065][ T1] load_skel (bpf_preload_kern.c:?)
[ 32.030869][ T1] ? bpf_load_and_run+0x3f5/0x3f5
[ 32.031963][ T1] ? kvm_clock_get_cycles (kvmclock.c:?)
[ 32.032914][ T1] ? btf_vmlinux_init (bpf_preload_kern.c:?)
[ 32.033801][ T1] load (bpf_preload_kern.c:?)
[ 32.034501][ T1] ? btf_vmlinux_init (bpf_preload_kern.c:?)
[ 32.035407][ T1] do_one_initcall (??:?)
[ 32.036266][ T1] ? trace_event_raw_event_initcall_level (??:?)
[ 32.037446][ T1] ? parse_one (??:?)
[ 32.038320][ T1] ? __kmem_cache_alloc_node (??:?)
[ 32.039369][ T1] do_initcalls (main.c:?)
[ 32.040314][ T1] kernel_init_freeable (main.c:?)
[ 32.041304][ T1] ? console_on_rootfs (main.c:?)
[ 32.042213][ T1] ? usleep_range_state (??:?)
[ 32.043197][ T1] ? rest_init (main.c:?)
[ 32.044036][ T1] ? rest_init (main.c:?)
[ 32.044879][ T1] kernel_init (main.c:?)
[ 32.045715][ T1] ret_from_fork (??:?)
[ 32.046587][ T1] </TASK>
[ 32.047273][ T1] BUG: sleeping function called from invalid context at include/linux/sched/mm.h:274
[ 32.048966][ T1] in_atomic(): 1, irqs_disabled(): 0, non_block: 0, pid: 1, name: swapper/0
[ 32.050596][ T1] preempt_count: 1, expected: 0
[ 32.051521][ T1] 1 lock held by swapper/0/1:
[ 32.052424][ T1] #0: ffffffff853269a0 (rcu_read_lock){....}-{1:2}, at: page_ext_get (??:?)
[ 32.054113][ T1] CPU: 0 PID: 1 Comm: swapper/0 Not tainted 6.1.0-rc7-01609-g8f13ff79ed92 #5
[ 32.055686][ T1] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.0-debian-1.16.0-4 04/01/2014
[ 32.057527][ T1] Call Trace:
[ 32.058191][ T1] <TASK>
[ 32.058803][ T1] dump_stack_lvl (??:?)
[ 32.059668][ T1] __might_resched.cold (core.c:?)
[ 32.060638][ T1] __kmem_cache_alloc_node (??:?)
[ 32.061654][ T1] ? active_vm_slab_add (??:?)
[ 32.062615][ T1] ? active_vm_slab_add (??:?)
[ 32.063557][ T1] __kmalloc_node (??:?)
[ 32.064421][ T1] active_vm_slab_add (??:?)
[ 32.065373][ T1] ? kasan_unpoison (??:?)
[ 32.066294][ T1] __kmem_cache_alloc_node (??:?)
[ 32.067294][ T1] ? __bpf_map_area_alloc (syscall.c:?)
[ 32.068314][ T1] ? __bpf_map_area_alloc (syscall.c:?)
[ 32.069306][ T1] __kmalloc_node (??:?)
[ 32.070215][ T1] __bpf_map_area_alloc (syscall.c:?)
[ 32.071210][ T1] array_map_alloc (arraymap.c:?)
[ 32.072134][ T1] map_create (syscall.c:?)
[ 32.072972][ T1] __sys_bpf (syscall.c:?)
[ 32.073810][ T1] ? link_create (syscall.c:?)
[ 32.074693][ T1] ? lock_downgrade (lockdep.c:?)
[ 32.075609][ T1] kern_sys_bpf (??:?)
[ 32.076455][ T1] ? bpf_sys_bpf (??:?)
[ 32.077295][ T1] ? trace_hardirqs_on (??:?)
[ 32.078232][ T1] ? _raw_spin_unlock_irqrestore (??:?)
[ 32.079288][ T1] ? __stack_depot_save (??:?)
[ 32.080258][ T1] skel_map_create+0xba/0xeb
[ 32.081264][ T1] ? skel_map_update_elem+0xe3/0xe3
[ 32.082356][ T1] ? kasan_save_stack (??:?)
[ 32.083234][ T1] ? kasan_set_track (??:?)
[ 32.084107][ T1] ? __kasan_kmalloc (??:?)
[ 32.085024][ T1] ? kernel_init (main.c:?)
[ 32.085901][ T1] ? lock_acquire (??:?)
[ 32.086784][ T1] ? find_held_lock (lockdep.c:?)
[ 32.087674][ T1] ? __kmem_cache_alloc_node (??:?)
[ 32.088715][ T1] bpf_load_and_run+0x93/0x3f5
[ 32.090649][ T1] ? skel_map_create+0xeb/0xeb
[ 32.091749][ T1] ? lock_downgrade (lockdep.c:?)
[ 32.092728][ T1] ? __kmem_cache_alloc_node (??:?)
[ 32.093794][ T1] ? load_skel (bpf_preload_kern.c:?)
[ 32.094612][ T1] ? rcu_read_lock_sched_held (??:?)
[ 32.095606][ T1] ? __kmalloc_node (??:?)
[ 32.096490][ T1] load_skel (bpf_preload_kern.c:?)
[ 32.097314][ T1] ? bpf_load_and_run+0x3f5/0x3f5
[ 32.098412][ T1] ? kvm_clock_get_cycles (kvmclock.c:?)
[ 32.099362][ T1] ? btf_vmlinux_init (bpf_preload_kern.c:?)
[ 32.100271][ T1] load (bpf_preload_kern.c:?)
[ 32.100966][ T1] ? btf_vmlinux_init (bpf_preload_kern.c:?)
[ 32.101872][ T1] do_one_initcall (??:?)
[ 32.102719][ T1] ? trace_event_raw_event_initcall_level (??:?)
[ 32.103859][ T1] ? parse_one (??:?)
[ 32.104645][ T1] ? __kmem_cache_alloc_node (??:?)
[ 32.105625][ T1] do_initcalls (main.c:?)
[ 32.106438][ T1] kernel_init_freeable (main.c:?)
[ 32.107333][ T1] ? console_on_rootfs (main.c:?)
[ 32.108213][ T1] ? usleep_range_state (??:?)
[ 32.109175][ T1] ? rest_init (main.c:?)
[ 32.110000][ T1] ? rest_init (main.c:?)
[ 32.110836][ T1] kernel_init (main.c:?)
[ 32.111633][ T1] ret_from_fork (??:?)
[ 32.112419][ T1] </TASK>
[ 32.144051][ T1] initcall load+0x0/0x4a returned 0 after 169883 usecs
If you fix the issue, kindly add following tag
| Reported-by: kernel test robot <yujie.liu@intel.com>
| Link: https://lore.kernel.org/oe-lkp/202212141512.469bca4-yujie.liu@intel.com
To reproduce:
# build kernel
cd linux
cp config-6.1.0-rc7-01609-g8f13ff79ed92 .config
make HOSTCC=gcc-11 CC=gcc-11 ARCH=x86_64 olddefconfig prepare modules_prepare bzImage modules
make HOSTCC=gcc-11 CC=gcc-11 ARCH=x86_64 INSTALL_MOD_PATH=<mod-install-dir> modules_install
cd <mod-install-dir>
find lib/ | cpio -o -H newc --quiet | gzip > modules.cgz
git clone https://github.com/intel/lkp-tests.git
cd lkp-tests
bin/lkp qemu -k <bzImage> -m modules.cgz job-script # job-script is attached in this email
# if come across any failure that blocks the test,
# please remove ~/.lkp and /lkp dir to run from a clean state.
On Wed, Dec 14, 2022 at 4:48 PM kernel test robot <yujie.liu@intel.com> wrote: > > Greeting, > > FYI, we noticed WARNING:suspicious_RCU_usage due to commit (built with gcc-11): > > commit: 8f13ff79ed924e23a36eb5c610ce48998ed69fd5 ("[RFC PATCH bpf-next 9/9] bpf: Use active vm to account bpf map memory usage") > url: https://github.com/intel-lab-lkp/linux/commits/Yafang-Shao/mm-bpf-Add-BPF-into-proc-meminfo/20221212-083842 > base: https://git.kernel.org/cgit/linux/kernel/git/bpf/bpf-next.git master > patch link: https://lore.kernel.org/all/20221212003711.24977-10-laoar.shao@gmail.com/ > patch subject: [RFC PATCH bpf-next 9/9] bpf: Use active vm to account bpf map memory usage > > in testcase: boot > > on test machine: qemu-system-x86_64 -enable-kvm -cpu SandyBridge -smp 2 -m 16G > > caused below changes (please refer to attached dmesg/kmsg for entire log/backtrace): > > > [ 31.975760][ T1] WARNING: suspicious RCU usage > [ 31.976682][ T1] 6.1.0-rc7-01609-g8f13ff79ed92 #5 Not tainted > [ 31.977802][ T1] ----------------------------- > [ 31.978710][ T1] include/linux/rcupdate.h:376 Illegal context switch in RCU read-side critical section! > [ 31.980465][ T1] > [ 31.980465][ T1] other info that might help us debug this: > [ 31.980465][ T1] > [ 31.982355][ T1] > [ 31.982355][ T1] rcu_scheduler_active = 2, debug_locks = 1 > [ 31.983818][ T1] 1 lock held by swapper/0/1: > [ 31.984695][ T1] #0: ffffffff853269a0 (rcu_read_lock){....}-{1:2}, at: page_ext_get (??:?) > [ 31.986346][ T1] > [ 31.986346][ T1] stack backtrace: > [ 31.987467][ T1] CPU: 0 PID: 1 Comm: swapper/0 Not tainted 6.1.0-rc7-01609-g8f13ff79ed92 #5 > [ 31.989054][ T1] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.0-debian-1.16.0-4 04/01/2014 > [ 31.990880][ T1] Call Trace: > [ 31.991554][ T1] <TASK> > [ 31.992173][ T1] dump_stack_lvl (??:?) > [ 31.993034][ T1] __might_resched (??:?) > [ 31.993970][ T1] __kmem_cache_alloc_node (??:?) > [ 31.994993][ T1] ? active_vm_slab_add (??:?) > [ 31.995976][ T1] ? active_vm_slab_add (??:?) > [ 31.996918][ T1] __kmalloc_node (??:?) > [ 31.997789][ T1] active_vm_slab_add (??:?) > [ 31.998727][ T1] ? kasan_unpoison (??:?) > [ 31.999615][ T1] __kmem_cache_alloc_node (??:?) > [ 32.000615][ T1] ? __bpf_map_area_alloc (syscall.c:?) > [ 32.001599][ T1] ? __bpf_map_area_alloc (syscall.c:?) > [ 32.002575][ T1] __kmalloc_node (??:?) > [ 32.003439][ T1] __bpf_map_area_alloc (syscall.c:?) > [ 32.004417][ T1] array_map_alloc (arraymap.c:?) > [ 32.005326][ T1] map_create (syscall.c:?) > [ 32.006173][ T1] __sys_bpf (syscall.c:?) > [ 32.006988][ T1] ? link_create (syscall.c:?) > [ 32.007873][ T1] ? lock_downgrade (lockdep.c:?) > [ 32.008790][ T1] kern_sys_bpf (??:?) > [ 32.009636][ T1] ? bpf_sys_bpf (??:?) > [ 32.010469][ T1] ? trace_hardirqs_on (??:?) > [ 32.011395][ T1] ? _raw_spin_unlock_irqrestore (??:?) > [ 32.012432][ T1] ? __stack_depot_save (??:?) > [ 32.013391][ T1] skel_map_create+0xba/0xeb > [ 32.014423][ T1] ? skel_map_update_elem+0xe3/0xe3 > [ 32.015527][ T1] ? kasan_save_stack (??:?) > [ 32.016422][ T1] ? kasan_set_track (??:?) > [ 32.017308][ T1] ? __kasan_kmalloc (??:?) > [ 32.018233][ T1] ? kernel_init (main.c:?) > [ 32.019090][ T1] ? lock_acquire (??:?) > [ 32.019968][ T1] ? find_held_lock (lockdep.c:?) > [ 32.020858][ T1] ? __kmem_cache_alloc_node (??:?) > [ 32.021875][ T1] bpf_load_and_run+0x93/0x3f5 > [ 32.022920][ T1] ? skel_map_create+0xeb/0xeb > [ 32.023959][ T1] ? lock_downgrade (lockdep.c:?) > [ 32.024885][ T1] ? __kmem_cache_alloc_node (??:?) > [ 32.025919][ T1] ? load_skel (bpf_preload_kern.c:?) > [ 32.026767][ T1] ? rcu_read_lock_sched_held (??:?) > [ 32.027781][ T1] ? __kmalloc_node (??:?) > [ 32.030065][ T1] load_skel (bpf_preload_kern.c:?) > [ 32.030869][ T1] ? bpf_load_and_run+0x3f5/0x3f5 > [ 32.031963][ T1] ? kvm_clock_get_cycles (kvmclock.c:?) > [ 32.032914][ T1] ? btf_vmlinux_init (bpf_preload_kern.c:?) > [ 32.033801][ T1] load (bpf_preload_kern.c:?) > [ 32.034501][ T1] ? btf_vmlinux_init (bpf_preload_kern.c:?) > [ 32.035407][ T1] do_one_initcall (??:?) > [ 32.036266][ T1] ? trace_event_raw_event_initcall_level (??:?) > [ 32.037446][ T1] ? parse_one (??:?) > [ 32.038320][ T1] ? __kmem_cache_alloc_node (??:?) > [ 32.039369][ T1] do_initcalls (main.c:?) > [ 32.040314][ T1] kernel_init_freeable (main.c:?) > [ 32.041304][ T1] ? console_on_rootfs (main.c:?) > [ 32.042213][ T1] ? usleep_range_state (??:?) > [ 32.043197][ T1] ? rest_init (main.c:?) > [ 32.044036][ T1] ? rest_init (main.c:?) > [ 32.044879][ T1] kernel_init (main.c:?) > [ 32.045715][ T1] ret_from_fork (??:?) > [ 32.046587][ T1] </TASK> > [ 32.047273][ T1] BUG: sleeping function called from invalid context at include/linux/sched/mm.h:274 > [ 32.048966][ T1] in_atomic(): 1, irqs_disabled(): 0, non_block: 0, pid: 1, name: swapper/0 > [ 32.050596][ T1] preempt_count: 1, expected: 0 > [ 32.051521][ T1] 1 lock held by swapper/0/1: > [ 32.052424][ T1] #0: ffffffff853269a0 (rcu_read_lock){....}-{1:2}, at: page_ext_get (??:?) > [ 32.054113][ T1] CPU: 0 PID: 1 Comm: swapper/0 Not tainted 6.1.0-rc7-01609-g8f13ff79ed92 #5 > [ 32.055686][ T1] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.0-debian-1.16.0-4 04/01/2014 > [ 32.057527][ T1] Call Trace: > [ 32.058191][ T1] <TASK> > [ 32.058803][ T1] dump_stack_lvl (??:?) > [ 32.059668][ T1] __might_resched.cold (core.c:?) > [ 32.060638][ T1] __kmem_cache_alloc_node (??:?) > [ 32.061654][ T1] ? active_vm_slab_add (??:?) > [ 32.062615][ T1] ? active_vm_slab_add (??:?) > [ 32.063557][ T1] __kmalloc_node (??:?) > [ 32.064421][ T1] active_vm_slab_add (??:?) > [ 32.065373][ T1] ? kasan_unpoison (??:?) > [ 32.066294][ T1] __kmem_cache_alloc_node (??:?) > [ 32.067294][ T1] ? __bpf_map_area_alloc (syscall.c:?) > [ 32.068314][ T1] ? __bpf_map_area_alloc (syscall.c:?) > [ 32.069306][ T1] __kmalloc_node (??:?) > [ 32.070215][ T1] __bpf_map_area_alloc (syscall.c:?) > [ 32.071210][ T1] array_map_alloc (arraymap.c:?) > [ 32.072134][ T1] map_create (syscall.c:?) > [ 32.072972][ T1] __sys_bpf (syscall.c:?) > [ 32.073810][ T1] ? link_create (syscall.c:?) > [ 32.074693][ T1] ? lock_downgrade (lockdep.c:?) > [ 32.075609][ T1] kern_sys_bpf (??:?) > [ 32.076455][ T1] ? bpf_sys_bpf (??:?) > [ 32.077295][ T1] ? trace_hardirqs_on (??:?) > [ 32.078232][ T1] ? _raw_spin_unlock_irqrestore (??:?) > [ 32.079288][ T1] ? __stack_depot_save (??:?) > [ 32.080258][ T1] skel_map_create+0xba/0xeb > [ 32.081264][ T1] ? skel_map_update_elem+0xe3/0xe3 > [ 32.082356][ T1] ? kasan_save_stack (??:?) > [ 32.083234][ T1] ? kasan_set_track (??:?) > [ 32.084107][ T1] ? __kasan_kmalloc (??:?) > [ 32.085024][ T1] ? kernel_init (main.c:?) > [ 32.085901][ T1] ? lock_acquire (??:?) > [ 32.086784][ T1] ? find_held_lock (lockdep.c:?) > [ 32.087674][ T1] ? __kmem_cache_alloc_node (??:?) > [ 32.088715][ T1] bpf_load_and_run+0x93/0x3f5 > [ 32.090649][ T1] ? skel_map_create+0xeb/0xeb > [ 32.091749][ T1] ? lock_downgrade (lockdep.c:?) > [ 32.092728][ T1] ? __kmem_cache_alloc_node (??:?) > [ 32.093794][ T1] ? load_skel (bpf_preload_kern.c:?) > [ 32.094612][ T1] ? rcu_read_lock_sched_held (??:?) > [ 32.095606][ T1] ? __kmalloc_node (??:?) > [ 32.096490][ T1] load_skel (bpf_preload_kern.c:?) > [ 32.097314][ T1] ? bpf_load_and_run+0x3f5/0x3f5 > [ 32.098412][ T1] ? kvm_clock_get_cycles (kvmclock.c:?) > [ 32.099362][ T1] ? btf_vmlinux_init (bpf_preload_kern.c:?) > [ 32.100271][ T1] load (bpf_preload_kern.c:?) > [ 32.100966][ T1] ? btf_vmlinux_init (bpf_preload_kern.c:?) > [ 32.101872][ T1] do_one_initcall (??:?) > [ 32.102719][ T1] ? trace_event_raw_event_initcall_level (??:?) > [ 32.103859][ T1] ? parse_one (??:?) > [ 32.104645][ T1] ? __kmem_cache_alloc_node (??:?) > [ 32.105625][ T1] do_initcalls (main.c:?) > [ 32.106438][ T1] kernel_init_freeable (main.c:?) > [ 32.107333][ T1] ? console_on_rootfs (main.c:?) > [ 32.108213][ T1] ? usleep_range_state (??:?) > [ 32.109175][ T1] ? rest_init (main.c:?) > [ 32.110000][ T1] ? rest_init (main.c:?) > [ 32.110836][ T1] kernel_init (main.c:?) > [ 32.111633][ T1] ret_from_fork (??:?) > [ 32.112419][ T1] </TASK> > [ 32.144051][ T1] initcall load+0x0/0x4a returned 0 after 169883 usecs > > > If you fix the issue, kindly add following tag > | Reported-by: kernel test robot <yujie.liu@intel.com> > | Link: https://lore.kernel.org/oe-lkp/202212141512.469bca4-yujie.liu@intel.com > > > To reproduce: > > # build kernel > cd linux > cp config-6.1.0-rc7-01609-g8f13ff79ed92 .config > make HOSTCC=gcc-11 CC=gcc-11 ARCH=x86_64 olddefconfig prepare modules_prepare bzImage modules > make HOSTCC=gcc-11 CC=gcc-11 ARCH=x86_64 INSTALL_MOD_PATH=<mod-install-dir> modules_install > cd <mod-install-dir> > find lib/ | cpio -o -H newc --quiet | gzip > modules.cgz > > > git clone https://github.com/intel/lkp-tests.git > cd lkp-tests > bin/lkp qemu -k <bzImage> -m modules.cgz job-script # job-script is attached in this email > > # if come across any failure that blocks the test, > # please remove ~/.lkp and /lkp dir to run from a clean state. > > Many thanks for the report. Should add GFP_ATOMIC to fix it. I missed the rcu_read_lock() in page_ext_get().
diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c index 440960110a42..efe1fbd6a80e 100644 --- a/fs/proc/meminfo.c +++ b/fs/proc/meminfo.c @@ -16,6 +16,7 @@ #ifdef CONFIG_CMA #include <linux/cma.h> #endif +#include <linux/active_vm.h> #include <asm/page.h> #include "internal.h" @@ -159,6 +160,8 @@ static int meminfo_proc_show(struct seq_file *m, void *v) arch_report_meminfo(m); + seq_printf(m, "BPF: %8lu kB\n", + active_vm_item_sum(ACTIVE_VM_BPF) >> 10); return 0; } diff --git a/include/linux/active_vm.h b/include/linux/active_vm.h index 21f9aaca12c4..e26edfb3654e 100644 --- a/include/linux/active_vm.h +++ b/include/linux/active_vm.h @@ -2,6 +2,11 @@ #ifndef __INCLUDE_ACTIVE_VM_H #define __INCLUDE_ACTIVE_VM_H +enum active_vm_item { + ACTIVE_VM_BPF = 1, + NR_ACTIVE_VM_ITEM = ACTIVE_VM_BPF, +}; + #ifdef CONFIG_ACTIVE_VM #include <linux/jump_label.h> #include <linux/preempt.h> @@ -18,11 +23,6 @@ static inline bool active_vm_enabled(void) return true; } -enum active_vm_item { - DUMMY_ITEM = 1, - NR_ACTIVE_VM_ITEM = DUMMY_ITEM, -}; - struct active_vm_stat { long stat[NR_ACTIVE_VM_ITEM]; }; diff --git a/kernel/bpf/memalloc.c b/kernel/bpf/memalloc.c index ebcc3dd0fa19..403ae0d83241 100644 --- a/kernel/bpf/memalloc.c +++ b/kernel/bpf/memalloc.c @@ -7,6 +7,8 @@ #include <linux/bpf_mem_alloc.h> #include <linux/memcontrol.h> #include <asm/local.h> +#include <linux/page_ext.h> +#include <linux/active_vm.h> /* Any context (including NMI) BPF specific memory allocator. * @@ -165,11 +167,13 @@ static void alloc_bulk(struct bpf_mem_cache *c, int cnt, int node) { struct mem_cgroup *memcg = NULL, *old_memcg; unsigned long flags; + int old_active_vm; void *obj; int i; memcg = get_memcg(c); old_memcg = set_active_memcg(memcg); + old_active_vm = active_vm_item_set(ACTIVE_VM_BPF); for (i = 0; i < cnt; i++) { /* * free_by_rcu is only manipulated by irq work refill_work(). @@ -209,6 +213,7 @@ static void alloc_bulk(struct bpf_mem_cache *c, int cnt, int node) if (IS_ENABLED(CONFIG_PREEMPT_RT)) local_irq_restore(flags); } + active_vm_item_set(old_active_vm); set_active_memcg(old_memcg); mem_cgroup_put(memcg); } diff --git a/kernel/bpf/ringbuf.c b/kernel/bpf/ringbuf.c index 3264bf509c68..7575f078eb34 100644 --- a/kernel/bpf/ringbuf.c +++ b/kernel/bpf/ringbuf.c @@ -11,6 +11,7 @@ #include <linux/kmemleak.h> #include <uapi/linux/btf.h> #include <linux/btf_ids.h> +#include <linux/active_vm.h> #define RINGBUF_CREATE_FLAG_MASK (BPF_F_NUMA_NODE) @@ -107,16 +108,18 @@ static struct page **bpf_ringbuf_pages_alloc(int nr_meta_pages, { int nr_pages = nr_meta_pages + nr_data_pages; struct page **pages, *page; + int old_active_vm; int array_size; int i; + old_active_vm = active_vm_item_set(ACTIVE_VM_BPF); array_size = (nr_meta_pages + 2 * nr_data_pages) * sizeof(*pages); pages = bpf_map_area_alloc(array_size, numa_node); if (!pages) goto err; for (i = 0; i < nr_pages; i++) { - page = alloc_pages_node(numa_node, flags, 0); + page = alloc_pages_node(numa_node, flags | __GFP_ACCOUNT, 0); if (!page) { nr_pages = i; goto err_free_pages; @@ -125,12 +128,13 @@ static struct page **bpf_ringbuf_pages_alloc(int nr_meta_pages, if (i >= nr_meta_pages) pages[nr_data_pages + i] = page; } - + active_vm_item_set(old_active_vm); return pages; err_free_pages: bpf_ringbuf_pages_free(pages, nr_pages); err: + active_vm_item_set(old_active_vm); return NULL; } diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c index c38875d6aea4..92572d4a09fb 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -35,6 +35,8 @@ #include <linux/rcupdate_trace.h> #include <linux/memcontrol.h> #include <linux/trace_events.h> +#include <linux/page_ext.h> +#include <linux/active_vm.h> #define IS_FD_ARRAY(map) ((map)->map_type == BPF_MAP_TYPE_PERF_EVENT_ARRAY || \ (map)->map_type == BPF_MAP_TYPE_CGROUP_ARRAY || \ @@ -312,11 +314,14 @@ static void *__bpf_map_area_alloc(u64 size, int numa_node, bool mmapable) const gfp_t gfp = __GFP_NOWARN | __GFP_ZERO | __GFP_ACCOUNT; unsigned int flags = 0; unsigned long align = 1; + int old_active_vm; void *area; + void *ptr; if (size >= SIZE_MAX) return NULL; + old_active_vm = active_vm_item_set(ACTIVE_VM_BPF); /* kmalloc()'ed memory can't be mmap()'ed */ if (mmapable) { BUG_ON(!PAGE_ALIGNED(size)); @@ -325,13 +330,17 @@ static void *__bpf_map_area_alloc(u64 size, int numa_node, bool mmapable) } else if (size <= (PAGE_SIZE << PAGE_ALLOC_COSTLY_ORDER)) { area = kmalloc_node(size, gfp | GFP_USER | __GFP_NORETRY, numa_node); - if (area != NULL) + if (area != NULL) { + active_vm_item_set(old_active_vm); return area; + } } - return __vmalloc_node_range(size, align, VMALLOC_START, VMALLOC_END, + ptr = __vmalloc_node_range(size, align, VMALLOC_START, VMALLOC_END, gfp | GFP_KERNEL | __GFP_RETRY_MAYFAIL, PAGE_KERNEL, flags, numa_node, __builtin_return_address(0)); + active_vm_item_set(old_active_vm); + return ptr; } void *bpf_map_area_alloc(u64 size, int numa_node) @@ -445,11 +454,14 @@ void *bpf_map_kmalloc_node(const struct bpf_map *map, size_t size, gfp_t flags, int node) { struct mem_cgroup *memcg, *old_memcg; + int old_active_vm; void *ptr; memcg = bpf_map_get_memcg(map); old_memcg = set_active_memcg(memcg); + old_active_vm = active_vm_item_set(ACTIVE_VM_BPF); ptr = kmalloc_node(size, flags | __GFP_ACCOUNT, node); + active_vm_item_set(old_active_vm); set_active_memcg(old_memcg); mem_cgroup_put(memcg); @@ -459,11 +471,14 @@ void *bpf_map_kmalloc_node(const struct bpf_map *map, size_t size, gfp_t flags, void *bpf_map_kzalloc(const struct bpf_map *map, size_t size, gfp_t flags) { struct mem_cgroup *memcg, *old_memcg; + int old_active_vm; void *ptr; memcg = bpf_map_get_memcg(map); old_memcg = set_active_memcg(memcg); + old_active_vm = active_vm_item_set(ACTIVE_VM_BPF); ptr = kzalloc(size, flags | __GFP_ACCOUNT); + active_vm_item_set(old_active_vm); set_active_memcg(old_memcg); mem_cgroup_put(memcg); @@ -474,11 +489,14 @@ void *bpf_map_kvcalloc(struct bpf_map *map, size_t n, size_t size, gfp_t flags) { struct mem_cgroup *memcg, *old_memcg; + int old_active_vm; void *ptr; memcg = bpf_map_get_memcg(map); old_memcg = set_active_memcg(memcg); + old_active_vm = active_vm_item_set(ACTIVE_VM_BPF); ptr = kvcalloc(n, size, flags | __GFP_ACCOUNT); + active_vm_item_set(old_active_vm); set_active_memcg(old_memcg); mem_cgroup_put(memcg); @@ -490,10 +508,13 @@ void __percpu *bpf_map_alloc_percpu(const struct bpf_map *map, size_t size, { struct mem_cgroup *memcg, *old_memcg; void __percpu *ptr; + int old_active_vm; memcg = bpf_map_get_memcg(map); old_memcg = set_active_memcg(memcg); + old_active_vm = active_vm_item_set(ACTIVE_VM_BPF); ptr = __alloc_percpu_gfp(size, align, flags | __GFP_ACCOUNT); + active_vm_item_set(old_active_vm); set_active_memcg(old_memcg); mem_cgroup_put(memcg);
The memory allocation via bpf_map_*alloc or bpf memalloc are accounted with active vm. We only need to annotate the allocation. These memory will automatically unaccount when they are freed. Signed-off-by: Yafang Shao <laoar.shao@gmail.com> --- fs/proc/meminfo.c | 3 +++ include/linux/active_vm.h | 10 +++++----- kernel/bpf/memalloc.c | 5 +++++ kernel/bpf/ringbuf.c | 8 ++++++-- kernel/bpf/syscall.c | 25 +++++++++++++++++++++++-- 5 files changed, 42 insertions(+), 9 deletions(-)