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

xdp_return_frame_bulk() needs to pass a xdp_buff
to __xdp_return().

strlcpy got converted to strscpy but here it makes no
functional difference, so just keep the right code.

Conflicts:
	net/netfilter/nf_tables_api.c

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

diff --cc CREDITS
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/can/softing/softing_main.c
Simple merge

diff --cc drivers/net/dsa/ocelot/felix.c
Simple merge

diff --cc drivers/net/ethernet/freescale/enetc/enetc_hw.h
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e_txrx.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_txrx.c
Simple merge

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

diff --cc drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
Simple merge

diff --cc drivers/net/ethernet/marvell/prestera/prestera_main.c
Simple merge

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

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

diff --cc drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/Kconfig
Simple merge

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

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

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

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 8c1ac75,c33db79..5b1c12f
--- 1/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
--- 2/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@@ -5170,8 -5163,13 +5193,13 @@@ int stmmac_suspend(struct device *dev
        stmmac_disable_all_queues(priv);
  
        for (chan = 0; chan < priv->plat->tx_queues_to_use; chan++)
 -              del_timer_sync(&priv->tx_queue[chan].txtimer);
 +              hrtimer_cancel(&priv->tx_queue[chan].txtimer);
  
+       if (priv->eee_enabled) {
+               priv->tx_path_in_lpi_mode = false;
+               del_timer_sync(&priv->eee_ctrl_timer);
+       }
+ 
        /* Stop TX/RX DMA */
        stmmac_stop_all_dma(priv);
  

diff --cc drivers/net/ethernet/ti/cpsw_priv.c
Simple merge

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

diff --cc drivers/net/netdevsim/netdevsim.h
Simple merge

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

diff --cc include/linux/security.h
Simple merge

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

diff --cc include/soc/mscc/ocelot.h
Simple merge

diff --cc include/uapi/linux/bpf.h
index 1233f14,556216d..7e9931b
--- 1/include/uapi/linux/bpf.h
--- 2/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@@ -3977,15 -3897,9 +3977,15 @@@ union bpf_attr 
        FN(seq_printf_btf),             \
        FN(skb_cgroup_classid),         \
        FN(redirect_neigh),             \
-       FN(bpf_per_cpu_ptr),            \
-       FN(bpf_this_cpu_ptr),           \
+       FN(per_cpu_ptr),                \
+       FN(this_cpu_ptr),               \
        FN(redirect_peer),              \
 +      FN(task_storage_get),           \
 +      FN(task_storage_delete),        \
 +      FN(get_current_task_btf),       \
 +      FN(bprm_opts_set),              \
 +      FN(ktime_get_coarse_ns),        \
 +      FN(ima_inode_hash),             \
        /* */
  
  /* integer value in 'imm' field of BPF_CALL instruction selects which helper

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

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

diff --cc kernel/trace/bpf_trace.c
Simple merge

diff --cc mm/slab.h
Simple merge

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

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

diff --cc net/bridge/br_private.h
Simple merge

diff --cc net/bridge/br_vlan.c
index d070086,08c7741..701cad6
--- 1/net/bridge/br_vlan.c
--- 2/net/bridge/br_vlan.c
+++ b/net/bridge/br_vlan.c
@@@ -266,12 -266,13 +266,14 @@@ static int __vlan_add(struct net_bridge
                }
  
                masterv = br_vlan_get_master(br, v->vid, extack);
-               if (!masterv)
+               if (!masterv) {
+                       err = -ENOMEM;
                        goto out_filt;
+               }
                v->brvlan = masterv;
                if (br_opt_get(br, BROPT_VLAN_STATS_PER_PORT)) {
 -                      v->stats = netdev_alloc_pcpu_stats(struct br_vlan_stats);
 +                      v->stats =
 +                           netdev_alloc_pcpu_stats(struct pcpu_sw_netstats);
                        if (!v->stats) {
                                err = -ENOMEM;
                                goto out_filt;

diff --cc net/can/isotp.c
Simple merge

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

diff --cc net/core/xdp.c
index 17ffd33,d900ceb..3a8c9ab
--- 1/net/core/xdp.c
--- 2/net/core/xdp.c
+++ b/net/core/xdp.c
@@@ -381,63 -383,9 +384,63 @@@ void xdp_return_frame_rx_napi(struct xd
  }
  EXPORT_SYMBOL_GPL(xdp_return_frame_rx_napi);
  
-               __xdp_return(xdpf->data, &xdpf->mem, false);
 +/* XDP bulk APIs introduce a defer/flush mechanism to return
 + * pages belonging to the same xdp_mem_allocator object
 + * (identified via the mem.id field) in bulk to optimize
 + * I-cache and D-cache.
 + * The bulk queue size is set to 16 to be aligned to how
 + * XDP_REDIRECT bulking works. The bulk is flushed when
 + * it is full or when mem.id changes.
 + * xdp_frame_bulk is usually stored/allocated on the function
 + * call-stack to avoid locking penalties.
 + */
 +void xdp_flush_frame_bulk(struct xdp_frame_bulk *bq)
 +{
 +      struct xdp_mem_allocator *xa = bq->xa;
 +
 +      if (unlikely(!xa || !bq->count))
 +              return;
 +
 +      page_pool_put_page_bulk(xa->page_pool, bq->q, bq->count);
 +      /* bq->xa is not cleared to save lookup, if mem.id same in next bulk */
 +      bq->count = 0;
 +}
 +EXPORT_SYMBOL_GPL(xdp_flush_frame_bulk);
 +
 +/* Must be called with rcu_read_lock held */
 +void xdp_return_frame_bulk(struct xdp_frame *xdpf,
 +                         struct xdp_frame_bulk *bq)
 +{
 +      struct xdp_mem_info *mem = &xdpf->mem;
 +      struct xdp_mem_allocator *xa;
 +
 +      if (mem->type != MEM_TYPE_PAGE_POOL) {
++              __xdp_return(xdpf->data, &xdpf->mem, false, NULL);
 +              return;
 +      }
 +
 +      xa = bq->xa;
 +      if (unlikely(!xa)) {
 +              xa = rhashtable_lookup(mem_id_ht, &mem->id, mem_id_rht_params);
 +              bq->count = 0;
 +              bq->xa = xa;
 +      }
 +
 +      if (bq->count == XDP_BULK_QUEUE_SIZE)
 +              xdp_flush_frame_bulk(bq);
 +
 +      if (unlikely(mem->id != xa->mem.id)) {
 +              xdp_flush_frame_bulk(bq);
 +              bq->xa = rhashtable_lookup(mem_id_ht, &mem->id, mem_id_rht_params);
 +      }
 +
 +      bq->q[bq->count++] = xdpf->data;
 +}
 +EXPORT_SYMBOL_GPL(xdp_return_frame_bulk);
 +
  void xdp_return_buff(struct xdp_buff *xdp)
  {
-       __xdp_return(xdp->data, &xdp->rxq->mem, true);
+       __xdp_return(xdp->data, &xdp->rxq->mem, true, xdp);
  }
  
  /* Only called for MEM_TYPE_PAGE_POOL see xdp.h */

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

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

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

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

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

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

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

diff --cc net/netfilter/nf_tables_api.c
index a11bc8d,9a08076..9d6c317
--- 1/net/netfilter/nf_tables_api.c
--- 2/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@@ -1723,7 -1722,11 +1723,11 @@@ static struct nft_hook *nft_netdev_hook
                goto err_hook_alloc;
        }
  
 -      nla_strlcpy(ifname, attr, IFNAMSIZ);
 +      nla_strscpy(ifname, attr, IFNAMSIZ);
+       /* nf_tables_netdev_event() is called under rtnl_mutex, this is
+        * indirectly serializing all the other holders of the commit_mutex with
+        * the rtnl_mutex.
+        */
        dev = __dev_get_by_name(net, ifname);
        if (!dev) {
                err = -ENOENT;

diff --cc net/netfilter/nft_ct.c
Simple merge

diff --cc net/tipc/node.c
Simple merge

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

diff --cc net/xdp/xsk.c
Simple merge

diff --cc net/xdp/xsk_buff_pool.c
Simple merge

diff --cc net/xdp/xsk_queue.h
index b936c46,9e71b9f..4a9663a
--- 1/net/xdp/xsk_queue.h
--- 2/net/xdp/xsk_queue.h
+++ b/net/xdp/xsk_queue.h
@@@ -307,9 -264,15 +307,15 @@@ static inline bool xskq_cons_is_full(st
                q->nentries;
  }
  
+ static inline u32 xskq_cons_present_entries(struct xsk_queue *q)
+ {
+       /* No barriers needed since data is not accessed */
+       return READ_ONCE(q->ring->producer) - READ_ONCE(q->ring->consumer);
+ }
+ 
  /* Functions for producers */
  
 -static inline bool xskq_prod_is_full(struct xsk_queue *q)
 +static inline u32 xskq_prod_nb_free(struct xsk_queue *q, u32 max)
  {
        u32 free_entries = q->nentries - (q->cached_prod - q->cached_cons);
  

diff --cc tools/include/uapi/linux/bpf.h
index 1233f14,556216d..7e9931b
--- 1/tools/include/uapi/linux/bpf.h
--- 2/tools/include/uapi/linux/bpf.h
+++ b/tools/include/uapi/linux/bpf.h
@@@ -3977,15 -3897,9 +3977,15 @@@ union bpf_attr 
        FN(seq_printf_btf),             \
        FN(skb_cgroup_classid),         \
        FN(redirect_neigh),             \
-       FN(bpf_per_cpu_ptr),            \
-       FN(bpf_this_cpu_ptr),           \
+       FN(per_cpu_ptr),                \
+       FN(this_cpu_ptr),               \
        FN(redirect_peer),              \
 +      FN(task_storage_get),           \
 +      FN(task_storage_delete),        \
 +      FN(get_current_task_btf),       \
 +      FN(bprm_opts_set),              \
 +      FN(ktime_get_coarse_ns),        \
 +      FN(ima_inode_hash),             \
        /* */
  
  /* integer value in 'imm' field of BPF_CALL instruction selects which helper