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

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
 - keep the ZC code, drop the code related to reinit
net/bridge/netfilter/ebtables.c
 - fix build after move to net_generic

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

diff --cc Documentation/networking/ip-sysctl.rst
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/dsa/mv88e6xxx/chip.c
Simple merge

diff --cc drivers/net/ethernet/cadence/macb_main.c
Simple merge

diff --cc drivers/net/ethernet/davicom/dm9000.c
Simple merge

diff --cc drivers/net/ethernet/ibm/ibmvnic.c
index b72159c,ffb2a91..5788bb9
--- 1/drivers/net/ethernet/ibm/ibmvnic.c
--- 2/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@@ -1967,14 -1916,12 +1961,14 @@@ static int do_reset(struct ibmvnic_adap
        u64 old_num_rx_queues, old_num_tx_queues;
        u64 old_num_rx_slots, old_num_tx_slots;
        struct net_device *netdev = adapter->netdev;
-       int i, rc;
+       int rc;
  
        netdev_dbg(adapter->netdev,
 -                 "[S:%d FOP:%d] Reset reason %d, reset_state %d\n",
 -                 adapter->state, adapter->failover_pending,
 -                 rwi->reset_reason, reset_state);
 +                 "[S:%s FOP:%d] Reset reason: %s, reset_state: %s\n",
 +                 adapter_state_to_string(adapter->state),
 +                 adapter->failover_pending,
 +                 reset_reason_to_string(rwi->reset_reason),
 +                 adapter_state_to_string(reset_state));
  
        adapter->reset_reason = rwi->reset_reason;
        /* requestor of VNIC_RESET_CHANGE_PARAM already has the rtnl lock */

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

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

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

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

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

diff --cc drivers/net/ethernet/realtek/r8169_main.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 3a5ca58,4749bd0..9f39664
--- 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
@@@ -1519,182 -1380,8 +1519,106 @@@ static void stmmac_free_tx_buffer(struc
  }
  
  /**
 - * init_dma_rx_desc_rings - init the RX descriptor rings
 - * @dev: net device structure
 + * dma_free_rx_skbufs - free RX dma buffers
 + * @priv: private structure
 + * @queue: RX queue index
 + */
 +static void dma_free_rx_skbufs(struct stmmac_priv *priv, u32 queue)
 +{
 +      int i;
 +
 +      for (i = 0; i < priv->dma_rx_size; i++)
 +              stmmac_free_rx_buffer(priv, queue, i);
 +}
 +
 +static int stmmac_alloc_rx_buffers(struct stmmac_priv *priv, u32 queue,
 +                                 gfp_t flags)
 +{
 +      struct stmmac_rx_queue *rx_q = &priv->rx_queue[queue];
 +      int i;
 +
 +      for (i = 0; i < priv->dma_rx_size; i++) {
 +              struct dma_desc *p;
 +              int ret;
 +
 +              if (priv->extend_desc)
 +                      p = &((rx_q->dma_erx + i)->basic);
 +              else
 +                      p = rx_q->dma_rx + i;
 +
 +              ret = stmmac_init_rx_buffers(priv, p, i, flags,
 +                                           queue);
 +              if (ret)
 +                      return ret;
 +
 +              rx_q->buf_alloc_num++;
 +      }
 +
 +      return 0;
 +}
 +
- /**
-  * dma_recycle_rx_skbufs - recycle RX dma buffers
-  * @priv: private structure
-  * @queue: RX queue index
-  */
- static void dma_recycle_rx_skbufs(struct stmmac_priv *priv, u32 queue)
- {
-       struct stmmac_rx_queue *rx_q = &priv->rx_queue[queue];
-       int i;
- 
-       for (i = 0; i < priv->dma_rx_size; i++) {
-               struct stmmac_rx_buffer *buf = &rx_q->buf_pool[i];
- 
-               if (buf->page) {
-                       page_pool_recycle_direct(rx_q->page_pool, buf->page);
-                       buf->page = NULL;
-               }
- 
-               if (priv->sph && buf->sec_page) {
-                       page_pool_recycle_direct(rx_q->page_pool, buf->sec_page);
-                       buf->sec_page = NULL;
-               }
-       }
- }
- 
 +/**
 + * dma_free_rx_xskbufs - free RX dma buffers from XSK pool
 + * @priv: private structure
 + * @queue: RX queue index
 + */
 +static void dma_free_rx_xskbufs(struct stmmac_priv *priv, u32 queue)
 +{
 +      struct stmmac_rx_queue *rx_q = &priv->rx_queue[queue];
 +      int i;
 +
 +      for (i = 0; i < priv->dma_rx_size; i++) {
 +              struct stmmac_rx_buffer *buf = &rx_q->buf_pool[i];
 +
 +              if (!buf->xdp)
 +                      continue;
 +
 +              xsk_buff_free(buf->xdp);
 +              buf->xdp = NULL;
 +      }
 +}
 +
 +static int stmmac_alloc_rx_buffers_zc(struct stmmac_priv *priv, u32 queue)
 +{
 +      struct stmmac_rx_queue *rx_q = &priv->rx_queue[queue];
 +      int i;
 +
 +      for (i = 0; i < priv->dma_rx_size; i++) {
 +              struct stmmac_rx_buffer *buf;
 +              dma_addr_t dma_addr;
 +              struct dma_desc *p;
 +
 +              if (priv->extend_desc)
 +                      p = (struct dma_desc *)(rx_q->dma_erx + i);
 +              else
 +                      p = rx_q->dma_rx + i;
 +
 +              buf = &rx_q->buf_pool[i];
 +
 +              buf->xdp = xsk_buff_alloc(rx_q->xsk_pool);
 +              if (!buf->xdp)
 +                      return -ENOMEM;
 +
 +              dma_addr = xsk_buff_xdp_get_dma(buf->xdp);
 +              stmmac_set_desc_addr(priv, p, dma_addr);
 +              rx_q->buf_alloc_num++;
 +      }
 +
 +      return 0;
 +}
 +
- /**
-  * stmmac_reinit_rx_buffers - reinit the RX descriptor buffer.
-  * @priv: driver private structure
-  * Description: this function is called to re-allocate a receive buffer, perform
-  * the DMA mapping and init the descriptor.
-  */
- static void stmmac_reinit_rx_buffers(struct stmmac_priv *priv)
- {
-       u32 rx_count = priv->plat->rx_queues_to_use;
-       u32 queue;
- 
-       for (queue = 0; queue < rx_count; queue++) {
-               struct stmmac_rx_queue *rx_q = &priv->rx_queue[queue];
- 
-               if (rx_q->xsk_pool)
-                       dma_free_rx_xskbufs(priv, queue);
-               else
-                       dma_recycle_rx_skbufs(priv, queue);
- 
-               rx_q->buf_alloc_num = 0;
-       }
- 
-       for (queue = 0; queue < rx_count; queue++) {
-               struct stmmac_rx_queue *rx_q = &priv->rx_queue[queue];
-               int ret;
- 
-               if (rx_q->xsk_pool) {
-                       /* RX XDP ZC buffer pool may not be populated, e.g.
-                        * xdpsock TX-only.
-                        */
-                       stmmac_alloc_rx_buffers_zc(priv, queue);
-               } else {
-                       ret = stmmac_alloc_rx_buffers(priv, queue, GFP_KERNEL);
-                       if (ret < 0)
-                               goto err_reinit_rx_buffers;
-               }
-       }
- 
-       return;
- 
- err_reinit_rx_buffers:
-       while (queue >= 0) {
-               dma_free_rx_skbufs(priv, queue);
- 
-               if (queue == 0)
-                       break;
- 
-               queue--;
-       }
- }
- 
 +static struct xsk_buff_pool *stmmac_get_xsk_pool(struct stmmac_priv *priv, u32 queue)
 +{
 +      if (!stmmac_xdp_is_enabled(priv) || !test_bit(queue, priv->af_xdp_zc_qps))
 +              return NULL;
 +
 +      return xsk_get_pool_from_qid(priv->dev, queue);
 +}
 +
 +/**
 + * __init_dma_rx_desc_rings - init the RX descriptor ring (per queue)
 + * @priv: driver private structure
 + * @queue: RX queue index
   * @flags: gfp flag.
   * Description: this function initializes the DMA RX descriptors
   * and allocates the socket buffers. It supports the chained and ring

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

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

diff --cc kernel/bpf/verifier.c
index f63b275,0399ac0..5682a02
--- 1/kernel/bpf/verifier.c
--- 2/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@@ -6369,9 -5918,9 +6380,9 @@@ static int update_alu_sanitation_state(
        if (aux->alu_state &&
            (aux->alu_state != alu_state ||
             aux->alu_limit != alu_limit))
-               return -EACCES;
+               return REASON_PATHS;
  
 -      /* Corresponding fixup done in fixup_bpf_calls(). */
 +      /* Corresponding fixup done in do_misc_fixups(). */
        aux->alu_state = alu_state;
        aux->alu_limit = alu_limit;
        return 0;

diff --cc net/bridge/netfilter/ebtables.c
index 11625d0,d481ff2..96d789c
--- 1/net/bridge/netfilter/ebtables.c
--- 2/net/bridge/netfilter/ebtables.c
+++ b/net/bridge/netfilter/ebtables.c
@@@ -1239,10 -1232,34 +1239,35 @@@ out
        return ret;
  }
  
- void ebt_unregister_table(struct net *net, struct ebt_table *table,
-                         const struct nf_hook_ops *ops)
+ static struct ebt_table *__ebt_find_table(struct net *net, const char *name)
+ {
++      struct ebt_pernet *ebt_net = net_generic(net, ebt_pernet_id);
+       struct ebt_table *t;
+ 
+       mutex_lock(&ebt_mutex);
+ 
 -      list_for_each_entry(t, &net->xt.tables[NFPROTO_BRIDGE], list) {
++      list_for_each_entry(t, &ebt_net->tables, list) {
+               if (strcmp(t->name, name) == 0) {
+                       mutex_unlock(&ebt_mutex);
+                       return t;
+               }
+       }
+ 
+       mutex_unlock(&ebt_mutex);
+       return NULL;
+ }
+ 
+ void ebt_unregister_table_pre_exit(struct net *net, const char *name, const struct nf_hook_ops *ops)
+ {
+       struct ebt_table *table = __ebt_find_table(net, name);
+ 
+       if (table)
+               nf_unregister_net_hooks(net, ops, hweight32(table->valid_hooks));
+ }
+ EXPORT_SYMBOL(ebt_unregister_table_pre_exit);
+ 
+ void ebt_unregister_table(struct net *net, struct ebt_table *table)
  {
-       nf_unregister_net_hooks(net, ops, hweight32(table->valid_hooks));
        __ebt_unregister_table(net, table);
  }
  

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

diff --cc net/ethtool/netlink.h
Simple merge

diff --cc net/ethtool/pause.c
Simple merge

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

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

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

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

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

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

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

diff --cc net/sctp/socket.c
Simple merge

diff --cc tools/lib/bpf/xsk.c
Simple merge