linux-next: manual merge of the bpf-next tree with the bpf tree

[Mark Brown]

Hi all,

Today's linux-next merge of the bpf-next tree got a conflict in:

  kernel/bpf/helpers.c

between commit:

  81c975aae375d ("bpf: Require CAP_PERFMON for kfuncs reading memory")

from the bpf tree and commit:

  3f9d98dfed79f ("bpf: Add user memory access kfuncs for mm_struct")

from the bpf-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc kernel/bpf/helpers.c
index 712dca5a2c5bd,82402d97ce67c..0000000000000
--- a/kernel/bpf/helpers.c
+++ b/kernel/bpf/helpers.c
@@@ -4920,12 -5049,14 +5049,14 @@@ BTF_ID_FLAGS(func, bpf_wq_set_callback
  BTF_ID_FLAGS(func, bpf_wq_start)
  BTF_ID_FLAGS(func, bpf_preempt_disable)
  BTF_ID_FLAGS(func, bpf_preempt_enable)
 -BTF_ID_FLAGS(func, bpf_iter_bits_new, KF_ITER_NEW)
 +BTF_ID_FLAGS(func, bpf_iter_bits_new, KF_ITER_NEW | KF_PERFMON)
  BTF_ID_FLAGS(func, bpf_iter_bits_next, KF_ITER_NEXT | KF_RET_NULL)
  BTF_ID_FLAGS(func, bpf_iter_bits_destroy, KF_ITER_DESTROY)
 -BTF_ID_FLAGS(func, bpf_copy_from_user_str, KF_SLEEPABLE)
 -BTF_ID_FLAGS(func, bpf_copy_from_user_mm, KF_SLEEPABLE)
 -BTF_ID_FLAGS(func, bpf_copy_from_user_mm_str, KF_SLEEPABLE)
 -BTF_ID_FLAGS(func, bpf_copy_from_user_task_str, KF_SLEEPABLE)
 -BTF_ID_FLAGS(func, bpf_get_kmem_cache)
 +BTF_ID_FLAGS(func, bpf_copy_from_user_str, KF_SLEEPABLE | KF_PERFMON)
++BTF_ID_FLAGS(func, bpf_copy_from_user_mm, KF_SLEEPABLE | KF_PERFMON)
++BTF_ID_FLAGS(func, bpf_copy_from_user_mm_str, KF_SLEEPABLE | KF_PERFMON)
 +BTF_ID_FLAGS(func, bpf_copy_from_user_task_str, KF_SLEEPABLE | KF_PERFMON)
 +BTF_ID_FLAGS(func, bpf_get_kmem_cache, KF_PERFMON)
  BTF_ID_FLAGS(func, bpf_iter_kmem_cache_new, KF_ITER_NEW | KF_SLEEPABLE)
  BTF_ID_FLAGS(func, bpf_iter_kmem_cache_next, KF_ITER_NEXT | KF_RET_NULL | KF_SLEEPABLE)
  BTF_ID_FLAGS(func, bpf_iter_kmem_cache_destroy, KF_ITER_DESTROY | KF_SLEEPABLE)

Attachment: signature.asc
Description: PGP signature