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:

  tools/testing/selftests/bpf/prog_tests/verifier.c

between commit:

  a903f145a8914 ("selftests/bpf: Add tests for the KF_PERFMON gates")

from the bpf tree and commit:

  a8bbd9ee1bbc7 ("selftests/bpf: Cover generic __uninit output initialization")

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,501c7ce35cba9..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)
diff --cc mm/internal.h
index 0434dfcfc36f1,9e3be236f18c0..0000000000000
--- a/mm/internal.h
+++ b/mm/internal.h
@@@ -24,7 -23,17 +24,10 @@@
  #include "vma.h"
  
  struct folio_batch;
 -struct hstate;
  
+ int __copy_remote_mm_str(struct mm_struct *mm, unsigned long addr,
+ 		void *buf, int len, unsigned int gup_flags);
+ 
 -struct huge_bootmem_page {
 -	struct list_head list;
 -	struct hstate *hstate;
 -	unsigned long flags;
 -};
 -
  /* mm/workingset.c */
  bool workingset_test_recent(void *shadow, bool file, bool *workingset,
  			    bool flush);
diff --cc tools/testing/selftests/bpf/prog_tests/cb_refs.c
index 490e15e7126d9,c32c6dab49bce..0000000000000
--- a/tools/testing/selftests/bpf/prog_tests/cb_refs.c
+++ b/tools/testing/selftests/bpf/prog_tests/cb_refs.c
@@@ -11,9 -11,9 +11,9 @@@ struct 
  	const char *prog_name;
  	const char *err_msg;
  } cb_refs_tests[] = {
- 	{ "underflow_prog", "release kfunc bpf_kfunc_call_test_release expects referenced PTR_TO_BTF_ID passed to R1" },
- 	{ "leak_prog", "Possibly NULL pointer passed to helper R2" },
+ 	{ "underflow_prog", "R1 type=scalar expected=ptr_, trusted_ptr_, rcu_ptr_" },
+ 	{ "leak_prog", "Unreleased reference id=4 alloc_insn=3" }, /* alloc_insn=3{2,3} */
 -	{ "nested_cb", "Unreleased reference id=4 alloc_insn=2" }, /* alloc_insn=2{4,5} */
 +	{ "nested_cb", "Unreleased reference id=5 alloc_insn=2" }, /* alloc_insn=2{4,5} */
  	{ "non_cb_transfer_ref", "Unreleased reference id=4 alloc_insn=1" }, /* alloc_insn=1{1,2} */
  };
  
diff --cc tools/testing/selftests/bpf/prog_tests/verifier.c
index 8b439e194bcc5,4f1e1c1cd5ab3..0000000000000
--- a/tools/testing/selftests/bpf/prog_tests/verifier.c
+++ b/tools/testing/selftests/bpf/prog_tests/verifier.c
@@@ -54,7 -55,9 +56,10 @@@
  #include "verifier_iterating_callbacks.skel.h"
  #include "verifier_jeq_infer_not_null.skel.h"
  #include "verifier_jit_convergence.skel.h"
+ #include "verifier_kfunc_packet_access.skel.h"
 +#include "verifier_kfunc_perfmon.skel.h"
+ #include "verifier_kfunc_uninit.skel.h"
+ #include "verifier_kfunc_uninit_multi.skel.h"
  #include "verifier_ld_ind.skel.h"
  #include "verifier_ldsx.skel.h"
  #include "verifier_leak_ptr.skel.h"
@@@ -219,7 -224,9 +227,10 @@@ void test_verifier_int_ptr(void
  void test_verifier_iterating_callbacks(void)  { RUN(verifier_iterating_callbacks); }
  void test_verifier_jeq_infer_not_null(void)   { RUN(verifier_jeq_infer_not_null); }
  void test_verifier_jit_convergence(void)      { RUN(verifier_jit_convergence); }
+ void test_verifier_kfunc_packet_access(void)  { RUN_TESTS(verifier_kfunc_packet_access); }
 +void test_verifier_kfunc_perfmon(void)        { RUN(verifier_kfunc_perfmon); }
+ void test_verifier_kfunc_uninit(void)         { RUN_TESTS(verifier_kfunc_uninit); }
+ void test_verifier_kfunc_uninit_multi(void)   { RUN_TESTS(verifier_kfunc_uninit_multi); }
  void test_verifier_load_acquire(void)         { RUN(verifier_load_acquire); }
  void test_verifier_ld_ind(void)               { RUN(verifier_ld_ind); }
  void test_verifier_ldsx(void)                  { RUN(verifier_ldsx); }

Attachment: signature.asc
Description: PGP signature