samsung_sm8750/android_kernel_samsung_sm8750
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: dlink: add synchronization for stats update

Browse Source 
[ Upstream commit 12889ce926e9a9baf6b83d809ba316af539b89e2 ]

This patch synchronizes code that accesses from both user-space
and IRQ contexts. The `get_stats()` function can be called from both
context.

`dev->stats.tx_errors` and `dev->stats.collisions` are also updated
in the `tx_errors()` function. Therefore, these fields must also be
protected by synchronized.

There is no code that accessses `dev->stats.tx_errors` between the
previous and updated lines, so the updating point can be moved.

Signed-off-by: Moon Yeounsu <yyyynoom@gmail.com>
Link: https://patch.msgid.link/20250515075333.48290-1-yyyynoom@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Moon Yeounsu
2025-05-15 16:53:31 +09:00
committed by Greg Kroah-Hartman
parent 04fa1bef29
commit 6f79eb2e68
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/net/ethernet/dlink/dl2k.c
View File

@@ -146,6 +146,8 @@ rio_probe1 (struct pci_dev *pdev, const struct pci_device_id *ent)
np->ioaddr = ioaddr; np->ioaddr = ioaddr;
np->chip_id = chip_idx; np->chip_id = chip_idx;
np->pdev = pdev; np->pdev = pdev;
spin_lock_init(&np->stats_lock);
spin_lock_init (&np->tx_lock); spin_lock_init (&np->tx_lock);
spin_lock_init (&np->rx_lock); spin_lock_init (&np->rx_lock);
@@ -866,7 +868,6 @@ tx_error (struct net_device *dev, int tx_status)
frame_id = (tx_status & 0xffff0000); frame_id = (tx_status & 0xffff0000);
printk (KERN_ERR "%s: Transmit error, TxStatus %4.4x, FrameId %d.\n", printk (KERN_ERR "%s: Transmit error, TxStatus %4.4x, FrameId %d.\n",
dev->name, tx_status, frame_id); dev->name, tx_status, frame_id);
dev->stats.tx_errors++;
/* Ttransmit Underrun */ /* Ttransmit Underrun */
if (tx_status & 0x10) { if (tx_status & 0x10) {
dev->stats.tx_fifo_errors++; dev->stats.tx_fifo_errors++;
@@ -903,9 +904,15 @@ tx_error (struct net_device *dev, int tx_status)
rio_set_led_mode(dev); rio_set_led_mode(dev);
/* Let TxStartThresh stay default value */ /* Let TxStartThresh stay default value */
} }
spin_lock(&np->stats_lock);
/* Maximum Collisions */ /* Maximum Collisions */
if (tx_status & 0x08) if (tx_status & 0x08)
dev->stats.collisions++; dev->stats.collisions++;
dev->stats.tx_errors++;
spin_unlock(&np->stats_lock);
/* Restart the Tx */ /* Restart the Tx */
dw32(MACCtrl, dr16(MACCtrl) | TxEnable); dw32(MACCtrl, dr16(MACCtrl) | TxEnable);
} }
@@ -1074,7 +1081,9 @@ get_stats (struct net_device *dev)
int i; int i;
#endif #endif
unsigned int stat_reg; unsigned int stat_reg;
unsigned long flags;
spin_lock_irqsave(&np->stats_lock, flags);
/* All statistics registers need to be acknowledged, /* All statistics registers need to be acknowledged,
else statistic overflow could cause problems */ else statistic overflow could cause problems */
@@ -1124,6 +1133,9 @@ get_stats (struct net_device *dev)
dr16(TCPCheckSumErrors); dr16(TCPCheckSumErrors);
dr16(UDPCheckSumErrors); dr16(UDPCheckSumErrors);
dr16(IPCheckSumErrors); dr16(IPCheckSumErrors);
spin_unlock_irqrestore(&np->stats_lock, flags);
return &dev->stats; return &dev->stats;
} }

2
drivers/net/ethernet/dlink/dl2k.h
View File

@@ -372,6 +372,8 @@ struct netdev_private {
struct pci_dev *pdev; struct pci_dev *pdev;
void __iomem *ioaddr; void __iomem *ioaddr;
void __iomem *eeprom_addr; void __iomem *eeprom_addr;
// To ensure synchronization when stats are updated.
spinlock_t stats_lock;
spinlock_t tx_lock; spinlock_t tx_lock;
spinlock_t rx_lock; spinlock_t rx_lock;
unsigned int rx_buf_sz; /* Based on MTU+slack. */ unsigned int rx_buf_sz; /* Based on MTU+slack. */