remove copies of the NAPI_POLL_WEIGHT define
Subsystems (21)
Jakub Kicinski
maintainerv2 cover remove copies of the NAPI_POLL_WEIGHT define
netif_napi_add() takes weight as the last argument. The value of that parameter is hard to come up with and depends on many factors, so driver authors are encouraged to use NAPI_POLL_WEIGHT.
We should probably move weight to an "advanced" version of the API (__netif_napi_add()?) and simplify the life of most driver authors.
In preparation for such API changes this series removes local defines equivalent to NAPI_POLL_WEIGHT from drivers, so that a simple coccinelle / spatch script does not get thrown off by them.
v2:
- drop staging bits (patch 2)
- fix subject (patch 8)
- add qeth change (patch 15)
Jakub Kicinski (15):
eth: remove copies of the NAPI_POLL_WEIGHT define
eth: smsc: remove a copy of the NAPI_POLL_WEIGHT define
eth: cpsw: remove a copy of the NAPI_POLL_WEIGHT define
eth: pch_gbe: remove a copy of the NAPI_POLL_WEIGHT define
eth: mtk_eth_soc: remove a copy of the NAPI_POLL_WEIGHT define
usb: lan78xx: remove a copy of the NAPI_POLL_WEIGHT define
slic: remove a copy of the NAPI_POLL_WEIGHT define
net: bgmac: remove a copy of the NAPI_POLL_WEIGHT define
eth: atlantic: remove a copy of the NAPI_POLL_WEIGHT define
eth: benet: remove a copy of the NAPI_POLL_WEIGHT define
eth: gfar: remove a copy of the NAPI_POLL_WEIGHT define
eth: vxge: remove a copy of the NAPI_POLL_WEIGHT define
eth: spider: remove a copy of the NAPI_POLL_WEIGHT define
eth: velocity: remove a copy of the NAPI_POLL_WEIGHT define
qeth: remove a copy of the NAPI_POLL_WEIGHT define
drivers/net/ethernet/alacritech/slic.h | 2 -- drivers/net/ethernet/alacritech/slicoss.c | 2 +- drivers/net/ethernet/aquantia/atlantic/aq_cfg.h | 2 -- drivers/net/ethernet/aquantia/atlantic/aq_ptp.c | 2 +- drivers/net/ethernet/aquantia/atlantic/aq_vec.c | 2 +- drivers/net/ethernet/broadcom/bgmac.c | 2 +- drivers/net/ethernet/broadcom/bgmac.h | 2 -- drivers/net/ethernet/cortina/gemini.c | 4 +--- drivers/net/ethernet/emulex/benet/be.h | 3 +-- drivers/net/ethernet/emulex/benet/be_main.c | 2 +- drivers/net/ethernet/freescale/gianfar.c | 2 +- drivers/net/ethernet/freescale/gianfar.h | 3 --- drivers/net/ethernet/marvell/skge.c | 3 +-- drivers/net/ethernet/marvell/sky2.c | 3 +-- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 4 ++-- drivers/net/ethernet/mediatek/mtk_eth_soc.h | 1 - drivers/net/ethernet/mediatek/mtk_star_emac.c | 3 +-- drivers/net/ethernet/neterion/vxge/vxge-main.c | 2 +- drivers/net/ethernet/neterion/vxge/vxge-main.h | 2 -- drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 12 +++++------- drivers/net/ethernet/smsc/smsc9420.c | 2 +- drivers/net/ethernet/smsc/smsc9420.h | 1 - drivers/net/ethernet/ti/cpsw.c | 4 ++-- drivers/net/ethernet/ti/cpsw_new.c | 4 ++-- drivers/net/ethernet/ti/cpsw_priv.c | 12 ++++++------ drivers/net/ethernet/ti/cpsw_priv.h | 1 - drivers/net/ethernet/ti/davinci_emac.c | 3 +-- drivers/net/ethernet/ti/netcp_core.c | 5 ++--- drivers/net/ethernet/toshiba/spider_net.c | 2 +- drivers/net/ethernet/toshiba/spider_net.h | 1 - drivers/net/ethernet/via/via-velocity.c | 3 +-- drivers/net/ethernet/via/via-velocity.h | 1 - drivers/net/usb/lan78xx.c | 4 +--- drivers/net/xen-netback/interface.c | 3 +-- drivers/s390/net/qeth_core.h | 2 -- drivers/s390/net/qeth_core_main.c | 2 +- drivers/s390/net/qeth_l2_main.c | 2 +- drivers/s390/net/qeth_l3_main.c | 2 +- 38 files changed, 40 insertions(+), 72 deletions(-)
Signature · 1 line
2.34.1
Jakub Kicinski
maintainerPATCH v2 1/15 eth: remove copies of the NAPI_POLL_WEIGHT define
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.
---
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
--- 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(-)
drivers/net/ethernet/cortina/gemini.c +1 -3
@@ -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
@@ -2472,8 +2471,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 ); ret =of_get_mac_address (np, mac);if (!ret) {
drivers/net/ethernet/marvell/skge.c +1 -2
@@ -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
@@ -3833,7 +3832,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);
drivers/net/ethernet/marvell/sky2.c +1 -2
@@ -63,7 +63,6 @@#define TX_DEF_PENDING 63#define TX_WATCHDOG (5 * HZ) -#define NAPI_WEIGHT 64#define PHY_RETRIES 1000#define SKY2_EEPROM_MAGIC 0x9955aabb
@@ -4938,7 +4937,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) {
drivers/net/ethernet/mediatek/mtk_star_emac.c +1 -2
@@ -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); }
drivers/net/ethernet/ti/davinci_emac.c +1 -2
@@ -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 */
@@ -1949,7 +1948,7 @@ static int davinci_emac_probe(struct platform_device *pdev) ndev->netdev_ops = &emac_netdev_ops; ndev->ethtool_ops = ðtool_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_resume_and_get (&pdev->dev);
drivers/net/ethernet/ti/netcp_core.c +2 -3
@@ -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
@@ -2096,8 +2095,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 ;
drivers/net/xen-netback/interface.c +1 -2
@@ -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)
@@ -739,7 +738,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;
Signature · 1 line
2.34.1
Jakub Kicinski
maintainerPATCH v2 2/15 eth: smsc: remove a copy of the NAPI_POLL_WEIGHT define
In reply to Jakub KicinskiDefining local versions of NAPI_POLL_WEIGHT with the same values in the drivers just makes refactoring harder.
---
v2: drop the staging part now only smsc gets changed by this patch
--- drivers/net/ethernet/smsc/smsc9420.c | 2 +- drivers/net/ethernet/smsc/smsc9420.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-)
drivers/net/ethernet/smsc/smsc9420.c +1 -1
@@ -1585,7 +1585,7 @@ smsc9420_probe(struct pci_dev *pdev, const struct pci_device_id *id) dev->netdev_ops = &smsc9420_netdev_ops; dev->ethtool_ops = &smsc9420_ethtool_ops; -netif_napi_add (dev, &pd->napi, smsc9420_rx_poll,NAPI_WEIGHT ); +netif_napi_add (dev, &pd->napi, smsc9420_rx_poll,NAPI_POLL_WEIGHT ); result =register_netdev (dev);if (result) {
drivers/net/ethernet/smsc/smsc9420.h +0 -1
@@ -15,7 +15,6 @@/* interrupt deassertion in multiples of 10us */ #define INT_DEAS_TIME (50) -#define NAPI_WEIGHT (64)#define SMSC_BAR (3)#ifdef __BIG_ENDIAN
Signature · 1 line
2.34.1
Jakub Kicinski
maintainerPATCH v2 3/15 eth: cpsw: remove a copy of the NAPI_POLL_WEIGHT define
In reply to Jakub KicinskiDefining local versions of NAPI_POLL_WEIGHT with the same values in the drivers just makes refactoring harder.
---
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
--- drivers/net/ethernet/ti/cpsw.c | 4 ++-- drivers/net/ethernet/ti/cpsw_new.c | 4 ++-- drivers/net/ethernet/ti/cpsw_priv.c | 12 ++++++------ drivers/net/ethernet/ti/cpsw_priv.h | 1 - 4 files changed, 10 insertions(+), 11 deletions(-)
drivers/net/ethernet/ti/cpsw.c +2 -2
@@ -1639,10 +1639,10 @@ static int cpsw_probe(struct platform_device *pdev) ndev->ethtool_ops = &cpsw_ethtool_ops;netif_napi_add (ndev, &cpsw->napi_rx, cpsw->quirk_irq ? cpsw_rx_poll : cpsw_rx_mq_poll, -CPSW_POLL_WEIGHT ); +NAPI_POLL_WEIGHT );netif_tx_napi_add (ndev, &cpsw->napi_tx, cpsw->quirk_irq ? cpsw_tx_poll : cpsw_tx_mq_poll, -CPSW_POLL_WEIGHT ); +NAPI_POLL_WEIGHT );/* register the network device */ SET_NETDEV_DEV (ndev, dev);
drivers/net/ethernet/ti/cpsw_new.c +2 -2
@@ -1416,11 +1416,11 @@ static int cpsw_create_ports(struct cpsw_common *cpsw)netif_napi_add (ndev, &cpsw->napi_rx, cpsw->quirk_irq ? cpsw_rx_poll : cpsw_rx_mq_poll, -CPSW_POLL_WEIGHT ); +NAPI_POLL_WEIGHT );netif_tx_napi_add (ndev, &cpsw->napi_tx, cpsw->quirk_irq ? cpsw_tx_poll : cpsw_tx_mq_poll, -CPSW_POLL_WEIGHT ); +NAPI_POLL_WEIGHT ); } napi_ndev = ndev;
drivers/net/ethernet/ti/cpsw_priv.c +6 -6
@@ -364,7 +364,7 @@ void cpsw_split_res(struct cpsw_common *cpsw)if (cpsw->tx_ch_num == rlim_ch_num) { max_rate = consumed_rate; }else if (!rlim_ch_num) { - ch_budget =CPSW_POLL_WEIGHT / cpsw->tx_ch_num; + ch_budget =NAPI_POLL_WEIGHT / cpsw->tx_ch_num; bigest_rate =0 ; max_rate = consumed_rate; }else {
@@ -379,19 +379,19 @@ void cpsw_split_res(struct cpsw_common *cpsw)if (max_rate < consumed_rate) max_rate *=10 ; - ch_budget = (consumed_rate *CPSW_POLL_WEIGHT ) / max_rate; - ch_budget = (CPSW_POLL_WEIGHT - ch_budget) / + ch_budget = (consumed_rate *NAPI_POLL_WEIGHT ) / max_rate; + ch_budget = (NAPI_POLL_WEIGHT - ch_budget) / (cpsw->tx_ch_num - rlim_ch_num); bigest_rate = (max_rate - consumed_rate) / (cpsw->tx_ch_num - rlim_ch_num); }/* split tx weight/budget */ - budget =CPSW_POLL_WEIGHT ; + budget =NAPI_POLL_WEIGHT ;for (i =0 ; i < cpsw->tx_ch_num; i++) { ch_rate =cpdma_chan_get_rate (txv[i].ch);if (ch_rate) { - txv[i].budget = (ch_rate *CPSW_POLL_WEIGHT ) / max_rate; + txv[i].budget = (ch_rate *NAPI_POLL_WEIGHT ) / max_rate;if (!txv[i].budget) txv[i].budget++;if (ch_rate > bigest_rate) {
@@ -417,7 +417,7 @@ void cpsw_split_res(struct cpsw_common *cpsw) txv[bigest_rate_ch].budget += budget;/* split rx budget */ - budget =CPSW_POLL_WEIGHT ; + budget =NAPI_POLL_WEIGHT ; ch_budget = budget / cpsw->rx_ch_num;for (i =0 ; i < cpsw->rx_ch_num; i++) { cpsw->rxv[i].budget = ch_budget;
drivers/net/ethernet/ti/cpsw_priv.h +0 -1
@@ -89,7 +89,6 @@ do { \#define CPDMA_TXCP 0x40#define CPDMA_RXCP 0x60 -#define CPSW_POLL_WEIGHT 64#define CPSW_RX_VLAN_ENCAP_HDR_SIZE 4#define CPSW_MIN_PACKET_SIZE_VLAN (VLAN_ETH_ZLEN)#define CPSW_MIN_PACKET_SIZE (ETH_ZLEN)
Signature · 1 line
2.34.1
Jakub Kicinski
maintainerPATCH v2 6/15 usb: lan78xx: remove a copy of the NAPI_POLL_WEIGHT define
In reply to Jakub KicinskiDefining local versions of NAPI_POLL_WEIGHT with the same values in the drivers just makes refactoring harder.
---
CC: [email protected]
CC: [email protected]
CC: [email protected]
--- drivers/net/usb/lan78xx.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/net/usb/lan78xx.c +1 -3
@@ -92,8 +92,6 @@ WAKE_MCAST | WAKE_BCAST | \ WAKE_ARP | WAKE_MAGIC) -#define LAN78XX_NAPI_WEIGHT 64 -#define TX_URB_NUM 10#define TX_SS_URB_NUM TX_URB_NUM#define TX_HS_URB_NUM TX_URB_NUM
@@ -4376,7 +4374,7 @@ static int lan78xx_probe(struct usb_interface *intf,netif_set_gso_max_size (netdev,LAN78XX_TSO_SIZE (dev)); -netif_napi_add (netdev, &dev->napi, lan78xx_poll,LAN78XX_NAPI_WEIGHT ); +netif_napi_add (netdev, &dev->napi, lan78xx_poll,NAPI_POLL_WEIGHT );INIT_DELAYED_WORK (&dev->wq, lan78xx_delayedwork);init_usb_anchor (&dev->deferred);
Signature · 1 line
2.34.1
Jakub Kicinski
maintainerPATCH v2 4/15 eth: pch_gbe: remove a copy of the NAPI_POLL_WEIGHT define
In reply to Jakub KicinskiDefining local versions of NAPI_POLL_WEIGHT with the same values in the drivers just makes refactoring harder.
--- drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c +5 -7
@@ -32,8 +32,6 @@#define PCI_DEVICE_ID_ROHM_ML7223_GBE 0x8013#define PCI_DEVICE_ID_ROHM_ML7831_GBE 0x8802 -#define PCH_GBE_TX_WEIGHT 64 -#define PCH_GBE_RX_WEIGHT 64#define PCH_GBE_RX_BUFFER_WRITE 16/* Initialize the wake-on-LAN settings */
@@ -1469,7 +1467,7 @@ pch_gbe_clean_tx(struct pch_gbe_adapter *adapter, tx_desc->gbec_status, tx_desc->dma_status); unused =PCH_GBE_DESC_UNUSED (tx_ring); - thresh = tx_ring->count -PCH_GBE_TX_WEIGHT ; + thresh = tx_ring->count -NAPI_POLL_WEIGHT ;if ((tx_desc->gbec_status ==DSC_INIT16 ) && (unused < thresh)) {/* current marked clean, tx queue filling up, do extra clean */ int j, k;
@@ -1482,13 +1480,13 @@ pch_gbe_clean_tx(struct pch_gbe_adapter *adapter,/* current marked clean, scan for more that need cleaning. */ k = i; -for (j =0 ; j <PCH_GBE_TX_WEIGHT ; j++) +for (j =0 ; j <NAPI_POLL_WEIGHT ; j++) { tx_desc =PCH_GBE_TX_DESC (*tx_ring, k);if (tx_desc->gbec_status !=DSC_INIT16 )break ;/*found*/ if (++k >= tx_ring->count) k =0 ;/*increment, wrap*/ } -if (j <PCH_GBE_TX_WEIGHT ) { +if (j <NAPI_POLL_WEIGHT ) { netdev_dbg(adapter->netdev, "clean_tx: unused=%d loops=%d found tx_desc[%x,%x:%x].gbec_status=%04x\n", unused, j, i, k, tx_ring->next_to_use,
@@ -1547,7 +1545,7 @@ pch_gbe_clean_tx(struct pch_gbe_adapter *adapter, tx_desc =PCH_GBE_TX_DESC (*tx_ring, i);/* weight of a sort for tx, to avoid endless transmit cleanup */ -if (cleaned_count++ ==PCH_GBE_TX_WEIGHT ) { +if (cleaned_count++ ==NAPI_POLL_WEIGHT ) { cleaned = false;break ; }
@@ -2519,7 +2517,7 @@ static int pch_gbe_probe(struct pci_dev *pdev, netdev->netdev_ops = &pch_gbe_netdev_ops; netdev->watchdog_timeo =PCH_GBE_WATCHDOG_PERIOD ;netif_napi_add (netdev, &adapter->napi, - pch_gbe_napi_poll,PCH_GBE_RX_WEIGHT ); + pch_gbe_napi_poll,NAPI_POLL_WEIGHT ); netdev->hw_features =NETIF_F_RXCSUM |NETIF_F_IP_CSUM |NETIF_F_IPV6_CSUM ; netdev->features = netdev->hw_features;
Signature · 1 line
2.34.1
Jakub Kicinski
maintainerPATCH v2 5/15 eth: mtk_eth_soc: remove a copy of the NAPI_POLL_WEIGHT define
In reply to Jakub KicinskiDefining local versions of NAPI_POLL_WEIGHT with the same values in the drivers just makes refactoring harder.
---
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
--- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 4 ++-- drivers/net/ethernet/mediatek/mtk_eth_soc.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-)
drivers/net/ethernet/mediatek/mtk_eth_soc.c +2 -2
@@ -3298,9 +3298,9 @@ static int mtk_probe(struct platform_device *pdev)*/ init_dummy_netdev (ð->dummy_dev);netif_napi_add (ð->dummy_dev, ð->tx_napi, mtk_napi_tx, -MTK_NAPI_WEIGHT ); +NAPI_POLL_WEIGHT );netif_napi_add (ð->dummy_dev, ð->rx_napi, mtk_napi_rx, -MTK_NAPI_WEIGHT ); +NAPI_POLL_WEIGHT );platform_set_drvdata (pdev, eth);
drivers/net/ethernet/mediatek/mtk_eth_soc.h +0 -1
@@ -24,7 +24,6 @@#define MTK_MAX_RX_LENGTH_2K 2048#define MTK_TX_DMA_BUF_LEN 0x3fff#define MTK_DMA_SIZE 512 -#define MTK_NAPI_WEIGHT 64#define MTK_MAC_COUNT 2#define MTK_RX_ETH_HLEN (ETH_HLEN + ETH_FCS_LEN)#define MTK_RX_HLEN (NET_SKB_PAD + MTK_RX_ETH_HLEN + NET_IP_ALIGN)
Signature · 1 line
2.34.1
Jakub Kicinski
maintainerPATCH v2 9/15 eth: atlantic: remove a copy of the NAPI_POLL_WEIGHT define
In reply to Jakub KicinskiDefining local versions of NAPI_POLL_WEIGHT with the same values in the drivers just makes refactoring harder.
---
CC: [email protected]
CC: [email protected]
--- drivers/net/ethernet/aquantia/atlantic/aq_cfg.h | 2 -- drivers/net/ethernet/aquantia/atlantic/aq_ptp.c | 2 +- drivers/net/ethernet/aquantia/atlantic/aq_vec.c | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-)
drivers/net/ethernet/aquantia/atlantic/aq_cfg.h +0 -2
@@ -65,8 +65,6 @@*/ #define AQ_CFG_RESTART_DESC_THRES (AQ_CFG_SKB_FRAGS_MAX * 2) -#define AQ_CFG_NAPI_WEIGHT 64U -/*#define AQ_CFG_MAC_ADDR_PERMANENT {0x30, 0x0E, 0xE3, 0x12, 0x34, 0x56}*/ #define AQ_CFG_FC_MODE AQ_NIC_FC_FULL
drivers/net/ethernet/aquantia/atlantic/aq_ptp.c +1 -1
@@ -1218,7 +1218,7 @@ int aq_ptp_init(struct aq_nic_s *aq_nic, unsigned int idx_vec)atomic_set (&aq_ptp->offset_ingress,0 );netif_napi_add (aq_nic_get_ndev (aq_nic), &aq_ptp->napi, - aq_ptp_poll,AQ_CFG_NAPI_WEIGHT ); + aq_ptp_poll,NAPI_POLL_WEIGHT ); aq_ptp->idx_vector = idx_vec;
drivers/net/ethernet/aquantia/atlantic/aq_vec.c +1 -1
@@ -120,7 +120,7 @@ struct aq_vec_s *aq_vec_alloc(struct aq_nic_s *aq_nic, unsigned int idx, self->rx_rings =0 ;netif_napi_add (aq_nic_get_ndev (aq_nic), &self->napi, - aq_vec_poll,AQ_CFG_NAPI_WEIGHT ); + aq_vec_poll,NAPI_POLL_WEIGHT ); err_exit:return self;
Signature · 1 line
2.34.1
Jakub Kicinski
maintainerPATCH v2 7/15 slic: remove a copy of the NAPI_POLL_WEIGHT define
In reply to Jakub KicinskiDefining local versions of NAPI_POLL_WEIGHT with the same values in the drivers just makes refactoring harder.
---
CC: [email protected]
--- drivers/net/ethernet/alacritech/slic.h | 2 -- drivers/net/ethernet/alacritech/slicoss.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-)
drivers/net/ethernet/alacritech/slic.h +0 -2
@@ -265,8 +265,6 @@#define SLIC_NUM_STAT_DESC_ARRAYS 4#define SLIC_INVALID_STAT_DESC_IDX 0xffffffff -#define SLIC_NAPI_WEIGHT 64 -#define SLIC_UPR_LSTAT 0#define SLIC_UPR_CONFIG 1
drivers/net/ethernet/alacritech/slicoss.c +1 -1
@@ -1803,7 +1803,7 @@ static int slic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) goto unmap; } -netif_napi_add (dev, &sdev->napi, slic_poll,SLIC_NAPI_WEIGHT ); +netif_napi_add (dev, &sdev->napi, slic_poll,NAPI_POLL_WEIGHT );netif_carrier_off (dev); err =register_netdev (dev);
Signature · 1 line
2.34.1
Jakub Kicinski
maintainerPATCH v2 8/15 net: bgmac: remove a copy of the NAPI_POLL_WEIGHT define
In reply to Jakub KicinskiDefining local versions of NAPI_POLL_WEIGHT with the same values in the drivers just makes refactoring harder.
---
v2: update subject
--- drivers/net/ethernet/broadcom/bgmac.c | 2 +- drivers/net/ethernet/broadcom/bgmac.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-)
drivers/net/ethernet/broadcom/bgmac.c +1 -1
@@ -1527,7 +1527,7 @@ int bgmac_enet_probe(struct bgmac *bgmac)if (bcm47xx_nvram_getenv ("et0_no_txint" ,NULL ,0 ) ==0 ) bgmac->int_mask &= ~BGMAC_IS_TX_MASK ; -netif_napi_add (net_dev, &bgmac->napi, bgmac_poll,BGMAC_WEIGHT ); +netif_napi_add (net_dev, &bgmac->napi, bgmac_poll,NAPI_POLL_WEIGHT ); err =bgmac_phy_connect (bgmac);if (err) {
drivers/net/ethernet/broadcom/bgmac.h +0 -2
@@ -364,8 +364,6 @@#define BGMAC_CHIPCTL_7_IF_TYPE_MII 0x00000040#define BGMAC_CHIPCTL_7_IF_TYPE_RGMII 0x00000080 -#define BGMAC_WEIGHT 64 -#define ETHER_MAX_LEN (ETH_FRAME_LEN + ETH_FCS_LEN)/* Feature Flags */
Signature · 1 line
2.34.1
Jakub Kicinski
maintainerPATCH v2 15/15 qeth: remove a copy of the NAPI_POLL_WEIGHT define
In reply to Jakub KicinskiDefining local versions of NAPI_POLL_WEIGHT with the same values in the drivers just makes refactoring harder.
---
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
--- drivers/s390/net/qeth_core.h | 2 -- drivers/s390/net/qeth_core_main.c | 2 +- drivers/s390/net/qeth_l2_main.c | 2 +- drivers/s390/net/qeth_l3_main.c | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-)
drivers/s390/net/qeth_core.h +0 -2
@@ -801,8 +801,6 @@ struct qeth_priv {u32 brport_features; }; -#define QETH_NAPI_WEIGHT NAPI_POLL_WEIGHT -struct qeth_card {enum qeth_card_states state;spinlock_t lock;
drivers/s390/net/qeth_core_main.c +1 -1
@@ -7100,7 +7100,7 @@ int qeth_open(struct net_device *dev)local_bh_disable ();qeth_for_each_output_queue (card, queue, i) {netif_tx_napi_add (dev, &queue->napi, qeth_tx_poll, -QETH_NAPI_WEIGHT ); +NAPI_POLL_WEIGHT );napi_enable (&queue->napi);napi_schedule (&queue->napi); }
drivers/s390/net/qeth_l2_main.c +1 -1
@@ -1133,7 +1133,7 @@ static int qeth_l2_setup_netdev(struct qeth_card *card) PAGE_SIZE * (QDIO_MAX_ELEMENTS_PER_BUFFER - 1)); } -netif_napi_add (card->dev, &card->napi, qeth_poll,QETH_NAPI_WEIGHT ); +netif_napi_add (card->dev, &card->napi, qeth_poll,NAPI_POLL_WEIGHT );return register_netdev (card->dev); }
drivers/s390/net/qeth_l3_main.c +1 -1
@@ -1910,7 +1910,7 @@ static int qeth_l3_setup_netdev(struct qeth_card *card)netif_set_gso_max_size (card->dev,PAGE_SIZE * (QETH_MAX_BUFFER_ELEMENTS (card) -1 )); -netif_napi_add (card->dev, &card->napi, qeth_poll,QETH_NAPI_WEIGHT ); +netif_napi_add (card->dev, &card->napi, qeth_poll,NAPI_POLL_WEIGHT );return register_netdev (card->dev); }
Signature · 1 line
2.34.1
Jakub Kicinski
maintainerPATCH v2 10/15 eth: benet: remove a copy of the NAPI_POLL_WEIGHT define
In reply to Jakub KicinskiDefining local versions of NAPI_POLL_WEIGHT with the same values in the drivers just makes refactoring harder.
---
CC: [email protected]
CC: [email protected]
CC: [email protected]
--- drivers/net/ethernet/emulex/benet/be.h | 3 +-- drivers/net/ethernet/emulex/benet/be_main.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-)
drivers/net/ethernet/emulex/benet/be.h +1 -2
@@ -101,8 +101,7 @@#define MAX_ROCE_EQS 5#define MAX_MSIX_VECTORS 32#define MIN_MSIX_VECTORS 1 -#define BE_NAPI_WEIGHT 64 -#define MAX_RX_POST BE_NAPI_WEIGHT/* Frags posted at a time */ +#define MAX_RX_POST NAPI_POLL_WEIGHT/* Frags posted at a time */ #define RX_FRAGS_REFILL_WM (RX_Q_LEN - MAX_RX_POST)#define MAX_NUM_POST_ERX_DB 255u
drivers/net/ethernet/emulex/benet/be_main.c +1 -1
@@ -2983,7 +2983,7 @@ static int be_evt_queues_create(struct be_adapter *adapter)cpumask_set_cpu (cpumask_local_spread (i, numa_node), eqo->affinity_mask);netif_napi_add (adapter->netdev, &eqo->napi, be_poll, -BE_NAPI_WEIGHT ); +NAPI_POLL_WEIGHT ); }return 0 ; }
Signature · 1 line
2.34.1
Jakub Kicinski
maintainerPATCH v2 11/15 eth: gfar: remove a copy of the NAPI_POLL_WEIGHT define
In reply to Jakub KicinskiDefining local versions of NAPI_POLL_WEIGHT with the same values in the drivers just makes refactoring harder.
---
CC: [email protected]
--- drivers/net/ethernet/freescale/gianfar.c | 2 +- drivers/net/ethernet/freescale/gianfar.h | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-)
drivers/net/ethernet/freescale/gianfar.c +1 -1
@@ -3232,7 +3232,7 @@ static int gfar_probe(struct platform_device *ofdev)/* Register for napi ...We are registering NAPI for each grp */ for (i =0 ; i < priv->num_grps; i++) {netif_napi_add (dev, &priv->gfargrp[i].napi_rx, - gfar_poll_rx_sq,GFAR_DEV_WEIGHT ); + gfar_poll_rx_sq,NAPI_POLL_WEIGHT );netif_tx_napi_add (dev, &priv->gfargrp[i].napi_tx, gfar_poll_tx_sq,2 ); }
drivers/net/ethernet/freescale/gianfar.h +0 -3
@@ -52,9 +52,6 @@ struct ethtool_rx_list {unsigned int count; }; -/* The maximum number of packets to be handled in one call of gfar_poll */ -#define GFAR_DEV_WEIGHT 64 -/* Length for FCB */ #define GMAC_FCB_LEN 8
Signature · 1 line
2.34.1
Jakub Kicinski
maintainerPATCH v2 14/15 eth: velocity: remove a copy of the NAPI_POLL_WEIGHT define
In reply to Jakub KicinskiDefining local versions of NAPI_POLL_WEIGHT with the same values in the drivers just makes refactoring harder.
---
CC: [email protected]
--- drivers/net/ethernet/via/via-velocity.c | 3 +-- drivers/net/ethernet/via/via-velocity.h | 1 - 2 files changed, 1 insertion(+), 3 deletions(-)
drivers/net/ethernet/via/via-velocity.c +1 -2
@@ -2846,8 +2846,7 @@ static int velocity_probe(struct device *dev, int irq, netdev->netdev_ops = &velocity_netdev_ops; netdev->ethtool_ops = &velocity_ethtool_ops; -netif_napi_add (netdev, &vptr->napi, velocity_poll, -VELOCITY_NAPI_WEIGHT ); +netif_napi_add (netdev, &vptr->napi, velocity_poll,NAPI_POLL_WEIGHT ); netdev->hw_features =NETIF_F_IP_CSUM |NETIF_F_SG |NETIF_F_HW_VLAN_CTAG_TX ;
drivers/net/ethernet/via/via-velocity.h +0 -1
@@ -23,7 +23,6 @@#define VELOCITY_VERSION "1.15"#define VELOCITY_IO_SIZE 256 -#define VELOCITY_NAPI_WEIGHT 64#define PKT_BUF_SZ 1540
Signature · 1 line
2.34.1
Jakub Kicinski
maintainerPATCH v2 13/15 eth: spider: remove a copy of the NAPI_POLL_WEIGHT define
In reply to Jakub KicinskiDefining local versions of NAPI_POLL_WEIGHT with the same values in the drivers just makes refactoring harder.
---
CC: [email protected]
CC: [email protected]
--- drivers/net/ethernet/toshiba/spider_net.c | 2 +- drivers/net/ethernet/toshiba/spider_net.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-)
drivers/net/ethernet/toshiba/spider_net.c +1 -1
@@ -2270,7 +2270,7 @@ spider_net_setup_netdev(struct spider_net_card *card)timer_setup (&card->aneg_timer, spider_net_link_phy,0 );netif_napi_add (netdev, &card->napi, - spider_net_poll,SPIDER_NET_NAPI_WEIGHT ); + spider_net_poll,NAPI_POLL_WEIGHT );spider_net_setup_netdev_ops (netdev);
drivers/net/ethernet/toshiba/spider_net.h +0 -1
@@ -44,7 +44,6 @@ extern char spider_net_driver_name[];#define SPIDER_NET_RX_CSUM_DEFAULT 1#define SPIDER_NET_WATCHDOG_TIMEOUT 50*HZ -#define SPIDER_NET_NAPI_WEIGHT 64#define SPIDER_NET_FIRMWARE_SEQS 6#define SPIDER_NET_FIRMWARE_SEQWORDS 1024
Signature · 1 line
2.34.1
Jakub Kicinski
maintainerPATCH v2 12/15 eth: vxge: remove a copy of the NAPI_POLL_WEIGHT define
In reply to Jakub KicinskiDefining local versions of NAPI_POLL_WEIGHT with the same values in the drivers just makes refactoring harder.
---
CC: [email protected]
CC: [email protected]
CC: [email protected]
--- drivers/net/ethernet/neterion/vxge/vxge-main.c | 2 +- drivers/net/ethernet/neterion/vxge/vxge-main.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-)
drivers/net/ethernet/neterion/vxge/vxge-main.c +1 -1
@@ -4351,7 +4351,7 @@ vxge_probe(struct pci_dev *pdev, const struct pci_device_id *pre) } ll_config->tx_steering_type =TX_MULTIQ_STEERING ; ll_config->intr_type =MSI_X ; - ll_config->napi_weight =NEW_NAPI_WEIGHT ; + ll_config->napi_weight =NAPI_POLL_WEIGHT ; ll_config->rth_steering =RTH_STEERING ;/* get the default configuration parameters */
drivers/net/ethernet/neterion/vxge/vxge-main.h +0 -2
@@ -167,8 +167,6 @@ struct macInfo {struct vxge_config {int tx_pause_enable;int rx_pause_enable; - -#define NEW_NAPI_WEIGHT 64int napi_weight;int intr_type;#define INTA 0
Signature · 1 line
2.34.1
Aw: [PATCH net-next v2 07/15] slic: remove a copy of the NAPI_POLL_WEIGHT define
In reply to Jakub KicinskiHi,
Quoted 9 lines
Gesendet: Donnerstag, 28. April 2022 um 23:23 Uhr
Von: "Jakub Kicinski" <[email protected]>
An: [email protected], [email protected]
Cc: [email protected], [email protected], "Jakub Kicinski" <[email protected]>, [email protected]
Betreff: [PATCH net-next v2 07/15] slic: remove a copy of theNAPI_POLL_WEIGHTdefineDefining local versions of
NAPI_POLL_WEIGHTwith the same values in the drivers just makes refactoring harder.
Agreed, FWIW:
Quoted 35 lines
Signed-off-by Jakub Kicinski <[email protected]>---
CC: [email protected]--- drivers/net/ethernet/alacritech/slic.h | 2 -- drivers/net/ethernet/alacritech/slicoss.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-)drivers/net/ethernet/alacritech/slic.h +0
-2@@ -265,8 +265,6 @@#define SLIC_NUM_STAT_DESC_ARRAYS 4#define SLIC_INVALID_STAT_DESC_IDX 0xffffffff -#define SLIC_NAPI_WEIGHT 64 -#define SLIC_UPR_LSTAT 0#define SLIC_UPR_CONFIG 1drivers/net/ethernet/alacritech/slicoss.c +1
-2@@ -1803,7 +1803,7 @@ static int slic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) goto unmap; } -netif_napi_add (dev, &sdev->napi, slic_poll,SLIC_NAPI_WEIGHT ); +netif_napi_add (dev, &sdev->napi, slic_poll,NAPI_POLL_WEIGHT );netif_carrier_off (dev); err =register_netdev (dev); --
Quoted 1 line
2.34.1
Best regards,
Lino
Re: [PATCH net-next v2 15/15] qeth: remove a copy of the NAPI_POLL_WEIGHT define
In reply to Jakub KicinskiQuoted 6 lines · Jakub Kicinski
Defining local versions of
NAPI_POLL_WEIGHTwith the same values in the drivers just makes refactoring harder.Signed-off-by Jakub Kicinski <[email protected]>---
Re: [PATCH net-next v2 01/15] eth: remove copies of the NAPI_POLL_WEIGHT define
In reply to Jakub KicinskiQuoted 26 lines · Jakub Kicinski
Defining local versions of
NAPI_POLL_WEIGHTwith 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 <[email protected]>---
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
Quoted 10 lines
--- 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(-)
xen-netback patch...
This series was applied to netdev/net-next.git (master) by David S. Miller <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (master) by David S. Miller <[email protected]>:
Quoted 8 lines · On Thu, 28 Apr 2022 14:23:08 -0700 you wrote:
netif_napi_add()takes weight as the last argument. The value of that parameter is hard to come up with and depends on many factors, so driver authors are encouraged to useNAPI_POLL_WEIGHT.We should probably move weight to an "advanced" version of the API (
__netif_napi_add()?) and simplify the life of most driver authors.[...]
Here is the summary with links:
- [net-next,v2,01/15] eth: remove copies of the NAPI_POLL_WEIGHT define
https://git.kernel.org/netdev/net-next/c/5f012b40ef63 - [net-next,v2,02/15] eth: smsc: remove a copy of the NAPI_POLL_WEIGHT define https://git.kernel.org/netdev/net-next/c/e2a303295d28 - [net-next,v2,03/15] eth: cpsw: remove a copy of the NAPI_POLL_WEIGHT define https://git.kernel.org/netdev/net-next/c/055e13f31f28 - [net-next,v2,04/15] eth: pch_gbe: remove a copy of the NAPI_POLL_WEIGHT define https://git.kernel.org/netdev/net-next/c/feda771f1b9e - [net-next,v2,05/15] eth: mtk_eth_soc: remove a copy of the NAPI_POLL_WEIGHT define https://git.kernel.org/netdev/net-next/c/889e3691b9d6 - [net-next,v2,06/15] usb: lan78xx: remove a copy of the NAPI_POLL_WEIGHT define https://git.kernel.org/netdev/net-next/c/f130683b1e24 - [net-next,v2,07/15] slic: remove a copy of the NAPI_POLL_WEIGHT define https://git.kernel.org/netdev/net-next/c/b3c2b61ef621 - [net-next,v2,08/15] net: bgmac: remove a copy of the NAPI_POLL_WEIGHT define https://git.kernel.org/netdev/net-next/c/592df3663789 - [net-next,v2,09/15] eth: atlantic: remove a copy of the NAPI_POLL_WEIGHT define https://git.kernel.org/netdev/net-next/c/0258f5399f0c - [net-next,v2,10/15] eth: benet: remove a copy of the NAPI_POLL_WEIGHT define https://git.kernel.org/netdev/net-next/c/e702def527ec - [net-next,v2,11/15] eth: gfar: remove a copy of the NAPI_POLL_WEIGHT define https://git.kernel.org/netdev/net-next/c/bbbe6ecbc36d - [net-next,v2,12/15] eth: vxge: remove a copy of the NAPI_POLL_WEIGHT define https://git.kernel.org/netdev/net-next/c/288696565f2d - [net-next,v2,13/15] eth: spider: remove a copy of the NAPI_POLL_WEIGHT define https://git.kernel.org/netdev/net-next/c/26450aa7ca42 - [net-next,v2,14/15] eth: velocity: remove a copy of the NAPI_POLL_WEIGHT define https://git.kernel.org/netdev/net-next/c/e9c6ec651030 - [net-next,v2,15/15] qeth: remove a copy of the NAPI_POLL_WEIGHT define https://git.kernel.org/netdev/net-next/c/4bb0c7f09a19
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html