* [PATCH 1/2] perf/ring_buffer: Modify the parameter type of perf_mmap_free_page()
@ 2019-09-27 8:22 Yunfeng Ye
2019-09-27 8:24 ` [PATCH 2/2] perf/ring_buffer: Matching the memory allocate and free, in rb_alloc() Yunfeng Ye
2019-10-14 8:14 ` [PATCH 1/2] perf/ring_buffer: Modify the parameter type of perf_mmap_free_page() Yunfeng Ye
0 siblings, 2 replies; 6+ messages in thread
From: Yunfeng Ye @ 2019-09-27 8:22 UTC (permalink / raw)
To: peterz, mingo, acme, mark.rutland, alexander.shishkin, jolsa, namhyung
Cc: linux-kernel
In perf_mmap_free_page(), the unsigned long type is converted to the
pointer type, but where the call is made, the pointer type is converted
to the unsigned long type. There is no need to do these operations.
Modify the parameter type of perf_mmap_free_page() to pointer type.
Signed-off-by: Yunfeng Ye <yeyunfeng@huawei.com>
---
kernel/events/ring_buffer.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/kernel/events/ring_buffer.c b/kernel/events/ring_buffer.c
index ffb59a4..abc145c 100644
--- a/kernel/events/ring_buffer.c
+++ b/kernel/events/ring_buffer.c
@@ -799,9 +799,9 @@ struct ring_buffer *rb_alloc(int nr_pages, long watermark, int cpu, int flags)
return NULL;
}
-static void perf_mmap_free_page(unsigned long addr)
+static void perf_mmap_free_page(void *addr)
{
- struct page *page = virt_to_page((void *)addr);
+ struct page *page = virt_to_page(addr);
page->mapping = NULL;
__free_page(page);
@@ -811,9 +811,9 @@ void rb_free(struct ring_buffer *rb)
{
int i;
- perf_mmap_free_page((unsigned long)rb->user_page);
+ perf_mmap_free_page(rb->user_page);
for (i = 0; i < rb->nr_pages; i++)
- perf_mmap_free_page((unsigned long)rb->data_pages[i]);
+ perf_mmap_free_page(rb->data_pages[i]);
kfree(rb);
}
--
2.7.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/2] perf/ring_buffer: Matching the memory allocate and free, in rb_alloc()
2019-09-27 8:22 [PATCH 1/2] perf/ring_buffer: Modify the parameter type of perf_mmap_free_page() Yunfeng Ye
@ 2019-09-27 8:24 ` Yunfeng Ye
2019-10-14 8:15 ` Yunfeng Ye
2019-10-14 8:14 ` [PATCH 1/2] perf/ring_buffer: Modify the parameter type of perf_mmap_free_page() Yunfeng Ye
1 sibling, 1 reply; 6+ messages in thread
From: Yunfeng Ye @ 2019-09-27 8:24 UTC (permalink / raw)
To: peterz, mingo, acme, mark.rutland, alexander.shishkin, jolsa, namhyung
Cc: linux-kernel
Currently perf_mmap_alloc_page() is used to allocate memory in
rb_alloc(), but using free_page() to free memory in the failure path.
It's better to use perf_mmap_free_page() instead.
Signed-off-by: Yunfeng Ye <yeyunfeng@huawei.com>
---
kernel/events/ring_buffer.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/kernel/events/ring_buffer.c b/kernel/events/ring_buffer.c
index abc145c..246c83a 100644
--- a/kernel/events/ring_buffer.c
+++ b/kernel/events/ring_buffer.c
@@ -754,6 +754,14 @@ static void *perf_mmap_alloc_page(int cpu)
return page_address(page);
}
+static void perf_mmap_free_page(void *addr)
+{
+ struct page *page = virt_to_page(addr);
+
+ page->mapping = NULL;
+ __free_page(page);
+}
+
struct ring_buffer *rb_alloc(int nr_pages, long watermark, int cpu, int flags)
{
struct ring_buffer *rb;
@@ -788,9 +796,9 @@ struct ring_buffer *rb_alloc(int nr_pages, long watermark, int cpu, int flags)
fail_data_pages:
for (i--; i >= 0; i--)
- free_page((unsigned long)rb->data_pages[i]);
+ perf_mmap_free_page(rb->data_pages[i]);
- free_page((unsigned long)rb->user_page);
+ perf_mmap_free_page(rb->user_page);
fail_user_page:
kfree(rb);
@@ -799,14 +807,6 @@ struct ring_buffer *rb_alloc(int nr_pages, long watermark, int cpu, int flags)
return NULL;
}
-static void perf_mmap_free_page(void *addr)
-{
- struct page *page = virt_to_page(addr);
-
- page->mapping = NULL;
- __free_page(page);
-}
-
void rb_free(struct ring_buffer *rb)
{
int i;
--
2.7.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/2] perf/ring_buffer: Matching the memory allocate and free, in rb_alloc()
2019-09-27 8:24 ` [PATCH 2/2] perf/ring_buffer: Matching the memory allocate and free, in rb_alloc() Yunfeng Ye
@ 2019-10-14 8:15 ` Yunfeng Ye
2019-10-18 12:48 ` [tip: perf/core] " tip-bot2 for Yunfeng Ye
0 siblings, 1 reply; 6+ messages in thread
From: Yunfeng Ye @ 2019-10-14 8:15 UTC (permalink / raw)
To: peterz, mingo, acme, mark.rutland, alexander.shishkin, jolsa, namhyung
Cc: linux-kernel
Currently perf_mmap_alloc_page() is used to allocate memory in
rb_alloc(), but using free_page() to free memory in the failure path.
It's better to use perf_mmap_free_page() instead.
Signed-off-by: Yunfeng Ye <yeyunfeng@huawei.com>
---
kernel/events/ring_buffer.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/kernel/events/ring_buffer.c b/kernel/events/ring_buffer.c
index abc145c..246c83a 100644
--- a/kernel/events/ring_buffer.c
+++ b/kernel/events/ring_buffer.c
@@ -754,6 +754,14 @@ static void *perf_mmap_alloc_page(int cpu)
return page_address(page);
}
+static void perf_mmap_free_page(void *addr)
+{
+ struct page *page = virt_to_page(addr);
+
+ page->mapping = NULL;
+ __free_page(page);
+}
+
struct ring_buffer *rb_alloc(int nr_pages, long watermark, int cpu, int flags)
{
struct ring_buffer *rb;
@@ -788,9 +796,9 @@ struct ring_buffer *rb_alloc(int nr_pages, long watermark, int cpu, int flags)
fail_data_pages:
for (i--; i >= 0; i--)
- free_page((unsigned long)rb->data_pages[i]);
+ perf_mmap_free_page(rb->data_pages[i]);
- free_page((unsigned long)rb->user_page);
+ perf_mmap_free_page(rb->user_page);
fail_user_page:
kfree(rb);
@@ -799,14 +807,6 @@ struct ring_buffer *rb_alloc(int nr_pages, long watermark, int cpu, int flags)
return NULL;
}
-static void perf_mmap_free_page(void *addr)
-{
- struct page *page = virt_to_page(addr);
-
- page->mapping = NULL;
- __free_page(page);
-}
-
void rb_free(struct ring_buffer *rb)
{
int i;
--
2.7.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [tip: perf/core] perf/ring_buffer: Matching the memory allocate and free, in rb_alloc()
2019-10-14 8:15 ` Yunfeng Ye
@ 2019-10-18 12:48 ` tip-bot2 for Yunfeng Ye
0 siblings, 0 replies; 6+ messages in thread
From: tip-bot2 for Yunfeng Ye @ 2019-10-18 12:48 UTC (permalink / raw)
To: linux-tip-commits
Cc: Yunfeng Ye, Peter Zijlstra (Intel),
jolsa, acme, mingo, mark.rutland, namhyung, alexander.shishkin,
Ingo Molnar, Borislav Petkov, linux-kernel
The following commit has been merged into the perf/core branch of tip:
Commit-ID: d7e78706e43107fa269fe34b1a69e653f5ec9f2c
Gitweb: https://git.kernel.org/tip/d7e78706e43107fa269fe34b1a69e653f5ec9f2c
Author: Yunfeng Ye <yeyunfeng@huawei.com>
AuthorDate: Mon, 14 Oct 2019 16:15:57 +08:00
Committer: Peter Zijlstra <peterz@infradead.org>
CommitterDate: Thu, 17 Oct 2019 21:31:55 +02:00
perf/ring_buffer: Matching the memory allocate and free, in rb_alloc()
Currently perf_mmap_alloc_page() is used to allocate memory in
rb_alloc(), but using free_page() to free memory in the failure path.
It's better to use perf_mmap_free_page() instead.
Signed-off-by: Yunfeng Ye <yeyunfeng@huawei.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: <jolsa@redhat.co>
Cc: <acme@kernel.org>
Cc: <mingo@redhat.com>
Cc: <mark.rutland@arm.com>
Cc: <namhyung@kernel.org>
Cc: <alexander.shishkin@linux.intel.com>
Link: https://lkml.kernel.org/r/575c7e8c-90c7-4e3a-b41d-f894d8cdbd7f@huawei.com
---
kernel/events/ring_buffer.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/kernel/events/ring_buffer.c b/kernel/events/ring_buffer.c
index abc145c..246c83a 100644
--- a/kernel/events/ring_buffer.c
+++ b/kernel/events/ring_buffer.c
@@ -754,6 +754,14 @@ static void *perf_mmap_alloc_page(int cpu)
return page_address(page);
}
+static void perf_mmap_free_page(void *addr)
+{
+ struct page *page = virt_to_page(addr);
+
+ page->mapping = NULL;
+ __free_page(page);
+}
+
struct ring_buffer *rb_alloc(int nr_pages, long watermark, int cpu, int flags)
{
struct ring_buffer *rb;
@@ -788,9 +796,9 @@ struct ring_buffer *rb_alloc(int nr_pages, long watermark, int cpu, int flags)
fail_data_pages:
for (i--; i >= 0; i--)
- free_page((unsigned long)rb->data_pages[i]);
+ perf_mmap_free_page(rb->data_pages[i]);
- free_page((unsigned long)rb->user_page);
+ perf_mmap_free_page(rb->user_page);
fail_user_page:
kfree(rb);
@@ -799,14 +807,6 @@ fail:
return NULL;
}
-static void perf_mmap_free_page(void *addr)
-{
- struct page *page = virt_to_page(addr);
-
- page->mapping = NULL;
- __free_page(page);
-}
-
void rb_free(struct ring_buffer *rb)
{
int i;
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 1/2] perf/ring_buffer: Modify the parameter type of perf_mmap_free_page()
2019-09-27 8:22 [PATCH 1/2] perf/ring_buffer: Modify the parameter type of perf_mmap_free_page() Yunfeng Ye
2019-09-27 8:24 ` [PATCH 2/2] perf/ring_buffer: Matching the memory allocate and free, in rb_alloc() Yunfeng Ye
@ 2019-10-14 8:14 ` Yunfeng Ye
2019-10-18 12:48 ` [tip: perf/core] " tip-bot2 for Yunfeng Ye
1 sibling, 1 reply; 6+ messages in thread
From: Yunfeng Ye @ 2019-10-14 8:14 UTC (permalink / raw)
To: peterz, mingo, acme, mark.rutland, alexander.shishkin, jolsa, namhyung
Cc: linux-kernel
In perf_mmap_free_page(), the unsigned long type is converted to the
pointer type, but where the call is made, the pointer type is converted
to the unsigned long type. There is no need to do these operations.
Modify the parameter type of perf_mmap_free_page() to pointer type.
Signed-off-by: Yunfeng Ye <yeyunfeng@huawei.com>
---
kernel/events/ring_buffer.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/kernel/events/ring_buffer.c b/kernel/events/ring_buffer.c
index ffb59a4..abc145c 100644
--- a/kernel/events/ring_buffer.c
+++ b/kernel/events/ring_buffer.c
@@ -799,9 +799,9 @@ struct ring_buffer *rb_alloc(int nr_pages, long watermark, int cpu, int flags)
return NULL;
}
-static void perf_mmap_free_page(unsigned long addr)
+static void perf_mmap_free_page(void *addr)
{
- struct page *page = virt_to_page((void *)addr);
+ struct page *page = virt_to_page(addr);
page->mapping = NULL;
__free_page(page);
@@ -811,9 +811,9 @@ void rb_free(struct ring_buffer *rb)
{
int i;
- perf_mmap_free_page((unsigned long)rb->user_page);
+ perf_mmap_free_page(rb->user_page);
for (i = 0; i < rb->nr_pages; i++)
- perf_mmap_free_page((unsigned long)rb->data_pages[i]);
+ perf_mmap_free_page(rb->data_pages[i]);
kfree(rb);
}
--
2.7.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [tip: perf/core] perf/ring_buffer: Modify the parameter type of perf_mmap_free_page()
2019-10-14 8:14 ` [PATCH 1/2] perf/ring_buffer: Modify the parameter type of perf_mmap_free_page() Yunfeng Ye
@ 2019-10-18 12:48 ` tip-bot2 for Yunfeng Ye
0 siblings, 0 replies; 6+ messages in thread
From: tip-bot2 for Yunfeng Ye @ 2019-10-18 12:48 UTC (permalink / raw)
To: linux-tip-commits
Cc: Yunfeng Ye, Peter Zijlstra (Intel),
jolsa, acme, mingo, mark.rutland, namhyung, alexander.shishkin,
Ingo Molnar, Borislav Petkov, linux-kernel
The following commit has been merged into the perf/core branch of tip:
Commit-ID: 8a9f91c51ea72b126864e0db616b1bac12261200
Gitweb: https://git.kernel.org/tip/8a9f91c51ea72b126864e0db616b1bac12261200
Author: Yunfeng Ye <yeyunfeng@huawei.com>
AuthorDate: Mon, 14 Oct 2019 16:14:59 +08:00
Committer: Peter Zijlstra <peterz@infradead.org>
CommitterDate: Thu, 17 Oct 2019 21:31:55 +02:00
perf/ring_buffer: Modify the parameter type of perf_mmap_free_page()
In perf_mmap_free_page(), the unsigned long type is converted to the
pointer type, but where the call is made, the pointer type is converted
to the unsigned long type. There is no need to do these operations.
Modify the parameter type of perf_mmap_free_page() to pointer type.
Signed-off-by: Yunfeng Ye <yeyunfeng@huawei.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: <jolsa@redhat.co>
Cc: <acme@kernel.org>
Cc: <mingo@redhat.com>
Cc: <mark.rutland@arm.com>
Cc: <namhyung@kernel.org>
Cc: <alexander.shishkin@linux.intel.com>
Link: https://lkml.kernel.org/r/e6ae3f0c-d04c-50f9-544a-aee3b30330cd@huawei.com
---
kernel/events/ring_buffer.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/kernel/events/ring_buffer.c b/kernel/events/ring_buffer.c
index ffb59a4..abc145c 100644
--- a/kernel/events/ring_buffer.c
+++ b/kernel/events/ring_buffer.c
@@ -799,9 +799,9 @@ fail:
return NULL;
}
-static void perf_mmap_free_page(unsigned long addr)
+static void perf_mmap_free_page(void *addr)
{
- struct page *page = virt_to_page((void *)addr);
+ struct page *page = virt_to_page(addr);
page->mapping = NULL;
__free_page(page);
@@ -811,9 +811,9 @@ void rb_free(struct ring_buffer *rb)
{
int i;
- perf_mmap_free_page((unsigned long)rb->user_page);
+ perf_mmap_free_page(rb->user_page);
for (i = 0; i < rb->nr_pages; i++)
- perf_mmap_free_page((unsigned long)rb->data_pages[i]);
+ perf_mmap_free_page(rb->data_pages[i]);
kfree(rb);
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-10-18 12:48 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-27 8:22 [PATCH 1/2] perf/ring_buffer: Modify the parameter type of perf_mmap_free_page() Yunfeng Ye
2019-09-27 8:24 ` [PATCH 2/2] perf/ring_buffer: Matching the memory allocate and free, in rb_alloc() Yunfeng Ye
2019-10-14 8:15 ` Yunfeng Ye
2019-10-18 12:48 ` [tip: perf/core] " tip-bot2 for Yunfeng Ye
2019-10-14 8:14 ` [PATCH 1/2] perf/ring_buffer: Modify the parameter type of perf_mmap_free_page() Yunfeng Ye
2019-10-18 12:48 ` [tip: perf/core] " tip-bot2 for Yunfeng Ye
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).