| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20251020134857.5820-3-viswanathiyyappan@gmail.com>
Date: Mon, 20 Oct 2025 19:18:57 +0530
From: I Viswanath <viswanathiyyappan@...il.com>
To: davem@...emloft.net,
edumazet@...gle.com,
kuba@...nel.org,
pabeni@...hat.com,
horms@...nel.org,
sdf@...ichev.me,
kuniyu@...gle.com,
ahmed.zaki@...el.com,
aleksander.lobakin@...el.com,
andrew+netdev@...n.ch
Cc: netdev@...r.kernel.org,
linux-kernel@...r.kernel.org,
skhan@...uxfoundation.org,
linux-kernel-mentees@...ts.linux.dev,
david.hunter.linux@...il.com,
khalid@...nel.org,
I Viswanath <viswanathiyyappan@...il.com>
Subject: [RFC net-next PATCH 2/2] net: ethernet: Implement ndo_write_rx_config callback for the 8139cp driver
Implement ndo_write_rx_config for the 8139cp driver
Signed-off-by: I Viswanath <viswanathiyyappan@...il.com>
---
I modified and set ndo_set_rx_mode to be __cp_set_rx_mode as using
cp_set_rx_mode as ndo_set_rx_mode callback would have led to a deadlock
in cp_init_hw()
drivers/net/ethernet/realtek/8139cp.c | 67 ++++++++++++++++++---------
1 file changed, 46 insertions(+), 21 deletions(-)
diff --git a/drivers/net/ethernet/realtek/8139cp.c b/drivers/net/ethernet/realtek/8139cp.c
index 5652da8a178c..ff6195c7f3b6 100644
--- a/drivers/net/ethernet/realtek/8139cp.c
+++ b/drivers/net/ethernet/realtek/8139cp.c
@@ -319,6 +319,11 @@ struct cp_extra_stats {
unsigned long rx_frags;
};
+struct cp_rx_config {
+ int rx_mode;
+ u32 mc_filter[2]; /* Multicast hash filter */
+};
+
struct cp_private {
void __iomem *regs;
struct net_device *dev;
@@ -328,7 +333,7 @@ struct cp_private {
struct napi_struct napi;
struct pci_dev *pdev;
- u32 rx_config;
+ struct cp_rx_config *rx_config;
u16 cpcmd;
struct cp_extra_stats cp_stats;
@@ -882,45 +887,53 @@ static netdev_tx_t cp_start_xmit (struct sk_buff *skb,
goto out_unlock;
}
+static void cp_write_rx_config(struct net_device *dev)
+{
+ struct cp_private *cp = netdev_priv(dev);
+ struct cp_rx_config snapshot;
+
+ read_snapshot((&snapshot), struct cp_private);
+
+ /* We can safely update without stopping the chip. */
+ cpw32_f(RxConfig, snapshot.rx_mode);
+
+ cpw32_f(MAR0 + 0, snapshot.mc_filter[0]);
+ cpw32_f(MAR0 + 4, snapshot.mc_filter[1]);
+}
+
/* Set or clear the multicast filter for this adaptor.
This routine is not state sensitive and need not be SMP locked. */
static void __cp_set_rx_mode (struct net_device *dev)
{
- struct cp_private *cp = netdev_priv(dev);
- u32 mc_filter[2]; /* Multicast hash filter */
- int rx_mode;
+ struct cp_rx_config new_config;
/* Note: do not reorder, GCC is clever about common statements. */
if (dev->flags & IFF_PROMISC) {
/* Unconditionally log net taps. */
- rx_mode =
+ new_config.rx_mode =
AcceptBroadcast | AcceptMulticast | AcceptMyPhys |
AcceptAllPhys;
- mc_filter[1] = mc_filter[0] = 0xffffffff;
+ new_config.mc_filter[1] = new_config.mc_filter[0] = 0xffffffff;
} else if ((netdev_mc_count(dev) > multicast_filter_limit) ||
(dev->flags & IFF_ALLMULTI)) {
/* Too many to filter perfectly -- accept all multicasts. */
- rx_mode = AcceptBroadcast | AcceptMulticast | AcceptMyPhys;
- mc_filter[1] = mc_filter[0] = 0xffffffff;
+ new_config.rx_mode = AcceptBroadcast | AcceptMulticast | AcceptMyPhys;
+ new_config.mc_filter[1] = new_config.mc_filter[0] = 0xffffffff;
} else {
struct netdev_hw_addr *ha;
- rx_mode = AcceptBroadcast | AcceptMyPhys;
- mc_filter[1] = mc_filter[0] = 0;
+ new_config.rx_mode = AcceptBroadcast | AcceptMyPhys;
+ new_config.mc_filter[1] = new_config.mc_filter[0] = 0;
netdev_for_each_mc_addr(ha, dev) {
int bit_nr = ether_crc(ETH_ALEN, ha->addr) >> 26;
- mc_filter[bit_nr >> 5] |= 1 << (bit_nr & 31);
- rx_mode |= AcceptMulticast;
+ new_config.mc_filter[bit_nr >> 5] |= 1 << (bit_nr & 31);
+ new_config.rx_mode |= AcceptMulticast;
}
}
- /* We can safely update without stopping the chip. */
- cp->rx_config = cp_rx_config | rx_mode;
- cpw32_f(RxConfig, cp->rx_config);
-
- cpw32_f (MAR0 + 0, mc_filter[0]);
- cpw32_f (MAR0 + 4, mc_filter[1]);
+ new_config.rx_mode = cp_rx_config | new_config.rx_mode;
+ update_snapshot(&new_config, struct cp_private);
}
static void cp_set_rx_mode (struct net_device *dev)
@@ -1040,7 +1053,7 @@ static void cp_init_hw (struct cp_private *cp)
cp_start_hw(cp);
cpw8(TxThresh, 0x06); /* XXX convert magic num to a constant */
- __cp_set_rx_mode(dev);
+ set_and_schedule_rx_config(dev, true);
cpw32_f (TxConfig, IFG | (TX_DMA_BURST << TxDMAShift));
cpw8(Config1, cpr8(Config1) | DriverLoaded | PMEnable);
@@ -1188,6 +1201,12 @@ static int cp_open (struct net_device *dev)
if (rc)
return rc;
+ cp->rx_config = kmalloc(sizeof(*cp->rx_config), GFP_KERNEL);
+ if (!cp->rx_config) {
+ rc = -ENOMEM;
+ goto err_out_rx_config;
+ }
+
napi_enable(&cp->napi);
cp_init_hw(cp);
@@ -1207,6 +1226,9 @@ static int cp_open (struct net_device *dev)
err_out_hw:
napi_disable(&cp->napi);
cp_stop_hw(cp);
+ kfree(cp->rx_config);
+
+err_out_rx_config:
cp_free_rings(cp);
return rc;
}
@@ -1227,6 +1249,8 @@ static int cp_close (struct net_device *dev)
cp_stop_hw(cp);
+ kfree(cp->rx_config);
+
spin_unlock_irqrestore(&cp->lock, flags);
free_irq(cp->pdev->irq, dev);
@@ -1262,7 +1286,7 @@ static void cp_tx_timeout(struct net_device *dev, unsigned int txqueue)
cp_clean_rings(cp);
cp_init_rings(cp);
cp_start_hw(cp);
- __cp_set_rx_mode(dev);
+ set_and_schedule_rx_config(dev, false);
cpw16_f(IntrMask, cp_norx_intr_mask);
netif_wake_queue(dev);
@@ -1869,7 +1893,8 @@ static const struct net_device_ops cp_netdev_ops = {
.ndo_stop = cp_close,
.ndo_validate_addr = eth_validate_addr,
.ndo_set_mac_address = cp_set_mac_address,
- .ndo_set_rx_mode = cp_set_rx_mode,
+ .ndo_set_rx_mode = __cp_set_rx_mode,
+ .ndo_write_rx_config = cp_write_rx_config,
.ndo_get_stats = cp_get_stats,
.ndo_eth_ioctl = cp_ioctl,
.ndo_start_xmit = cp_start_xmit,
--
2.47.3
Powered by blists - more mailing lists