Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Resolved kernel/bpf/btf.c using instructions from merge commit
69138b34a7248d2396ab85c8652e20c0c39beaba

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile
Simple merge

diff --cc drivers/net/bareudp.c
Simple merge

diff --cc drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
Simple merge

diff --cc drivers/net/ethernet/intel/e1000e/ich8lan.c
Simple merge

diff --cc drivers/net/ethernet/intel/igb/igb_main.c
Simple merge

diff --cc drivers/net/ethernet/mediatek/mtk_eth_soc.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx4/main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en/rep/tc.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlxsw/core.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlxsw/reg.h
Simple merge

diff --cc drivers/net/ethernet/mscc/ocelot.c
Simple merge

diff --cc drivers/net/ethernet/pensando/ionic/ionic_lif.c
Simple merge

diff --cc drivers/net/vxlan.c
Simple merge

diff --cc include/linux/mlx5/mlx5_ifc.h
Simple merge

diff --cc include/net/devlink.h
Simple merge

diff --cc include/net/xfrm.h
Simple merge

diff --cc kernel/bpf/btf.c
index ee36b7f609368416bdd31056479389880b4835ac,0443600146dc27edd385e5c7dd594b087605a012..4ff0de860ab754736394dbe94fd45a1e42a081a1
--- 1/kernel/bpf/btf.c
--- 2/kernel/bpf/btf.c
+++ b/kernel/bpf/btf.c
@@@ -4080,14 -4052,98 +4080,14 @@@ error
  int btf_resolve_helper_id(struct bpf_verifier_log *log,
                          const struct bpf_func_proto *fn, int arg)
  {
 -      int *btf_id = &fn->btf_id[arg];
 -      int ret;
 +      int id;
  
--      if (fn->arg_type[arg] != ARG_PTR_TO_BTF_ID)
++      if (fn->arg_type[arg] != ARG_PTR_TO_BTF_ID || !btf_vmlinux)
                return -EINVAL;
 -
 -      ret = READ_ONCE(*btf_id);
 -      if (ret)
 -              return ret;
 -      /* ok to race the search. The result is the same */
 -      ret = __btf_resolve_helper_id(log, fn->func, arg);
 -      if (!ret) {
 -              /* Function argument cannot be type 'void' */
 -              bpf_log(log, "BTF resolution bug\n");
 -              return -EFAULT;
 -      }
 -      WRITE_ONCE(*btf_id, ret);
 -      return ret;
 +      id = fn->btf_id[arg];
 +      if (!id || id > btf_vmlinux->nr_types)
 +              return -EINVAL;
 +      return id;
  }
  
  static int __get_type_size(struct btf *btf, u32 btf_id,

diff --cc kernel/bpf/hashtab.c
Simple merge

diff --cc net/bluetooth/hci_event.c
Simple merge

diff --cc net/bpfilter/bpfilter_kern.c
index f580c3344cb3ac4233e7a13723532bb3ff07ccff,4494ea6056cdb81e189c4d6cf95209d182a9fc0d..51a941b56ec3aab03d8151b4ce1fa169139f05cb
--- 1/net/bpfilter/bpfilter_kern.c
--- 2/net/bpfilter/bpfilter_kern.c
+++ b/net/bpfilter/bpfilter_kern.c
@@@ -31,20 -33,30 +31,20 @@@ static void __stop_umh(void
                shutdown_umh();
  }
  
 -static int __bpfilter_process_sockopt(struct sock *sk, int optname,
 -                                    char __user *optval,
 -                                    unsigned int optlen, bool is_set)
 +static int bpfilter_send_req(struct mbox_request *req)
  {
 -      struct mbox_request req;
        struct mbox_reply reply;
-       loff_t pos;
+       loff_t pos = 0;
        ssize_t n;
 -      int ret = -EFAULT;
 -
 -      req.is_set = is_set;
 -      req.pid = current->pid;
 -      req.cmd = optname;
 -      req.addr = (long __force __user)optval;
 -      req.len = optlen;
 -      if (!bpfilter_ops.info.pid)
 -              goto out;
 -      n = kernel_write(bpfilter_ops.info.pipe_to_umh, &req, sizeof(req),
 +
 +      if (!bpfilter_ops.info.tgid)
 +              return -EFAULT;
 +      pos = 0;
 +      n = kernel_write(bpfilter_ops.info.pipe_to_umh, req, sizeof(*req),
                           &pos);
 -      if (n != sizeof(req)) {
 +      if (n != sizeof(*req)) {
                pr_err("write fail %zd\n", n);
 -              __stop_umh();
 -              ret = -EFAULT;
 -              goto out;
 +              goto stop;
        }
        pos = 0;
        n = kernel_read(bpfilter_ops.info.pipe_from_umh, &reply, sizeof(reply),

diff --cc net/compat.c
Simple merge

diff --cc net/core/devlink.c
Simple merge

diff --cc net/ipv4/fib_trie.c
Simple merge

diff --cc net/ipv6/ipv6_sockglue.c
Simple merge

diff --cc net/ipv6/route.c
Simple merge

diff --cc net/key/af_key.c
Simple merge

diff --cc net/mac80211/cfg.c
Simple merge

diff --cc net/mac80211/mesh.c
Simple merge

diff --cc net/mac80211/mesh_pathtbl.c
Simple merge

diff --cc net/mac80211/sta_info.c
Simple merge

diff --cc net/mac80211/tx.c
Simple merge

diff --cc net/mac80211/util.c
Simple merge

diff --cc net/mptcp/protocol.c
Simple merge

diff --cc net/sched/act_ct.c
Simple merge

diff --cc net/wireless/nl80211.c
Simple merge

diff --cc net/xfrm/xfrm_policy.c
Simple merge

diff --cc tools/testing/selftests/net/forwarding/ethtool.sh
Simple merge

diff --cc tools/testing/selftests/net/rxtimestamp.c
index 221fdece47d4510adbf8d30b4e71b99eab2c3a88,bcb79ba1f2143e1569fd96943170c357044f1d38..e4613ce4ed6934ba415a816bd5fe92d10794d43e
--- 1/tools/testing/selftests/net/rxtimestamp.c
--- 2/tools/testing/selftests/net/rxtimestamp.c
+++ b/tools/testing/selftests/net/rxtimestamp.c
@@@ -354,13 -327,9 +354,12 @@@ int main(int argc, char **argv
  {
        bool all_protocols = true;
        bool all_tests = true;
 +      bool cfg_ipv4 = false;
 +      bool cfg_ipv6 = false;
 +      bool strict = false;
        int arg_index = 0;
        int failures = 0;
-       int s, t;
-       char opt;
+       int s, t, opt;
  
        while ((opt = getopt_long(argc, argv, "", long_options,
                                  &arg_index)) != -1) {