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

include/linux/bpf.h
  1f6e04a1c7b8 ("bpf: Fix offset calculation error in __copy_map_value and zero_map_value")
  aa3496accc41 ("bpf: Refactor kptr_off_tab into btf_record")
  f71b2f64177a ("bpf: Refactor map->off_arr handling")
https://lore.kernel.org/all/20221114095000.67a73239@canb.auug.org.au/

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --cc MAINTAINERS
Simple merge

diff --cc arch/x86/net/bpf_jit_comp.c
Simple merge

diff --cc drivers/net/ethernet/amazon/ena/ena_netdev.c
Simple merge

diff --cc drivers/net/ethernet/atheros/ag71xx.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt.c
Simple merge

diff --cc drivers/net/ethernet/cavium/liquidio/lio_main.c
Simple merge

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

diff --cc drivers/net/ethernet/huawei/hinic/hinic_main.c
Simple merge

diff --cc drivers/net/ethernet/marvell/octeon_ep/octep_main.c
Simple merge

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

diff --cc drivers/net/ethernet/microchip/sparx5/sparx5_main.c
Simple merge

diff --cc drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c
Simple merge

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

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
Simple merge

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

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

diff --cc drivers/net/netdevsim/dev.c
Simple merge

diff --cc drivers/net/phy/dp83867.c
Simple merge

diff --cc drivers/net/usb/qmi_wwan.c
Simple merge

diff --cc include/linux/bpf.h
index 798aec816970a42f83abc2efe6a3dcc9af7e0e78,c1bd1bd105067e575aafbf1f9e03b8280f81910d..c577e4c7c84b4f2eb5c196e484e09e7f8c3e5087
--- 1/include/linux/bpf.h
--- 2/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@@ -356,14 -311,13 +356,14 @@@ static inline void bpf_obj_memcpy(struc
                return;
        }
  
 -      for (i = 0; i < map->off_arr->cnt; i++) {
 -              u32 next_off = map->off_arr->field_off[i];
 +      for (i = 0; i < foffs->cnt; i++) {
 +              u32 next_off = foffs->field_off[i];
 +              u32 sz = next_off - curr_off;
  
 -              memcpy(dst + curr_off, src + curr_off, next_off - curr_off);
 -              curr_off = next_off + map->off_arr->field_sz[i];
 +              memcpy(dst + curr_off, src + curr_off, sz);
-               curr_off += foffs->field_sz[i];
++              curr_off = next_off + foffs->field_sz[i];
        }
 -      memcpy(dst + curr_off, src + curr_off, map->value_size - curr_off);
 +      memcpy(dst + curr_off, src + curr_off, size - curr_off);
  }
  
  static inline void copy_map_value(struct bpf_map *map, void *dst, void *src)
@@@ -386,19 -340,13 +386,19 @@@ static inline void bpf_obj_memzero(stru
                return;
        }
  
 -      for (i = 0; i < map->off_arr->cnt; i++) {
 -              u32 next_off = map->off_arr->field_off[i];
 +      for (i = 0; i < foffs->cnt; i++) {
 +              u32 next_off = foffs->field_off[i];
 +              u32 sz = next_off - curr_off;
  
 -              memset(dst + curr_off, 0, next_off - curr_off);
 -              curr_off = next_off + map->off_arr->field_sz[i];
 +              memset(dst + curr_off, 0, sz);
-               curr_off += foffs->field_sz[i];
++              curr_off = next_off + foffs->field_sz[i];
        }
 -      memset(dst + curr_off, 0, map->value_size - curr_off);
 +      memset(dst + curr_off, 0, size - curr_off);
 +}
 +
 +static inline void zero_map_value(struct bpf_map *map, void *dst)
 +{
 +      bpf_obj_memzero(map->field_offs, dst, map->value_size);
  }
  
  void copy_map_value_locked(struct bpf_map *map, void *dst, void *src,

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

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

diff --cc net/bridge/br_vlan.c
Simple merge

diff --cc net/dsa/dsa2.c
Simple merge

diff --cc net/dsa/port.c
Simple merge

diff --cc tools/testing/selftests/bpf/test_progs.c
Simple merge

diff --cc tools/testing/selftests/bpf/test_verifier.c
Simple merge