* [PATCH net-next 0/8] net: Convert user to netif_rx(), part 2.
@ 2022-03-05 22:12 Sebastian Andrzej Siewior
2022-03-05 22:12 ` [PATCH net-next 5/8] wireless: Atheros: Use netif_rx() Sebastian Andrzej Siewior
` (4 more replies)
0 siblings, 5 replies; 8+ messages in thread
From: Sebastian Andrzej Siewior @ 2022-03-05 22:12 UTC (permalink / raw)
To: netdev
Cc: David S. Miller, Jakub Kicinski, Thomas Gleixner,
Amitkumar Karwar, Andrew Lunn, Arend van Spriel,
brcm80211-dev-list.pdl, Chi-hsien Lin, Chung-hsien Hsu,
Franky Lin, Ganapathi Bhat, Hante Meuleman, Heiner Kallweit,
Jeremy Kerr, Johannes Berg, Kalle Valo, libertas-dev, linux-can,
linux-wireless, Marc Kleine-Budde, Matt Johnston, Maya Erez,
Oliver Hartkopp, Radu Pirea, Richard Cochran, Russell King,
SHA-cyfmac-dev-list, Sharvari Harisangam, wil6210,
Wolfgang Grandegger, Wright Feng, Xinming Hu
This is the second 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().
The brcmfmac changes are slilghtly larger because the inirq parameter
can be removed.
Cc: Amitkumar Karwar <amitkarwar@gmail.com>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Arend van Spriel <aspriel@gmail.com>
Cc: brcm80211-dev-list.pdl@broadcom.com
Cc: Chi-hsien Lin <chi-hsien.lin@infineon.com>
Cc: Chung-hsien Hsu <chung-hsien.hsu@infineon.com>
Cc: Franky Lin <franky.lin@broadcom.com>
Cc: Ganapathi Bhat <ganapathi017@gmail.com>
Cc: Hante Meuleman <hante.meuleman@broadcom.com>
Cc: Heiner Kallweit <hkallweit1@gmail.com>
Cc: Jeremy Kerr <jk@codeconstruct.com.au>
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: Kalle Valo <kvalo@kernel.org>
Cc: libertas-dev@lists.infradead.org
Cc: linux-can@vger.kernel.org
Cc: linux-wireless@vger.kernel.org
Cc: Marc Kleine-Budde <mkl@pengutronix.de>
Cc: Matt Johnston <matt@codeconstruct.com.au>
Cc: Maya Erez <merez@codeaurora.org>
Cc: Oliver Hartkopp <socketcan@hartkopp.net>
Cc: Radu Pirea <radu-nicolae.pirea@oss.nxp.com>
Cc: Richard Cochran <richardcochran@gmail.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: SHA-cyfmac-dev-list@infineon.com
Cc: Sharvari Harisangam <sharvari.harisangam@nxp.com>
Cc: wil6210@qti.qualcomm.com
Cc: Wolfgang Grandegger <wg@grandegger.com>
Cc: Wright Feng <wright.feng@infineon.com>
Cc: Xinming Hu <huxinming820@gmail.com>
Sebastian
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH net-next 5/8] wireless: Atheros: Use netif_rx(). 2022-03-05 22:12 [PATCH net-next 0/8] net: Convert user to netif_rx(), part 2 Sebastian Andrzej Siewior @ 2022-03-05 22:12 ` Sebastian Andrzej Siewior 2022-03-05 22:12 ` [PATCH net-next 6/8] wireless: brcmfmac: " Sebastian Andrzej Siewior ` (3 subsequent siblings) 4 siblings, 0 replies; 8+ messages in thread From: Sebastian Andrzej Siewior @ 2022-03-05 22:12 UTC (permalink / raw) To: netdev Cc: David S. Miller, Jakub Kicinski, Thomas Gleixner, Sebastian Andrzej Siewior, Kalle Valo, Maya Erez, linux-wireless, wil6210 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: Kalle Valo <kvalo@kernel.org> Cc: Maya Erez <merez@codeaurora.org> Cc: linux-wireless@vger.kernel.org Cc: wil6210@qti.qualcomm.com Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> --- drivers/net/wireless/ath/ath6kl/txrx.c | 2 +- drivers/net/wireless/ath/wil6210/txrx.c | 2 +- drivers/net/wireless/ath/wil6210/wmi.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/ath/ath6kl/txrx.c b/drivers/net/wireless/ath/ath6kl/txrx.c index b22ed499f7ba7..a56fab6232a9b 100644 --- a/drivers/net/wireless/ath/ath6kl/txrx.c +++ b/drivers/net/wireless/ath/ath6kl/txrx.c @@ -839,7 +839,7 @@ static void ath6kl_deliver_frames_to_nw_stack(struct net_device *dev, skb->protocol = eth_type_trans(skb, skb->dev); - netif_rx_ni(skb); + netif_rx(skb); } static void ath6kl_alloc_netbufs(struct sk_buff_head *q, u16 num) diff --git a/drivers/net/wireless/ath/wil6210/txrx.c b/drivers/net/wireless/ath/wil6210/txrx.c index cc830c795b33c..5704defd7be1b 100644 --- a/drivers/net/wireless/ath/wil6210/txrx.c +++ b/drivers/net/wireless/ath/wil6210/txrx.c @@ -958,7 +958,7 @@ void wil_netif_rx(struct sk_buff *skb, struct net_device *ndev, int cid, if (gro) napi_gro_receive(&wil->napi_rx, skb); else - netif_rx_ni(skb); + netif_rx(skb); } ndev->stats.rx_packets++; stats->rx_packets++; diff --git a/drivers/net/wireless/ath/wil6210/wmi.c b/drivers/net/wireless/ath/wil6210/wmi.c index dd8abbb288497..98b4c189eeccb 100644 --- a/drivers/net/wireless/ath/wil6210/wmi.c +++ b/drivers/net/wireless/ath/wil6210/wmi.c @@ -1199,7 +1199,7 @@ static void wmi_evt_eapol_rx(struct wil6210_vif *vif, int id, void *d, int len) eth->h_proto = cpu_to_be16(ETH_P_PAE); skb_put_data(skb, evt->eapol, eapol_len); skb->protocol = eth_type_trans(skb, ndev); - if (likely(netif_rx_ni(skb) == NET_RX_SUCCESS)) { + if (likely(netif_rx(skb) == NET_RX_SUCCESS)) { ndev->stats.rx_packets++; ndev->stats.rx_bytes += sz; if (stats) { -- 2.35.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH net-next 6/8] wireless: brcmfmac: Use netif_rx(). 2022-03-05 22:12 [PATCH net-next 0/8] net: Convert user to netif_rx(), part 2 Sebastian Andrzej Siewior 2022-03-05 22:12 ` [PATCH net-next 5/8] wireless: Atheros: Use netif_rx() Sebastian Andrzej Siewior @ 2022-03-05 22:12 ` Sebastian Andrzej Siewior 2022-03-08 14:59 ` Arend van Spriel 2022-03-05 22:12 ` [PATCH net-next 7/8] wireless: Marvell: " Sebastian Andrzej Siewior ` (2 subsequent siblings) 4 siblings, 1 reply; 8+ messages in thread From: Sebastian Andrzej Siewior @ 2022-03-05 22:12 UTC (permalink / raw) To: netdev Cc: David S. Miller, Jakub Kicinski, Thomas Gleixner, Sebastian Andrzej Siewior, Arend van Spriel, Chi-hsien Lin, Chung-hsien Hsu, Franky Lin, Hante Meuleman, Kalle Valo, SHA-cyfmac-dev-list, Wright Feng, brcm80211-dev-list.pdl, linux-wireless 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: Arend van Spriel <aspriel@gmail.com> Cc: Chi-hsien Lin <chi-hsien.lin@infineon.com> Cc: Chung-hsien Hsu <chung-hsien.hsu@infineon.com> Cc: Franky Lin <franky.lin@broadcom.com> Cc: Hante Meuleman <hante.meuleman@broadcom.com> Cc: Kalle Valo <kvalo@kernel.org> Cc: SHA-cyfmac-dev-list@infineon.com Cc: Wright Feng <wright.feng@infineon.com> Cc: brcm80211-dev-list.pdl@broadcom.com Cc: linux-wireless@vger.kernel.org Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> --- .../broadcom/brcm80211/brcmfmac/bcdc.c | 4 ++-- .../broadcom/brcm80211/brcmfmac/core.c | 18 +++++------------- .../broadcom/brcm80211/brcmfmac/core.h | 2 +- .../broadcom/brcm80211/brcmfmac/fwsignal.c | 10 +++++----- .../broadcom/brcm80211/brcmfmac/fwsignal.h | 2 +- .../broadcom/brcm80211/brcmfmac/msgbuf.c | 5 ++--- .../broadcom/brcm80211/brcmfmac/proto.h | 6 +++--- 7 files changed, 19 insertions(+), 28 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c index 3984fd7d918e1..2c95a08a58711 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c @@ -397,9 +397,9 @@ brcmf_proto_bcdc_add_tdls_peer(struct brcmf_pub *drvr, int ifidx, } static void brcmf_proto_bcdc_rxreorder(struct brcmf_if *ifp, - struct sk_buff *skb, bool inirq) + struct sk_buff *skb) { - brcmf_fws_rxreorder(ifp, skb, inirq); + brcmf_fws_rxreorder(ifp, skb); } static void diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c index fed9cd5f29a26..26fab4bee22cf 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c @@ -400,7 +400,7 @@ void brcmf_txflowblock_if(struct brcmf_if *ifp, spin_unlock_irqrestore(&ifp->netif_stop_lock, flags); } -void brcmf_netif_rx(struct brcmf_if *ifp, struct sk_buff *skb, bool inirq) +void brcmf_netif_rx(struct brcmf_if *ifp, struct sk_buff *skb) { /* Most of Broadcom's firmwares send 802.11f ADD frame every time a new * STA connects to the AP interface. This is an obsoleted standard most @@ -423,15 +423,7 @@ void brcmf_netif_rx(struct brcmf_if *ifp, struct sk_buff *skb, bool inirq) ifp->ndev->stats.rx_packets++; brcmf_dbg(DATA, "rx proto=0x%X\n", ntohs(skb->protocol)); - if (inirq) { - netif_rx(skb); - } else { - /* If the receive is not processed inside an ISR, - * the softirqd must be woken explicitly to service - * the NET_RX_SOFTIRQ. This is handled by netif_rx_ni(). - */ - netif_rx_ni(skb); - } + netif_rx(skb); } void brcmf_netif_mon_rx(struct brcmf_if *ifp, struct sk_buff *skb) @@ -480,7 +472,7 @@ void brcmf_netif_mon_rx(struct brcmf_if *ifp, struct sk_buff *skb) skb->pkt_type = PACKET_OTHERHOST; skb->protocol = htons(ETH_P_802_2); - brcmf_netif_rx(ifp, skb, false); + brcmf_netif_rx(ifp, skb); } static int brcmf_rx_hdrpull(struct brcmf_pub *drvr, struct sk_buff *skb, @@ -515,7 +507,7 @@ void brcmf_rx_frame(struct device *dev, struct sk_buff *skb, bool handle_event, return; if (brcmf_proto_is_reorder_skb(skb)) { - brcmf_proto_rxreorder(ifp, skb, inirq); + brcmf_proto_rxreorder(ifp, skb); } else { /* Process special event packets */ if (handle_event) { @@ -524,7 +516,7 @@ void brcmf_rx_frame(struct device *dev, struct sk_buff *skb, bool handle_event, brcmf_fweh_process_skb(ifp->drvr, skb, BCMILCP_SUBTYPE_VENDOR_LONG, gfp); } - brcmf_netif_rx(ifp, skb, inirq); + brcmf_netif_rx(ifp, skb); } } diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h index 8212c9de14f1f..340346c122d32 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h @@ -208,7 +208,7 @@ void brcmf_remove_interface(struct brcmf_if *ifp, bool locked); void brcmf_txflowblock_if(struct brcmf_if *ifp, enum brcmf_netif_stop_reason reason, bool state); void brcmf_txfinalize(struct brcmf_if *ifp, struct sk_buff *txp, bool success); -void brcmf_netif_rx(struct brcmf_if *ifp, struct sk_buff *skb, bool inirq); +void brcmf_netif_rx(struct brcmf_if *ifp, struct sk_buff *skb); void brcmf_netif_mon_rx(struct brcmf_if *ifp, struct sk_buff *skb); void brcmf_net_detach(struct net_device *ndev, bool locked); int brcmf_net_mon_attach(struct brcmf_if *ifp); diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c index 19b0f318f93ed..d58525ebe618e 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c @@ -1664,7 +1664,7 @@ static void brcmf_rxreorder_get_skb_list(struct brcmf_ampdu_rx_reorder *rfi, rfi->pend_pkts -= skb_queue_len(skb_list); } -void brcmf_fws_rxreorder(struct brcmf_if *ifp, struct sk_buff *pkt, bool inirq) +void brcmf_fws_rxreorder(struct brcmf_if *ifp, struct sk_buff *pkt) { struct brcmf_pub *drvr = ifp->drvr; u8 *reorder_data; @@ -1682,7 +1682,7 @@ void brcmf_fws_rxreorder(struct brcmf_if *ifp, struct sk_buff *pkt, bool inirq) /* validate flags and flow id */ if (flags == 0xFF) { bphy_err(drvr, "invalid flags...so ignore this packet\n"); - brcmf_netif_rx(ifp, pkt, inirq); + brcmf_netif_rx(ifp, pkt); return; } @@ -1694,7 +1694,7 @@ void brcmf_fws_rxreorder(struct brcmf_if *ifp, struct sk_buff *pkt, bool inirq) if (rfi == NULL) { brcmf_dbg(INFO, "received flags to cleanup, but no flow (%d) yet\n", flow_id); - brcmf_netif_rx(ifp, pkt, inirq); + brcmf_netif_rx(ifp, pkt); return; } @@ -1719,7 +1719,7 @@ void brcmf_fws_rxreorder(struct brcmf_if *ifp, struct sk_buff *pkt, bool inirq) rfi = kzalloc(buf_size, GFP_ATOMIC); if (rfi == NULL) { bphy_err(drvr, "failed to alloc buffer\n"); - brcmf_netif_rx(ifp, pkt, inirq); + brcmf_netif_rx(ifp, pkt); return; } @@ -1833,7 +1833,7 @@ void brcmf_fws_rxreorder(struct brcmf_if *ifp, struct sk_buff *pkt, bool inirq) netif_rx: skb_queue_walk_safe(&reorder_list, pkt, pnext) { __skb_unlink(pkt, &reorder_list); - brcmf_netif_rx(ifp, pkt, inirq); + brcmf_netif_rx(ifp, pkt); } } diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.h index 50e424b5880de..b16a9d1c0508e 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.h +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.h @@ -42,6 +42,6 @@ void brcmf_fws_add_interface(struct brcmf_if *ifp); void brcmf_fws_del_interface(struct brcmf_if *ifp); void brcmf_fws_bustxfail(struct brcmf_fws_info *fws, struct sk_buff *skb); void brcmf_fws_bus_blocked(struct brcmf_pub *drvr, bool flow_blocked); -void brcmf_fws_rxreorder(struct brcmf_if *ifp, struct sk_buff *skb, bool inirq); +void brcmf_fws_rxreorder(struct brcmf_if *ifp, struct sk_buff *skb); #endif /* FWSIGNAL_H_ */ diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c index 7c8e08ee8f0ff..b2d0f7570aa97 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c @@ -536,8 +536,7 @@ static int brcmf_msgbuf_hdrpull(struct brcmf_pub *drvr, bool do_fws, return -ENODEV; } -static void brcmf_msgbuf_rxreorder(struct brcmf_if *ifp, struct sk_buff *skb, - bool inirq) +static void brcmf_msgbuf_rxreorder(struct brcmf_if *ifp, struct sk_buff *skb) { } @@ -1191,7 +1190,7 @@ brcmf_msgbuf_process_rx_complete(struct brcmf_msgbuf *msgbuf, void *buf) } skb->protocol = eth_type_trans(skb, ifp->ndev); - brcmf_netif_rx(ifp, skb, false); + brcmf_netif_rx(ifp, skb); } static void brcmf_msgbuf_process_gen_status(struct brcmf_msgbuf *msgbuf, diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h index f4a79e217da5b..bd08d3aaa8f4a 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h @@ -32,7 +32,7 @@ struct brcmf_proto { u8 peer[ETH_ALEN]); void (*add_tdls_peer)(struct brcmf_pub *drvr, int ifidx, u8 peer[ETH_ALEN]); - void (*rxreorder)(struct brcmf_if *ifp, struct sk_buff *skb, bool inirq); + void (*rxreorder)(struct brcmf_if *ifp, struct sk_buff *skb); void (*add_if)(struct brcmf_if *ifp); void (*del_if)(struct brcmf_if *ifp); void (*reset_if)(struct brcmf_if *ifp); @@ -109,9 +109,9 @@ static inline bool brcmf_proto_is_reorder_skb(struct sk_buff *skb) } static inline void -brcmf_proto_rxreorder(struct brcmf_if *ifp, struct sk_buff *skb, bool inirq) +brcmf_proto_rxreorder(struct brcmf_if *ifp, struct sk_buff *skb) { - ifp->drvr->proto->rxreorder(ifp, skb, inirq); + ifp->drvr->proto->rxreorder(ifp, skb); } static inline void -- 2.35.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH net-next 6/8] wireless: brcmfmac: Use netif_rx(). 2022-03-05 22:12 ` [PATCH net-next 6/8] wireless: brcmfmac: " Sebastian Andrzej Siewior @ 2022-03-08 14:59 ` Arend van Spriel 2022-03-08 15:01 ` Sebastian Andrzej Siewior 0 siblings, 1 reply; 8+ messages in thread From: Arend van Spriel @ 2022-03-08 14:59 UTC (permalink / raw) To: Sebastian Andrzej Siewior, netdev Cc: David S. Miller, Jakub Kicinski, Thomas Gleixner, Arend van Spriel, Chi-hsien Lin, Chung-hsien Hsu, Franky Lin, Hante Meuleman, Kalle Valo, SHA-cyfmac-dev-list, Wright Feng, brcm80211-dev-list.pdl, linux-wireless [-- Attachment #1: Type: text/plain, Size: 1452 bytes --] On 3/5/2022 11:12 PM, 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(). Looks good to me but that commit only seems to exist in net-next repo. So you want to take this patch through the net-next repo as well? Regards, Arend > Cc: Arend van Spriel <aspriel@gmail.com> > Cc: Chi-hsien Lin <chi-hsien.lin@infineon.com> > Cc: Chung-hsien Hsu <chung-hsien.hsu@infineon.com> > Cc: Franky Lin <franky.lin@broadcom.com> > Cc: Hante Meuleman <hante.meuleman@broadcom.com> > Cc: Kalle Valo <kvalo@kernel.org> > Cc: SHA-cyfmac-dev-list@infineon.com > Cc: Wright Feng <wright.feng@infineon.com> > Cc: brcm80211-dev-list.pdl@broadcom.com > Cc: linux-wireless@vger.kernel.org > Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> > --- > .../broadcom/brcm80211/brcmfmac/bcdc.c | 4 ++-- > .../broadcom/brcm80211/brcmfmac/core.c | 18 +++++------------- > .../broadcom/brcm80211/brcmfmac/core.h | 2 +- > .../broadcom/brcm80211/brcmfmac/fwsignal.c | 10 +++++----- > .../broadcom/brcm80211/brcmfmac/fwsignal.h | 2 +- > .../broadcom/brcm80211/brcmfmac/msgbuf.c | 5 ++--- > .../broadcom/brcm80211/brcmfmac/proto.h | 6 +++--- > 7 files changed, 19 insertions(+), 28 deletions(-) [-- Attachment #2: S/MIME Cryptographic Signature --] [-- Type: application/pkcs7-signature, Size: 4219 bytes --] ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH net-next 6/8] wireless: brcmfmac: Use netif_rx(). 2022-03-08 14:59 ` Arend van Spriel @ 2022-03-08 15:01 ` Sebastian Andrzej Siewior 0 siblings, 0 replies; 8+ messages in thread From: Sebastian Andrzej Siewior @ 2022-03-08 15:01 UTC (permalink / raw) To: Arend van Spriel Cc: netdev, David S. Miller, Jakub Kicinski, Thomas Gleixner, Arend van Spriel, Chi-hsien Lin, Chung-hsien Hsu, Franky Lin, Hante Meuleman, Kalle Valo, SHA-cyfmac-dev-list, Wright Feng, brcm80211-dev-list.pdl, linux-wireless On 2022-03-08 15:59:50 [+0100], Arend van Spriel wrote: > Looks good to me but that commit only seems to exist in net-next repo. So > you want to take this patch through the net-next repo as well? No need, DaveM took care of everything. > Regards, > Arend Sebastian ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH net-next 7/8] wireless: Marvell: Use netif_rx(). 2022-03-05 22:12 [PATCH net-next 0/8] net: Convert user to netif_rx(), part 2 Sebastian Andrzej Siewior 2022-03-05 22:12 ` [PATCH net-next 5/8] wireless: Atheros: Use netif_rx() Sebastian Andrzej Siewior 2022-03-05 22:12 ` [PATCH net-next 6/8] wireless: brcmfmac: " Sebastian Andrzej Siewior @ 2022-03-05 22:12 ` Sebastian Andrzej Siewior 2022-03-05 22:12 ` [PATCH net-next 8/8] wireless: " Sebastian Andrzej Siewior 2022-03-06 11:40 ` [PATCH net-next 0/8] net: Convert user to netif_rx(), part 2 patchwork-bot+netdevbpf 4 siblings, 0 replies; 8+ messages in thread From: Sebastian Andrzej Siewior @ 2022-03-05 22:12 UTC (permalink / raw) To: netdev Cc: David S. Miller, Jakub Kicinski, Thomas Gleixner, Sebastian Andrzej Siewior, Amitkumar Karwar, Ganapathi Bhat, Kalle Valo, Sharvari Harisangam, Xinming Hu, libertas-dev, linux-wireless 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: Amitkumar Karwar <amitkarwar@gmail.com> Cc: Ganapathi Bhat <ganapathi017@gmail.com> Cc: Kalle Valo <kvalo@kernel.org> Cc: Sharvari Harisangam <sharvari.harisangam@nxp.com> Cc: Xinming Hu <huxinming820@gmail.com> Cc: libertas-dev@lists.infradead.org Cc: linux-wireless@vger.kernel.org Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> --- drivers/net/wireless/marvell/libertas/rx.c | 4 ++-- drivers/net/wireless/marvell/mwifiex/uap_txrx.c | 2 +- drivers/net/wireless/marvell/mwifiex/util.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/marvell/libertas/rx.c b/drivers/net/wireless/marvell/libertas/rx.c index 9f24b0760e1f7..c34d30f7cbe03 100644 --- a/drivers/net/wireless/marvell/libertas/rx.c +++ b/drivers/net/wireless/marvell/libertas/rx.c @@ -147,7 +147,7 @@ int lbs_process_rxed_packet(struct lbs_private *priv, struct sk_buff *skb) dev->stats.rx_packets++; skb->protocol = eth_type_trans(skb, dev); - netif_rx_any_context(skb); + netif_rx(skb); ret = 0; done: @@ -262,7 +262,7 @@ static int process_rxed_802_11_packet(struct lbs_private *priv, dev->stats.rx_packets++; skb->protocol = eth_type_trans(skb, priv->dev); - netif_rx_any_context(skb); + netif_rx(skb); ret = 0; diff --git a/drivers/net/wireless/marvell/mwifiex/uap_txrx.c b/drivers/net/wireless/marvell/mwifiex/uap_txrx.c index 245ff644f81e3..4e49ed21c5ced 100644 --- a/drivers/net/wireless/marvell/mwifiex/uap_txrx.c +++ b/drivers/net/wireless/marvell/mwifiex/uap_txrx.c @@ -350,7 +350,7 @@ int mwifiex_uap_recv_packet(struct mwifiex_private *priv, skb->truesize += (skb->len - MWIFIEX_RX_DATA_BUF_SIZE); /* Forward multicast/broadcast packet to upper layer*/ - netif_rx_any_context(skb); + netif_rx(skb); return 0; } diff --git a/drivers/net/wireless/marvell/mwifiex/util.c b/drivers/net/wireless/marvell/mwifiex/util.c index d583fa600a296..d5edb1e89f5bd 100644 --- a/drivers/net/wireless/marvell/mwifiex/util.c +++ b/drivers/net/wireless/marvell/mwifiex/util.c @@ -488,7 +488,7 @@ int mwifiex_recv_packet(struct mwifiex_private *priv, struct sk_buff *skb) (skb->truesize > MWIFIEX_RX_DATA_BUF_SIZE)) skb->truesize += (skb->len - MWIFIEX_RX_DATA_BUF_SIZE); - netif_rx_any_context(skb); + netif_rx(skb); return 0; } -- 2.35.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH net-next 8/8] wireless: Use netif_rx(). 2022-03-05 22:12 [PATCH net-next 0/8] net: Convert user to netif_rx(), part 2 Sebastian Andrzej Siewior ` (2 preceding siblings ...) 2022-03-05 22:12 ` [PATCH net-next 7/8] wireless: Marvell: " Sebastian Andrzej Siewior @ 2022-03-05 22:12 ` Sebastian Andrzej Siewior 2022-03-06 11:40 ` [PATCH net-next 0/8] net: Convert user to netif_rx(), part 2 patchwork-bot+netdevbpf 4 siblings, 0 replies; 8+ messages in thread From: Sebastian Andrzej Siewior @ 2022-03-05 22:12 UTC (permalink / raw) To: netdev Cc: David S. Miller, Jakub Kicinski, Thomas Gleixner, Sebastian Andrzej Siewior, Johannes Berg, linux-wireless 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: Johannes Berg <johannes@sipsolutions.net> Cc: linux-wireless@vger.kernel.org Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> --- net/wireless/util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/wireless/util.c b/net/wireless/util.c index e02f1702806e4..63b37f421e102 100644 --- a/net/wireless/util.c +++ b/net/wireless/util.c @@ -2153,7 +2153,7 @@ void cfg80211_send_layer2_update(struct net_device *dev, const u8 *addr) skb->dev = dev; skb->protocol = eth_type_trans(skb, dev); memset(skb->cb, 0, sizeof(skb->cb)); - netif_rx_ni(skb); + netif_rx(skb); } EXPORT_SYMBOL(cfg80211_send_layer2_update); -- 2.35.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH net-next 0/8] net: Convert user to netif_rx(), part 2. 2022-03-05 22:12 [PATCH net-next 0/8] net: Convert user to netif_rx(), part 2 Sebastian Andrzej Siewior ` (3 preceding siblings ...) 2022-03-05 22:12 ` [PATCH net-next 8/8] wireless: " Sebastian Andrzej Siewior @ 2022-03-06 11:40 ` patchwork-bot+netdevbpf 4 siblings, 0 replies; 8+ messages in thread From: patchwork-bot+netdevbpf @ 2022-03-06 11:40 UTC (permalink / raw) To: Sebastian Andrzej Siewior Cc: netdev, davem, kuba, tglx, amitkarwar, andrew, aspriel, brcm80211-dev-list.pdl, chi-hsien.lin, chung-hsien.hsu, franky.lin, ganapathi017, hante.meuleman, hkallweit1, jk, johannes, kvalo, libertas-dev, linux-can, linux-wireless, mkl, matt, merez, socketcan, radu-nicolae.pirea, richardcochran, linux, SHA-cyfmac-dev-list, sharvari.harisangam, wil6210, wg, wright.feng, huxinming820 Hello: This series was applied to netdev/net-next.git (master) by David S. Miller <davem@davemloft.net>: On Sat, 5 Mar 2022 23:12:44 +0100 you wrote: > This is the second 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(). > > The brcmfmac changes are slilghtly larger because the inirq parameter > can be removed. > > [...] Here is the summary with links: - [net-next,1/8] net: phy: Use netif_rx(). https://git.kernel.org/netdev/net-next/c/a3d73e15909b - [net-next,2/8] can: Use netif_rx(). https://git.kernel.org/netdev/net-next/c/00f4a0afb7ea - [net-next,3/8] mctp: serial: Use netif_rx(). https://git.kernel.org/netdev/net-next/c/b903117b4868 - [net-next,4/8] slip/plip: Use netif_rx(). https://git.kernel.org/netdev/net-next/c/e77975e02b59 - [net-next,5/8] wireless: Atheros: Use netif_rx(). https://git.kernel.org/netdev/net-next/c/1cd2ef9fcb67 - [net-next,6/8] wireless: brcmfmac: Use netif_rx(). https://git.kernel.org/netdev/net-next/c/b381728e7e28 - [net-next,7/8] wireless: Marvell: Use netif_rx(). https://git.kernel.org/netdev/net-next/c/afb6d39f3292 - [net-next,8/8] wireless: Use netif_rx(). https://git.kernel.org/netdev/net-next/c/f9834dbdd322 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] 8+ messages in thread
end of thread, other threads:[~2022-03-08 15:02 UTC | newest] Thread overview: 8+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2022-03-05 22:12 [PATCH net-next 0/8] net: Convert user to netif_rx(), part 2 Sebastian Andrzej Siewior 2022-03-05 22:12 ` [PATCH net-next 5/8] wireless: Atheros: Use netif_rx() Sebastian Andrzej Siewior 2022-03-05 22:12 ` [PATCH net-next 6/8] wireless: brcmfmac: " Sebastian Andrzej Siewior 2022-03-08 14:59 ` Arend van Spriel 2022-03-08 15:01 ` Sebastian Andrzej Siewior 2022-03-05 22:12 ` [PATCH net-next 7/8] wireless: Marvell: " Sebastian Andrzej Siewior 2022-03-05 22:12 ` [PATCH net-next 8/8] wireless: " Sebastian Andrzej Siewior 2022-03-06 11:40 ` [PATCH net-next 0/8] net: Convert user to netif_rx(), part 2 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).