* [PATCH net-next 0/6] net: switch drivers to netif_napi_add_weight()
@ 2022-05-06 17:07 Jakub Kicinski
2022-05-06 17:07 ` [PATCH net-next 1/6] um: vector: switch " Jakub Kicinski
` (6 more replies)
0 siblings, 7 replies; 16+ messages in thread
From: Jakub Kicinski @ 2022-05-06 17:07 UTC (permalink / raw)
To: davem; +Cc: netdev, pabeni, edumazet, Jakub Kicinski
The minority of drivers pass a custom weight to netif_napi_add().
Switch those away to the new netif_napi_add_weight(). All drivers
(which can go thru net-next) calling netif_napi_add() will now
be calling it with NAPI_POLL_WEIGHT or 64.
Jakub Kicinski (6):
um: vector: switch to netif_napi_add_weight()
caif_virtio: switch to netif_napi_add_weight()
eth: switch to netif_napi_add_weight()
r8152: switch to netif_napi_add_weight()
net: virtio: switch to netif_napi_add_weight()
net: wan: switch to netif_napi_add_weight()
arch/um/drivers/vector_kern.c | 3 ++-
drivers/net/caif/caif_virtio.c | 3 ++-
drivers/net/ethernet/3com/typhoon.c | 2 +-
drivers/net/ethernet/adaptec/starfire.c | 2 +-
drivers/net/ethernet/amd/amd8111e.c | 2 +-
drivers/net/ethernet/amd/pcnet32.c | 3 ++-
drivers/net/ethernet/arc/emac_main.c | 3 ++-
drivers/net/ethernet/atheros/ag71xx.c | 3 ++-
drivers/net/ethernet/broadcom/bcm63xx_enet.c | 4 ++--
drivers/net/ethernet/broadcom/sb1250-mac.c | 2 +-
drivers/net/ethernet/dec/tulip/tulip_core.c | 2 +-
drivers/net/ethernet/ezchip/nps_enet.c | 4 ++--
drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c | 3 ++-
drivers/net/ethernet/hisilicon/hisi_femac.c | 3 ++-
drivers/net/ethernet/huawei/hinic/hinic_rx.c | 3 ++-
drivers/net/ethernet/huawei/hinic/hinic_tx.c | 3 ++-
drivers/net/ethernet/ibm/emac/mal.c | 4 ++--
drivers/net/ethernet/ibm/ibmveth.c | 2 +-
drivers/net/ethernet/intel/e100.c | 2 +-
drivers/net/ethernet/lantiq_etop.c | 8 ++++----
drivers/net/ethernet/marvell/pxa168_eth.c | 3 ++-
drivers/net/ethernet/microchip/sparx5/sparx5_fdma.c | 3 ++-
drivers/net/ethernet/microsoft/mana/mana_en.c | 2 +-
drivers/net/ethernet/moxa/moxart_ether.c | 2 +-
drivers/net/ethernet/mscc/ocelot_fdma.c | 4 ++--
drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 4 ++--
drivers/net/ethernet/neterion/vxge/vxge-main.c | 9 +++++----
drivers/net/ethernet/nxp/lpc_eth.c | 2 +-
drivers/net/ethernet/realtek/8139cp.c | 2 +-
drivers/net/ethernet/sfc/efx_channels.c | 4 ++--
drivers/net/ethernet/sfc/falcon/efx.c | 4 ++--
drivers/net/ethernet/smsc/smsc911x.c | 3 ++-
drivers/net/ethernet/toshiba/tc35815.c | 2 +-
drivers/net/ethernet/wiznet/w5100.c | 2 +-
drivers/net/ethernet/wiznet/w5300.c | 2 +-
drivers/net/ethernet/xscale/ixp4xx_eth.c | 2 +-
drivers/net/usb/r8152.c | 6 ++----
drivers/net/virtio_net.c | 4 ++--
drivers/net/wan/fsl_ucc_hdlc.c | 2 +-
drivers/net/wan/hd64572.c | 3 ++-
drivers/net/wan/ixp4xx_hss.c | 2 +-
drivers/net/wan/lapbether.c | 2 +-
42 files changed, 71 insertions(+), 59 deletions(-)
--
2.34.1
^ permalink raw reply [flat|nested] 16+ messages in thread* [PATCH net-next 1/6] um: vector: switch to netif_napi_add_weight() 2022-05-06 17:07 [PATCH net-next 0/6] net: switch drivers to netif_napi_add_weight() Jakub Kicinski @ 2022-05-06 17:07 ` Jakub Kicinski 2022-05-06 17:07 ` [PATCH net-next 2/6] caif_virtio: " Jakub Kicinski ` (5 subsequent siblings) 6 siblings, 0 replies; 16+ messages in thread From: Jakub Kicinski @ 2022-05-06 17:07 UTC (permalink / raw) To: davem Cc: netdev, pabeni, edumazet, Jakub Kicinski, richard, anton.ivanov, johannes, linux-um UM's netdev driver uses a custom napi weight, switch to the new API for setting custom weight. Signed-off-by: Jakub Kicinski <kuba@kernel.org> --- CC: richard@nod.at CC: anton.ivanov@cambridgegreys.com CC: johannes@sipsolutions.net CC: linux-um@lists.infradead.org --- arch/um/drivers/vector_kern.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/um/drivers/vector_kern.c b/arch/um/drivers/vector_kern.c index 1d6f6a66766c..548265312743 100644 --- a/arch/um/drivers/vector_kern.c +++ b/arch/um/drivers/vector_kern.c @@ -1255,7 +1255,8 @@ static int vector_net_open(struct net_device *dev) goto out_close; } - netif_napi_add(vp->dev, &vp->napi, vector_poll, get_depth(vp->parsed)); + netif_napi_add_weight(vp->dev, &vp->napi, vector_poll, + get_depth(vp->parsed)); napi_enable(&vp->napi); /* READ IRQ */ -- 2.34.1 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH net-next 2/6] caif_virtio: switch to netif_napi_add_weight() 2022-05-06 17:07 [PATCH net-next 0/6] net: switch drivers to netif_napi_add_weight() Jakub Kicinski 2022-05-06 17:07 ` [PATCH net-next 1/6] um: vector: switch " Jakub Kicinski @ 2022-05-06 17:07 ` Jakub Kicinski 2022-05-07 6:55 ` Michael S. Tsirkin 2022-05-06 17:07 ` [PATCH net-next 3/6] eth: " Jakub Kicinski ` (4 subsequent siblings) 6 siblings, 1 reply; 16+ messages in thread From: Jakub Kicinski @ 2022-05-06 17:07 UTC (permalink / raw) To: davem; +Cc: netdev, pabeni, edumazet, Jakub Kicinski, mst, wanghai38 caif_virtio uses a custom napi weight, switch to the new API for setting custom weights. Signed-off-by: Jakub Kicinski <kuba@kernel.org> --- CC: mst@redhat.com CC: wanghai38@huawei.com --- drivers/net/caif/caif_virtio.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/caif/caif_virtio.c b/drivers/net/caif/caif_virtio.c index 444ef6a342f6..5458f57177a0 100644 --- a/drivers/net/caif/caif_virtio.c +++ b/drivers/net/caif/caif_virtio.c @@ -714,7 +714,8 @@ static int cfv_probe(struct virtio_device *vdev) /* Initialize NAPI poll context data */ vringh_kiov_init(&cfv->ctx.riov, NULL, 0); cfv->ctx.head = USHRT_MAX; - netif_napi_add(netdev, &cfv->napi, cfv_rx_poll, CFV_DEFAULT_QUOTA); + netif_napi_add_weight(netdev, &cfv->napi, cfv_rx_poll, + CFV_DEFAULT_QUOTA); tasklet_setup(&cfv->tx_release_tasklet, cfv_tx_release_tasklet); -- 2.34.1 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH net-next 2/6] caif_virtio: switch to netif_napi_add_weight() 2022-05-06 17:07 ` [PATCH net-next 2/6] caif_virtio: " Jakub Kicinski @ 2022-05-07 6:55 ` Michael S. Tsirkin 0 siblings, 0 replies; 16+ messages in thread From: Michael S. Tsirkin @ 2022-05-07 6:55 UTC (permalink / raw) To: Jakub Kicinski; +Cc: davem, netdev, pabeni, edumazet, wanghai38 On Fri, May 06, 2022 at 10:07:47AM -0700, Jakub Kicinski wrote: > caif_virtio uses a custom napi weight, switch to the new > API for setting custom weights. > > Signed-off-by: Jakub Kicinski <kuba@kernel.org> Acked-by: Michael S. Tsirkin <mst@redhat.com> > --- > CC: mst@redhat.com > CC: wanghai38@huawei.com > --- > drivers/net/caif/caif_virtio.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/caif/caif_virtio.c b/drivers/net/caif/caif_virtio.c > index 444ef6a342f6..5458f57177a0 100644 > --- a/drivers/net/caif/caif_virtio.c > +++ b/drivers/net/caif/caif_virtio.c > @@ -714,7 +714,8 @@ static int cfv_probe(struct virtio_device *vdev) > /* Initialize NAPI poll context data */ > vringh_kiov_init(&cfv->ctx.riov, NULL, 0); > cfv->ctx.head = USHRT_MAX; > - netif_napi_add(netdev, &cfv->napi, cfv_rx_poll, CFV_DEFAULT_QUOTA); > + netif_napi_add_weight(netdev, &cfv->napi, cfv_rx_poll, > + CFV_DEFAULT_QUOTA); > > tasklet_setup(&cfv->tx_release_tasklet, cfv_tx_release_tasklet); > > -- > 2.34.1 ^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH net-next 3/6] eth: switch to netif_napi_add_weight() 2022-05-06 17:07 [PATCH net-next 0/6] net: switch drivers to netif_napi_add_weight() Jakub Kicinski 2022-05-06 17:07 ` [PATCH net-next 1/6] um: vector: switch " Jakub Kicinski 2022-05-06 17:07 ` [PATCH net-next 2/6] caif_virtio: " Jakub Kicinski @ 2022-05-06 17:07 ` Jakub Kicinski 2022-05-11 17:57 ` Edward Cree 2022-05-06 17:07 ` [PATCH net-next 4/6] r8152: " Jakub Kicinski ` (3 subsequent siblings) 6 siblings, 1 reply; 16+ messages in thread From: Jakub Kicinski @ 2022-05-06 17:07 UTC (permalink / raw) To: davem Cc: netdev, pabeni, edumazet, Jakub Kicinski, dave, ionut, pcnet32, chris.snook, f.fainelli, pantelis.antoniou, yisen.zhuang, salil.mehta, mpe, benh, paulus, cforno12, jesse.brandeburg, anthony.l.nguyen, lars.povlsen, Steen.Hegelund, kys, haiyangz, sthemmin, wei.liu, decui, vladimir.oltean, claudiu.manoil, alexandre.belloni, christopher.lee, jdmason, vz, ecree.xilinx, habetsm.xilinx, steve.glendinning, khalasa, masahiroy, tanghui20, chenhao288, tangmeng, yangyingliang, nitesh, huangguangbin2, gustavoars, olek2, christophe.jaillet, zhengyongjun3, hkallweit1, u.kleine-koenig Switch all Ethernet drivers which use custom napi weights to the new API. Signed-off-by: Jakub Kicinski <kuba@kernel.org> --- CC: dave@thedillows.org CC: ionut@badula.org CC: pcnet32@frontier.com CC: chris.snook@gmail.com CC: f.fainelli@gmail.com CC: pantelis.antoniou@gmail.com CC: yisen.zhuang@huawei.com CC: salil.mehta@huawei.com CC: mpe@ellerman.id.au CC: benh@kernel.crashing.org CC: paulus@samba.org CC: cforno12@linux.ibm.com CC: jesse.brandeburg@intel.com CC: anthony.l.nguyen@intel.com CC: lars.povlsen@microchip.com CC: Steen.Hegelund@microchip.com CC: kys@microsoft.com CC: haiyangz@microsoft.com CC: sthemmin@microsoft.com CC: wei.liu@kernel.org CC: decui@microsoft.com CC: vladimir.oltean@nxp.com CC: claudiu.manoil@nxp.com CC: alexandre.belloni@bootlin.com CC: christopher.lee@cspi.com CC: jdmason@kudzu.us CC: vz@mleia.com CC: ecree.xilinx@gmail.com CC: habetsm.xilinx@gmail.com CC: steve.glendinning@shawell.net CC: khalasa@piap.pl CC: masahiroy@kernel.org CC: tanghui20@huawei.com CC: chenhao288@hisilicon.com CC: tangmeng@uniontech.com CC: yangyingliang@huawei.com CC: nitesh@redhat.com CC: huangguangbin2@huawei.com CC: gustavoars@kernel.org CC: olek2@wp.pl CC: christophe.jaillet@wanadoo.fr CC: zhengyongjun3@huawei.com CC: hkallweit1@gmail.com CC: u.kleine-koenig@pengutronix.de --- drivers/net/ethernet/3com/typhoon.c | 2 +- drivers/net/ethernet/adaptec/starfire.c | 2 +- drivers/net/ethernet/amd/amd8111e.c | 2 +- drivers/net/ethernet/amd/pcnet32.c | 3 ++- drivers/net/ethernet/arc/emac_main.c | 3 ++- drivers/net/ethernet/atheros/ag71xx.c | 3 ++- drivers/net/ethernet/broadcom/bcm63xx_enet.c | 4 ++-- drivers/net/ethernet/broadcom/sb1250-mac.c | 2 +- drivers/net/ethernet/dec/tulip/tulip_core.c | 2 +- drivers/net/ethernet/ezchip/nps_enet.c | 4 ++-- drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c | 3 ++- drivers/net/ethernet/hisilicon/hisi_femac.c | 3 ++- drivers/net/ethernet/huawei/hinic/hinic_rx.c | 3 ++- drivers/net/ethernet/huawei/hinic/hinic_tx.c | 3 ++- drivers/net/ethernet/ibm/emac/mal.c | 4 ++-- drivers/net/ethernet/ibm/ibmveth.c | 2 +- drivers/net/ethernet/intel/e100.c | 2 +- drivers/net/ethernet/lantiq_etop.c | 8 ++++---- drivers/net/ethernet/marvell/pxa168_eth.c | 3 ++- drivers/net/ethernet/microchip/sparx5/sparx5_fdma.c | 3 ++- drivers/net/ethernet/microsoft/mana/mana_en.c | 2 +- drivers/net/ethernet/moxa/moxart_ether.c | 2 +- drivers/net/ethernet/mscc/ocelot_fdma.c | 4 ++-- drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 4 ++-- drivers/net/ethernet/neterion/vxge/vxge-main.c | 9 +++++---- drivers/net/ethernet/nxp/lpc_eth.c | 2 +- drivers/net/ethernet/realtek/8139cp.c | 2 +- drivers/net/ethernet/sfc/efx_channels.c | 4 ++-- drivers/net/ethernet/sfc/falcon/efx.c | 4 ++-- drivers/net/ethernet/smsc/smsc911x.c | 3 ++- drivers/net/ethernet/toshiba/tc35815.c | 2 +- drivers/net/ethernet/wiznet/w5100.c | 2 +- drivers/net/ethernet/wiznet/w5300.c | 2 +- drivers/net/ethernet/xscale/ixp4xx_eth.c | 2 +- 34 files changed, 58 insertions(+), 47 deletions(-) diff --git a/drivers/net/ethernet/3com/typhoon.c b/drivers/net/ethernet/3com/typhoon.c index ad57209007e1..cad4f354cc76 100644 --- a/drivers/net/ethernet/3com/typhoon.c +++ b/drivers/net/ethernet/3com/typhoon.c @@ -2464,7 +2464,7 @@ typhoon_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) /* The chip-specific entries in the device structure. */ dev->netdev_ops = &typhoon_netdev_ops; - netif_napi_add(dev, &tp->napi, typhoon_poll, 16); + netif_napi_add_weight(dev, &tp->napi, typhoon_poll, 16); dev->watchdog_timeo = TX_TIMEOUT; dev->ethtool_ops = &typhoon_ethtool_ops; diff --git a/drivers/net/ethernet/adaptec/starfire.c b/drivers/net/ethernet/adaptec/starfire.c index c6982f7caf9b..8f0a6b9c518e 100644 --- a/drivers/net/ethernet/adaptec/starfire.c +++ b/drivers/net/ethernet/adaptec/starfire.c @@ -772,7 +772,7 @@ static int starfire_init_one(struct pci_dev *pdev, dev->watchdog_timeo = TX_TIMEOUT; dev->ethtool_ops = ðtool_ops; - netif_napi_add(dev, &np->napi, netdev_poll, max_interrupt_work); + netif_napi_add_weight(dev, &np->napi, netdev_poll, max_interrupt_work); if (mtu) dev->mtu = mtu; diff --git a/drivers/net/ethernet/amd/amd8111e.c b/drivers/net/ethernet/amd/amd8111e.c index 9421afb950f7..05ac8d9ccb2f 100644 --- a/drivers/net/ethernet/amd/amd8111e.c +++ b/drivers/net/ethernet/amd/amd8111e.c @@ -1828,7 +1828,7 @@ static int amd8111e_probe_one(struct pci_dev *pdev, dev->watchdog_timeo = AMD8111E_TX_TIMEOUT; dev->min_mtu = AMD8111E_MIN_MTU; dev->max_mtu = AMD8111E_MAX_MTU; - netif_napi_add(dev, &lp->napi, amd8111e_rx_poll, 32); + netif_napi_add_weight(dev, &lp->napi, amd8111e_rx_poll, 32); #if AMD8111E_VLAN_TAG_USED dev->features |= NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX; diff --git a/drivers/net/ethernet/amd/pcnet32.c b/drivers/net/ethernet/amd/pcnet32.c index c20c369c7eb8..b5ff47283cfe 100644 --- a/drivers/net/ethernet/amd/pcnet32.c +++ b/drivers/net/ethernet/amd/pcnet32.c @@ -1881,7 +1881,8 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev) /* napi.weight is used in both the napi and non-napi cases */ lp->napi.weight = lp->rx_ring_size / 2; - netif_napi_add(dev, &lp->napi, pcnet32_poll, lp->rx_ring_size / 2); + netif_napi_add_weight(dev, &lp->napi, pcnet32_poll, + lp->rx_ring_size / 2); if (fdx && !(lp->options & PCNET32_PORT_ASEL) && ((cards_found >= MAX_UNITS) || full_duplex[cards_found])) diff --git a/drivers/net/ethernet/arc/emac_main.c b/drivers/net/ethernet/arc/emac_main.c index c642c3d3e600..288e2961823e 100644 --- a/drivers/net/ethernet/arc/emac_main.c +++ b/drivers/net/ethernet/arc/emac_main.c @@ -981,7 +981,8 @@ int arc_emac_probe(struct net_device *ndev, int interface) dev_info(dev, "connected to %s phy with id 0x%x\n", phydev->drv->name, phydev->phy_id); - netif_napi_add(ndev, &priv->napi, arc_emac_poll, ARC_EMAC_NAPI_WEIGHT); + netif_napi_add_weight(ndev, &priv->napi, arc_emac_poll, + ARC_EMAC_NAPI_WEIGHT); err = register_netdev(ndev); if (err) { diff --git a/drivers/net/ethernet/atheros/ag71xx.c b/drivers/net/ethernet/atheros/ag71xx.c index ec167af0e3b2..cac509708e9d 100644 --- a/drivers/net/ethernet/atheros/ag71xx.c +++ b/drivers/net/ethernet/atheros/ag71xx.c @@ -1922,7 +1922,8 @@ static int ag71xx_probe(struct platform_device *pdev) return err; } - netif_napi_add(ndev, &ag->napi, ag71xx_poll, AG71XX_NAPI_WEIGHT); + netif_napi_add_weight(ndev, &ag->napi, ag71xx_poll, + AG71XX_NAPI_WEIGHT); err = clk_prepare_enable(ag->clk_eth); if (err) { diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c index c1b97e8c55ef..698438a2ee0f 100644 --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c @@ -1859,7 +1859,7 @@ static int bcm_enet_probe(struct platform_device *pdev) /* register netdevice */ dev->netdev_ops = &bcm_enet_ops; - netif_napi_add(dev, &priv->napi, bcm_enet_poll, 16); + netif_napi_add_weight(dev, &priv->napi, bcm_enet_poll, 16); dev->ethtool_ops = &bcm_enet_ethtool_ops; /* MTU range: 46 - 2028 */ @@ -2714,7 +2714,7 @@ static int bcm_enetsw_probe(struct platform_device *pdev) /* register netdevice */ dev->netdev_ops = &bcm_enetsw_ops; - netif_napi_add(dev, &priv->napi, bcm_enet_poll, 16); + netif_napi_add_weight(dev, &priv->napi, bcm_enet_poll, 16); dev->ethtool_ops = &bcm_enetsw_ethtool_ops; SET_NETDEV_DEV(dev, &pdev->dev); diff --git a/drivers/net/ethernet/broadcom/sb1250-mac.c b/drivers/net/ethernet/broadcom/sb1250-mac.c index 5d5f10180158..f02facb60fd1 100644 --- a/drivers/net/ethernet/broadcom/sb1250-mac.c +++ b/drivers/net/ethernet/broadcom/sb1250-mac.c @@ -2203,7 +2203,7 @@ static int sbmac_init(struct platform_device *pldev, long long base) dev->min_mtu = 0; dev->max_mtu = ENET_PACKET_SIZE; - netif_napi_add(dev, &sc->napi, sbmac_poll, 16); + netif_napi_add_weight(dev, &sc->napi, sbmac_poll, 16); dev->irq = UNIT_INT(idx); diff --git a/drivers/net/ethernet/dec/tulip/tulip_core.c b/drivers/net/ethernet/dec/tulip/tulip_core.c index 79df5a72877b..434d8bf0e8f9 100644 --- a/drivers/net/ethernet/dec/tulip/tulip_core.c +++ b/drivers/net/ethernet/dec/tulip/tulip_core.c @@ -1689,7 +1689,7 @@ static int tulip_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) dev->netdev_ops = &tulip_netdev_ops; dev->watchdog_timeo = TX_TIMEOUT; #ifdef CONFIG_TULIP_NAPI - netif_napi_add(dev, &tp->napi, tulip_poll, 16); + netif_napi_add_weight(dev, &tp->napi, tulip_poll, 16); #endif dev->ethtool_ops = &ops; diff --git a/drivers/net/ethernet/ezchip/nps_enet.c b/drivers/net/ethernet/ezchip/nps_enet.c index 69dbf950d451..f1eb660aaee2 100644 --- a/drivers/net/ethernet/ezchip/nps_enet.c +++ b/drivers/net/ethernet/ezchip/nps_enet.c @@ -612,8 +612,8 @@ static s32 nps_enet_probe(struct platform_device *pdev) goto out_netdev; } - netif_napi_add(ndev, &priv->napi, nps_enet_poll, - NPS_ENET_NAPI_POLL_WEIGHT); + netif_napi_add_weight(ndev, &priv->napi, nps_enet_poll, + NPS_ENET_NAPI_POLL_WEIGHT); /* Register the driver. Should be the last thing in probe */ err = register_netdev(ndev); diff --git a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c index bacf25318f87..b3dae17e067e 100644 --- a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c +++ b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c @@ -1020,7 +1020,8 @@ static int fs_enet_probe(struct platform_device *ofdev) ndev->netdev_ops = &fs_enet_netdev_ops; ndev->watchdog_timeo = 2 * HZ; INIT_WORK(&fep->timeout_work, fs_timeout_work); - netif_napi_add(ndev, &fep->napi, fs_enet_napi, fpi->napi_weight); + netif_napi_add_weight(ndev, &fep->napi, fs_enet_napi, + fpi->napi_weight); ndev->ethtool_ops = &fs_ethtool_ops; diff --git a/drivers/net/ethernet/hisilicon/hisi_femac.c b/drivers/net/ethernet/hisilicon/hisi_femac.c index a6c18b6527f9..93846bace028 100644 --- a/drivers/net/ethernet/hisilicon/hisi_femac.c +++ b/drivers/net/ethernet/hisilicon/hisi_femac.c @@ -852,7 +852,8 @@ static int hisi_femac_drv_probe(struct platform_device *pdev) ndev->priv_flags |= IFF_UNICAST_FLT; ndev->netdev_ops = &hisi_femac_netdev_ops; ndev->ethtool_ops = &hisi_femac_ethtools_ops; - netif_napi_add(ndev, &priv->napi, hisi_femac_poll, FEMAC_POLL_WEIGHT); + netif_napi_add_weight(ndev, &priv->napi, hisi_femac_poll, + FEMAC_POLL_WEIGHT); hisi_femac_port_init(priv); diff --git a/drivers/net/ethernet/huawei/hinic/hinic_rx.c b/drivers/net/ethernet/huawei/hinic/hinic_rx.c index b33ed4d92b71..24b7b819dbfb 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_rx.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_rx.c @@ -481,7 +481,8 @@ static void rx_add_napi(struct hinic_rxq *rxq) { struct hinic_dev *nic_dev = netdev_priv(rxq->netdev); - netif_napi_add(rxq->netdev, &rxq->napi, rx_poll, nic_dev->rx_weight); + netif_napi_add_weight(rxq->netdev, &rxq->napi, rx_poll, + nic_dev->rx_weight); napi_enable(&rxq->napi); } diff --git a/drivers/net/ethernet/huawei/hinic/hinic_tx.c b/drivers/net/ethernet/huawei/hinic/hinic_tx.c index 8d59babbf476..87408e7bb809 100644 --- a/drivers/net/ethernet/huawei/hinic/hinic_tx.c +++ b/drivers/net/ethernet/huawei/hinic/hinic_tx.c @@ -809,7 +809,8 @@ static int tx_request_irq(struct hinic_txq *txq) qp = container_of(sq, struct hinic_qp, sq); - netif_napi_add(txq->netdev, &txq->napi, free_tx_poll, nic_dev->tx_weight); + netif_napi_add_weight(txq->netdev, &txq->napi, free_tx_poll, + nic_dev->tx_weight); hinic_hwdev_msix_set(nic_dev->hwdev, sq->msix_entry, TX_IRQ_NO_PENDING, TX_IRQ_NO_COALESC, diff --git a/drivers/net/ethernet/ibm/emac/mal.c b/drivers/net/ethernet/ibm/emac/mal.c index 075c07303f16..ff5487bbebe3 100644 --- a/drivers/net/ethernet/ibm/emac/mal.c +++ b/drivers/net/ethernet/ibm/emac/mal.c @@ -605,8 +605,8 @@ static int mal_probe(struct platform_device *ofdev) init_dummy_netdev(&mal->dummy_dev); - netif_napi_add(&mal->dummy_dev, &mal->napi, mal_poll, - CONFIG_IBM_EMAC_POLL_WEIGHT); + netif_napi_add_weight(&mal->dummy_dev, &mal->napi, mal_poll, + CONFIG_IBM_EMAC_POLL_WEIGHT); /* Load power-on reset defaults */ mal_reset(mal); diff --git a/drivers/net/ethernet/ibm/ibmveth.c b/drivers/net/ethernet/ibm/ibmveth.c index 22fb0d109a68..5c6a04d29f5b 100644 --- a/drivers/net/ethernet/ibm/ibmveth.c +++ b/drivers/net/ethernet/ibm/ibmveth.c @@ -1674,7 +1674,7 @@ static int ibmveth_probe(struct vio_dev *dev, const struct vio_device_id *id) adapter->pool_config = 0; ibmveth_init_link_settings(netdev); - netif_napi_add(netdev, &adapter->napi, ibmveth_poll, 16); + netif_napi_add_weight(netdev, &adapter->napi, ibmveth_poll, 16); netdev->irq = dev->irq; netdev->netdev_ops = &ibmveth_netdev_ops; diff --git a/drivers/net/ethernet/intel/e100.c b/drivers/net/ethernet/intel/e100.c index 4a8013f20152..36418b510dde 100644 --- a/drivers/net/ethernet/intel/e100.c +++ b/drivers/net/ethernet/intel/e100.c @@ -2848,7 +2848,7 @@ static int e100_probe(struct pci_dev *pdev, const struct pci_device_id *ent) strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1); nic = netdev_priv(netdev); - netif_napi_add(netdev, &nic->napi, e100_poll, E100_NAPI_WEIGHT); + netif_napi_add_weight(netdev, &nic->napi, e100_poll, E100_NAPI_WEIGHT); nic->netdev = netdev; nic->pdev = pdev; nic->msg_enable = (1 << debug) - 1; diff --git a/drivers/net/ethernet/lantiq_etop.c b/drivers/net/ethernet/lantiq_etop.c index 9b6fa27b7daf..7cedbe1fdfd7 100644 --- a/drivers/net/ethernet/lantiq_etop.c +++ b/drivers/net/ethernet/lantiq_etop.c @@ -701,11 +701,11 @@ ltq_etop_probe(struct platform_device *pdev) for (i = 0; i < MAX_DMA_CHAN; i++) { if (IS_TX(i)) - netif_napi_add(dev, &priv->ch[i].napi, - ltq_etop_poll_tx, 8); + netif_napi_add_weight(dev, &priv->ch[i].napi, + ltq_etop_poll_tx, 8); else if (IS_RX(i)) - netif_napi_add(dev, &priv->ch[i].napi, - ltq_etop_poll_rx, 32); + netif_napi_add_weight(dev, &priv->ch[i].napi, + ltq_etop_poll_rx, 32); priv->ch[i].netdev = dev; } diff --git a/drivers/net/ethernet/marvell/pxa168_eth.c b/drivers/net/ethernet/marvell/pxa168_eth.c index 52bef50f5a0d..349b8a94e939 100644 --- a/drivers/net/ethernet/marvell/pxa168_eth.c +++ b/drivers/net/ethernet/marvell/pxa168_eth.c @@ -1486,7 +1486,8 @@ static int pxa168_eth_probe(struct platform_device *pdev) /* Hardware supports only 3 ports */ BUG_ON(pep->port_num > 2); - netif_napi_add(dev, &pep->napi, pxa168_rx_poll, pep->rx_ring_size); + netif_napi_add_weight(dev, &pep->napi, pxa168_rx_poll, + pep->rx_ring_size); memset(&pep->timeout, 0, sizeof(struct timer_list)); timer_setup(&pep->timeout, rxq_refill_timer_wrapper, 0); diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_fdma.c b/drivers/net/ethernet/microchip/sparx5/sparx5_fdma.c index 1e9ff365459e..66360c8c5a38 100644 --- a/drivers/net/ethernet/microchip/sparx5/sparx5_fdma.c +++ b/drivers/net/ethernet/microchip/sparx5/sparx5_fdma.c @@ -381,7 +381,8 @@ static int sparx5_fdma_rx_alloc(struct sparx5 *sparx5) } sparx5_fdma_rx_add_dcb(rx, dcb, rx->dma + sizeof(*dcb) * idx); } - netif_napi_add(rx->ndev, &rx->napi, sparx5_fdma_napi_callback, FDMA_WEIGHT); + netif_napi_add_weight(rx->ndev, &rx->napi, sparx5_fdma_napi_callback, + FDMA_WEIGHT); napi_enable(&rx->napi); sparx5_fdma_rx_activate(sparx5, rx); return 0; diff --git a/drivers/net/ethernet/microsoft/mana/mana_en.c b/drivers/net/ethernet/microsoft/mana/mana_en.c index 06f853c5c141..b1d773823232 100644 --- a/drivers/net/ethernet/microsoft/mana/mana_en.c +++ b/drivers/net/ethernet/microsoft/mana/mana_en.c @@ -1602,7 +1602,7 @@ static struct mana_rxq *mana_create_rxq(struct mana_port_context *apc, gc->cq_table[cq->gdma_id] = cq->gdma_cq; - netif_napi_add(ndev, &cq->napi, mana_poll, 1); + netif_napi_add_weight(ndev, &cq->napi, mana_poll, 1); WARN_ON(xdp_rxq_info_reg(&rxq->xdp_rxq, ndev, rxq_idx, cq->napi.napi_id)); diff --git a/drivers/net/ethernet/moxa/moxart_ether.c b/drivers/net/ethernet/moxa/moxart_ether.c index afb7dcadb8d2..a3214a762e4b 100644 --- a/drivers/net/ethernet/moxa/moxart_ether.c +++ b/drivers/net/ethernet/moxa/moxart_ether.c @@ -533,7 +533,7 @@ static int moxart_mac_probe(struct platform_device *pdev) } ndev->netdev_ops = &moxart_netdev_ops; - netif_napi_add(ndev, &priv->napi, moxart_rx_poll, RX_DESC_NUM); + netif_napi_add_weight(ndev, &priv->napi, moxart_rx_poll, RX_DESC_NUM); ndev->priv_flags |= IFF_UNICAST_FLT; ndev->irq = irq; diff --git a/drivers/net/ethernet/mscc/ocelot_fdma.c b/drivers/net/ethernet/mscc/ocelot_fdma.c index dffa597bffe6..083fddd263ec 100644 --- a/drivers/net/ethernet/mscc/ocelot_fdma.c +++ b/drivers/net/ethernet/mscc/ocelot_fdma.c @@ -799,8 +799,8 @@ void ocelot_fdma_netdev_init(struct ocelot *ocelot, struct net_device *dev) return; fdma->ndev = dev; - netif_napi_add(dev, &fdma->napi, ocelot_fdma_napi_poll, - OCELOT_FDMA_WEIGHT); + netif_napi_add_weight(dev, &fdma->napi, ocelot_fdma_napi_poll, + OCELOT_FDMA_WEIGHT); } void ocelot_fdma_netdev_deinit(struct ocelot *ocelot, struct net_device *dev) diff --git a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c index fe5e77330f5f..61497c3e4cfb 100644 --- a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c +++ b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c @@ -3586,8 +3586,8 @@ static int myri10ge_alloc_slices(struct myri10ge_priv *mgp) goto abort; ss->mgp = mgp; ss->dev = mgp->dev; - netif_napi_add(ss->dev, &ss->napi, myri10ge_poll, - myri10ge_napi_weight); + netif_napi_add_weight(ss->dev, &ss->napi, myri10ge_poll, + myri10ge_napi_weight); } return 0; abort: diff --git a/drivers/net/ethernet/neterion/vxge/vxge-main.c b/drivers/net/ethernet/neterion/vxge/vxge-main.c index db4dfae8c01d..d2de8ac44f72 100644 --- a/drivers/net/ethernet/neterion/vxge/vxge-main.c +++ b/drivers/net/ethernet/neterion/vxge/vxge-main.c @@ -2720,8 +2720,8 @@ static int vxge_open(struct net_device *dev) } if (vdev->config.intr_type != MSI_X) { - netif_napi_add(dev, &vdev->napi, vxge_poll_inta, - vdev->config.napi_weight); + netif_napi_add_weight(dev, &vdev->napi, vxge_poll_inta, + vdev->config.napi_weight); napi_enable(&vdev->napi); for (i = 0; i < vdev->no_of_vpath; i++) { vpath = &vdev->vpaths[i]; @@ -2730,8 +2730,9 @@ static int vxge_open(struct net_device *dev) } else { for (i = 0; i < vdev->no_of_vpath; i++) { vpath = &vdev->vpaths[i]; - netif_napi_add(dev, &vpath->ring.napi, - vxge_poll_msix, vdev->config.napi_weight); + netif_napi_add_weight(dev, &vpath->ring.napi, + vxge_poll_msix, + vdev->config.napi_weight); napi_enable(&vpath->ring.napi); vpath->ring.napi_p = &vpath->ring.napi; } diff --git a/drivers/net/ethernet/nxp/lpc_eth.c b/drivers/net/ethernet/nxp/lpc_eth.c index 756f97dce85b..f606d75b33b4 100644 --- a/drivers/net/ethernet/nxp/lpc_eth.c +++ b/drivers/net/ethernet/nxp/lpc_eth.c @@ -1373,7 +1373,7 @@ static int lpc_eth_drv_probe(struct platform_device *pdev) pldat->duplex = DUPLEX_FULL; __lpc_params_setup(pldat); - netif_napi_add(ndev, &pldat->napi, lpc_eth_poll, NAPI_WEIGHT); + netif_napi_add_weight(ndev, &pldat->napi, lpc_eth_poll, NAPI_WEIGHT); ret = register_netdev(ndev); if (ret) { diff --git a/drivers/net/ethernet/realtek/8139cp.c b/drivers/net/ethernet/realtek/8139cp.c index ad7b9e9d7f95..e0feeec13da6 100644 --- a/drivers/net/ethernet/realtek/8139cp.c +++ b/drivers/net/ethernet/realtek/8139cp.c @@ -1986,7 +1986,7 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) eth_hw_addr_set(dev, (u8 *)addr); dev->netdev_ops = &cp_netdev_ops; - netif_napi_add(dev, &cp->napi, cp_rx_poll, 16); + netif_napi_add_weight(dev, &cp->napi, cp_rx_poll, 16); dev->ethtool_ops = &cp_ethtool_ops; dev->watchdog_timeo = TX_TIMEOUT; diff --git a/drivers/net/ethernet/sfc/efx_channels.c b/drivers/net/ethernet/sfc/efx_channels.c index eec80b024195..3f28f9861dfa 100644 --- a/drivers/net/ethernet/sfc/efx_channels.c +++ b/drivers/net/ethernet/sfc/efx_channels.c @@ -1316,8 +1316,8 @@ void efx_init_napi_channel(struct efx_channel *channel) struct efx_nic *efx = channel->efx; channel->napi_dev = efx->net_dev; - netif_napi_add(channel->napi_dev, &channel->napi_str, - efx_poll, napi_weight); + netif_napi_add_weight(channel->napi_dev, &channel->napi_str, efx_poll, + napi_weight); } void efx_init_napi(struct efx_nic *efx) diff --git a/drivers/net/ethernet/sfc/falcon/efx.c b/drivers/net/ethernet/sfc/falcon/efx.c index b7282331faec..f619ffb26787 100644 --- a/drivers/net/ethernet/sfc/falcon/efx.c +++ b/drivers/net/ethernet/sfc/falcon/efx.c @@ -2017,8 +2017,8 @@ static void ef4_init_napi_channel(struct ef4_channel *channel) struct ef4_nic *efx = channel->efx; channel->napi_dev = efx->net_dev; - netif_napi_add(channel->napi_dev, &channel->napi_str, - ef4_poll, napi_weight); + netif_napi_add_weight(channel->napi_dev, &channel->napi_str, ef4_poll, + napi_weight); } static void ef4_init_napi(struct ef4_nic *efx) diff --git a/drivers/net/ethernet/smsc/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c index c854efdf1f25..3bf20211cceb 100644 --- a/drivers/net/ethernet/smsc/smsc911x.c +++ b/drivers/net/ethernet/smsc/smsc911x.c @@ -2304,7 +2304,8 @@ static int smsc911x_init(struct net_device *dev) return -ENODEV; dev->flags |= IFF_MULTICAST; - netif_napi_add(dev, &pdata->napi, smsc911x_poll, SMSC_NAPI_WEIGHT); + netif_napi_add_weight(dev, &pdata->napi, smsc911x_poll, + SMSC_NAPI_WEIGHT); dev->netdev_ops = &smsc911x_netdev_ops; dev->ethtool_ops = &smsc911x_ethtool_ops; diff --git a/drivers/net/ethernet/toshiba/tc35815.c b/drivers/net/ethernet/toshiba/tc35815.c index ce38f7515225..47aab9c132c8 100644 --- a/drivers/net/ethernet/toshiba/tc35815.c +++ b/drivers/net/ethernet/toshiba/tc35815.c @@ -804,7 +804,7 @@ static int tc35815_init_one(struct pci_dev *pdev, dev->netdev_ops = &tc35815_netdev_ops; dev->ethtool_ops = &tc35815_ethtool_ops; dev->watchdog_timeo = TC35815_TX_TIMEOUT; - netif_napi_add(dev, &lp->napi, tc35815_poll, NAPI_WEIGHT); + netif_napi_add_weight(dev, &lp->napi, tc35815_poll, NAPI_WEIGHT); dev->irq = pdev->irq; dev->base_addr = (unsigned long)ioaddr; diff --git a/drivers/net/ethernet/wiznet/w5100.c b/drivers/net/ethernet/wiznet/w5100.c index 4fd7c39e1123..acd78120e53c 100644 --- a/drivers/net/ethernet/wiznet/w5100.c +++ b/drivers/net/ethernet/wiznet/w5100.c @@ -1133,7 +1133,7 @@ int w5100_probe(struct device *dev, const struct w5100_ops *ops, ndev->netdev_ops = &w5100_netdev_ops; ndev->ethtool_ops = &w5100_ethtool_ops; - netif_napi_add(ndev, &priv->napi, w5100_napi_poll, 16); + netif_napi_add_weight(ndev, &priv->napi, w5100_napi_poll, 16); /* This chip doesn't support VLAN packets with normal MTU, * so disable VLAN for this device. diff --git a/drivers/net/ethernet/wiznet/w5300.c b/drivers/net/ethernet/wiznet/w5300.c index 402d5036f266..773f8c77909a 100644 --- a/drivers/net/ethernet/wiznet/w5300.c +++ b/drivers/net/ethernet/wiznet/w5300.c @@ -603,7 +603,7 @@ static int w5300_probe(struct platform_device *pdev) ndev->netdev_ops = &w5300_netdev_ops; ndev->ethtool_ops = &w5300_ethtool_ops; ndev->watchdog_timeo = HZ; - netif_napi_add(ndev, &priv->napi, w5300_napi_poll, 16); + netif_napi_add_weight(ndev, &priv->napi, w5300_napi_poll, 16); /* This chip doesn't support VLAN packets with normal MTU, * so disable VLAN for this device. diff --git a/drivers/net/ethernet/xscale/ixp4xx_eth.c b/drivers/net/ethernet/xscale/ixp4xx_eth.c index d947955621ee..89770c2e0ffb 100644 --- a/drivers/net/ethernet/xscale/ixp4xx_eth.c +++ b/drivers/net/ethernet/xscale/ixp4xx_eth.c @@ -1480,7 +1480,7 @@ static int ixp4xx_eth_probe(struct platform_device *pdev) ndev->dev.dma_mask = dev->dma_mask; ndev->dev.coherent_dma_mask = dev->coherent_dma_mask; - netif_napi_add(ndev, &port->napi, eth_poll, NAPI_WEIGHT); + netif_napi_add_weight(ndev, &port->napi, eth_poll, NAPI_WEIGHT); if (!(port->npe = npe_request(NPE_ID(port->id)))) return -EIO; -- 2.34.1 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH net-next 3/6] eth: switch to netif_napi_add_weight() 2022-05-06 17:07 ` [PATCH net-next 3/6] eth: " Jakub Kicinski @ 2022-05-11 17:57 ` Edward Cree 2022-05-11 19:45 ` Jakub Kicinski 0 siblings, 1 reply; 16+ messages in thread From: Edward Cree @ 2022-05-11 17:57 UTC (permalink / raw) To: Jakub Kicinski, davem; +Cc: netdev, pabeni, edumazet, Martin Habets On 06/05/2022 18:07, Jakub Kicinski wrote: > Switch all Ethernet drivers which use custom napi weights > to the new API. > > Signed-off-by: Jakub Kicinski <kuba@kernel.org> > --- > diff --git a/drivers/net/ethernet/sfc/efx_channels.c b/drivers/net/ethernet/sfc/efx_channels.c > index eec80b024195..3f28f9861dfa 100644 > --- a/drivers/net/ethernet/sfc/efx_channels.c > +++ b/drivers/net/ethernet/sfc/efx_channels.c > @@ -1316,8 +1316,8 @@ void efx_init_napi_channel(struct efx_channel *channel) > struct efx_nic *efx = channel->efx; > > channel->napi_dev = efx->net_dev; > - netif_napi_add(channel->napi_dev, &channel->napi_str, > - efx_poll, napi_weight); > + netif_napi_add_weight(channel->napi_dev, &channel->napi_str, efx_poll, > + napi_weight); > } This isn't really a custom weight; napi_weight is initialised to 64 and never changed, so probably we ought to be just using NAPI_POLL_WEIGHT here and end up on the non-_weight API. Same goes for Falcon. -ed ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH net-next 3/6] eth: switch to netif_napi_add_weight() 2022-05-11 17:57 ` Edward Cree @ 2022-05-11 19:45 ` Jakub Kicinski 2022-05-11 21:02 ` Edward Cree 0 siblings, 1 reply; 16+ messages in thread From: Jakub Kicinski @ 2022-05-11 19:45 UTC (permalink / raw) To: Edward Cree; +Cc: davem, netdev, pabeni, edumazet, Martin Habets On Wed, 11 May 2022 18:57:53 +0100 Edward Cree wrote: > > diff --git a/drivers/net/ethernet/sfc/efx_channels.c b/drivers/net/ethernet/sfc/efx_channels.c > > index eec80b024195..3f28f9861dfa 100644 > > --- a/drivers/net/ethernet/sfc/efx_channels.c > > +++ b/drivers/net/ethernet/sfc/efx_channels.c > > @@ -1316,8 +1316,8 @@ void efx_init_napi_channel(struct efx_channel *channel) > > struct efx_nic *efx = channel->efx; > > > > channel->napi_dev = efx->net_dev; > > - netif_napi_add(channel->napi_dev, &channel->napi_str, > > - efx_poll, napi_weight); > > + netif_napi_add_weight(channel->napi_dev, &channel->napi_str, efx_poll, > > + napi_weight); > > } > > This isn't really a custom weight; napi_weight is initialised to > 64 and never changed, so probably we ought to be just using > NAPI_POLL_WEIGHT here and end up on the non-_weight API. > Same goes for Falcon. Ack, I wanted to be nice. I figured this must be a stub for a module param in your our of tree driver. Should I send a patch to remove the non-const static napi_weight globals and switch back to non-_weight? ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH net-next 3/6] eth: switch to netif_napi_add_weight() 2022-05-11 19:45 ` Jakub Kicinski @ 2022-05-11 21:02 ` Edward Cree 2022-05-12 7:27 ` Martin Habets 0 siblings, 1 reply; 16+ messages in thread From: Edward Cree @ 2022-05-11 21:02 UTC (permalink / raw) To: Jakub Kicinski, Martin Habets; +Cc: davem, netdev, pabeni, edumazet On 11/05/2022 20:45, Jakub Kicinski wrote: > On Wed, 11 May 2022 18:57:53 +0100 Edward Cree wrote: >> This isn't really a custom weight; napi_weight is initialised to >> 64 and never changed, so probably we ought to be just using >> NAPI_POLL_WEIGHT here and end up on the non-_weight API. >> Same goes for Falcon. > > Ack, I wanted to be nice. I figured this must be a stub for a module > param in your our of tree driver. I mean, it *is*... but there's almost certainly a better way. Configuring NAPI weight for tuning purposes (as opposed to some kind of correctness limitation in a driver) probably ought to be left to generic infrastructure rather than vendor-specific modparams in driver code. > Should I send a patch to remove > the non-const static napi_weight globals and switch back to non-_weight? Yes please, unless Martin has any objections...? -ed ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH net-next 3/6] eth: switch to netif_napi_add_weight() 2022-05-11 21:02 ` Edward Cree @ 2022-05-12 7:27 ` Martin Habets 0 siblings, 0 replies; 16+ messages in thread From: Martin Habets @ 2022-05-12 7:27 UTC (permalink / raw) To: Edward Cree; +Cc: Jakub Kicinski, davem, netdev, pabeni, edumazet On Wed, May 11, 2022 at 10:02:44PM +0100, Edward Cree wrote: > On 11/05/2022 20:45, Jakub Kicinski wrote: > > On Wed, 11 May 2022 18:57:53 +0100 Edward Cree wrote: > >> This isn't really a custom weight; napi_weight is initialised to > >> 64 and never changed, so probably we ought to be just using > >> NAPI_POLL_WEIGHT here and end up on the non-_weight API. > >> Same goes for Falcon. > > > > Ack, I wanted to be nice. I figured this must be a stub for a module > > param in your our of tree driver. > > I mean, it *is*... but there's almost certainly a better way. Configuring > NAPI weight for tuning purposes (as opposed to some kind of correctness > limitation in a driver) probably ought to be left to generic infrastructure > rather than vendor-specific modparams in driver code. > > > Should I send a patch to remove > > the non-const static napi_weight globals and switch back to non-_weight? > > Yes please, unless Martin has any objections...? Fine for me. Martin ^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH net-next 4/6] r8152: switch to netif_napi_add_weight() 2022-05-06 17:07 [PATCH net-next 0/6] net: switch drivers to netif_napi_add_weight() Jakub Kicinski ` (2 preceding siblings ...) 2022-05-06 17:07 ` [PATCH net-next 3/6] eth: " Jakub Kicinski @ 2022-05-06 17:07 ` Jakub Kicinski 2022-05-06 17:07 ` [PATCH net-next 5/6] net: virtio: " Jakub Kicinski ` (2 subsequent siblings) 6 siblings, 0 replies; 16+ messages in thread From: Jakub Kicinski @ 2022-05-06 17:07 UTC (permalink / raw) To: davem; +Cc: netdev, pabeni, edumazet, Jakub Kicinski, hayeswang, linux-usb r8152 uses a custom napi weight, switch to the new API for setting custom weight. Signed-off-by: Jakub Kicinski <kuba@kernel.org> --- CC: hayeswang@realtek.com CC: linux-usb@vger.kernel.org --- drivers/net/usb/r8152.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index d3b53db57c26..c2da3438387c 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -9732,10 +9732,8 @@ static int rtl8152_probe(struct usb_interface *intf, usb_set_intfdata(intf, tp); - if (tp->support_2500full) - netif_napi_add(netdev, &tp->napi, r8152_poll, 256); - else - netif_napi_add(netdev, &tp->napi, r8152_poll, 64); + netif_napi_add_weight(netdev, &tp->napi, r8152_poll, + tp->support_2500full ? 256 : 64); ret = register_netdev(netdev); if (ret != 0) { -- 2.34.1 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH net-next 5/6] net: virtio: switch to netif_napi_add_weight() 2022-05-06 17:07 [PATCH net-next 0/6] net: switch drivers to netif_napi_add_weight() Jakub Kicinski ` (3 preceding siblings ...) 2022-05-06 17:07 ` [PATCH net-next 4/6] r8152: " Jakub Kicinski @ 2022-05-06 17:07 ` Jakub Kicinski 2022-05-07 1:38 ` Xuan Zhuo ` (2 more replies) 2022-05-06 17:07 ` [PATCH net-next 6/6] net: wan: " Jakub Kicinski 2022-05-08 10:50 ` [PATCH net-next 0/6] net: switch drivers " patchwork-bot+netdevbpf 6 siblings, 3 replies; 16+ messages in thread From: Jakub Kicinski @ 2022-05-06 17:07 UTC (permalink / raw) To: davem Cc: netdev, pabeni, edumazet, Jakub Kicinski, mst, jasowang, virtualization virtio netdev driver uses a custom napi weight, switch to the new API for setting custom weight. Signed-off-by: Jakub Kicinski <kuba@kernel.org> --- CC: mst@redhat.com CC: jasowang@redhat.com CC: virtualization@lists.linux-foundation.org --- drivers/net/virtio_net.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index ebb98b796352..db05b5e930be 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -3313,8 +3313,8 @@ static int virtnet_alloc_queues(struct virtnet_info *vi) INIT_DELAYED_WORK(&vi->refill, refill_work); for (i = 0; i < vi->max_queue_pairs; i++) { vi->rq[i].pages = NULL; - netif_napi_add(vi->dev, &vi->rq[i].napi, virtnet_poll, - napi_weight); + netif_napi_add_weight(vi->dev, &vi->rq[i].napi, virtnet_poll, + napi_weight); netif_napi_add_tx_weight(vi->dev, &vi->sq[i].napi, virtnet_poll_tx, napi_tx ? napi_weight : 0); -- 2.34.1 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH net-next 5/6] net: virtio: switch to netif_napi_add_weight() 2022-05-06 17:07 ` [PATCH net-next 5/6] net: virtio: " Jakub Kicinski @ 2022-05-07 1:38 ` Xuan Zhuo 2022-05-07 3:08 ` Jason Wang 2022-05-07 6:55 ` Michael S. Tsirkin 2 siblings, 0 replies; 16+ messages in thread From: Xuan Zhuo @ 2022-05-07 1:38 UTC (permalink / raw) To: Jakub Kicinski Cc: netdev, pabeni, edumazet, Jakub Kicinski, mst, jasowang, virtualization, davem On Fri, 6 May 2022 10:07:50 -0700, Jakub Kicinski <kuba@kernel.org> wrote: > virtio netdev driver uses a custom napi weight, switch to the new > API for setting custom weight. > > Signed-off-by: Jakub Kicinski <kuba@kernel.org> Reviewed-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com> > --- > CC: mst@redhat.com > CC: jasowang@redhat.com > CC: virtualization@lists.linux-foundation.org > --- > drivers/net/virtio_net.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c > index ebb98b796352..db05b5e930be 100644 > --- a/drivers/net/virtio_net.c > +++ b/drivers/net/virtio_net.c > @@ -3313,8 +3313,8 @@ static int virtnet_alloc_queues(struct virtnet_info *vi) > INIT_DELAYED_WORK(&vi->refill, refill_work); > for (i = 0; i < vi->max_queue_pairs; i++) { > vi->rq[i].pages = NULL; > - netif_napi_add(vi->dev, &vi->rq[i].napi, virtnet_poll, > - napi_weight); > + netif_napi_add_weight(vi->dev, &vi->rq[i].napi, virtnet_poll, > + napi_weight); > netif_napi_add_tx_weight(vi->dev, &vi->sq[i].napi, > virtnet_poll_tx, > napi_tx ? napi_weight : 0); > -- > 2.34.1 > ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH net-next 5/6] net: virtio: switch to netif_napi_add_weight() 2022-05-06 17:07 ` [PATCH net-next 5/6] net: virtio: " Jakub Kicinski 2022-05-07 1:38 ` Xuan Zhuo @ 2022-05-07 3:08 ` Jason Wang 2022-05-07 6:55 ` Michael S. Tsirkin 2 siblings, 0 replies; 16+ messages in thread From: Jason Wang @ 2022-05-07 3:08 UTC (permalink / raw) To: Jakub Kicinski Cc: davem, netdev, Paolo Abeni, Eric Dumazet, mst, virtualization On Sat, May 7, 2022 at 1:08 AM Jakub Kicinski <kuba@kernel.org> wrote: > > virtio netdev driver uses a custom napi weight, switch to the new > API for setting custom weight. > > Signed-off-by: Jakub Kicinski <kuba@kernel.org> Acked-by: Jason Wang <jasowang@redhat.com> > --- > CC: mst@redhat.com > CC: jasowang@redhat.com > CC: virtualization@lists.linux-foundation.org > --- > drivers/net/virtio_net.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c > index ebb98b796352..db05b5e930be 100644 > --- a/drivers/net/virtio_net.c > +++ b/drivers/net/virtio_net.c > @@ -3313,8 +3313,8 @@ static int virtnet_alloc_queues(struct virtnet_info *vi) > INIT_DELAYED_WORK(&vi->refill, refill_work); > for (i = 0; i < vi->max_queue_pairs; i++) { > vi->rq[i].pages = NULL; > - netif_napi_add(vi->dev, &vi->rq[i].napi, virtnet_poll, > - napi_weight); > + netif_napi_add_weight(vi->dev, &vi->rq[i].napi, virtnet_poll, > + napi_weight); > netif_napi_add_tx_weight(vi->dev, &vi->sq[i].napi, > virtnet_poll_tx, > napi_tx ? napi_weight : 0); > -- > 2.34.1 > ^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH net-next 5/6] net: virtio: switch to netif_napi_add_weight() 2022-05-06 17:07 ` [PATCH net-next 5/6] net: virtio: " Jakub Kicinski 2022-05-07 1:38 ` Xuan Zhuo 2022-05-07 3:08 ` Jason Wang @ 2022-05-07 6:55 ` Michael S. Tsirkin 2 siblings, 0 replies; 16+ messages in thread From: Michael S. Tsirkin @ 2022-05-07 6:55 UTC (permalink / raw) To: Jakub Kicinski; +Cc: davem, netdev, pabeni, edumazet, jasowang, virtualization On Fri, May 06, 2022 at 10:07:50AM -0700, Jakub Kicinski wrote: > virtio netdev driver uses a custom napi weight, switch to the new > API for setting custom weight. > > Signed-off-by: Jakub Kicinski <kuba@kernel.org> Acked-by: Michael S. Tsirkin <mst@redhat.com> > --- > CC: mst@redhat.com > CC: jasowang@redhat.com > CC: virtualization@lists.linux-foundation.org > --- > drivers/net/virtio_net.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c > index ebb98b796352..db05b5e930be 100644 > --- a/drivers/net/virtio_net.c > +++ b/drivers/net/virtio_net.c > @@ -3313,8 +3313,8 @@ static int virtnet_alloc_queues(struct virtnet_info *vi) > INIT_DELAYED_WORK(&vi->refill, refill_work); > for (i = 0; i < vi->max_queue_pairs; i++) { > vi->rq[i].pages = NULL; > - netif_napi_add(vi->dev, &vi->rq[i].napi, virtnet_poll, > - napi_weight); > + netif_napi_add_weight(vi->dev, &vi->rq[i].napi, virtnet_poll, > + napi_weight); > netif_napi_add_tx_weight(vi->dev, &vi->sq[i].napi, > virtnet_poll_tx, > napi_tx ? napi_weight : 0); > -- > 2.34.1 ^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH net-next 6/6] net: wan: switch to netif_napi_add_weight() 2022-05-06 17:07 [PATCH net-next 0/6] net: switch drivers to netif_napi_add_weight() Jakub Kicinski ` (4 preceding siblings ...) 2022-05-06 17:07 ` [PATCH net-next 5/6] net: virtio: " Jakub Kicinski @ 2022-05-06 17:07 ` Jakub Kicinski 2022-05-08 10:50 ` [PATCH net-next 0/6] net: switch drivers " patchwork-bot+netdevbpf 6 siblings, 0 replies; 16+ messages in thread From: Jakub Kicinski @ 2022-05-06 17:07 UTC (permalink / raw) To: davem Cc: netdev, pabeni, edumazet, Jakub Kicinski, qiang.zhao, khc, ms, linuxppc-dev, linux-x25 A handful of WAN drivers use custom napi weights, switch them to the new API. Signed-off-by: Jakub Kicinski <kuba@kernel.org> --- CC: qiang.zhao@nxp.com CC: khc@pm.waw.pl CC: ms@dev.tdt.de CC: linuxppc-dev@lists.ozlabs.org CC: linux-x25@vger.kernel.org --- drivers/net/wan/fsl_ucc_hdlc.c | 2 +- drivers/net/wan/hd64572.c | 3 ++- drivers/net/wan/ixp4xx_hss.c | 2 +- drivers/net/wan/lapbether.c | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/net/wan/fsl_ucc_hdlc.c b/drivers/net/wan/fsl_ucc_hdlc.c index 5ae2d27b5da9..22edea6ca4b8 100644 --- a/drivers/net/wan/fsl_ucc_hdlc.c +++ b/drivers/net/wan/fsl_ucc_hdlc.c @@ -1231,7 +1231,7 @@ static int ucc_hdlc_probe(struct platform_device *pdev) dev->watchdog_timeo = 2 * HZ; hdlc->attach = ucc_hdlc_attach; hdlc->xmit = ucc_hdlc_tx; - netif_napi_add(dev, &uhdlc_priv->napi, ucc_hdlc_poll, 32); + netif_napi_add_weight(dev, &uhdlc_priv->napi, ucc_hdlc_poll, 32); if (register_hdlc_device(dev)) { ret = -ENOBUFS; pr_err("ucc_hdlc: unable to register hdlc device\n"); diff --git a/drivers/net/wan/hd64572.c b/drivers/net/wan/hd64572.c index b89b03a6aba7..534369ffe5de 100644 --- a/drivers/net/wan/hd64572.c +++ b/drivers/net/wan/hd64572.c @@ -173,7 +173,8 @@ static void sca_init_port(port_t *port) sca_out(DIR_EOME, DIR_TX(port->chan), card); /* enable interrupts */ sca_set_carrier(port); - netif_napi_add(port->netdev, &port->napi, sca_poll, NAPI_WEIGHT); + netif_napi_add_weight(port->netdev, &port->napi, sca_poll, + NAPI_WEIGHT); } /* MSCI interrupt service */ diff --git a/drivers/net/wan/ixp4xx_hss.c b/drivers/net/wan/ixp4xx_hss.c index 863c3e34e136..e46b7f5ee49e 100644 --- a/drivers/net/wan/ixp4xx_hss.c +++ b/drivers/net/wan/ixp4xx_hss.c @@ -1504,7 +1504,7 @@ static int ixp4xx_hss_probe(struct platform_device *pdev) port->clock_reg = CLK42X_SPEED_2048KHZ; port->id = pdev->id; port->dev = &pdev->dev; - netif_napi_add(ndev, &port->napi, hss_hdlc_poll, NAPI_WEIGHT); + netif_napi_add_weight(ndev, &port->napi, hss_hdlc_poll, NAPI_WEIGHT); err = register_hdlc_device(ndev); if (err) diff --git a/drivers/net/wan/lapbether.c b/drivers/net/wan/lapbether.c index 282192b82404..960f1393595c 100644 --- a/drivers/net/wan/lapbether.c +++ b/drivers/net/wan/lapbether.c @@ -408,7 +408,7 @@ static int lapbeth_new_device(struct net_device *dev) spin_lock_init(&lapbeth->up_lock); skb_queue_head_init(&lapbeth->rx_queue); - netif_napi_add(ndev, &lapbeth->napi, lapbeth_napi_poll, 16); + netif_napi_add_weight(ndev, &lapbeth->napi, lapbeth_napi_poll, 16); rc = -EIO; if (register_netdevice(ndev)) -- 2.34.1 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH net-next 0/6] net: switch drivers to netif_napi_add_weight() 2022-05-06 17:07 [PATCH net-next 0/6] net: switch drivers to netif_napi_add_weight() Jakub Kicinski ` (5 preceding siblings ...) 2022-05-06 17:07 ` [PATCH net-next 6/6] net: wan: " Jakub Kicinski @ 2022-05-08 10:50 ` patchwork-bot+netdevbpf 6 siblings, 0 replies; 16+ messages in thread From: patchwork-bot+netdevbpf @ 2022-05-08 10:50 UTC (permalink / raw) To: Jakub Kicinski; +Cc: davem, netdev, pabeni, edumazet Hello: This series was applied to netdev/net-next.git (master) by David S. Miller <davem@davemloft.net>: On Fri, 6 May 2022 10:07:45 -0700 you wrote: > The minority of drivers pass a custom weight to netif_napi_add(). > Switch those away to the new netif_napi_add_weight(). All drivers > (which can go thru net-next) calling netif_napi_add() will now > be calling it with NAPI_POLL_WEIGHT or 64. > > Jakub Kicinski (6): > um: vector: switch to netif_napi_add_weight() > caif_virtio: switch to netif_napi_add_weight() > eth: switch to netif_napi_add_weight() > r8152: switch to netif_napi_add_weight() > net: virtio: switch to netif_napi_add_weight() > net: wan: switch to netif_napi_add_weight() > > [...] Here is the summary with links: - [net-next,1/6] um: vector: switch to netif_napi_add_weight() https://git.kernel.org/netdev/net-next/c/4d92c6275575 - [net-next,2/6] caif_virtio: switch to netif_napi_add_weight() https://git.kernel.org/netdev/net-next/c/be8af67fabcb - [net-next,3/6] eth: switch to netif_napi_add_weight() https://git.kernel.org/netdev/net-next/c/b707b89f7be3 - [net-next,4/6] r8152: switch to netif_napi_add_weight() https://git.kernel.org/netdev/net-next/c/8ded532cd1cb - [net-next,5/6] net: virtio: switch to netif_napi_add_weight() https://git.kernel.org/netdev/net-next/c/d484735dcf92 - [net-next,6/6] net: wan: switch to netif_napi_add_weight() https://git.kernel.org/netdev/net-next/c/6f83cb8cbfbf You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html ^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2022-05-12 7:28 UTC | newest] Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2022-05-06 17:07 [PATCH net-next 0/6] net: switch drivers to netif_napi_add_weight() Jakub Kicinski 2022-05-06 17:07 ` [PATCH net-next 1/6] um: vector: switch " Jakub Kicinski 2022-05-06 17:07 ` [PATCH net-next 2/6] caif_virtio: " Jakub Kicinski 2022-05-07 6:55 ` Michael S. Tsirkin 2022-05-06 17:07 ` [PATCH net-next 3/6] eth: " Jakub Kicinski 2022-05-11 17:57 ` Edward Cree 2022-05-11 19:45 ` Jakub Kicinski 2022-05-11 21:02 ` Edward Cree 2022-05-12 7:27 ` Martin Habets 2022-05-06 17:07 ` [PATCH net-next 4/6] r8152: " Jakub Kicinski 2022-05-06 17:07 ` [PATCH net-next 5/6] net: virtio: " Jakub Kicinski 2022-05-07 1:38 ` Xuan Zhuo 2022-05-07 3:08 ` Jason Wang 2022-05-07 6:55 ` Michael S. Tsirkin 2022-05-06 17:07 ` [PATCH net-next 6/6] net: wan: " Jakub Kicinski 2022-05-08 10:50 ` [PATCH net-next 0/6] net: switch drivers " patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).