| .. | .. |
|---|
| 1 | +// SPDX-License-Identifier: GPL-2.0 |
|---|
| 1 | 2 | /* |
|---|
| 2 | 3 | * Performance events ring-buffer code: |
|---|
| 3 | 4 | * |
|---|
| .. | .. |
|---|
| 5 | 6 | * Copyright (C) 2008-2011 Red Hat, Inc., Ingo Molnar |
|---|
| 6 | 7 | * Copyright (C) 2008-2011 Red Hat, Inc., Peter Zijlstra |
|---|
| 7 | 8 | * Copyright © 2009 Paul Mackerras, IBM Corp. <paulus@au1.ibm.com> |
|---|
| 8 | | - * |
|---|
| 9 | | - * For licensing details see kernel-base/COPYING |
|---|
| 10 | 9 | */ |
|---|
| 11 | 10 | |
|---|
| 12 | 11 | #include <linux/perf_event.h> |
|---|
| .. | .. |
|---|
| 36 | 35 | */ |
|---|
| 37 | 36 | static void perf_output_get_handle(struct perf_output_handle *handle) |
|---|
| 38 | 37 | { |
|---|
| 39 | | - struct ring_buffer *rb = handle->rb; |
|---|
| 38 | + struct perf_buffer *rb = handle->rb; |
|---|
| 40 | 39 | |
|---|
| 41 | 40 | preempt_disable(); |
|---|
| 42 | | - local_inc(&rb->nest); |
|---|
| 41 | + |
|---|
| 42 | + /* |
|---|
| 43 | + * Avoid an explicit LOAD/STORE such that architectures with memops |
|---|
| 44 | + * can use them. |
|---|
| 45 | + */ |
|---|
| 46 | + (*(volatile unsigned int *)&rb->nest)++; |
|---|
| 43 | 47 | handle->wakeup = local_read(&rb->wakeup); |
|---|
| 44 | 48 | } |
|---|
| 45 | 49 | |
|---|
| 46 | 50 | static void perf_output_put_handle(struct perf_output_handle *handle) |
|---|
| 47 | 51 | { |
|---|
| 48 | | - struct ring_buffer *rb = handle->rb; |
|---|
| 52 | + struct perf_buffer *rb = handle->rb; |
|---|
| 49 | 53 | unsigned long head; |
|---|
| 54 | + unsigned int nest; |
|---|
| 55 | + |
|---|
| 56 | + /* |
|---|
| 57 | + * If this isn't the outermost nesting, we don't have to update |
|---|
| 58 | + * @rb->user_page->data_head. |
|---|
| 59 | + */ |
|---|
| 60 | + nest = READ_ONCE(rb->nest); |
|---|
| 61 | + if (nest > 1) { |
|---|
| 62 | + WRITE_ONCE(rb->nest, nest - 1); |
|---|
| 63 | + goto out; |
|---|
| 64 | + } |
|---|
| 50 | 65 | |
|---|
| 51 | 66 | again: |
|---|
| 52 | 67 | /* |
|---|
| .. | .. |
|---|
| 64 | 79 | * IRQ/NMI can happen here and advance @rb->head, causing our |
|---|
| 65 | 80 | * load above to be stale. |
|---|
| 66 | 81 | */ |
|---|
| 67 | | - |
|---|
| 68 | | - /* |
|---|
| 69 | | - * If this isn't the outermost nesting, we don't have to update |
|---|
| 70 | | - * @rb->user_page->data_head. |
|---|
| 71 | | - */ |
|---|
| 72 | | - if (local_read(&rb->nest) > 1) { |
|---|
| 73 | | - local_dec(&rb->nest); |
|---|
| 74 | | - goto out; |
|---|
| 75 | | - } |
|---|
| 76 | 82 | |
|---|
| 77 | 83 | /* |
|---|
| 78 | 84 | * Since the mmap() consumer (userspace) can run on a different CPU: |
|---|
| .. | .. |
|---|
| 109 | 115 | * write will (temporarily) publish a stale value. |
|---|
| 110 | 116 | */ |
|---|
| 111 | 117 | barrier(); |
|---|
| 112 | | - local_set(&rb->nest, 0); |
|---|
| 118 | + WRITE_ONCE(rb->nest, 0); |
|---|
| 113 | 119 | |
|---|
| 114 | 120 | /* |
|---|
| 115 | 121 | * Ensure we decrement @rb->nest before we validate the @rb->head. |
|---|
| .. | .. |
|---|
| 117 | 123 | */ |
|---|
| 118 | 124 | barrier(); |
|---|
| 119 | 125 | if (unlikely(head != local_read(&rb->head))) { |
|---|
| 120 | | - local_inc(&rb->nest); |
|---|
| 126 | + WRITE_ONCE(rb->nest, 1); |
|---|
| 121 | 127 | goto again; |
|---|
| 122 | 128 | } |
|---|
| 123 | 129 | |
|---|
| .. | .. |
|---|
| 141 | 147 | |
|---|
| 142 | 148 | static __always_inline int |
|---|
| 143 | 149 | __perf_output_begin(struct perf_output_handle *handle, |
|---|
| 150 | + struct perf_sample_data *data, |
|---|
| 144 | 151 | struct perf_event *event, unsigned int size, |
|---|
| 145 | 152 | bool backward) |
|---|
| 146 | 153 | { |
|---|
| 147 | | - struct ring_buffer *rb; |
|---|
| 154 | + struct perf_buffer *rb; |
|---|
| 148 | 155 | unsigned long tail, offset, head; |
|---|
| 149 | 156 | int have_lost, page_shift; |
|---|
| 150 | 157 | struct { |
|---|
| .. | .. |
|---|
| 231 | 238 | handle->size = (1UL << page_shift) - offset; |
|---|
| 232 | 239 | |
|---|
| 233 | 240 | if (unlikely(have_lost)) { |
|---|
| 234 | | - struct perf_sample_data sample_data; |
|---|
| 235 | | - |
|---|
| 236 | 241 | lost_event.header.size = sizeof(lost_event); |
|---|
| 237 | 242 | lost_event.header.type = PERF_RECORD_LOST; |
|---|
| 238 | 243 | lost_event.header.misc = 0; |
|---|
| 239 | 244 | lost_event.id = event->id; |
|---|
| 240 | 245 | lost_event.lost = local_xchg(&rb->lost, 0); |
|---|
| 241 | 246 | |
|---|
| 242 | | - perf_event_header__init_id(&lost_event.header, |
|---|
| 243 | | - &sample_data, event); |
|---|
| 247 | + /* XXX mostly redundant; @data is already fully initializes */ |
|---|
| 248 | + perf_event_header__init_id(&lost_event.header, data, event); |
|---|
| 244 | 249 | perf_output_put(handle, lost_event); |
|---|
| 245 | | - perf_event__output_id_sample(event, handle, &sample_data); |
|---|
| 250 | + perf_event__output_id_sample(event, handle, data); |
|---|
| 246 | 251 | } |
|---|
| 247 | 252 | |
|---|
| 248 | 253 | return 0; |
|---|
| .. | .. |
|---|
| 257 | 262 | } |
|---|
| 258 | 263 | |
|---|
| 259 | 264 | int perf_output_begin_forward(struct perf_output_handle *handle, |
|---|
| 260 | | - struct perf_event *event, unsigned int size) |
|---|
| 265 | + struct perf_sample_data *data, |
|---|
| 266 | + struct perf_event *event, unsigned int size) |
|---|
| 261 | 267 | { |
|---|
| 262 | | - return __perf_output_begin(handle, event, size, false); |
|---|
| 268 | + return __perf_output_begin(handle, data, event, size, false); |
|---|
| 263 | 269 | } |
|---|
| 264 | 270 | |
|---|
| 265 | 271 | int perf_output_begin_backward(struct perf_output_handle *handle, |
|---|
| 272 | + struct perf_sample_data *data, |
|---|
| 266 | 273 | struct perf_event *event, unsigned int size) |
|---|
| 267 | 274 | { |
|---|
| 268 | | - return __perf_output_begin(handle, event, size, true); |
|---|
| 275 | + return __perf_output_begin(handle, data, event, size, true); |
|---|
| 269 | 276 | } |
|---|
| 270 | 277 | |
|---|
| 271 | 278 | int perf_output_begin(struct perf_output_handle *handle, |
|---|
| 279 | + struct perf_sample_data *data, |
|---|
| 272 | 280 | struct perf_event *event, unsigned int size) |
|---|
| 273 | 281 | { |
|---|
| 274 | 282 | |
|---|
| 275 | | - return __perf_output_begin(handle, event, size, |
|---|
| 283 | + return __perf_output_begin(handle, data, event, size, |
|---|
| 276 | 284 | unlikely(is_write_backward(event))); |
|---|
| 277 | 285 | } |
|---|
| 278 | 286 | |
|---|
| .. | .. |
|---|
| 295 | 303 | } |
|---|
| 296 | 304 | |
|---|
| 297 | 305 | static void |
|---|
| 298 | | -ring_buffer_init(struct ring_buffer *rb, long watermark, int flags) |
|---|
| 306 | +ring_buffer_init(struct perf_buffer *rb, long watermark, int flags) |
|---|
| 299 | 307 | { |
|---|
| 300 | 308 | long max_size = perf_data_size(rb); |
|---|
| 301 | 309 | |
|---|
| .. | .. |
|---|
| 310 | 318 | else |
|---|
| 311 | 319 | rb->overwrite = 1; |
|---|
| 312 | 320 | |
|---|
| 313 | | - atomic_set(&rb->refcount, 1); |
|---|
| 321 | + refcount_set(&rb->refcount, 1); |
|---|
| 314 | 322 | |
|---|
| 315 | 323 | INIT_LIST_HEAD(&rb->event_list); |
|---|
| 316 | 324 | spin_lock_init(&rb->event_lock); |
|---|
| .. | .. |
|---|
| 355 | 363 | { |
|---|
| 356 | 364 | struct perf_event *output_event = event; |
|---|
| 357 | 365 | unsigned long aux_head, aux_tail; |
|---|
| 358 | | - struct ring_buffer *rb; |
|---|
| 366 | + struct perf_buffer *rb; |
|---|
| 367 | + unsigned int nest; |
|---|
| 359 | 368 | |
|---|
| 360 | 369 | if (output_event->parent) |
|---|
| 361 | 370 | output_event = output_event->parent; |
|---|
| .. | .. |
|---|
| 383 | 392 | if (!atomic_read(&rb->aux_mmap_count)) |
|---|
| 384 | 393 | goto err; |
|---|
| 385 | 394 | |
|---|
| 386 | | - if (!atomic_inc_not_zero(&rb->aux_refcount)) |
|---|
| 395 | + if (!refcount_inc_not_zero(&rb->aux_refcount)) |
|---|
| 387 | 396 | goto err; |
|---|
| 388 | 397 | |
|---|
| 398 | + nest = READ_ONCE(rb->aux_nest); |
|---|
| 389 | 399 | /* |
|---|
| 390 | 400 | * Nesting is not supported for AUX area, make sure nested |
|---|
| 391 | 401 | * writers are caught early |
|---|
| 392 | 402 | */ |
|---|
| 393 | | - if (WARN_ON_ONCE(local_xchg(&rb->aux_nest, 1))) |
|---|
| 403 | + if (WARN_ON_ONCE(nest)) |
|---|
| 394 | 404 | goto err_put; |
|---|
| 405 | + |
|---|
| 406 | + WRITE_ONCE(rb->aux_nest, nest + 1); |
|---|
| 395 | 407 | |
|---|
| 396 | 408 | aux_head = rb->aux_head; |
|---|
| 397 | 409 | |
|---|
| .. | .. |
|---|
| 420 | 432 | if (!handle->size) { /* A, matches D */ |
|---|
| 421 | 433 | event->pending_disable = smp_processor_id(); |
|---|
| 422 | 434 | perf_output_wakeup(handle); |
|---|
| 423 | | - local_set(&rb->aux_nest, 0); |
|---|
| 435 | + WRITE_ONCE(rb->aux_nest, 0); |
|---|
| 424 | 436 | goto err_put; |
|---|
| 425 | 437 | } |
|---|
| 426 | 438 | } |
|---|
| .. | .. |
|---|
| 439 | 451 | } |
|---|
| 440 | 452 | EXPORT_SYMBOL_GPL(perf_aux_output_begin); |
|---|
| 441 | 453 | |
|---|
| 442 | | -static __always_inline bool rb_need_aux_wakeup(struct ring_buffer *rb) |
|---|
| 454 | +static __always_inline bool rb_need_aux_wakeup(struct perf_buffer *rb) |
|---|
| 443 | 455 | { |
|---|
| 444 | 456 | if (rb->aux_overwrite) |
|---|
| 445 | 457 | return false; |
|---|
| .. | .. |
|---|
| 465 | 477 | void perf_aux_output_end(struct perf_output_handle *handle, unsigned long size) |
|---|
| 466 | 478 | { |
|---|
| 467 | 479 | bool wakeup = !!(handle->aux_flags & PERF_AUX_FLAG_TRUNCATED); |
|---|
| 468 | | - struct ring_buffer *rb = handle->rb; |
|---|
| 480 | + struct perf_buffer *rb = handle->rb; |
|---|
| 469 | 481 | unsigned long aux_head; |
|---|
| 470 | 482 | |
|---|
| 471 | 483 | /* in overwrite mode, driver provides aux_head via handle */ |
|---|
| .. | .. |
|---|
| 481 | 493 | rb->aux_head += size; |
|---|
| 482 | 494 | } |
|---|
| 483 | 495 | |
|---|
| 484 | | - if (size || handle->aux_flags) { |
|---|
| 485 | | - /* |
|---|
| 486 | | - * Only send RECORD_AUX if we have something useful to communicate |
|---|
| 487 | | - */ |
|---|
| 488 | | - |
|---|
| 496 | + /* |
|---|
| 497 | + * Only send RECORD_AUX if we have something useful to communicate |
|---|
| 498 | + * |
|---|
| 499 | + * Note: the OVERWRITE records by themselves are not considered |
|---|
| 500 | + * useful, as they don't communicate any *new* information, |
|---|
| 501 | + * aside from the short-lived offset, that becomes history at |
|---|
| 502 | + * the next event sched-in and therefore isn't useful. |
|---|
| 503 | + * The userspace that needs to copy out AUX data in overwrite |
|---|
| 504 | + * mode should know to use user_page::aux_head for the actual |
|---|
| 505 | + * offset. So, from now on we don't output AUX records that |
|---|
| 506 | + * have *only* OVERWRITE flag set. |
|---|
| 507 | + */ |
|---|
| 508 | + if (size || (handle->aux_flags & ~(u64)PERF_AUX_FLAG_OVERWRITE)) |
|---|
| 489 | 509 | perf_event_aux_event(handle->event, aux_head, size, |
|---|
| 490 | | - handle->aux_flags); |
|---|
| 491 | | - } |
|---|
| 510 | + handle->aux_flags); |
|---|
| 492 | 511 | |
|---|
| 493 | 512 | WRITE_ONCE(rb->user_page->aux_head, rb->aux_head); |
|---|
| 494 | 513 | if (rb_need_aux_wakeup(rb)) |
|---|
| .. | .. |
|---|
| 502 | 521 | |
|---|
| 503 | 522 | handle->event = NULL; |
|---|
| 504 | 523 | |
|---|
| 505 | | - local_set(&rb->aux_nest, 0); |
|---|
| 524 | + WRITE_ONCE(rb->aux_nest, 0); |
|---|
| 506 | 525 | /* can't be last */ |
|---|
| 507 | 526 | rb_free_aux(rb); |
|---|
| 508 | 527 | ring_buffer_put(rb); |
|---|
| .. | .. |
|---|
| 515 | 534 | */ |
|---|
| 516 | 535 | int perf_aux_output_skip(struct perf_output_handle *handle, unsigned long size) |
|---|
| 517 | 536 | { |
|---|
| 518 | | - struct ring_buffer *rb = handle->rb; |
|---|
| 537 | + struct perf_buffer *rb = handle->rb; |
|---|
| 519 | 538 | |
|---|
| 520 | 539 | if (size > handle->size) |
|---|
| 521 | 540 | return -ENOSPC; |
|---|
| .. | .. |
|---|
| 545 | 564 | } |
|---|
| 546 | 565 | EXPORT_SYMBOL_GPL(perf_get_aux); |
|---|
| 547 | 566 | |
|---|
| 567 | +/* |
|---|
| 568 | + * Copy out AUX data from an AUX handle. |
|---|
| 569 | + */ |
|---|
| 570 | +long perf_output_copy_aux(struct perf_output_handle *aux_handle, |
|---|
| 571 | + struct perf_output_handle *handle, |
|---|
| 572 | + unsigned long from, unsigned long to) |
|---|
| 573 | +{ |
|---|
| 574 | + struct perf_buffer *rb = aux_handle->rb; |
|---|
| 575 | + unsigned long tocopy, remainder, len = 0; |
|---|
| 576 | + void *addr; |
|---|
| 577 | + |
|---|
| 578 | + from &= (rb->aux_nr_pages << PAGE_SHIFT) - 1; |
|---|
| 579 | + to &= (rb->aux_nr_pages << PAGE_SHIFT) - 1; |
|---|
| 580 | + |
|---|
| 581 | + do { |
|---|
| 582 | + tocopy = PAGE_SIZE - offset_in_page(from); |
|---|
| 583 | + if (to > from) |
|---|
| 584 | + tocopy = min(tocopy, to - from); |
|---|
| 585 | + if (!tocopy) |
|---|
| 586 | + break; |
|---|
| 587 | + |
|---|
| 588 | + addr = rb->aux_pages[from >> PAGE_SHIFT]; |
|---|
| 589 | + addr += offset_in_page(from); |
|---|
| 590 | + |
|---|
| 591 | + remainder = perf_output_copy(handle, addr, tocopy); |
|---|
| 592 | + if (remainder) |
|---|
| 593 | + return -EFAULT; |
|---|
| 594 | + |
|---|
| 595 | + len += tocopy; |
|---|
| 596 | + from += tocopy; |
|---|
| 597 | + from &= (rb->aux_nr_pages << PAGE_SHIFT) - 1; |
|---|
| 598 | + } while (to != from); |
|---|
| 599 | + |
|---|
| 600 | + return len; |
|---|
| 601 | +} |
|---|
| 602 | + |
|---|
| 548 | 603 | #define PERF_AUX_GFP (GFP_KERNEL | __GFP_ZERO | __GFP_NOWARN | __GFP_NORETRY) |
|---|
| 549 | 604 | |
|---|
| 550 | 605 | static struct page *rb_alloc_aux_page(int node, int order) |
|---|
| .. | .. |
|---|
| 573 | 628 | return page; |
|---|
| 574 | 629 | } |
|---|
| 575 | 630 | |
|---|
| 576 | | -static void rb_free_aux_page(struct ring_buffer *rb, int idx) |
|---|
| 631 | +static void rb_free_aux_page(struct perf_buffer *rb, int idx) |
|---|
| 577 | 632 | { |
|---|
| 578 | 633 | struct page *page = virt_to_page(rb->aux_pages[idx]); |
|---|
| 579 | 634 | |
|---|
| .. | .. |
|---|
| 582 | 637 | __free_page(page); |
|---|
| 583 | 638 | } |
|---|
| 584 | 639 | |
|---|
| 585 | | -static void __rb_free_aux(struct ring_buffer *rb) |
|---|
| 640 | +static void __rb_free_aux(struct perf_buffer *rb) |
|---|
| 586 | 641 | { |
|---|
| 587 | 642 | int pg; |
|---|
| 588 | 643 | |
|---|
| .. | .. |
|---|
| 609 | 664 | } |
|---|
| 610 | 665 | } |
|---|
| 611 | 666 | |
|---|
| 612 | | -int rb_alloc_aux(struct ring_buffer *rb, struct perf_event *event, |
|---|
| 667 | +int rb_alloc_aux(struct perf_buffer *rb, struct perf_event *event, |
|---|
| 613 | 668 | pgoff_t pgoff, int nr_pages, long watermark, int flags) |
|---|
| 614 | 669 | { |
|---|
| 615 | 670 | bool overwrite = !(flags & RING_BUFFER_WRITABLE); |
|---|
| 616 | 671 | int node = (event->cpu == -1) ? -1 : cpu_to_node(event->cpu); |
|---|
| 617 | | - int ret = -ENOMEM, max_order = 0; |
|---|
| 672 | + int ret = -ENOMEM, max_order; |
|---|
| 618 | 673 | |
|---|
| 619 | 674 | if (!has_aux(event)) |
|---|
| 620 | 675 | return -EOPNOTSUPP; |
|---|
| 621 | 676 | |
|---|
| 622 | | - if (event->pmu->capabilities & PERF_PMU_CAP_AUX_NO_SG) { |
|---|
| 623 | | - /* |
|---|
| 624 | | - * We need to start with the max_order that fits in nr_pages, |
|---|
| 625 | | - * not the other way around, hence ilog2() and not get_order. |
|---|
| 626 | | - */ |
|---|
| 627 | | - max_order = ilog2(nr_pages); |
|---|
| 677 | + /* |
|---|
| 678 | + * We need to start with the max_order that fits in nr_pages, |
|---|
| 679 | + * not the other way around, hence ilog2() and not get_order. |
|---|
| 680 | + */ |
|---|
| 681 | + max_order = ilog2(nr_pages); |
|---|
| 628 | 682 | |
|---|
| 629 | | - /* |
|---|
| 630 | | - * PMU requests more than one contiguous chunks of memory |
|---|
| 631 | | - * for SW double buffering |
|---|
| 632 | | - */ |
|---|
| 633 | | - if ((event->pmu->capabilities & PERF_PMU_CAP_AUX_SW_DOUBLEBUF) && |
|---|
| 634 | | - !overwrite) { |
|---|
| 635 | | - if (!max_order) |
|---|
| 636 | | - return -EINVAL; |
|---|
| 683 | + /* |
|---|
| 684 | + * PMU requests more than one contiguous chunks of memory |
|---|
| 685 | + * for SW double buffering |
|---|
| 686 | + */ |
|---|
| 687 | + if (!overwrite) { |
|---|
| 688 | + if (!max_order) |
|---|
| 689 | + return -EINVAL; |
|---|
| 637 | 690 | |
|---|
| 638 | | - max_order--; |
|---|
| 639 | | - } |
|---|
| 691 | + max_order--; |
|---|
| 640 | 692 | } |
|---|
| 641 | 693 | |
|---|
| 642 | 694 | rb->aux_pages = kcalloc_node(nr_pages, sizeof(void *), GFP_KERNEL, |
|---|
| .. | .. |
|---|
| 686 | 738 | * we keep a refcount here to make sure either of the two can |
|---|
| 687 | 739 | * reference them safely. |
|---|
| 688 | 740 | */ |
|---|
| 689 | | - atomic_set(&rb->aux_refcount, 1); |
|---|
| 741 | + refcount_set(&rb->aux_refcount, 1); |
|---|
| 690 | 742 | |
|---|
| 691 | 743 | rb->aux_overwrite = overwrite; |
|---|
| 692 | 744 | rb->aux_watermark = watermark; |
|---|
| .. | .. |
|---|
| 703 | 755 | return ret; |
|---|
| 704 | 756 | } |
|---|
| 705 | 757 | |
|---|
| 706 | | -void rb_free_aux(struct ring_buffer *rb) |
|---|
| 758 | +void rb_free_aux(struct perf_buffer *rb) |
|---|
| 707 | 759 | { |
|---|
| 708 | | - if (atomic_dec_and_test(&rb->aux_refcount)) |
|---|
| 760 | + if (refcount_dec_and_test(&rb->aux_refcount)) |
|---|
| 709 | 761 | __rb_free_aux(rb); |
|---|
| 710 | 762 | } |
|---|
| 711 | 763 | |
|---|
| .. | .. |
|---|
| 716 | 768 | */ |
|---|
| 717 | 769 | |
|---|
| 718 | 770 | static struct page * |
|---|
| 719 | | -__perf_mmap_to_page(struct ring_buffer *rb, unsigned long pgoff) |
|---|
| 771 | +__perf_mmap_to_page(struct perf_buffer *rb, unsigned long pgoff) |
|---|
| 720 | 772 | { |
|---|
| 721 | 773 | if (pgoff > rb->nr_pages) |
|---|
| 722 | 774 | return NULL; |
|---|
| .. | .. |
|---|
| 740 | 792 | return page_address(page); |
|---|
| 741 | 793 | } |
|---|
| 742 | 794 | |
|---|
| 743 | | -struct ring_buffer *rb_alloc(int nr_pages, long watermark, int cpu, int flags) |
|---|
| 795 | +static void perf_mmap_free_page(void *addr) |
|---|
| 744 | 796 | { |
|---|
| 745 | | - struct ring_buffer *rb; |
|---|
| 797 | + struct page *page = virt_to_page(addr); |
|---|
| 798 | + |
|---|
| 799 | + page->mapping = NULL; |
|---|
| 800 | + __free_page(page); |
|---|
| 801 | +} |
|---|
| 802 | + |
|---|
| 803 | +struct perf_buffer *rb_alloc(int nr_pages, long watermark, int cpu, int flags) |
|---|
| 804 | +{ |
|---|
| 805 | + struct perf_buffer *rb; |
|---|
| 746 | 806 | unsigned long size; |
|---|
| 747 | 807 | int i; |
|---|
| 748 | 808 | |
|---|
| 749 | | - size = sizeof(struct ring_buffer); |
|---|
| 809 | + size = sizeof(struct perf_buffer); |
|---|
| 750 | 810 | size += nr_pages * sizeof(void *); |
|---|
| 751 | 811 | |
|---|
| 752 | 812 | if (order_base_2(size) >= PAGE_SHIFT+MAX_ORDER) |
|---|
| .. | .. |
|---|
| 774 | 834 | |
|---|
| 775 | 835 | fail_data_pages: |
|---|
| 776 | 836 | for (i--; i >= 0; i--) |
|---|
| 777 | | - free_page((unsigned long)rb->data_pages[i]); |
|---|
| 837 | + perf_mmap_free_page(rb->data_pages[i]); |
|---|
| 778 | 838 | |
|---|
| 779 | | - free_page((unsigned long)rb->user_page); |
|---|
| 839 | + perf_mmap_free_page(rb->user_page); |
|---|
| 780 | 840 | |
|---|
| 781 | 841 | fail_user_page: |
|---|
| 782 | 842 | kfree(rb); |
|---|
| .. | .. |
|---|
| 785 | 845 | return NULL; |
|---|
| 786 | 846 | } |
|---|
| 787 | 847 | |
|---|
| 788 | | -static void perf_mmap_free_page(unsigned long addr) |
|---|
| 789 | | -{ |
|---|
| 790 | | - struct page *page = virt_to_page((void *)addr); |
|---|
| 791 | | - |
|---|
| 792 | | - page->mapping = NULL; |
|---|
| 793 | | - __free_page(page); |
|---|
| 794 | | -} |
|---|
| 795 | | - |
|---|
| 796 | | -void rb_free(struct ring_buffer *rb) |
|---|
| 848 | +void rb_free(struct perf_buffer *rb) |
|---|
| 797 | 849 | { |
|---|
| 798 | 850 | int i; |
|---|
| 799 | 851 | |
|---|
| 800 | | - perf_mmap_free_page((unsigned long)rb->user_page); |
|---|
| 852 | + perf_mmap_free_page(rb->user_page); |
|---|
| 801 | 853 | for (i = 0; i < rb->nr_pages; i++) |
|---|
| 802 | | - perf_mmap_free_page((unsigned long)rb->data_pages[i]); |
|---|
| 854 | + perf_mmap_free_page(rb->data_pages[i]); |
|---|
| 803 | 855 | kfree(rb); |
|---|
| 804 | 856 | } |
|---|
| 805 | 857 | |
|---|
| 806 | 858 | #else |
|---|
| 807 | | -static int data_page_nr(struct ring_buffer *rb) |
|---|
| 808 | | -{ |
|---|
| 809 | | - return rb->nr_pages << page_order(rb); |
|---|
| 810 | | -} |
|---|
| 811 | | - |
|---|
| 812 | 859 | static struct page * |
|---|
| 813 | | -__perf_mmap_to_page(struct ring_buffer *rb, unsigned long pgoff) |
|---|
| 860 | +__perf_mmap_to_page(struct perf_buffer *rb, unsigned long pgoff) |
|---|
| 814 | 861 | { |
|---|
| 815 | 862 | /* The '>' counts in the user page. */ |
|---|
| 816 | 863 | if (pgoff > data_page_nr(rb)) |
|---|
| .. | .. |
|---|
| 828 | 875 | |
|---|
| 829 | 876 | static void rb_free_work(struct work_struct *work) |
|---|
| 830 | 877 | { |
|---|
| 831 | | - struct ring_buffer *rb; |
|---|
| 878 | + struct perf_buffer *rb; |
|---|
| 832 | 879 | void *base; |
|---|
| 833 | 880 | int i, nr; |
|---|
| 834 | 881 | |
|---|
| 835 | | - rb = container_of(work, struct ring_buffer, work); |
|---|
| 882 | + rb = container_of(work, struct perf_buffer, work); |
|---|
| 836 | 883 | nr = data_page_nr(rb); |
|---|
| 837 | 884 | |
|---|
| 838 | 885 | base = rb->user_page; |
|---|
| .. | .. |
|---|
| 844 | 891 | kfree(rb); |
|---|
| 845 | 892 | } |
|---|
| 846 | 893 | |
|---|
| 847 | | -void rb_free(struct ring_buffer *rb) |
|---|
| 894 | +void rb_free(struct perf_buffer *rb) |
|---|
| 848 | 895 | { |
|---|
| 849 | 896 | schedule_work(&rb->work); |
|---|
| 850 | 897 | } |
|---|
| 851 | 898 | |
|---|
| 852 | | -struct ring_buffer *rb_alloc(int nr_pages, long watermark, int cpu, int flags) |
|---|
| 899 | +struct perf_buffer *rb_alloc(int nr_pages, long watermark, int cpu, int flags) |
|---|
| 853 | 900 | { |
|---|
| 854 | | - struct ring_buffer *rb; |
|---|
| 901 | + struct perf_buffer *rb; |
|---|
| 855 | 902 | unsigned long size; |
|---|
| 856 | 903 | void *all_buf; |
|---|
| 857 | 904 | |
|---|
| 858 | | - size = sizeof(struct ring_buffer); |
|---|
| 905 | + size = sizeof(struct perf_buffer); |
|---|
| 859 | 906 | size += sizeof(void *); |
|---|
| 860 | 907 | |
|---|
| 861 | 908 | rb = kzalloc(size, GFP_KERNEL); |
|---|
| .. | .. |
|---|
| 889 | 936 | #endif |
|---|
| 890 | 937 | |
|---|
| 891 | 938 | struct page * |
|---|
| 892 | | -perf_mmap_to_page(struct ring_buffer *rb, unsigned long pgoff) |
|---|
| 939 | +perf_mmap_to_page(struct perf_buffer *rb, unsigned long pgoff) |
|---|
| 893 | 940 | { |
|---|
| 894 | 941 | if (rb->aux_nr_pages) { |
|---|
| 895 | 942 | /* above AUX space */ |
|---|