Unverified Commit 6a02f116 authored Nov 29, 2023 by openeuler-ci-bot Committed by Gitee Nov 29, 2023

!3071 perf/core: Fix perf_mmap fail when CONFIG_PERF_USE_VMALLOC enabled

Merge Pull Request from: @ci-robot 
 
PR sync from: Yang Jihong <yangjihong1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/Y724KUTLBNMIJJPPULFQ4VOAROBO7EGV/ 
 
https://gitee.com/openeuler/kernel/issues/I8KFB3 
 
Link:https://gitee.com/openeuler/kernel/pulls/3071

 

Reviewed-by: Xu Kuohai <xukuohai@huawei.com>
Reviewed-by: Liu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>

parents 61d3ea9d 866a6c20

kernel/events/core.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -5760,7 +5760,7 @@ static int perf_mmap(struct file file, struct vm_area_struct vma)
		again:
		mutex_lock(&event->mmap_mutex);
		if (event->rb) {
		if (event->rb->nr_pages != nr_pages) {
		if (data_page_nr(event->rb) != nr_pages) {
		ret = -EINVAL;
		goto unlock;
		}

kernel/events/internal.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -114,6 +114,11 @@ static inline int page_order(struct ring_buffer *rb)
		}
		#endif

		static inline int data_page_nr(struct ring_buffer *rb)
		{
		return rb->nr_pages << page_order(rb);
		}

		static inline unsigned long perf_data_size(struct ring_buffer *rb)
		{
		return rb->nr_pages << (PAGE_SHIFT + page_order(rb));

kernel/events/ring_buffer.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -803,10 +803,6 @@ void rb_free(struct ring_buffer *rb)
		}

		#else
		static int data_page_nr(struct ring_buffer *rb)
		{
		return rb->nr_pages << page_order(rb);
		}

		static struct page *
		__perf_mmap_to_page(struct ring_buffer *rb, unsigned long pgoff)