lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

perf: Optimize the !vmalloc backed buffer

Browse Source 
Reduce code and data by using the knowledge that for
!PERF_USE_VMALLOC data_order is always 0.

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Steven Rostedt <rostedt@goodmis.org>
LKML-Reference: <20100521090710.795019386@chello.nl>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Peter Zijlstra
2010-05-20 19:07:56 +02:00
committed by Ingo Molnar
parent 5d967a8be6
commit 3cafa9fbb5
2 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/perf_event.h
View File

@@ -588,8 +588,8 @@ struct perf_mmap_data {
struct rcu_head rcu_head; struct rcu_head rcu_head;
#ifdef CONFIG_PERF_USE_VMALLOC #ifdef CONFIG_PERF_USE_VMALLOC
struct work_struct work; struct work_struct work;
int page_order; /* allocation order */
#endif #endif
int data_order; /* allocation order */
int nr_pages; /* nr of data pages */ int nr_pages; /* nr of data pages */
int writable; /* are we writable */ int writable; /* are we writable */
int nr_locked; /* nr pages mlocked */ int nr_locked; /* nr pages mlocked */

41
kernel/perf_event.c
View File

@@ -2297,11 +2297,6 @@ unlock:
rcu_read_unlock(); rcu_read_unlock();
} }
static unsigned long perf_data_size(struct perf_mmap_data *data)
{
return data->nr_pages << (PAGE_SHIFT + data->data_order);
}
#ifndef CONFIG_PERF_USE_VMALLOC #ifndef CONFIG_PERF_USE_VMALLOC
/* /*
@@ -2359,7 +2354,6 @@ perf_mmap_data_alloc(struct perf_event *event, int nr_pages)
goto fail_data_pages; goto fail_data_pages;
} }
data->data_order = 0;
data->nr_pages = nr_pages; data->nr_pages = nr_pages;
return data; return data;
@@ -2395,6 +2389,11 @@ static void perf_mmap_data_free(struct perf_mmap_data *data)
kfree(data); kfree(data);
} }
static inline int page_order(struct perf_mmap_data *data)
{
return 0;
}
#else #else
/* /*
@@ -2403,10 +2402,15 @@ static void perf_mmap_data_free(struct perf_mmap_data *data)
* Required for architectures that have d-cache aliasing issues. * Required for architectures that have d-cache aliasing issues.
*/ */
static inline int page_order(struct perf_mmap_data *data)
{
return data->page_order;
}
static struct page * static struct page *
perf_mmap_to_page(struct perf_mmap_data *data, unsigned long pgoff) perf_mmap_to_page(struct perf_mmap_data *data, unsigned long pgoff)
{ {
if (pgoff > (1UL << data->data_order)) if (pgoff > (1UL << page_order(data)))
return NULL; return NULL;
return vmalloc_to_page((void *)data->user_page + pgoff * PAGE_SIZE); return vmalloc_to_page((void *)data->user_page + pgoff * PAGE_SIZE);
@@ -2426,7 +2430,7 @@ static void perf_mmap_data_free_work(struct work_struct *work)
int i, nr; int i, nr;
data = container_of(work, struct perf_mmap_data, work); data = container_of(work, struct perf_mmap_data, work);
nr = 1 << data->data_order; nr = 1 << page_order(data);
base = data->user_page; base = data->user_page;
for (i = 0; i < nr + 1; i++) for (i = 0; i < nr + 1; i++)
@@ -2465,7 +2469,7 @@ perf_mmap_data_alloc(struct perf_event *event, int nr_pages)
data->user_page = all_buf; data->user_page = all_buf;
data->data_pages[0] = all_buf + PAGE_SIZE; data->data_pages[0] = all_buf + PAGE_SIZE;
data->data_order = ilog2(nr_pages); data->page_order = ilog2(nr_pages);
data->nr_pages = 1; data->nr_pages = 1;
return data; return data;
@@ -2479,6 +2483,11 @@ fail:
#endif #endif
static unsigned long perf_data_size(struct perf_mmap_data *data)
{
return data->nr_pages << (PAGE_SHIFT + page_order(data));
}
static int perf_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf) static int perf_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
{ {
struct perf_event *event = vma->vm_file->private_data; struct perf_event *event = vma->vm_file->private_data;
@@ -2979,10 +2988,12 @@ void perf_output_copy(struct perf_output_handle *handle,
handle->addr += size; handle->addr += size;
handle->size -= size; handle->size -= size;
if (!handle->size) { if (!handle->size) {
struct perf_mmap_data *data = handle->data;
handle->page++; handle->page++;
handle->page &= handle->data->nr_pages - 1; handle->page &= data->nr_pages - 1;
handle->addr = handle->data->data_pages[handle->page]; handle->addr = data->data_pages[handle->page];
handle->size = PAGE_SIZE << handle->data->data_order; handle->size = PAGE_SIZE << page_order(data);
} }
} while (len); } while (len);
} }
@@ -3050,12 +3061,12 @@ int perf_output_begin(struct perf_output_handle *handle,
if (head - local_read(&data->wakeup) > data->watermark) if (head - local_read(&data->wakeup) > data->watermark)
local_add(data->watermark, &data->wakeup); local_add(data->watermark, &data->wakeup);
handle->page = handle->offset >> (PAGE_SHIFT + data->data_order); handle->page = handle->offset >> (PAGE_SHIFT + page_order(data));
handle->page &= data->nr_pages - 1; handle->page &= data->nr_pages - 1;
handle->size = handle->offset & ((PAGE_SIZE << data->data_order) - 1); handle->size = handle->offset & ((PAGE_SIZE << page_order(data)) - 1);
handle->addr = data->data_pages[handle->page]; handle->addr = data->data_pages[handle->page];
handle->addr += handle->size; handle->addr += handle->size;
handle->size = (PAGE_SIZE << data->data_order) - handle->size; handle->size = (PAGE_SIZE << page_order(data)) - handle->size;
if (have_lost) { if (have_lost) {
lost_event.header.type = PERF_RECORD_LOST; lost_event.header.type = PERF_RECORD_LOST;