Commit 866a6c20 authored by Zhipeng Xie's avatar Zhipeng Xie Committed by Yang Jihong
Browse files

perf/core: Fix perf_mmap fail when CONFIG_PERF_USE_VMALLOC enabled

mainline inclusion
from mainline-v5.18-rc4
commit 60490e79
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I8KFB3
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=60490e7966659b26d74bf1fa4aa8693d9a94ca88

--------------------------------

This problem can be reproduced with CONFIG_PERF_USE_VMALLOC enabled on
both x86_64 and aarch64 arch when using sysdig -B(using ebpf)[1].
sysdig -B works fine after rebuilding the kernel with
CONFIG_PERF_USE_VMALLOC disabled.

I tracked it down to the if condition event->rb->nr_pages != nr_pages
in perf_mmap is true when CONFIG_PERF_USE_VMALLOC is enabled where
event->rb->nr_pages = 1 and nr_pages = 2048 resulting perf_mmap to
return -EINVAL. This is because when CONFIG_PERF_USE_VMALLOC is
enabled, rb->nr_pages is always equal to 1.

Arch with CONFIG_PERF_USE_VMALLOC enabled by default:
	arc/arm/csky/mips/sh/sparc/xtensa

Arch with CONFIG_PERF_USE_VMALLOC disabled by default:
	x86_64/aarch64/...

Fix this problem by using data_page_nr()

[1] https://github.com/draios/sysdig



Fixes: 906010b2 ("perf_event: Provide vmalloc() based mmap() backing")
Signed-off-by: default avatarZhipeng Xie <xiezhipeng1@huawei.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20220209145417.6495-1-xiezhipeng1@huawei.com



conflict:
	kernel/events/core.c
	kernel/events/internal.h
	kernel/events/ring_buffer.c

Signed-off-by: default avatarYang Jihong <yangjihong1@huawei.com>
parent 61d3ea9d
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment