libbpf: deprecate bpf_perf_event_read_simple() API #2344

kernel-patches-bot · 2021-12-29T20:47:01Z

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 · 2021-12-29T20:47:02Z

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

kernel-patches-bot · 2021-12-30T02:05:52Z

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

kernel-patches-bot · 2021-12-30T04:11:08Z

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

kernel-patches-bot · 2021-12-31T00:20:35Z

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

kernel-patches-bot · 2021-12-31T00:48:53Z

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

kernel-patches-bot · 2021-12-31T02:37:11Z

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

kernel-patches-bot · 2021-12-31T02:48:38Z

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

kernel-patches-bot · 2021-12-31T15:42:09Z

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

kernel-patches-bot · 2022-01-05T12:39:50Z

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

kernel-patches-bot · 2022-01-05T19:47:11Z

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

kernel-patches-bot · 2022-01-05T20:05:47Z

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

kernel-patches-bot · 2022-01-05T20:10:39Z

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

kernel-patches-bot · 2022-01-05T21:16:02Z

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

kernel-patches-bot · 2022-01-05T21:46:12Z

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

kernel-patches-bot · 2022-01-05T22:27:25Z

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

kernel-patches-bot · 2022-01-05T22:35:44Z

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

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 <[email protected]>

kernel-patches-bot · 2022-01-05T23:31:57Z

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 · 2022-01-05T23:38:03Z

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

kernel-patches-bot added bpf-next new V1 labels Dec 29, 2021

kernel-patches-bot force-pushed the series/601914=>bpf-next branch from e16a5fb to 61a8b4a Compare December 30, 2021 02:05

kernel-patches-bot force-pushed the series/601914=>bpf-next branch from 61a8b4a to 2495965 Compare December 30, 2021 04:11

kernel-patches-bot force-pushed the series/601914=>bpf-next branch from 2495965 to 2c58351 Compare December 31, 2021 00:20

kernel-patches-bot force-pushed the series/601914=>bpf-next branch from 2c58351 to 72db82c Compare December 31, 2021 00:48

kernel-patches-bot force-pushed the series/601914=>bpf-next branch from 72db82c to 9cfe78f Compare December 31, 2021 02:37

kernel-patches-bot force-pushed the bpf-next branch from 11f9983 to 9e6b19a Compare December 31, 2021 02:47

kernel-patches-bot force-pushed the series/601914=>bpf-next branch from 9cfe78f to db8c71a Compare December 31, 2021 02:48

kernel-patches-bot force-pushed the series/601914=>bpf-next branch from db8c71a to fd6f9f0 Compare December 31, 2021 15:42

kernel-patches-bot force-pushed the series/601914=>bpf-next branch from fd6f9f0 to 1a9e63e Compare January 5, 2022 12:39

kernel-patches-bot force-pushed the series/601914=>bpf-next branch from 1a9e63e to cfbe306 Compare January 5, 2022 19:47

kernel-patches-bot force-pushed the series/601914=>bpf-next branch from cfbe306 to c4efaa1 Compare January 5, 2022 20:05

kernel-patches-bot force-pushed the series/601914=>bpf-next branch from c4efaa1 to 51bae92 Compare January 5, 2022 20:10

kernel-patches-bot force-pushed the series/601914=>bpf-next branch from 51bae92 to bd7ce9d Compare January 5, 2022 21:16

kernel-patches-bot force-pushed the series/601914=>bpf-next branch from bd7ce9d to e89b379 Compare January 5, 2022 21:46

kernel-patches-bot force-pushed the series/601914=>bpf-next branch from e89b379 to f88a793 Compare January 5, 2022 22:27

adding ci files

5665ee6

kernel-patches-bot force-pushed the series/601914=>bpf-next branch from f88a793 to 99decfb Compare January 5, 2022 22:35

kernel-patches-bot added the merge-conflict label Jan 5, 2022

kernel-patches-bot added accepted and removed merge-conflict new labels Jan 5, 2022

kernel-patches-bot closed this Jan 5, 2022

kernel-patches-bot deleted the series/601914=>bpf-next branch January 5, 2022 23:38

libbpf: deprecate bpf_perf_event_read_simple() API #2344

libbpf: deprecate bpf_perf_event_read_simple() API #2344

Uh oh!

Conversation

kernel-patches-bot commented Dec 29, 2021

Uh oh!

kernel-patches-bot commented Dec 29, 2021

Uh oh!

kernel-patches-bot commented Dec 30, 2021

Uh oh!

kernel-patches-bot commented Dec 30, 2021

Uh oh!

kernel-patches-bot commented Dec 31, 2021

Uh oh!

kernel-patches-bot commented Dec 31, 2021

Uh oh!

kernel-patches-bot commented Dec 31, 2021

Uh oh!

kernel-patches-bot commented Dec 31, 2021

Uh oh!

kernel-patches-bot commented Dec 31, 2021

Uh oh!

kernel-patches-bot commented Jan 5, 2022

Uh oh!

kernel-patches-bot commented Jan 5, 2022

Uh oh!

kernel-patches-bot commented Jan 5, 2022

Uh oh!

kernel-patches-bot commented Jan 5, 2022

Uh oh!

kernel-patches-bot commented Jan 5, 2022

Uh oh!

kernel-patches-bot commented Jan 5, 2022

Uh oh!

kernel-patches-bot commented Jan 5, 2022

Uh oh!

kernel-patches-bot commented Jan 5, 2022

Uh oh!

kernel-patches-bot commented Jan 5, 2022

Uh oh!

kernel-patches-bot commented Jan 5, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants