aleph/lkl_linux
1
0
Fork 0
mirror of https://github.com/lkl/linux.git synced 2025-12-19 16:13:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

net: renesas: rswitch: Add spin lock protection for irq {un}mask

Browse Source 
Add spin lock protection for irq {un}mask registers' control.

After napi_complete_done() and this protection were applied,
a lot of redundant interrupts no longer occur.

For example: when "iperf3 -c <ipaddr> -R" on R-Car S4-8 Spider
 Before the patches are applied: about 800,000 times happened
 After the patches were applied: about 100,000 times happened

Fixes: 3590918b5d ("net: ethernet: renesas: Add support for "Ethernet Switch"")
Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
This commit is contained in:
Yoshihiro Shimoda
2023-09-12 10:49:36 +09:00
committed by Paolo Abeni
parent e7b1ef2942
commit c4f922e86c
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/net/ethernet/renesas/rswitch.c
View File

@@ -799,6 +799,7 @@ static int rswitch_poll(struct napi_struct *napi, int budget)
struct net_device *ndev = napi->dev; struct net_device *ndev = napi->dev;
struct rswitch_private *priv; struct rswitch_private *priv;
struct rswitch_device *rdev; struct rswitch_device *rdev;
unsigned long flags;
int quota = budget; int quota = budget;
rdev = netdev_priv(ndev); rdev = netdev_priv(ndev);
@@ -817,8 +818,10 @@ retry:
netif_wake_subqueue(ndev, 0); netif_wake_subqueue(ndev, 0);
if (napi_complete_done(napi, budget - quota)) { if (napi_complete_done(napi, budget - quota)) {
spin_lock_irqsave(&priv->lock, flags);
rswitch_enadis_data_irq(priv, rdev->tx_queue->index, true); rswitch_enadis_data_irq(priv, rdev->tx_queue->index, true);
rswitch_enadis_data_irq(priv, rdev->rx_queue->index, true); rswitch_enadis_data_irq(priv, rdev->rx_queue->index, true);
spin_unlock_irqrestore(&priv->lock, flags);
} }
out: out:
@@ -835,8 +838,10 @@ static void rswitch_queue_interrupt(struct net_device *ndev)
struct rswitch_device *rdev = netdev_priv(ndev); struct rswitch_device *rdev = netdev_priv(ndev);
if (napi_schedule_prep(&rdev->napi)) { if (napi_schedule_prep(&rdev->napi)) {
spin_lock(&rdev->priv->lock);
rswitch_enadis_data_irq(rdev->priv, rdev->tx_queue->index, false); rswitch_enadis_data_irq(rdev->priv, rdev->tx_queue->index, false);
rswitch_enadis_data_irq(rdev->priv, rdev->rx_queue->index, false); rswitch_enadis_data_irq(rdev->priv, rdev->rx_queue->index, false);
spin_unlock(&rdev->priv->lock);
__napi_schedule(&rdev->napi); __napi_schedule(&rdev->napi);
} }
} }
@@ -1440,14 +1445,17 @@ static void rswitch_ether_port_deinit_all(struct rswitch_private *priv)
static int rswitch_open(struct net_device *ndev) static int rswitch_open(struct net_device *ndev)
{ {
struct rswitch_device *rdev = netdev_priv(ndev); struct rswitch_device *rdev = netdev_priv(ndev);
unsigned long flags;
phy_start(ndev->phydev); phy_start(ndev->phydev);
napi_enable(&rdev->napi); napi_enable(&rdev->napi);
netif_start_queue(ndev); netif_start_queue(ndev);
spin_lock_irqsave(&rdev->priv->lock, flags);
rswitch_enadis_data_irq(rdev->priv, rdev->tx_queue->index, true); rswitch_enadis_data_irq(rdev->priv, rdev->tx_queue->index, true);
rswitch_enadis_data_irq(rdev->priv, rdev->rx_queue->index, true); rswitch_enadis_data_irq(rdev->priv, rdev->rx_queue->index, true);
spin_unlock_irqrestore(&rdev->priv->lock, flags);
if (bitmap_empty(rdev->priv->opened_ports, RSWITCH_NUM_PORTS)) if (bitmap_empty(rdev->priv->opened_ports, RSWITCH_NUM_PORTS))
iowrite32(GWCA_TS_IRQ_BIT, rdev->priv->addr + GWTSDIE); iowrite32(GWCA_TS_IRQ_BIT, rdev->priv->addr + GWTSDIE);
@@ -1461,6 +1469,7 @@ static int rswitch_stop(struct net_device *ndev)
{ {
struct rswitch_device *rdev = netdev_priv(ndev); struct rswitch_device *rdev = netdev_priv(ndev);
struct rswitch_gwca_ts_info *ts_info, *ts_info2; struct rswitch_gwca_ts_info *ts_info, *ts_info2;
unsigned long flags;
netif_tx_stop_all_queues(ndev); netif_tx_stop_all_queues(ndev);
bitmap_clear(rdev->priv->opened_ports, rdev->port, 1); bitmap_clear(rdev->priv->opened_ports, rdev->port, 1);
@@ -1476,8 +1485,10 @@ static int rswitch_stop(struct net_device *ndev)
kfree(ts_info); kfree(ts_info);
} }
spin_lock_irqsave(&rdev->priv->lock, flags);
rswitch_enadis_data_irq(rdev->priv, rdev->tx_queue->index, false); rswitch_enadis_data_irq(rdev->priv, rdev->tx_queue->index, false);
rswitch_enadis_data_irq(rdev->priv, rdev->rx_queue->index, false); rswitch_enadis_data_irq(rdev->priv, rdev->rx_queue->index, false);
spin_unlock_irqrestore(&rdev->priv->lock, flags);
phy_stop(ndev->phydev); phy_stop(ndev->phydev);
napi_disable(&rdev->napi); napi_disable(&rdev->napi);
@@ -1887,6 +1898,7 @@ static int renesas_eth_sw_probe(struct platform_device *pdev)
priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
if (!priv) if (!priv)
return -ENOMEM; return -ENOMEM;
spin_lock_init(&priv->lock);
attr = soc_device_match(rswitch_soc_no_speed_change); attr = soc_device_match(rswitch_soc_no_speed_change);
if (attr) if (attr)

2
drivers/net/ethernet/renesas/rswitch.h
View File

@@ -1011,6 +1011,8 @@ struct rswitch_private {
struct rswitch_etha etha[RSWITCH_NUM_PORTS]; struct rswitch_etha etha[RSWITCH_NUM_PORTS];
struct rswitch_mfwd mfwd; struct rswitch_mfwd mfwd;
spinlock_t lock; /* lock interrupt registers' control */
bool etha_no_runtime_change; bool etha_no_runtime_change;
bool gwca_halt; bool gwca_halt;
}; };