* [PATCH net-next 1/9] docs: networking: Use netif_rx().
2022-03-03 17:14 [PATCH net-next 0/9] net: Convert user to netif_rx() Sebastian Andrzej Siewior
@ 2022-03-03 17:14 ` Sebastian Andrzej Siewior
2022-03-03 17:14 ` [PATCH net-next 2/9] net: xtensa: " Sebastian Andrzej Siewior
` (8 subsequent siblings)
9 siblings, 0 replies; 15+ messages in thread
From: Sebastian Andrzej Siewior @ 2022-03-03 17:14 UTC (permalink / raw)
To: netdev
Cc: David S. Miller, Jakub Kicinski, Thomas Gleixner,
Sebastian Andrzej Siewior, Jonathan Corbet, linux-doc
Since commit
baebdf48c3600 ("net: dev: Makes sure netif_rx() can be invoked in any context.")
the function netif_rx() can be used in preemptible/thread context as
well as in interrupt context.
Use netif_rx().
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: linux-doc@vger.kernel.org
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
---
Documentation/networking/timestamping.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/networking/timestamping.rst b/Documentation/networking/timestamping.rst
index f5809206eb93d..be4eb12420570 100644
--- a/Documentation/networking/timestamping.rst
+++ b/Documentation/networking/timestamping.rst
@@ -668,7 +668,7 @@ In the generic layer, DSA provides the following infrastructure for PTP
(through another RX timestamping FIFO). Deferral on RX is typically
necessary when retrieving the timestamp needs a sleepable context. In
that case, it is the responsibility of the DSA driver to call
- ``netif_rx_ni()`` on the freshly timestamped skb.
+ ``netif_rx()`` on the freshly timestamped skb.
3.2.2 Ethernet PHYs
^^^^^^^^^^^^^^^^^^^
--
2.35.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH net-next 2/9] net: xtensa: Use netif_rx().
2022-03-03 17:14 [PATCH net-next 0/9] net: Convert user to netif_rx() Sebastian Andrzej Siewior
2022-03-03 17:14 ` [PATCH net-next 1/9] docs: networking: Use netif_rx() Sebastian Andrzej Siewior
@ 2022-03-03 17:14 ` Sebastian Andrzej Siewior
2022-03-04 3:12 ` Max Filippov
2022-03-03 17:14 ` [PATCH net-next 3/9] net: sgi-xp: " Sebastian Andrzej Siewior
` (7 subsequent siblings)
9 siblings, 1 reply; 15+ messages in thread
From: Sebastian Andrzej Siewior @ 2022-03-03 17:14 UTC (permalink / raw)
To: netdev
Cc: David S. Miller, Jakub Kicinski, Thomas Gleixner,
Sebastian Andrzej Siewior, Chris Zankel, Max Filippov,
linux-xtensa
Since commit
baebdf48c3600 ("net: dev: Makes sure netif_rx() can be invoked in any context.")
the function netif_rx() can be used in preemptible/thread context as
well as in interrupt context.
Use netif_rx().
Cc: Chris Zankel <chris@zankel.net>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: linux-xtensa@linux-xtensa.org
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
---
arch/xtensa/platforms/iss/network.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/xtensa/platforms/iss/network.c b/arch/xtensa/platforms/iss/network.c
index 962e5e1452097..9fb99d18e3c22 100644
--- a/arch/xtensa/platforms/iss/network.c
+++ b/arch/xtensa/platforms/iss/network.c
@@ -304,7 +304,7 @@ static int iss_net_rx(struct net_device *dev)
lp->stats.rx_bytes += skb->len;
lp->stats.rx_packets++;
- netif_rx_ni(skb);
+ netif_rx(skb);
return pkt_len;
}
kfree_skb(skb);
--
2.35.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [PATCH net-next 2/9] net: xtensa: Use netif_rx().
2022-03-03 17:14 ` [PATCH net-next 2/9] net: xtensa: " Sebastian Andrzej Siewior
@ 2022-03-04 3:12 ` Max Filippov
0 siblings, 0 replies; 15+ messages in thread
From: Max Filippov @ 2022-03-04 3:12 UTC (permalink / raw)
To: Sebastian Andrzej Siewior
Cc: netdev, David S. Miller, Jakub Kicinski, Thomas Gleixner,
Chris Zankel, open list:TENSILICA XTENSA PORT (xtensa)
On Thu, Mar 3, 2022 at 9:15 AM Sebastian Andrzej Siewior
<bigeasy@linutronix.de> wrote:
>
> Since commit
> baebdf48c3600 ("net: dev: Makes sure netif_rx() can be invoked in any context.")
>
> the function netif_rx() can be used in preemptible/thread context as
> well as in interrupt context.
>
> Use netif_rx().
>
> Cc: Chris Zankel <chris@zankel.net>
> Cc: Max Filippov <jcmvbkbc@gmail.com>
> Cc: linux-xtensa@linux-xtensa.org
> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
> ---
> arch/xtensa/platforms/iss/network.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Acked-by: Max Filippov <jcmvbkbc@gmail.com>
--
Thanks.
-- Max
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH net-next 3/9] net: sgi-xp: Use netif_rx().
2022-03-03 17:14 [PATCH net-next 0/9] net: Convert user to netif_rx() Sebastian Andrzej Siewior
2022-03-03 17:14 ` [PATCH net-next 1/9] docs: networking: Use netif_rx() Sebastian Andrzej Siewior
2022-03-03 17:14 ` [PATCH net-next 2/9] net: xtensa: " Sebastian Andrzej Siewior
@ 2022-03-03 17:14 ` Sebastian Andrzej Siewior
2022-03-04 20:31 ` Steve Wahl
2022-03-03 17:15 ` [PATCH net-next 4/9] net: caif: " Sebastian Andrzej Siewior
` (6 subsequent siblings)
9 siblings, 1 reply; 15+ messages in thread
From: Sebastian Andrzej Siewior @ 2022-03-03 17:14 UTC (permalink / raw)
To: netdev
Cc: David S. Miller, Jakub Kicinski, Thomas Gleixner,
Sebastian Andrzej Siewior, Robin Holt, Steve Wahl, Mike Travis
Since commit
baebdf48c3600 ("net: dev: Makes sure netif_rx() can be invoked in any context.")
the function netif_rx() can be used in preemptible/thread context as
well as in interrupt context.
Use netif_rx().
Cc: Robin Holt <robinmholt@gmail.com>
Cc: Steve Wahl <steve.wahl@hpe.com>
Cc: Mike Travis <mike.travis@hpe.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
---
drivers/misc/sgi-xp/xpnet.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/misc/sgi-xp/xpnet.c b/drivers/misc/sgi-xp/xpnet.c
index dab7b92db790a..50644f83e78ce 100644
--- a/drivers/misc/sgi-xp/xpnet.c
+++ b/drivers/misc/sgi-xp/xpnet.c
@@ -247,7 +247,7 @@ xpnet_receive(short partid, int channel, struct xpnet_message *msg)
xpnet_device->stats.rx_packets++;
xpnet_device->stats.rx_bytes += skb->len + ETH_HLEN;
- netif_rx_ni(skb);
+ netif_rx(skb);
xpc_received(partid, channel, (void *)msg);
}
--
2.35.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [PATCH net-next 3/9] net: sgi-xp: Use netif_rx().
2022-03-03 17:14 ` [PATCH net-next 3/9] net: sgi-xp: " Sebastian Andrzej Siewior
@ 2022-03-04 20:31 ` Steve Wahl
0 siblings, 0 replies; 15+ messages in thread
From: Steve Wahl @ 2022-03-04 20:31 UTC (permalink / raw)
To: Sebastian Andrzej Siewior
Cc: netdev, David S. Miller, Jakub Kicinski, Thomas Gleixner,
Robin Holt, Steve Wahl, Mike Travis
Reviewed-by: Steve Wahl <steve.wahl@hpe.com>
On Thu, Mar 03, 2022 at 06:14:59PM +0100, Sebastian Andrzej Siewior wrote:
> Since commit
> baebdf48c3600 ("net: dev: Makes sure netif_rx() can be invoked in any context.")
>
> the function netif_rx() can be used in preemptible/thread context as
> well as in interrupt context.
>
> Use netif_rx().
>
> Cc: Robin Holt <robinmholt@gmail.com>
> Cc: Steve Wahl <steve.wahl@hpe.com>
> Cc: Mike Travis <mike.travis@hpe.com>
> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
> ---
> drivers/misc/sgi-xp/xpnet.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/misc/sgi-xp/xpnet.c b/drivers/misc/sgi-xp/xpnet.c
> index dab7b92db790a..50644f83e78ce 100644
> --- a/drivers/misc/sgi-xp/xpnet.c
> +++ b/drivers/misc/sgi-xp/xpnet.c
> @@ -247,7 +247,7 @@ xpnet_receive(short partid, int channel, struct xpnet_message *msg)
> xpnet_device->stats.rx_packets++;
> xpnet_device->stats.rx_bytes += skb->len + ETH_HLEN;
>
> - netif_rx_ni(skb);
> + netif_rx(skb);
> xpc_received(partid, channel, (void *)msg);
> }
>
> --
> 2.35.1
>
--
Steve Wahl, Hewlett Packard Enterprise
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH net-next 4/9] net: caif: Use netif_rx().
2022-03-03 17:14 [PATCH net-next 0/9] net: Convert user to netif_rx() Sebastian Andrzej Siewior
` (2 preceding siblings ...)
2022-03-03 17:14 ` [PATCH net-next 3/9] net: sgi-xp: " Sebastian Andrzej Siewior
@ 2022-03-03 17:15 ` Sebastian Andrzej Siewior
2022-03-03 17:15 ` [PATCH net-next 5/9] net: dsa: " Sebastian Andrzej Siewior
` (5 subsequent siblings)
9 siblings, 0 replies; 15+ messages in thread
From: Sebastian Andrzej Siewior @ 2022-03-03 17:15 UTC (permalink / raw)
To: netdev
Cc: David S. Miller, Jakub Kicinski, Thomas Gleixner,
Sebastian Andrzej Siewior
Since commit
baebdf48c3600 ("net: dev: Makes sure netif_rx() can be invoked in any context.")
the function netif_rx() can be used in preemptible/thread context as
well as in interrupt context.
Use netif_rx().
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
---
drivers/net/caif/caif_serial.c | 2 +-
net/caif/chnl_net.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/caif/caif_serial.c b/drivers/net/caif/caif_serial.c
index 2a7af611d43a5..688075859ae47 100644
--- a/drivers/net/caif/caif_serial.c
+++ b/drivers/net/caif/caif_serial.c
@@ -196,7 +196,7 @@ static void ldisc_receive(struct tty_struct *tty, const u8 *data,
skb_reset_mac_header(skb);
debugfs_rx(ser, data, count);
/* Push received packet up the stack. */
- ret = netif_rx_ni(skb);
+ ret = netif_rx(skb);
if (!ret) {
ser->dev->stats.rx_packets++;
ser->dev->stats.rx_bytes += count;
diff --git a/net/caif/chnl_net.c b/net/caif/chnl_net.c
index 414dc5671c45e..4d63ef13a1fd7 100644
--- a/net/caif/chnl_net.c
+++ b/net/caif/chnl_net.c
@@ -99,7 +99,7 @@ static int chnl_recv_cb(struct cflayer *layr, struct cfpkt *pkt)
else
skb->ip_summed = CHECKSUM_NONE;
- netif_rx_any_context(skb);
+ netif_rx(skb);
/* Update statistics. */
priv->netdev->stats.rx_packets++;
--
2.35.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH net-next 5/9] net: dsa: Use netif_rx().
2022-03-03 17:14 [PATCH net-next 0/9] net: Convert user to netif_rx() Sebastian Andrzej Siewior
` (3 preceding siblings ...)
2022-03-03 17:15 ` [PATCH net-next 4/9] net: caif: " Sebastian Andrzej Siewior
@ 2022-03-03 17:15 ` Sebastian Andrzej Siewior
2022-03-04 7:41 ` Kurt Kanzenbach
2022-03-03 17:15 ` [PATCH net-next 6/9] net: ethernet: " Sebastian Andrzej Siewior
` (4 subsequent siblings)
9 siblings, 1 reply; 15+ messages in thread
From: Sebastian Andrzej Siewior @ 2022-03-03 17:15 UTC (permalink / raw)
To: netdev
Cc: David S. Miller, Jakub Kicinski, Thomas Gleixner,
Sebastian Andrzej Siewior, Kurt Kanzenbach, Andrew Lunn,
Vivien Didelot, Florian Fainelli, Vladimir Oltean
Since commit
baebdf48c3600 ("net: dev: Makes sure netif_rx() can be invoked in any context.")
the function netif_rx() can be used in preemptible/thread context as
well as in interrupt context.
Use netif_rx().
Cc: Kurt Kanzenbach <kurt@linutronix.de>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Vivien Didelot <vivien.didelot@gmail.com>
Cc: Florian Fainelli <f.fainelli@gmail.com>
Cc: Vladimir Oltean <olteanv@gmail.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
---
drivers/net/dsa/hirschmann/hellcreek_hwtstamp.c | 2 +-
drivers/net/dsa/mv88e6xxx/hwtstamp.c | 2 +-
drivers/net/dsa/sja1105/sja1105_ptp.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/dsa/hirschmann/hellcreek_hwtstamp.c b/drivers/net/dsa/hirschmann/hellcreek_hwtstamp.c
index b3bc948d6145b..ffd06cf8c44f0 100644
--- a/drivers/net/dsa/hirschmann/hellcreek_hwtstamp.c
+++ b/drivers/net/dsa/hirschmann/hellcreek_hwtstamp.c
@@ -331,7 +331,7 @@ static void hellcreek_get_rxts(struct hellcreek *hellcreek,
shwt = skb_hwtstamps(skb);
memset(shwt, 0, sizeof(*shwt));
shwt->hwtstamp = ns_to_ktime(ns);
- netif_rx_ni(skb);
+ netif_rx(skb);
}
}
diff --git a/drivers/net/dsa/mv88e6xxx/hwtstamp.c b/drivers/net/dsa/mv88e6xxx/hwtstamp.c
index 389f8a6ec0ab3..331b4ca089ffa 100644
--- a/drivers/net/dsa/mv88e6xxx/hwtstamp.c
+++ b/drivers/net/dsa/mv88e6xxx/hwtstamp.c
@@ -301,7 +301,7 @@ static void mv88e6xxx_get_rxts(struct mv88e6xxx_chip *chip,
shwt->hwtstamp = ns_to_ktime(ns);
status &= ~MV88E6XXX_PTP_TS_VALID;
}
- netif_rx_ni(skb);
+ netif_rx(skb);
}
}
diff --git a/drivers/net/dsa/sja1105/sja1105_ptp.c b/drivers/net/dsa/sja1105/sja1105_ptp.c
index be3068a935af5..30fb2cc40164b 100644
--- a/drivers/net/dsa/sja1105/sja1105_ptp.c
+++ b/drivers/net/dsa/sja1105/sja1105_ptp.c
@@ -399,7 +399,7 @@ static long sja1105_rxtstamp_work(struct ptp_clock_info *ptp)
ts = sja1105_tstamp_reconstruct(ds, ticks, ts);
shwt->hwtstamp = ns_to_ktime(sja1105_ticks_to_ns(ts));
- netif_rx_ni(skb);
+ netif_rx(skb);
}
if (ptp_data->extts_enabled)
--
2.35.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [PATCH net-next 5/9] net: dsa: Use netif_rx().
2022-03-03 17:15 ` [PATCH net-next 5/9] net: dsa: " Sebastian Andrzej Siewior
@ 2022-03-04 7:41 ` Kurt Kanzenbach
0 siblings, 0 replies; 15+ messages in thread
From: Kurt Kanzenbach @ 2022-03-04 7:41 UTC (permalink / raw)
To: Sebastian Andrzej Siewior, netdev
Cc: David S. Miller, Jakub Kicinski, Thomas Gleixner,
Sebastian Andrzej Siewior, Andrew Lunn, Vivien Didelot,
Florian Fainelli, Vladimir Oltean
[-- Attachment #1: Type: text/plain, Size: 622 bytes --]
On Thu Mar 03 2022, Sebastian Andrzej Siewior wrote:
> Since commit
> baebdf48c3600 ("net: dev: Makes sure netif_rx() can be invoked in any context.")
>
> the function netif_rx() can be used in preemptible/thread context as
> well as in interrupt context.
>
> Use netif_rx().
>
> Cc: Kurt Kanzenbach <kurt@linutronix.de>
> Cc: Andrew Lunn <andrew@lunn.ch>
> Cc: Vivien Didelot <vivien.didelot@gmail.com>
> Cc: Florian Fainelli <f.fainelli@gmail.com>
> Cc: Vladimir Oltean <olteanv@gmail.com>
> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Acked-by: Kurt Kanzenbach <kurt@linutronix.de> # hellcreek
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 861 bytes --]
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH net-next 6/9] net: ethernet: Use netif_rx().
2022-03-03 17:14 [PATCH net-next 0/9] net: Convert user to netif_rx() Sebastian Andrzej Siewior
` (4 preceding siblings ...)
2022-03-03 17:15 ` [PATCH net-next 5/9] net: dsa: " Sebastian Andrzej Siewior
@ 2022-03-03 17:15 ` Sebastian Andrzej Siewior
2022-03-08 9:50 ` Lukasz Stelmach
2022-03-03 17:15 ` [PATCH net-next 7/9] net: macvlan: " Sebastian Andrzej Siewior
` (3 subsequent siblings)
9 siblings, 1 reply; 15+ messages in thread
From: Sebastian Andrzej Siewior @ 2022-03-03 17:15 UTC (permalink / raw)
To: netdev
Cc: David S. Miller, Jakub Kicinski, Thomas Gleixner,
Sebastian Andrzej Siewior, Łukasz Stelmach, Horatiu Vultur,
UNGLinuxDriver
Since commit
baebdf48c3600 ("net: dev: Makes sure netif_rx() can be invoked in any context.")
the function netif_rx() can be used in preemptible/thread context as
well as in interrupt context.
Use netif_rx().
Cc: Łukasz Stelmach <l.stelmach@samsung.com>
Cc: Horatiu Vultur <horatiu.vultur@microchip.com>
Cc: UNGLinuxDriver@microchip.com
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
---
drivers/net/ethernet/asix/ax88796c_main.c | 2 +-
drivers/net/ethernet/davicom/dm9051.c | 2 +-
drivers/net/ethernet/micrel/ks8851_spi.c | 2 +-
drivers/net/ethernet/microchip/enc28j60.c | 2 +-
drivers/net/ethernet/microchip/lan966x/lan966x_main.c | 2 +-
drivers/net/ethernet/qualcomm/qca_spi.c | 2 +-
drivers/net/ethernet/qualcomm/qca_uart.c | 2 +-
drivers/net/ethernet/vertexcom/mse102x.c | 2 +-
drivers/net/ethernet/wiznet/w5100.c | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/net/ethernet/asix/ax88796c_main.c b/drivers/net/ethernet/asix/ax88796c_main.c
index bf70481bb1cad..6ba5b024a7be7 100644
--- a/drivers/net/ethernet/asix/ax88796c_main.c
+++ b/drivers/net/ethernet/asix/ax88796c_main.c
@@ -433,7 +433,7 @@ ax88796c_skb_return(struct ax88796c_device *ax_local,
netif_info(ax_local, rx_status, ndev, "< rx, len %zu, type 0x%x\n",
skb->len + sizeof(struct ethhdr), skb->protocol);
- status = netif_rx_ni(skb);
+ status = netif_rx(skb);
if (status != NET_RX_SUCCESS && net_ratelimit())
netif_info(ax_local, rx_err, ndev,
"netif_rx status %d\n", status);
diff --git a/drivers/net/ethernet/davicom/dm9051.c b/drivers/net/ethernet/davicom/dm9051.c
index 8ebcb35bbc0e1..a523ddda76093 100644
--- a/drivers/net/ethernet/davicom/dm9051.c
+++ b/drivers/net/ethernet/davicom/dm9051.c
@@ -804,7 +804,7 @@ static int dm9051_loop_rx(struct board_info *db)
skb->protocol = eth_type_trans(skb, db->ndev);
if (db->ndev->features & NETIF_F_RXCSUM)
skb_checksum_none_assert(skb);
- netif_rx_ni(skb);
+ netif_rx(skb);
db->ndev->stats.rx_bytes += rxlen;
db->ndev->stats.rx_packets++;
scanrr++;
diff --git a/drivers/net/ethernet/micrel/ks8851_spi.c b/drivers/net/ethernet/micrel/ks8851_spi.c
index d167d93e4c12f..82d55fc27edc6 100644
--- a/drivers/net/ethernet/micrel/ks8851_spi.c
+++ b/drivers/net/ethernet/micrel/ks8851_spi.c
@@ -293,7 +293,7 @@ static void ks8851_wrfifo_spi(struct ks8851_net *ks, struct sk_buff *txp,
*/
static void ks8851_rx_skb_spi(struct ks8851_net *ks, struct sk_buff *skb)
{
- netif_rx_ni(skb);
+ netif_rx(skb);
}
/**
diff --git a/drivers/net/ethernet/microchip/enc28j60.c b/drivers/net/ethernet/microchip/enc28j60.c
index db5a3edb4c3c0..559ad94a44d03 100644
--- a/drivers/net/ethernet/microchip/enc28j60.c
+++ b/drivers/net/ethernet/microchip/enc28j60.c
@@ -975,7 +975,7 @@ static void enc28j60_hw_rx(struct net_device *ndev)
/* update statistics */
ndev->stats.rx_packets++;
ndev->stats.rx_bytes += len;
- netif_rx_ni(skb);
+ netif_rx(skb);
}
}
/*
diff --git a/drivers/net/ethernet/microchip/lan966x/lan966x_main.c b/drivers/net/ethernet/microchip/lan966x/lan966x_main.c
index 4e877d9859bff..ad310c95bf5c9 100644
--- a/drivers/net/ethernet/microchip/lan966x/lan966x_main.c
+++ b/drivers/net/ethernet/microchip/lan966x/lan966x_main.c
@@ -600,7 +600,7 @@ static irqreturn_t lan966x_xtr_irq_handler(int irq, void *args)
skb->offload_fwd_mark = 0;
}
- netif_rx_ni(skb);
+ netif_rx(skb);
dev->stats.rx_bytes += len;
dev->stats.rx_packets++;
diff --git a/drivers/net/ethernet/qualcomm/qca_spi.c b/drivers/net/ethernet/qualcomm/qca_spi.c
index 3c5494afd3c04..c865a4be05eec 100644
--- a/drivers/net/ethernet/qualcomm/qca_spi.c
+++ b/drivers/net/ethernet/qualcomm/qca_spi.c
@@ -435,7 +435,7 @@ qcaspi_receive(struct qcaspi *qca)
qca->rx_skb->protocol = eth_type_trans(
qca->rx_skb, qca->rx_skb->dev);
skb_checksum_none_assert(qca->rx_skb);
- netif_rx_ni(qca->rx_skb);
+ netif_rx(qca->rx_skb);
qca->rx_skb = netdev_alloc_skb_ip_align(net_dev,
net_dev->mtu + VLAN_ETH_HLEN);
if (!qca->rx_skb) {
diff --git a/drivers/net/ethernet/qualcomm/qca_uart.c b/drivers/net/ethernet/qualcomm/qca_uart.c
index 27c4f43176aaa..26646cb6a20a6 100644
--- a/drivers/net/ethernet/qualcomm/qca_uart.c
+++ b/drivers/net/ethernet/qualcomm/qca_uart.c
@@ -108,7 +108,7 @@ qca_tty_receive(struct serdev_device *serdev, const unsigned char *data,
qca->rx_skb->protocol = eth_type_trans(
qca->rx_skb, qca->rx_skb->dev);
skb_checksum_none_assert(qca->rx_skb);
- netif_rx_ni(qca->rx_skb);
+ netif_rx(qca->rx_skb);
qca->rx_skb = netdev_alloc_skb_ip_align(netdev,
netdev->mtu +
VLAN_ETH_HLEN);
diff --git a/drivers/net/ethernet/vertexcom/mse102x.c b/drivers/net/ethernet/vertexcom/mse102x.c
index 25739b182ac7b..eb39a45de0121 100644
--- a/drivers/net/ethernet/vertexcom/mse102x.c
+++ b/drivers/net/ethernet/vertexcom/mse102x.c
@@ -362,7 +362,7 @@ static void mse102x_rx_pkt_spi(struct mse102x_net *mse)
mse102x_dump_packet(__func__, skb->len, skb->data);
skb->protocol = eth_type_trans(skb, mse->ndev);
- netif_rx_ni(skb);
+ netif_rx(skb);
mse->ndev->stats.rx_packets++;
mse->ndev->stats.rx_bytes += rxlen;
diff --git a/drivers/net/ethernet/wiznet/w5100.c b/drivers/net/ethernet/wiznet/w5100.c
index ae24d6b868031..4fd7c39e11233 100644
--- a/drivers/net/ethernet/wiznet/w5100.c
+++ b/drivers/net/ethernet/wiznet/w5100.c
@@ -883,7 +883,7 @@ static void w5100_rx_work(struct work_struct *work)
struct sk_buff *skb;
while ((skb = w5100_rx_skb(priv->ndev)))
- netif_rx_ni(skb);
+ netif_rx(skb);
w5100_enable_intr(priv);
}
--
2.35.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [PATCH net-next 6/9] net: ethernet: Use netif_rx().
2022-03-03 17:15 ` [PATCH net-next 6/9] net: ethernet: " Sebastian Andrzej Siewior
@ 2022-03-08 9:50 ` Lukasz Stelmach
0 siblings, 0 replies; 15+ messages in thread
From: Lukasz Stelmach @ 2022-03-08 9:50 UTC (permalink / raw)
To: Sebastian Andrzej Siewior
Cc: netdev, David S. Miller, Jakub Kicinski, Thomas Gleixner,
Horatiu Vultur, UNGLinuxDriver
[-- Attachment #1: Type: text/plain, Size: 6374 bytes --]
It was <2022-03-03 czw 18:15>, when Sebastian Andrzej Siewior wrote:
> Since commit
> baebdf48c3600 ("net: dev: Makes sure netif_rx() can be invoked in any context.")
>
> the function netif_rx() can be used in preemptible/thread context as
> well as in interrupt context.
>
> Use netif_rx().
>
> Cc: Łukasz Stelmach <l.stelmach@samsung.com>
> Cc: Horatiu Vultur <horatiu.vultur@microchip.com>
> Cc: UNGLinuxDriver@microchip.com
> Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
> ---
> drivers/net/ethernet/asix/ax88796c_main.c | 2 +-
> drivers/net/ethernet/davicom/dm9051.c | 2 +-
> drivers/net/ethernet/micrel/ks8851_spi.c | 2 +-
> drivers/net/ethernet/microchip/enc28j60.c | 2 +-
> drivers/net/ethernet/microchip/lan966x/lan966x_main.c | 2 +-
> drivers/net/ethernet/qualcomm/qca_spi.c | 2 +-
> drivers/net/ethernet/qualcomm/qca_uart.c | 2 +-
> drivers/net/ethernet/vertexcom/mse102x.c | 2 +-
> drivers/net/ethernet/wiznet/w5100.c | 2 +-
> 9 files changed, 9 insertions(+), 9 deletions(-)
>
Acked-by: Łukasz Stelmach <l.stelmach@samsung.com>
> diff --git a/drivers/net/ethernet/asix/ax88796c_main.c b/drivers/net/ethernet/asix/ax88796c_main.c
> index bf70481bb1cad..6ba5b024a7be7 100644
> --- a/drivers/net/ethernet/asix/ax88796c_main.c
> +++ b/drivers/net/ethernet/asix/ax88796c_main.c
> @@ -433,7 +433,7 @@ ax88796c_skb_return(struct ax88796c_device *ax_local,
> netif_info(ax_local, rx_status, ndev, "< rx, len %zu, type 0x%x\n",
> skb->len + sizeof(struct ethhdr), skb->protocol);
>
> - status = netif_rx_ni(skb);
> + status = netif_rx(skb);
> if (status != NET_RX_SUCCESS && net_ratelimit())
> netif_info(ax_local, rx_err, ndev,
> "netif_rx status %d\n", status);
> diff --git a/drivers/net/ethernet/davicom/dm9051.c b/drivers/net/ethernet/davicom/dm9051.c
> index 8ebcb35bbc0e1..a523ddda76093 100644
> --- a/drivers/net/ethernet/davicom/dm9051.c
> +++ b/drivers/net/ethernet/davicom/dm9051.c
> @@ -804,7 +804,7 @@ static int dm9051_loop_rx(struct board_info *db)
> skb->protocol = eth_type_trans(skb, db->ndev);
> if (db->ndev->features & NETIF_F_RXCSUM)
> skb_checksum_none_assert(skb);
> - netif_rx_ni(skb);
> + netif_rx(skb);
> db->ndev->stats.rx_bytes += rxlen;
> db->ndev->stats.rx_packets++;
> scanrr++;
> diff --git a/drivers/net/ethernet/micrel/ks8851_spi.c b/drivers/net/ethernet/micrel/ks8851_spi.c
> index d167d93e4c12f..82d55fc27edc6 100644
> --- a/drivers/net/ethernet/micrel/ks8851_spi.c
> +++ b/drivers/net/ethernet/micrel/ks8851_spi.c
> @@ -293,7 +293,7 @@ static void ks8851_wrfifo_spi(struct ks8851_net *ks, struct sk_buff *txp,
> */
> static void ks8851_rx_skb_spi(struct ks8851_net *ks, struct sk_buff *skb)
> {
> - netif_rx_ni(skb);
> + netif_rx(skb);
> }
>
> /**
> diff --git a/drivers/net/ethernet/microchip/enc28j60.c b/drivers/net/ethernet/microchip/enc28j60.c
> index db5a3edb4c3c0..559ad94a44d03 100644
> --- a/drivers/net/ethernet/microchip/enc28j60.c
> +++ b/drivers/net/ethernet/microchip/enc28j60.c
> @@ -975,7 +975,7 @@ static void enc28j60_hw_rx(struct net_device *ndev)
> /* update statistics */
> ndev->stats.rx_packets++;
> ndev->stats.rx_bytes += len;
> - netif_rx_ni(skb);
> + netif_rx(skb);
> }
> }
> /*
> diff --git a/drivers/net/ethernet/microchip/lan966x/lan966x_main.c b/drivers/net/ethernet/microchip/lan966x/lan966x_main.c
> index 4e877d9859bff..ad310c95bf5c9 100644
> --- a/drivers/net/ethernet/microchip/lan966x/lan966x_main.c
> +++ b/drivers/net/ethernet/microchip/lan966x/lan966x_main.c
> @@ -600,7 +600,7 @@ static irqreturn_t lan966x_xtr_irq_handler(int irq, void *args)
> skb->offload_fwd_mark = 0;
> }
>
> - netif_rx_ni(skb);
> + netif_rx(skb);
> dev->stats.rx_bytes += len;
> dev->stats.rx_packets++;
>
> diff --git a/drivers/net/ethernet/qualcomm/qca_spi.c b/drivers/net/ethernet/qualcomm/qca_spi.c
> index 3c5494afd3c04..c865a4be05eec 100644
> --- a/drivers/net/ethernet/qualcomm/qca_spi.c
> +++ b/drivers/net/ethernet/qualcomm/qca_spi.c
> @@ -435,7 +435,7 @@ qcaspi_receive(struct qcaspi *qca)
> qca->rx_skb->protocol = eth_type_trans(
> qca->rx_skb, qca->rx_skb->dev);
> skb_checksum_none_assert(qca->rx_skb);
> - netif_rx_ni(qca->rx_skb);
> + netif_rx(qca->rx_skb);
> qca->rx_skb = netdev_alloc_skb_ip_align(net_dev,
> net_dev->mtu + VLAN_ETH_HLEN);
> if (!qca->rx_skb) {
> diff --git a/drivers/net/ethernet/qualcomm/qca_uart.c b/drivers/net/ethernet/qualcomm/qca_uart.c
> index 27c4f43176aaa..26646cb6a20a6 100644
> --- a/drivers/net/ethernet/qualcomm/qca_uart.c
> +++ b/drivers/net/ethernet/qualcomm/qca_uart.c
> @@ -108,7 +108,7 @@ qca_tty_receive(struct serdev_device *serdev, const unsigned char *data,
> qca->rx_skb->protocol = eth_type_trans(
> qca->rx_skb, qca->rx_skb->dev);
> skb_checksum_none_assert(qca->rx_skb);
> - netif_rx_ni(qca->rx_skb);
> + netif_rx(qca->rx_skb);
> qca->rx_skb = netdev_alloc_skb_ip_align(netdev,
> netdev->mtu +
> VLAN_ETH_HLEN);
> diff --git a/drivers/net/ethernet/vertexcom/mse102x.c b/drivers/net/ethernet/vertexcom/mse102x.c
> index 25739b182ac7b..eb39a45de0121 100644
> --- a/drivers/net/ethernet/vertexcom/mse102x.c
> +++ b/drivers/net/ethernet/vertexcom/mse102x.c
> @@ -362,7 +362,7 @@ static void mse102x_rx_pkt_spi(struct mse102x_net *mse)
> mse102x_dump_packet(__func__, skb->len, skb->data);
>
> skb->protocol = eth_type_trans(skb, mse->ndev);
> - netif_rx_ni(skb);
> + netif_rx(skb);
>
> mse->ndev->stats.rx_packets++;
> mse->ndev->stats.rx_bytes += rxlen;
> diff --git a/drivers/net/ethernet/wiznet/w5100.c b/drivers/net/ethernet/wiznet/w5100.c
> index ae24d6b868031..4fd7c39e11233 100644
> --- a/drivers/net/ethernet/wiznet/w5100.c
> +++ b/drivers/net/ethernet/wiznet/w5100.c
> @@ -883,7 +883,7 @@ static void w5100_rx_work(struct work_struct *work)
> struct sk_buff *skb;
>
> while ((skb = w5100_rx_skb(priv->ndev)))
> - netif_rx_ni(skb);
> + netif_rx(skb);
>
> w5100_enable_intr(priv);
> }
--
Łukasz Stelmach
Samsung R&D Institute Poland
Samsung Electronics
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH net-next 7/9] net: macvlan: Use netif_rx().
2022-03-03 17:14 [PATCH net-next 0/9] net: Convert user to netif_rx() Sebastian Andrzej Siewior
` (5 preceding siblings ...)
2022-03-03 17:15 ` [PATCH net-next 6/9] net: ethernet: " Sebastian Andrzej Siewior
@ 2022-03-03 17:15 ` Sebastian Andrzej Siewior
2022-03-03 17:15 ` [PATCH net-next 8/9] net: bridge: " Sebastian Andrzej Siewior
` (2 subsequent siblings)
9 siblings, 0 replies; 15+ messages in thread
From: Sebastian Andrzej Siewior @ 2022-03-03 17:15 UTC (permalink / raw)
To: netdev
Cc: David S. Miller, Jakub Kicinski, Thomas Gleixner,
Sebastian Andrzej Siewior
Since commit
baebdf48c3600 ("net: dev: Makes sure netif_rx() can be invoked in any context.")
the function netif_rx() can be used in preemptible/thread context as
well as in interrupt context.
Use netif_rx().
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
---
drivers/net/macvlan.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index d87c06c317ede..33753a2fde292 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -285,7 +285,7 @@ static void macvlan_broadcast(struct sk_buff *skb,
if (likely(nskb))
err = macvlan_broadcast_one(nskb, vlan, eth,
mode == MACVLAN_MODE_BRIDGE) ?:
- netif_rx_ni(nskb);
+ netif_rx(nskb);
macvlan_count_rx(vlan, skb->len + ETH_HLEN,
err == NET_RX_SUCCESS, true);
}
--
2.35.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH net-next 8/9] net: bridge: Use netif_rx().
2022-03-03 17:14 [PATCH net-next 0/9] net: Convert user to netif_rx() Sebastian Andrzej Siewior
` (6 preceding siblings ...)
2022-03-03 17:15 ` [PATCH net-next 7/9] net: macvlan: " Sebastian Andrzej Siewior
@ 2022-03-03 17:15 ` Sebastian Andrzej Siewior
2022-03-03 17:15 ` [PATCH net-next 9/9] net: dev: " Sebastian Andrzej Siewior
2022-03-04 12:10 ` [PATCH net-next 0/9] net: Convert user to netif_rx() patchwork-bot+netdevbpf
9 siblings, 0 replies; 15+ messages in thread
From: Sebastian Andrzej Siewior @ 2022-03-03 17:15 UTC (permalink / raw)
To: netdev
Cc: David S. Miller, Jakub Kicinski, Thomas Gleixner,
Sebastian Andrzej Siewior, Roopa Prabhu, Nikolay Aleksandrov,
bridge
Since commit
baebdf48c3600 ("net: dev: Makes sure netif_rx() can be invoked in any context.")
the function netif_rx() can be used in preemptible/thread context as
well as in interrupt context.
Use netif_rx().
Cc: Roopa Prabhu <roopa@nvidia.com>
Cc: Nikolay Aleksandrov <razor@blackwall.org>
Cc: bridge@lists.linux-foundation.org
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
---
net/bridge/br_arp_nd_proxy.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/bridge/br_arp_nd_proxy.c b/net/bridge/br_arp_nd_proxy.c
index 3db1def4437b3..e5e48c6e35d78 100644
--- a/net/bridge/br_arp_nd_proxy.c
+++ b/net/bridge/br_arp_nd_proxy.c
@@ -84,7 +84,7 @@ static void br_arp_send(struct net_bridge *br, struct net_bridge_port *p,
skb->ip_summed = CHECKSUM_UNNECESSARY;
skb->pkt_type = PACKET_HOST;
- netif_rx_ni(skb);
+ netif_rx(skb);
}
}
@@ -364,7 +364,7 @@ static void br_nd_send(struct net_bridge *br, struct net_bridge_port *p,
reply->ip_summed = CHECKSUM_UNNECESSARY;
reply->pkt_type = PACKET_HOST;
- netif_rx_ni(reply);
+ netif_rx(reply);
}
}
--
2.35.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH net-next 9/9] net: dev: Use netif_rx().
2022-03-03 17:14 [PATCH net-next 0/9] net: Convert user to netif_rx() Sebastian Andrzej Siewior
` (7 preceding siblings ...)
2022-03-03 17:15 ` [PATCH net-next 8/9] net: bridge: " Sebastian Andrzej Siewior
@ 2022-03-03 17:15 ` Sebastian Andrzej Siewior
2022-03-04 12:10 ` [PATCH net-next 0/9] net: Convert user to netif_rx() patchwork-bot+netdevbpf
9 siblings, 0 replies; 15+ messages in thread
From: Sebastian Andrzej Siewior @ 2022-03-03 17:15 UTC (permalink / raw)
To: netdev
Cc: David S. Miller, Jakub Kicinski, Thomas Gleixner,
Sebastian Andrzej Siewior
Since commit
baebdf48c3600 ("net: dev: Makes sure netif_rx() can be invoked in any context.")
the function netif_rx() can be used in preemptible/thread context as
well as in interrupt context.
Use netif_rx().
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
---
net/core/dev.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/net/core/dev.c b/net/core/dev.c
index c9e54e5ad48df..59b3ab7485d65 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3858,7 +3858,7 @@ int dev_loopback_xmit(struct net *net, struct sock *sk, struct sk_buff *skb)
skb->ip_summed = CHECKSUM_UNNECESSARY;
WARN_ON(!skb_dst(skb));
skb_dst_force(skb);
- netif_rx_ni(skb);
+ netif_rx(skb);
return 0;
}
EXPORT_SYMBOL(dev_loopback_xmit);
@@ -10947,11 +10947,11 @@ static int dev_cpu_dead(unsigned int oldcpu)
/* Process offline CPU's input_pkt_queue */
while ((skb = __skb_dequeue(&oldsd->process_queue))) {
- netif_rx_ni(skb);
+ netif_rx(skb);
input_queue_head_incr(oldsd);
}
while ((skb = skb_dequeue(&oldsd->input_pkt_queue))) {
- netif_rx_ni(skb);
+ netif_rx(skb);
input_queue_head_incr(oldsd);
}
--
2.35.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [PATCH net-next 0/9] net: Convert user to netif_rx().
2022-03-03 17:14 [PATCH net-next 0/9] net: Convert user to netif_rx() Sebastian Andrzej Siewior
` (8 preceding siblings ...)
2022-03-03 17:15 ` [PATCH net-next 9/9] net: dev: " Sebastian Andrzej Siewior
@ 2022-03-04 12:10 ` patchwork-bot+netdevbpf
9 siblings, 0 replies; 15+ messages in thread
From: patchwork-bot+netdevbpf @ 2022-03-04 12:10 UTC (permalink / raw)
To: Sebastian Andrzej Siewior
Cc: netdev, davem, kuba, tglx, andrew, bridge, chris, f.fainelli,
horatiu.vultur, corbet, kurt, linux-doc, linux-xtensa, l.stelmach,
jcmvbkbc, mike.travis, razor, robinmholt, roopa, steve.wahl,
UNGLinuxDriver, vivien.didelot, olteanv
Hello:
This series was applied to netdev/net-next.git (master)
by David S. Miller <davem@davemloft.net>:
On Thu, 3 Mar 2022 18:14:56 +0100 you wrote:
> This is the first batch of converting netif_rx_ni() caller to
> netif_rx(). The change making this possible is net-next and
> netif_rx_ni() is a wrapper around netif_rx(). This is a clean up in
> order to remove netif_rx_ni().
>
> Cc: Andrew Lunn <andrew@lunn.ch>
> Cc: bridge@lists.linux-foundation.org
> Cc: Chris Zankel <chris@zankel.net>
> Cc: Florian Fainelli <f.fainelli@gmail.com>
> Cc: Horatiu Vultur <horatiu.vultur@microchip.com>
> Cc: Jonathan Corbet <corbet@lwn.net>
> Cc: Kurt Kanzenbach <kurt@linutronix.de>
> Cc: linux-doc@vger.kernel.org
> Cc: linux-xtensa@linux-xtensa.org
> Cc: Łukasz Stelmach <l.stelmach@samsung.com>
> Cc: Max Filippov <jcmvbkbc@gmail.com>
> Cc: Mike Travis <mike.travis@hpe.com>
> Cc: Nikolay Aleksandrov <razor@blackwall.org>
> Cc: Robin Holt <robinmholt@gmail.com>
> Cc: Roopa Prabhu <roopa@nvidia.com>
> Cc: Steve Wahl <steve.wahl@hpe.com>
> Cc: UNGLinuxDriver@microchip.com
> Cc: Vivien Didelot <vivien.didelot@gmail.com>
> Cc: Vladimir Oltean <olteanv@gmail.com>
> Sebastian
Here is the summary with links:
- [net-next,1/9] docs: networking: Use netif_rx().
https://git.kernel.org/netdev/net-next/c/21f95a88eab4
- [net-next,2/9] net: xtensa: Use netif_rx().
https://git.kernel.org/netdev/net-next/c/aa4e5761bff5
- [net-next,3/9] net: sgi-xp: Use netif_rx().
https://git.kernel.org/netdev/net-next/c/4343b866aa94
- [net-next,4/9] net: caif: Use netif_rx().
https://git.kernel.org/netdev/net-next/c/3fb4430e73bf
- [net-next,5/9] net: dsa: Use netif_rx().
https://git.kernel.org/netdev/net-next/c/db00cc9da079
- [net-next,6/9] net: ethernet: Use netif_rx().
https://git.kernel.org/netdev/net-next/c/90f77c1c512f
- [net-next,7/9] net: macvlan: Use netif_rx().
https://git.kernel.org/netdev/net-next/c/566214f44697
- [net-next,8/9] net: bridge: Use netif_rx().
https://git.kernel.org/netdev/net-next/c/2e83bdd5d6cf
- [net-next,9/9] net: dev: Use netif_rx().
https://git.kernel.org/netdev/net-next/c/ad0a043fc26c
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] 15+ messages in thread