fix up some xen dependencies

diff --git a/queue-4.19/eth-remove-copies-of-the-napi_poll_weight-define.patch b/queue-4.19/eth-remove-copies-of-the-napi_poll_weight-define.patch
deleted file mode 100644 (file)
index cf5c9a1..0000000
--- a/queue-4.19/eth-remove-copies-of-the-napi_poll_weight-define.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-From 95236c1eced1d6fc77c6ca992d2800824fc1c114 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 28 Apr 2022 14:23:09 -0700
-Subject: eth: remove copies of the NAPI_POLL_WEIGHT define
-
-From: Jakub Kicinski <kuba@kernel.org>
-
-[ Upstream commit 5f012b40ef639343a976553bf3cc26dd0474756e ]
-
-Defining local versions of NAPI_POLL_WEIGHT with the same
-values in the drivers just makes refactoring harder.
-
-Drop the special defines in a bunch of drivers where the
-removal is relatively simple so grouping into one patch
-does not impact reviewability.
-
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Reviewed-by: Paul Durrant <paul@xen.org>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Stable-dep-of: 66cf7435a269 ("xen-netback: use default TX queue size for vifs")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/ethernet/cortina/gemini.c  | 4 +---
- drivers/net/ethernet/marvell/skge.c    | 3 +--
- drivers/net/ethernet/marvell/sky2.c    | 3 +--
- drivers/net/ethernet/ti/davinci_emac.c | 3 +--
- drivers/net/ethernet/ti/netcp_core.c   | 5 ++---
- drivers/net/xen-netback/interface.c    | 3 +--
- 6 files changed, 7 insertions(+), 14 deletions(-)
-
-diff --git a/drivers/net/ethernet/cortina/gemini.c b/drivers/net/ethernet/cortina/gemini.c
-index f8a3d1fecb0a5..7aa3ac0d21d36 100644
---- a/drivers/net/ethernet/cortina/gemini.c
-+++ b/drivers/net/ethernet/cortina/gemini.c
-@@ -69,7 +69,6 @@ MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");
- #define DEFAULT_GMAC_RXQ_ORDER                9
- #define DEFAULT_GMAC_TXQ_ORDER                8
- #define DEFAULT_RX_BUF_ORDER          11
--#define DEFAULT_NAPI_WEIGHT           64
- #define TX_MAX_FRAGS                  16
- #define TX_QUEUE_NUM                  1       /* max: 6 */
- #define RX_MAX_ALLOC_ORDER            2
-@@ -2489,8 +2488,7 @@ static int gemini_ethernet_port_probe(struct platform_device *pdev)
-       netdev->max_mtu = 10236 - VLAN_ETH_HLEN;
- 
-       port->freeq_refill = 0;
--      netif_napi_add(netdev, &port->napi, gmac_napi_poll,
--                     DEFAULT_NAPI_WEIGHT);
-+      netif_napi_add(netdev, &port->napi, gmac_napi_poll, NAPI_POLL_WEIGHT);
- 
-       if (is_valid_ether_addr((void *)port->mac_addr)) {
-               memcpy(netdev->dev_addr, port->mac_addr, ETH_ALEN);
-diff --git a/drivers/net/ethernet/marvell/skge.c b/drivers/net/ethernet/marvell/skge.c
-index d6f8a41c3e35c..dcd056d805fab 100644
---- a/drivers/net/ethernet/marvell/skge.c
-+++ b/drivers/net/ethernet/marvell/skge.c
-@@ -62,7 +62,6 @@
- #define PHY_RETRIES           1000
- #define ETH_JUMBO_MTU         9000
- #define TX_WATCHDOG           (5 * HZ)
--#define NAPI_WEIGHT           64
- #define BLINK_MS              250
- #define LINK_HZ                       HZ
- 
-@@ -3873,7 +3872,7 @@ static struct net_device *skge_devinit(struct skge_hw *hw, int port,
-               dev->features |= NETIF_F_HIGHDMA;
- 
-       skge = netdev_priv(dev);
--      netif_napi_add(dev, &skge->napi, skge_poll, NAPI_WEIGHT);
-+      netif_napi_add(dev, &skge->napi, skge_poll, NAPI_POLL_WEIGHT);
-       skge->netdev = dev;
-       skge->hw = hw;
-       skge->msg_enable = netif_msg_init(debug, default_msg);
-diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c
-index 2452d8ba40730..18bdceb99ec8c 100644
---- a/drivers/net/ethernet/marvell/sky2.c
-+++ b/drivers/net/ethernet/marvell/sky2.c
-@@ -74,7 +74,6 @@
- #define TX_DEF_PENDING                63
- 
- #define TX_WATCHDOG           (5 * HZ)
--#define NAPI_WEIGHT           64
- #define PHY_RETRIES           1000
- 
- #define SKY2_EEPROM_MAGIC     0x9955aabb
-@@ -5087,7 +5086,7 @@ static int sky2_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
-               }
-       }
- 
--      netif_napi_add(dev, &hw->napi, sky2_poll, NAPI_WEIGHT);
-+      netif_napi_add(dev, &hw->napi, sky2_poll, NAPI_POLL_WEIGHT);
- 
-       err = register_netdev(dev);
-       if (err) {
-diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c
-index 566da1e3cfbcc..00469fd19d5f9 100644
---- a/drivers/net/ethernet/ti/davinci_emac.c
-+++ b/drivers/net/ethernet/ti/davinci_emac.c
-@@ -127,7 +127,6 @@ static const char emac_version_string[] = "TI DaVinci EMAC Linux v6.1";
- #define EMAC_DEF_RX_NUM_DESC          (128)
- #define EMAC_DEF_MAX_TX_CH            (1) /* Max TX channels configured */
- #define EMAC_DEF_MAX_RX_CH            (1) /* Max RX channels configured */
--#define EMAC_POLL_WEIGHT              (64) /* Default NAPI poll weight */
- 
- /* Buffer descriptor parameters */
- #define EMAC_DEF_TX_MAX_SERVICE               (32) /* TX max service BD's */
-@@ -1932,7 +1931,7 @@ static int davinci_emac_probe(struct platform_device *pdev)
- 
-       ndev->netdev_ops = &emac_netdev_ops;
-       ndev->ethtool_ops = &ethtool_ops;
--      netif_napi_add(ndev, &priv->napi, emac_poll, EMAC_POLL_WEIGHT);
-+      netif_napi_add(ndev, &priv->napi, emac_poll, NAPI_POLL_WEIGHT);
- 
-       pm_runtime_enable(&pdev->dev);
-       rc = pm_runtime_get_sync(&pdev->dev);
-diff --git a/drivers/net/ethernet/ti/netcp_core.c b/drivers/net/ethernet/ti/netcp_core.c
-index 7fdbd2ff55737..366a820ad4583 100644
---- a/drivers/net/ethernet/ti/netcp_core.c
-+++ b/drivers/net/ethernet/ti/netcp_core.c
-@@ -32,7 +32,6 @@
- #include "netcp.h"
- 
- #define NETCP_SOP_OFFSET      (NET_IP_ALIGN + NET_SKB_PAD)
--#define NETCP_NAPI_WEIGHT     64
- #define NETCP_TX_TIMEOUT      (5 * HZ)
- #define NETCP_PACKET_SIZE     (ETH_FRAME_LEN + ETH_FCS_LEN)
- #define NETCP_MIN_PACKET_SIZE ETH_ZLEN
-@@ -2113,8 +2112,8 @@ static int netcp_create_interface(struct netcp_device *netcp_device,
-       }
- 
-       /* NAPI register */
--      netif_napi_add(ndev, &netcp->rx_napi, netcp_rx_poll, NETCP_NAPI_WEIGHT);
--      netif_tx_napi_add(ndev, &netcp->tx_napi, netcp_tx_poll, NETCP_NAPI_WEIGHT);
-+      netif_napi_add(ndev, &netcp->rx_napi, netcp_rx_poll, NAPI_POLL_WEIGHT);
-+      netif_tx_napi_add(ndev, &netcp->tx_napi, netcp_tx_poll, NAPI_POLL_WEIGHT);
- 
-       /* Register the network device */
-       ndev->dev_id            = 0;
-diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c
-index df20270827631..a44e865513711 100644
---- a/drivers/net/xen-netback/interface.c
-+++ b/drivers/net/xen-netback/interface.c
-@@ -42,7 +42,6 @@
- #include <xen/balloon.h>
- 
- #define XENVIF_QUEUE_LENGTH 32
--#define XENVIF_NAPI_WEIGHT  64
- 
- /* Number of bytes allowed on the internal guest Rx queue. */
- #define XENVIF_RX_QUEUE_BYTES (XEN_NETIF_RX_RING_SIZE/2 * PAGE_SIZE)
-@@ -682,7 +681,7 @@ int xenvif_connect_data(struct xenvif_queue *queue,
-       atomic_set(&queue->inflight_packets, 0);
- 
-       netif_napi_add(queue->vif->dev, &queue->napi, xenvif_poll,
--                      XENVIF_NAPI_WEIGHT);
-+                      NAPI_POLL_WEIGHT);
- 
-       if (tx_evtchn == rx_evtchn) {
-               /* feature-split-event-channels == 0 */
--- 
-2.40.1
-

diff --git a/queue-4.19/series b/queue-4.19/series
index b09fad139f565770734e9c8a6fc0a7eb6e999ca6..965aa034316bea8fe3c3452b1180325927603808 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -10,7 +10,6 @@ net-prevent-address-rewrite-in-kernel_bind.patch
 drm-etvnaviv-fix-bad-backport-leading-to-warning.patch
 drm-msm-dsi-skip-the-wait-for-video-mode-done-if-not.patch
 ieee802154-ca8210-fix-a-potential-uaf-in-ca8210_prob.patch
-eth-remove-copies-of-the-napi_poll_weight-define.patch
 xen-netback-use-default-tx-queue-size-for-vifs.patch
 drm-vmwgfx-fix-typo-of-sizeof-argument.patch
 ixgbe-fix-crash-with-empty-vf-macvlan-list.patch

diff --git a/queue-4.19/xen-netback-use-default-tx-queue-size-for-vifs.patch b/queue-4.19/xen-netback-use-default-tx-queue-size-for-vifs.patch
index 41186663d8866e319e80406a119ae2e3a98428ba..1dc259668b980c13d1d457061658dd95e08b5291 100644 (file)
--- a/queue-4.19/xen-netback-use-default-tx-queue-size-for-vifs.patch
+++ b/queue-4.19/xen-netback-use-default-tx-queue-size-for-vifs.patch
@@ -1,4 +1,4 @@
-From 1128c28c7268ef53e7a8240d0e7f27c7bfeab526 Mon Sep 17 00:00:00 2001
+From 3c3a9debea4b25ab1eecf9a467140f2c70225115 Mon Sep 17 00:00:00 2001
 From: Sasha Levin <sashal@kernel.org>
 Date: Thu, 5 Oct 2023 16:08:31 +0200
 Subject: xen-netback: use default TX queue size for vifs
@@ -27,23 +27,20 @@ Acked-by: Wei Liu <wei.liu@kernel.org>
 Signed-off-by: David S. Miller <davem@davemloft.net>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- drivers/net/xen-netback/interface.c | 4 ----
- 1 file changed, 4 deletions(-)
+ drivers/net/xen-netback/interface.c |    3 ---
+ 1 file changed, 3 deletions(-)
 
-diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c
-index a44e865513711..d7a84aa2f0e7d 100644
 --- a/drivers/net/xen-netback/interface.c
 +++ b/drivers/net/xen-netback/interface.c
-@@ -41,8 +41,6 @@
+@@ -41,7 +41,6 @@
  #include <asm/xen/hypercall.h>
  #include <xen/balloon.h>
  
 -#define XENVIF_QUEUE_LENGTH 32
--
- /* Number of bytes allowed on the internal guest Rx queue. */
- #define XENVIF_RX_QUEUE_BYTES (XEN_NETIF_RX_RING_SIZE/2 * PAGE_SIZE)
+ #define XENVIF_NAPI_WEIGHT  64
  
-@@ -525,8 +523,6 @@ struct xenvif *xenvif_alloc(struct device *parent, domid_t domid,
+ /* Number of bytes allowed on the internal guest Rx queue. */
+@@ -526,8 +525,6 @@ struct xenvif *xenvif_alloc(struct devic
        dev->features = dev->hw_features | NETIF_F_RXCSUM;
        dev->ethtool_ops = &xenvif_ethtool_ops;
  
@@ -52,6 +49,3 @@ index a44e865513711..d7a84aa2f0e7d 100644
        dev->min_mtu = ETH_MIN_MTU;
        dev->max_mtu = ETH_MAX_MTU - VLAN_ETH_HLEN;
  
--- 
-2.40.1
-

diff --git a/queue-5.10/eth-remove-copies-of-the-napi_poll_weight-define.patch b/queue-5.10/eth-remove-copies-of-the-napi_poll_weight-define.patch
deleted file mode 100644 (file)
index 05fb5ed..0000000
--- a/queue-5.10/eth-remove-copies-of-the-napi_poll_weight-define.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-From 1b5f5f5af9fcfb6bac8297934ec8445b52fdc44c Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 28 Apr 2022 14:23:09 -0700
-Subject: eth: remove copies of the NAPI_POLL_WEIGHT define
-
-From: Jakub Kicinski <kuba@kernel.org>
-
-[ Upstream commit 5f012b40ef639343a976553bf3cc26dd0474756e ]
-
-Defining local versions of NAPI_POLL_WEIGHT with the same
-values in the drivers just makes refactoring harder.
-
-Drop the special defines in a bunch of drivers where the
-removal is relatively simple so grouping into one patch
-does not impact reviewability.
-
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Reviewed-by: Paul Durrant <paul@xen.org>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Stable-dep-of: 66cf7435a269 ("xen-netback: use default TX queue size for vifs")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/ethernet/cortina/gemini.c         | 4 +---
- drivers/net/ethernet/marvell/skge.c           | 3 +--
- drivers/net/ethernet/marvell/sky2.c           | 3 +--
- drivers/net/ethernet/mediatek/mtk_star_emac.c | 3 +--
- drivers/net/ethernet/ti/davinci_emac.c        | 3 +--
- drivers/net/ethernet/ti/netcp_core.c          | 5 ++---
- drivers/net/xen-netback/interface.c           | 3 +--
- 7 files changed, 8 insertions(+), 16 deletions(-)
-
-diff --git a/drivers/net/ethernet/cortina/gemini.c b/drivers/net/ethernet/cortina/gemini.c
-index 85ea073b742fb..cd746e0dd5749 100644
---- a/drivers/net/ethernet/cortina/gemini.c
-+++ b/drivers/net/ethernet/cortina/gemini.c
-@@ -68,7 +68,6 @@ MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");
- #define DEFAULT_GMAC_RXQ_ORDER                9
- #define DEFAULT_GMAC_TXQ_ORDER                8
- #define DEFAULT_RX_BUF_ORDER          11
--#define DEFAULT_NAPI_WEIGHT           64
- #define TX_MAX_FRAGS                  16
- #define TX_QUEUE_NUM                  1       /* max: 6 */
- #define RX_MAX_ALLOC_ORDER            2
-@@ -2470,8 +2469,7 @@ static int gemini_ethernet_port_probe(struct platform_device *pdev)
-       netdev->max_mtu = 10236 - VLAN_ETH_HLEN;
- 
-       port->freeq_refill = 0;
--      netif_napi_add(netdev, &port->napi, gmac_napi_poll,
--                     DEFAULT_NAPI_WEIGHT);
-+      netif_napi_add(netdev, &port->napi, gmac_napi_poll, NAPI_POLL_WEIGHT);
- 
-       if (is_valid_ether_addr((void *)port->mac_addr)) {
-               memcpy(netdev->dev_addr, port->mac_addr, ETH_ALEN);
-diff --git a/drivers/net/ethernet/marvell/skge.c b/drivers/net/ethernet/marvell/skge.c
-index 8a9c0f490bfb5..e7b7a2ad5ec0c 100644
---- a/drivers/net/ethernet/marvell/skge.c
-+++ b/drivers/net/ethernet/marvell/skge.c
-@@ -50,7 +50,6 @@
- #define PHY_RETRIES           1000
- #define ETH_JUMBO_MTU         9000
- #define TX_WATCHDOG           (5 * HZ)
--#define NAPI_WEIGHT           64
- #define BLINK_MS              250
- #define LINK_HZ                       HZ
- 
-@@ -3823,7 +3822,7 @@ static struct net_device *skge_devinit(struct skge_hw *hw, int port,
-               dev->features |= NETIF_F_HIGHDMA;
- 
-       skge = netdev_priv(dev);
--      netif_napi_add(dev, &skge->napi, skge_poll, NAPI_WEIGHT);
-+      netif_napi_add(dev, &skge->napi, skge_poll, NAPI_POLL_WEIGHT);
-       skge->netdev = dev;
-       skge->hw = hw;
-       skge->msg_enable = netif_msg_init(debug, default_msg);
-diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c
-index 25981a7a43b5d..31989869e7616 100644
---- a/drivers/net/ethernet/marvell/sky2.c
-+++ b/drivers/net/ethernet/marvell/sky2.c
-@@ -62,7 +62,6 @@
- #define TX_DEF_PENDING                63
- 
- #define TX_WATCHDOG           (5 * HZ)
--#define NAPI_WEIGHT           64
- #define PHY_RETRIES           1000
- 
- #define SKY2_EEPROM_MAGIC     0x9955aabb
-@@ -5069,7 +5068,7 @@ static int sky2_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
-               }
-       }
- 
--      netif_napi_add(dev, &hw->napi, sky2_poll, NAPI_WEIGHT);
-+      netif_napi_add(dev, &hw->napi, sky2_poll, NAPI_POLL_WEIGHT);
- 
-       err = register_netdev(dev);
-       if (err) {
-diff --git a/drivers/net/ethernet/mediatek/mtk_star_emac.c b/drivers/net/ethernet/mediatek/mtk_star_emac.c
-index 96d2891f1675a..8b545b9170789 100644
---- a/drivers/net/ethernet/mediatek/mtk_star_emac.c
-+++ b/drivers/net/ethernet/mediatek/mtk_star_emac.c
-@@ -30,7 +30,6 @@
- #define MTK_STAR_WAIT_TIMEOUT                 300
- #define MTK_STAR_MAX_FRAME_SIZE                       1514
- #define MTK_STAR_SKB_ALIGNMENT                        16
--#define MTK_STAR_NAPI_WEIGHT                  64
- #define MTK_STAR_HASHTABLE_MC_LIMIT           256
- #define MTK_STAR_HASHTABLE_SIZE_MAX           512
- 
-@@ -1551,7 +1550,7 @@ static int mtk_star_probe(struct platform_device *pdev)
-       ndev->netdev_ops = &mtk_star_netdev_ops;
-       ndev->ethtool_ops = &mtk_star_ethtool_ops;
- 
--      netif_napi_add(ndev, &priv->napi, mtk_star_poll, MTK_STAR_NAPI_WEIGHT);
-+      netif_napi_add(ndev, &priv->napi, mtk_star_poll, NAPI_POLL_WEIGHT);
- 
-       return devm_register_netdev(dev, ndev);
- }
-diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c
-index ad5293571af4d..44e118bd5f6ba 100644
---- a/drivers/net/ethernet/ti/davinci_emac.c
-+++ b/drivers/net/ethernet/ti/davinci_emac.c
-@@ -113,7 +113,6 @@ static const char emac_version_string[] = "TI DaVinci EMAC Linux v6.1";
- #define EMAC_DEF_RX_NUM_DESC          (128)
- #define EMAC_DEF_MAX_TX_CH            (1) /* Max TX channels configured */
- #define EMAC_DEF_MAX_RX_CH            (1) /* Max RX channels configured */
--#define EMAC_POLL_WEIGHT              (64) /* Default NAPI poll weight */
- 
- /* Buffer descriptor parameters */
- #define EMAC_DEF_TX_MAX_SERVICE               (32) /* TX max service BD's */
-@@ -1920,7 +1919,7 @@ static int davinci_emac_probe(struct platform_device *pdev)
- 
-       ndev->netdev_ops = &emac_netdev_ops;
-       ndev->ethtool_ops = &ethtool_ops;
--      netif_napi_add(ndev, &priv->napi, emac_poll, EMAC_POLL_WEIGHT);
-+      netif_napi_add(ndev, &priv->napi, emac_poll, NAPI_POLL_WEIGHT);
- 
-       pm_runtime_enable(&pdev->dev);
-       rc = pm_runtime_get_sync(&pdev->dev);
-diff --git a/drivers/net/ethernet/ti/netcp_core.c b/drivers/net/ethernet/ti/netcp_core.c
-index f145abb77a497..618802a832e31 100644
---- a/drivers/net/ethernet/ti/netcp_core.c
-+++ b/drivers/net/ethernet/ti/netcp_core.c
-@@ -24,7 +24,6 @@
- #include "netcp.h"
- 
- #define NETCP_SOP_OFFSET      (NET_IP_ALIGN + NET_SKB_PAD)
--#define NETCP_NAPI_WEIGHT     64
- #define NETCP_TX_TIMEOUT      (5 * HZ)
- #define NETCP_PACKET_SIZE     (ETH_FRAME_LEN + ETH_FCS_LEN)
- #define NETCP_MIN_PACKET_SIZE ETH_ZLEN
-@@ -2099,8 +2098,8 @@ static int netcp_create_interface(struct netcp_device *netcp_device,
-       }
- 
-       /* NAPI register */
--      netif_napi_add(ndev, &netcp->rx_napi, netcp_rx_poll, NETCP_NAPI_WEIGHT);
--      netif_tx_napi_add(ndev, &netcp->tx_napi, netcp_tx_poll, NETCP_NAPI_WEIGHT);
-+      netif_napi_add(ndev, &netcp->rx_napi, netcp_rx_poll, NAPI_POLL_WEIGHT);
-+      netif_tx_napi_add(ndev, &netcp->tx_napi, netcp_tx_poll, NAPI_POLL_WEIGHT);
- 
-       /* Register the network device */
-       ndev->dev_id            = 0;
-diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c
-index 97cf5bc48902a..255432e75d48d 100644
---- a/drivers/net/xen-netback/interface.c
-+++ b/drivers/net/xen-netback/interface.c
-@@ -42,7 +42,6 @@
- #include <xen/balloon.h>
- 
- #define XENVIF_QUEUE_LENGTH 32
--#define XENVIF_NAPI_WEIGHT  64
- 
- /* Number of bytes allowed on the internal guest Rx queue. */
- #define XENVIF_RX_QUEUE_BYTES (XEN_NETIF_RX_RING_SIZE/2 * PAGE_SIZE)
-@@ -725,7 +724,7 @@ int xenvif_connect_data(struct xenvif_queue *queue,
-       atomic_set(&queue->inflight_packets, 0);
- 
-       netif_napi_add(queue->vif->dev, &queue->napi, xenvif_poll,
--                      XENVIF_NAPI_WEIGHT);
-+                      NAPI_POLL_WEIGHT);
- 
-       queue->stalled = true;
- 
--- 
-2.40.1
-

diff --git a/queue-5.10/eth-remove-remaining-copies-of-the-napi_poll_weight-define.patch b/queue-5.10/eth-remove-remaining-copies-of-the-napi_poll_weight-define.patch
deleted file mode 100644 (file)
index dfdc5b8..0000000
--- a/queue-5.10/eth-remove-remaining-copies-of-the-napi_poll_weight-define.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 36ffca1afea9b429d3e49aa0b6a68ecd93f3be11 Mon Sep 17 00:00:00 2001
-From: Jakub Kicinski <kuba@kernel.org>
-Date: Fri, 29 Apr 2022 10:43:30 -0700
-Subject: eth: remove remaining copies of the NAPI_POLL_WEIGHT define
-
-From: Jakub Kicinski <kuba@kernel.org>
-
-commit 36ffca1afea9b429d3e49aa0b6a68ecd93f3be11 upstream.
-
-Defining local versions of NAPI_POLL_WEIGHT with the same
-values in the drivers just makes refactoring harder.
-
-This patch covers three more drivers which I missed in
-commit 5f012b40ef63 ("eth: remove copies of the NAPI_POLL_WEIGHT define").
-
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/net/ethernet/amazon/ena/ena_netdev.c |    4 +---
- drivers/net/ethernet/brocade/bna/bnad.c      |    3 +--
- drivers/net/ethernet/nvidia/forcedeth.c      |    6 +++---
- 3 files changed, 5 insertions(+), 8 deletions(-)
-
---- a/drivers/net/ethernet/amazon/ena/ena_netdev.c
-+++ b/drivers/net/ethernet/amazon/ena/ena_netdev.c
-@@ -29,8 +29,6 @@ MODULE_LICENSE("GPL");
- /* Time in jiffies before concluding the transmitter is hung. */
- #define TX_TIMEOUT  (5 * HZ)
- 
--#define ENA_NAPI_BUDGET 64
--
- #define DEFAULT_MSG_ENABLE (NETIF_MSG_DRV | NETIF_MSG_PROBE | NETIF_MSG_IFUP | \
-               NETIF_MSG_TX_DONE | NETIF_MSG_TX_ERR | NETIF_MSG_RX_ERR)
- static int debug = -1;
-@@ -2179,7 +2177,7 @@ static void ena_init_napi_in_range(struc
-               netif_napi_add(adapter->netdev,
-                              &napi->napi,
-                              ENA_IS_XDP_INDEX(adapter, i) ? ena_xdp_io_poll : ena_io_poll,
--                             ENA_NAPI_BUDGET);
-+                             NAPI_POLL_WEIGHT);
- 
-               if (!ENA_IS_XDP_INDEX(adapter, i)) {
-                       napi->rx_ring = &adapter->rx_ring[i];
---- a/drivers/net/ethernet/brocade/bna/bnad.c
-+++ b/drivers/net/ethernet/brocade/bna/bnad.c
-@@ -1881,7 +1881,6 @@ poll_exit:
-       return rcvd;
- }
- 
--#define BNAD_NAPI_POLL_QUOTA          64
- static void
- bnad_napi_add(struct bnad *bnad, u32 rx_id)
- {
-@@ -1892,7 +1891,7 @@ bnad_napi_add(struct bnad *bnad, u32 rx_
-       for (i = 0; i < bnad->num_rxp_per_rx; i++) {
-               rx_ctrl = &bnad->rx_info[rx_id].rx_ctrl[i];
-               netif_napi_add(bnad->netdev, &rx_ctrl->napi,
--                             bnad_napi_poll_rx, BNAD_NAPI_POLL_QUOTA);
-+                             bnad_napi_poll_rx, NAPI_POLL_WEIGHT);
-       }
- }
- 
---- a/drivers/net/ethernet/nvidia/forcedeth.c
-+++ b/drivers/net/ethernet/nvidia/forcedeth.c
-@@ -56,8 +56,8 @@
- 
- #include <asm/irq.h>
- 
--#define TX_WORK_PER_LOOP  64
--#define RX_WORK_PER_LOOP  64
-+#define TX_WORK_PER_LOOP  NAPI_POLL_WEIGHT
-+#define RX_WORK_PER_LOOP  NAPI_POLL_WEIGHT
- 
- /*
-  * Hardware access:
-@@ -5878,7 +5878,7 @@ static int nv_probe(struct pci_dev *pci_
-       else
-               dev->netdev_ops = &nv_netdev_ops_optimized;
- 
--      netif_napi_add(dev, &np->napi, nv_napi_poll, RX_WORK_PER_LOOP);
-+      netif_napi_add(dev, &np->napi, nv_napi_poll, NAPI_POLL_WEIGHT);
-       dev->ethtool_ops = &ops;
-       dev->watchdog_timeo = NV_WATCHDOG_TIMEO;
- 

diff --git a/queue-5.10/series b/queue-5.10/series
index 243a68935b2fcc4029eb2db14c834bdc5b6f425a..06ff20db8761c493414ba4d9924732935972cbea 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -13,7 +13,6 @@ drm-msm-dpu-change-_dpu_plane_calc_bw-to-use-u64-to-.patch
 ravb-fix-up-dma_free_coherent-call-in-ravb_remove.patch
 ieee802154-ca8210-fix-a-potential-uaf-in-ca8210_prob.patch
 mlxsw-fix-mlxsw_sp2_nve_vxlan_learning_set-return-ty.patch
-eth-remove-copies-of-the-napi_poll_weight-define.patch
 xen-netback-use-default-tx-queue-size-for-vifs.patch
 riscv-bpf-factor-out-emit_call-for-kernel-and-bpf-co.patch
 riscv-bpf-sign-extend-return-values.patch
@@ -76,7 +75,6 @@ arm64-armv8_deprecated-move-emulation-functions.patch
 arm64-armv8_deprecated-move-aarch32-helper-earlier.patch
 arm64-armv8_deprecated-rework-deprected-instruction-handling.patch
 arm64-armv8_deprecated-fix-unused-function-error.patch
-eth-remove-remaining-copies-of-the-napi_poll_weight-define.patch
 rdma-srp-set-scmnd-result-only-when-scmnd-is-not-null.patch
 rdma-srp-fix-srp_abort.patch
 ravb-fix-use-after-free-issue-in-ravb_tx_timeout_work.patch

diff --git a/queue-5.10/xen-netback-use-default-tx-queue-size-for-vifs.patch b/queue-5.10/xen-netback-use-default-tx-queue-size-for-vifs.patch
index 59f559b2a89aacd7b04c933be1347b0e537839ee..7fea032010b31e72029a575c4c57931ef024be69 100644 (file)
--- a/queue-5.10/xen-netback-use-default-tx-queue-size-for-vifs.patch
+++ b/queue-5.10/xen-netback-use-default-tx-queue-size-for-vifs.patch
@@ -27,23 +27,20 @@ Acked-by: Wei Liu <wei.liu@kernel.org>
 Signed-off-by: David S. Miller <davem@davemloft.net>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- drivers/net/xen-netback/interface.c | 4 ----
- 1 file changed, 4 deletions(-)
+ drivers/net/xen-netback/interface.c |    3 ---
+ 1 file changed, 3 deletions(-)
 
-diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c
-index 255432e75d48d..077b23ff50f95 100644
 --- a/drivers/net/xen-netback/interface.c
 +++ b/drivers/net/xen-netback/interface.c
-@@ -41,8 +41,6 @@
+@@ -41,7 +41,6 @@
  #include <asm/xen/hypercall.h>
  #include <xen/balloon.h>
  
 -#define XENVIF_QUEUE_LENGTH 32
--
- /* Number of bytes allowed on the internal guest Rx queue. */
- #define XENVIF_RX_QUEUE_BYTES (XEN_NETIF_RX_RING_SIZE/2 * PAGE_SIZE)
+ #define XENVIF_NAPI_WEIGHT  64
  
-@@ -527,8 +525,6 @@ struct xenvif *xenvif_alloc(struct device *parent, domid_t domid,
+ /* Number of bytes allowed on the internal guest Rx queue. */
+@@ -528,8 +527,6 @@ struct xenvif *xenvif_alloc(struct devic
        dev->features = dev->hw_features | NETIF_F_RXCSUM;
        dev->ethtool_ops = &xenvif_ethtool_ops;
  
@@ -52,6 +49,3 @@ index 255432e75d48d..077b23ff50f95 100644
        dev->min_mtu = ETH_MIN_MTU;
        dev->max_mtu = ETH_MAX_MTU - VLAN_ETH_HLEN;
  
--- 
-2.40.1
-

diff --git a/queue-5.4/eth-remove-copies-of-the-napi_poll_weight-define.patch b/queue-5.4/eth-remove-copies-of-the-napi_poll_weight-define.patch
deleted file mode 100644 (file)
index 21d8420..0000000
--- a/queue-5.4/eth-remove-copies-of-the-napi_poll_weight-define.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-From 8ebaa6f8b0f75d7e11a78076dd740fd1571ac938 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 28 Apr 2022 14:23:09 -0700
-Subject: eth: remove copies of the NAPI_POLL_WEIGHT define
-
-From: Jakub Kicinski <kuba@kernel.org>
-
-[ Upstream commit 5f012b40ef639343a976553bf3cc26dd0474756e ]
-
-Defining local versions of NAPI_POLL_WEIGHT with the same
-values in the drivers just makes refactoring harder.
-
-Drop the special defines in a bunch of drivers where the
-removal is relatively simple so grouping into one patch
-does not impact reviewability.
-
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Reviewed-by: Paul Durrant <paul@xen.org>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Stable-dep-of: 66cf7435a269 ("xen-netback: use default TX queue size for vifs")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/ethernet/cortina/gemini.c  | 4 +---
- drivers/net/ethernet/marvell/skge.c    | 3 +--
- drivers/net/ethernet/marvell/sky2.c    | 3 +--
- drivers/net/ethernet/ti/davinci_emac.c | 3 +--
- drivers/net/ethernet/ti/netcp_core.c   | 5 ++---
- drivers/net/xen-netback/interface.c    | 3 +--
- 6 files changed, 7 insertions(+), 14 deletions(-)
-
-diff --git a/drivers/net/ethernet/cortina/gemini.c b/drivers/net/ethernet/cortina/gemini.c
-index a8a8b77c1611e..a2b8c2a53c8e7 100644
---- a/drivers/net/ethernet/cortina/gemini.c
-+++ b/drivers/net/ethernet/cortina/gemini.c
-@@ -69,7 +69,6 @@ MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");
- #define DEFAULT_GMAC_RXQ_ORDER                9
- #define DEFAULT_GMAC_TXQ_ORDER                8
- #define DEFAULT_RX_BUF_ORDER          11
--#define DEFAULT_NAPI_WEIGHT           64
- #define TX_MAX_FRAGS                  16
- #define TX_QUEUE_NUM                  1       /* max: 6 */
- #define RX_MAX_ALLOC_ORDER            2
-@@ -2483,8 +2482,7 @@ static int gemini_ethernet_port_probe(struct platform_device *pdev)
-       netdev->max_mtu = 10236 - VLAN_ETH_HLEN;
- 
-       port->freeq_refill = 0;
--      netif_napi_add(netdev, &port->napi, gmac_napi_poll,
--                     DEFAULT_NAPI_WEIGHT);
-+      netif_napi_add(netdev, &port->napi, gmac_napi_poll, NAPI_POLL_WEIGHT);
- 
-       if (is_valid_ether_addr((void *)port->mac_addr)) {
-               memcpy(netdev->dev_addr, port->mac_addr, ETH_ALEN);
-diff --git a/drivers/net/ethernet/marvell/skge.c b/drivers/net/ethernet/marvell/skge.c
-index 095f6c71b4fa1..a75288e3288d2 100644
---- a/drivers/net/ethernet/marvell/skge.c
-+++ b/drivers/net/ethernet/marvell/skge.c
-@@ -50,7 +50,6 @@
- #define PHY_RETRIES           1000
- #define ETH_JUMBO_MTU         9000
- #define TX_WATCHDOG           (5 * HZ)
--#define NAPI_WEIGHT           64
- #define BLINK_MS              250
- #define LINK_HZ                       HZ
- 
-@@ -3826,7 +3825,7 @@ static struct net_device *skge_devinit(struct skge_hw *hw, int port,
-               dev->features |= NETIF_F_HIGHDMA;
- 
-       skge = netdev_priv(dev);
--      netif_napi_add(dev, &skge->napi, skge_poll, NAPI_WEIGHT);
-+      netif_napi_add(dev, &skge->napi, skge_poll, NAPI_POLL_WEIGHT);
-       skge->netdev = dev;
-       skge->hw = hw;
-       skge->msg_enable = netif_msg_init(debug, default_msg);
-diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c
-index df7c23cd33600..01248509addeb 100644
---- a/drivers/net/ethernet/marvell/sky2.c
-+++ b/drivers/net/ethernet/marvell/sky2.c
-@@ -62,7 +62,6 @@
- #define TX_DEF_PENDING                63
- 
- #define TX_WATCHDOG           (5 * HZ)
--#define NAPI_WEIGHT           64
- #define PHY_RETRIES           1000
- 
- #define SKY2_EEPROM_MAGIC     0x9955aabb
-@@ -5064,7 +5063,7 @@ static int sky2_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
-               }
-       }
- 
--      netif_napi_add(dev, &hw->napi, sky2_poll, NAPI_WEIGHT);
-+      netif_napi_add(dev, &hw->napi, sky2_poll, NAPI_POLL_WEIGHT);
- 
-       err = register_netdev(dev);
-       if (err) {
-diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c
-index fac59032bf83a..9d7b2328a98a3 100644
---- a/drivers/net/ethernet/ti/davinci_emac.c
-+++ b/drivers/net/ethernet/ti/davinci_emac.c
-@@ -113,7 +113,6 @@ static const char emac_version_string[] = "TI DaVinci EMAC Linux v6.1";
- #define EMAC_DEF_RX_NUM_DESC          (128)
- #define EMAC_DEF_MAX_TX_CH            (1) /* Max TX channels configured */
- #define EMAC_DEF_MAX_RX_CH            (1) /* Max RX channels configured */
--#define EMAC_POLL_WEIGHT              (64) /* Default NAPI poll weight */
- 
- /* Buffer descriptor parameters */
- #define EMAC_DEF_TX_MAX_SERVICE               (32) /* TX max service BD's */
-@@ -1918,7 +1917,7 @@ static int davinci_emac_probe(struct platform_device *pdev)
- 
-       ndev->netdev_ops = &emac_netdev_ops;
-       ndev->ethtool_ops = &ethtool_ops;
--      netif_napi_add(ndev, &priv->napi, emac_poll, EMAC_POLL_WEIGHT);
-+      netif_napi_add(ndev, &priv->napi, emac_poll, NAPI_POLL_WEIGHT);
- 
-       pm_runtime_enable(&pdev->dev);
-       rc = pm_runtime_get_sync(&pdev->dev);
-diff --git a/drivers/net/ethernet/ti/netcp_core.c b/drivers/net/ethernet/ti/netcp_core.c
-index 5dbb4ed1b1328..1eef4ac59c348 100644
---- a/drivers/net/ethernet/ti/netcp_core.c
-+++ b/drivers/net/ethernet/ti/netcp_core.c
-@@ -24,7 +24,6 @@
- #include "netcp.h"
- 
- #define NETCP_SOP_OFFSET      (NET_IP_ALIGN + NET_SKB_PAD)
--#define NETCP_NAPI_WEIGHT     64
- #define NETCP_TX_TIMEOUT      (5 * HZ)
- #define NETCP_PACKET_SIZE     (ETH_FRAME_LEN + ETH_FCS_LEN)
- #define NETCP_MIN_PACKET_SIZE ETH_ZLEN
-@@ -2099,8 +2098,8 @@ static int netcp_create_interface(struct netcp_device *netcp_device,
-       }
- 
-       /* NAPI register */
--      netif_napi_add(ndev, &netcp->rx_napi, netcp_rx_poll, NETCP_NAPI_WEIGHT);
--      netif_tx_napi_add(ndev, &netcp->tx_napi, netcp_tx_poll, NETCP_NAPI_WEIGHT);
-+      netif_napi_add(ndev, &netcp->rx_napi, netcp_rx_poll, NAPI_POLL_WEIGHT);
-+      netif_tx_napi_add(ndev, &netcp->tx_napi, netcp_tx_poll, NAPI_POLL_WEIGHT);
- 
-       /* Register the network device */
-       ndev->dev_id            = 0;
-diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c
-index 6432f6e7fd548..1f735376539e7 100644
---- a/drivers/net/xen-netback/interface.c
-+++ b/drivers/net/xen-netback/interface.c
-@@ -42,7 +42,6 @@
- #include <xen/balloon.h>
- 
- #define XENVIF_QUEUE_LENGTH 32
--#define XENVIF_NAPI_WEIGHT  64
- 
- /* Number of bytes allowed on the internal guest Rx queue. */
- #define XENVIF_RX_QUEUE_BYTES (XEN_NETIF_RX_RING_SIZE/2 * PAGE_SIZE)
-@@ -682,7 +681,7 @@ int xenvif_connect_data(struct xenvif_queue *queue,
-       atomic_set(&queue->inflight_packets, 0);
- 
-       netif_napi_add(queue->vif->dev, &queue->napi, xenvif_poll,
--                      XENVIF_NAPI_WEIGHT);
-+                      NAPI_POLL_WEIGHT);
- 
-       if (tx_evtchn == rx_evtchn) {
-               /* feature-split-event-channels == 0 */
--- 
-2.40.1
-

diff --git a/queue-5.4/series b/queue-5.4/series
index aa2c52610bfbc344f9da7f1e0436cbacb5ef0b18..c852396143b230d0978735f06dfb165ed2c77505 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -10,7 +10,6 @@ drm-msm-dsi-skip-the-wait-for-video-mode-done-if-not.patch
 ravb-fix-up-dma_free_coherent-call-in-ravb_remove.patch
 ieee802154-ca8210-fix-a-potential-uaf-in-ca8210_prob.patch
 mlxsw-fix-mlxsw_sp2_nve_vxlan_learning_set-return-ty.patch
-eth-remove-copies-of-the-napi_poll_weight-define.patch
 xen-netback-use-default-tx-queue-size-for-vifs.patch
 drm-vmwgfx-fix-typo-of-sizeof-argument.patch
 ixgbe-fix-crash-with-empty-vf-macvlan-list.patch

diff --git a/queue-5.4/xen-netback-use-default-tx-queue-size-for-vifs.patch b/queue-5.4/xen-netback-use-default-tx-queue-size-for-vifs.patch
index 5c0bbaf77869d97199884b94a7bb0091ac8518b5..1dc259668b980c13d1d457061658dd95e08b5291 100644 (file)
--- a/queue-5.4/xen-netback-use-default-tx-queue-size-for-vifs.patch
+++ b/queue-5.4/xen-netback-use-default-tx-queue-size-for-vifs.patch
@@ -1,4 +1,4 @@
-From b98b5917f345f4c07d7c84f6d709fc8b08148e26 Mon Sep 17 00:00:00 2001
+From 3c3a9debea4b25ab1eecf9a467140f2c70225115 Mon Sep 17 00:00:00 2001
 From: Sasha Levin <sashal@kernel.org>
 Date: Thu, 5 Oct 2023 16:08:31 +0200
 Subject: xen-netback: use default TX queue size for vifs
@@ -27,23 +27,20 @@ Acked-by: Wei Liu <wei.liu@kernel.org>
 Signed-off-by: David S. Miller <davem@davemloft.net>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- drivers/net/xen-netback/interface.c | 4 ----
- 1 file changed, 4 deletions(-)
+ drivers/net/xen-netback/interface.c |    3 ---
+ 1 file changed, 3 deletions(-)
 
-diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c
-index 1f735376539e7..df803f0cc7d57 100644
 --- a/drivers/net/xen-netback/interface.c
 +++ b/drivers/net/xen-netback/interface.c
-@@ -41,8 +41,6 @@
+@@ -41,7 +41,6 @@
  #include <asm/xen/hypercall.h>
  #include <xen/balloon.h>
  
 -#define XENVIF_QUEUE_LENGTH 32
--
- /* Number of bytes allowed on the internal guest Rx queue. */
- #define XENVIF_RX_QUEUE_BYTES (XEN_NETIF_RX_RING_SIZE/2 * PAGE_SIZE)
+ #define XENVIF_NAPI_WEIGHT  64
  
-@@ -525,8 +523,6 @@ struct xenvif *xenvif_alloc(struct device *parent, domid_t domid,
+ /* Number of bytes allowed on the internal guest Rx queue. */
+@@ -526,8 +525,6 @@ struct xenvif *xenvif_alloc(struct devic
        dev->features = dev->hw_features | NETIF_F_RXCSUM;
        dev->ethtool_ops = &xenvif_ethtool_ops;
  
@@ -52,6 +49,3 @@ index 1f735376539e7..df803f0cc7d57 100644
        dev->min_mtu = ETH_MIN_MTU;
        dev->max_mtu = ETH_MAX_MTU - VLAN_ETH_HLEN;
  
--- 
-2.40.1
-