Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

libbpf: deprecate bpf_perf_event_read_simple() API #2344

Closed
wants to merge 2 commits into from
Closed

libbpf: deprecate bpf_perf_event_read_simple() API #2344

wants to merge 2 commits into from

Conversation

kernel-patches-bot
Copy link

Pull request for series with
subject: libbpf: deprecate bpf_perf_event_read_simple() API
version: 1
url: https://patchwork.kernel.org/project/netdevbpf/list/?series=601914

@kernel-patches-bot
Copy link
Author

Master branch: 3ccdcee
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=601914
version: 1

@kernel-patches-bot
Copy link
Author

Master branch: 1705c62
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=601914
version: 1

@kernel-patches-bot
Copy link
Author

Master branch: 35580f9
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=601914
version: 1

@kernel-patches-bot
Copy link
Author

Master branch: 35580f9
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=601914
version: 1

@kernel-patches-bot
Copy link
Author

Master branch: 63d000c
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=601914
version: 1

@kernel-patches-bot
Copy link
Author

Master branch: 11f9983
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=601914
version: 1

@kernel-patches-bot
Copy link
Author

Master branch: 9e6b19a
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=601914
version: 1

@kernel-patches-bot
Copy link
Author

Master branch: e63a023
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=601914
version: 1

@kernel-patches-bot
Copy link
Author

Master branch: 5e22dd1
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=601914
version: 1

@kernel-patches-bot
Copy link
Author

Master branch: 218d747
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=601914
version: 1

@kernel-patches-bot
Copy link
Author

Master branch: ca796fe
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=601914
version: 1

@kernel-patches-bot
Copy link
Author

Master branch: ca796fe
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=601914
version: 1

@kernel-patches-bot
Copy link
Author

Master branch: 58d8a3f
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=601914
version: 1

@kernel-patches-bot
Copy link
Author

Master branch: a5bebc4
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=601914
version: 1

@kernel-patches-bot
Copy link
Author

Master branch: 2847993
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=601914
version: 1

@kernel-patches-bot
Copy link
Author

Master branch: 2847993
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=601914
version: 1

@christycylee
libbpf: deprecate bpf_perf_event_read_simple() API
99decfb 
With perf_buffer__poll() and perf_buffer__consume() APIs available,
there is no reason to expose bpf_perf_event_read_simple() API to
users. If users need custom perf buffer, they could re-implement
the function.

Mark bpf_perf_event_read_simple() and move the logic to a new
static function so it can still be called by other functions in the
same file.

[0] Closes: libbpf/libbpf#310

Signed-off-by: Christy Lee <christylee@fb.com>
@kernel-patches-bot
Copy link
Author

Master branch: 7218c28
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=601914
version: 1

Pull request is NOT updated. Failed to apply https://patchwork.kernel.org/project/netdevbpf/list/?series=601914
error message:

Cmd('git') failed due to: exit code(128)
  cmdline: git am -3
  stdout: 'Applying: libbpf: deprecate bpf_perf_event_read_simple() API
Using index info to reconstruct a base tree...
M	tools/lib/bpf/libbpf.c
M	tools/lib/bpf/libbpf.h
Falling back to patching base and 3-way merge...
Auto-merging tools/lib/bpf/libbpf.c
CONFLICT (content): Merge conflict in tools/lib/bpf/libbpf.c
Patch failed at 0001 libbpf: deprecate bpf_perf_event_read_simple() API
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".'
  stderr: 'error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch'

conflict:

diff --cc tools/lib/bpf/libbpf.c
index 1d02ba7f11b4,8a8020985db1..000000000000
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@@ -10678,8 -10678,8 +10678,13 @@@ struct bpf_link *bpf_map__attach_struct
  
  static enum bpf_perf_event_ret
  perf_event_read_simple(void *mmap_mem, size_t mmap_size, size_t page_size,
++<<<<<<< HEAD
 +		       void **copy_mem, size_t *copy_size,
 +		       bpf_perf_event_print_t fn, void *private_data)
++=======
+ 			   void **copy_mem, size_t *copy_size,
+ 			   bpf_perf_event_print_t fn, void *private_data)
++>>>>>>> libbpf: deprecate bpf_perf_event_read_simple() API
  {
  	struct perf_event_mmap_page *header = mmap_mem;
  	__u64 data_head = ring_buffer_read_head(header);
@@@ -10724,11 -10724,14 +10729,22 @@@
  	return libbpf_err(ret);
  }
  
++<<<<<<< HEAD
 +__attribute__((alias("perf_event_read_simple")))
 +enum bpf_perf_event_ret
 +bpf_perf_event_read_simple(void *mmap_mem, size_t mmap_size, size_t page_size,
 +			   void **copy_mem, size_t *copy_size,
 +			   bpf_perf_event_print_t fn, void *private_data);
++=======
+ enum bpf_perf_event_ret
+ bpf_perf_event_read_simple(void *mmap_mem, size_t mmap_size, size_t page_size,
+ 			   void **copy_mem, size_t *copy_size,
+ 			   bpf_perf_event_print_t fn, void *private_data)
+ {
+ 	return perf_event_read_simple(mmap_mem, mmap_size, page_size, copy_mem,
+ 				      copy_size, fn, private_data);
+ }
++>>>>>>> libbpf: deprecate bpf_perf_event_read_simple() API
  
  struct perf_buffer;
  
@@@ -11139,9 -11142,9 +11155,15 @@@ static int perf_buffer__process_records
  	enum bpf_perf_event_ret ret;
  
  	ret = perf_event_read_simple(cpu_buf->base, pb->mmap_size,
++<<<<<<< HEAD
 +				     pb->page_size, &cpu_buf->buf,
 +				     &cpu_buf->buf_size,
 +				     perf_buffer__process_record, cpu_buf);
++=======
+ 					 pb->page_size, &cpu_buf->buf,
+ 					 &cpu_buf->buf_size,
+ 					 perf_buffer__process_record, cpu_buf);
++>>>>>>> libbpf: deprecate bpf_perf_event_read_simple() API
  	if (ret != LIBBPF_PERF_EVENT_CONT)
  		return ret;
  	return 0;

@kernel-patches-bot
Copy link
Author

At least one diff in series https://patchwork.kernel.org/project/netdevbpf/list/?series=601914 irrelevant now. Closing PR.

@kernel-patches-bot kernel-patches-bot deleted the series/601914=>bpf-next branch January 5, 2022 23:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
accepted bpf-next V1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@kernel-patches-bot @christycylee