Commit da54d75b authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'netdev-RT' 

Sebastian Andrzej Siewior says:

====================
net: dev: PREEMPT_RT fixups.

this series removes or replaces preempt_disable() and local_irq_save()
sections which are problematic on PREEMPT_RT.
Patch 2 makes netif_rx() work from any context after I found suggestions
for it in an old thread. Should that work, then the context-specific
variants could be removed.

v2…v3:
   - #2
     - Export __netif_rx() so it can be used by everyone.
     - Add a lockdep assert to check for interrupt context.
     - Update the kernel doc and mention that the skb is posted to
       backlog NAPI.
     - Use __netif_rx() also in drivers/net/*.c.
     - Added Toke''s review tag and kept Eric's desptite the changes
       made.

v1…v2:
  - #1 and #2
    - merge patch 1 und 2 from the series (as per Toke).
    - updated patch description and corrected the first commit number (as
      per Eric).
   - #2
     - Provide netif_rx() as in v1 and additionally __netif_rx() without
       local_bh disable()+enable() for the loopback driver. __netif_rx() is
       not exported (loopback is built-in only) so it won't be used
       drivers. If this doesn't work then we can still export/ define a
       wrapper as Eric suggested.
     - Added a comment that netif_rx() considered legacy.
   - #3
     - Moved ____napi_schedule() into rps_ipi_queued() and
       renamed it napi_schedule_rps().
   https://lore.kernel.org/all/20220204201259.1095226-1-bigeasy@linutronix.de/

v1:
   https://lore.kernel.org/all/20220202122848.647635-1-bigeasy@linutronix.de


====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 88f62aea e722db8d

drivers/net/amt.c

+2 −2
Original line number Diff line number Diff line
@@ -2373,7 +2373,7 @@ static bool amt_membership_query_handler(struct amt_dev *amt, 
	skb->pkt_type = PACKET_MULTICAST;

	skb->ip_summed = CHECKSUM_NONE;

	len = skb->len;

	if (netif_rx(skb) == NET_RX_SUCCESS) {

	if (__netif_rx(skb) == NET_RX_SUCCESS) {

		amt_update_gw_status(amt, AMT_STATUS_RECEIVED_QUERY, true);

		dev_sw_netstats_rx_add(amt->dev, len);

	} else {
@@ -2470,7 +2470,7 @@ static bool amt_update_handler(struct amt_dev *amt, struct sk_buff *skb) 
	skb->pkt_type = PACKET_MULTICAST;

	skb->ip_summed = CHECKSUM_NONE;

	len = skb->len;

	if (netif_rx(skb) == NET_RX_SUCCESS) {

	if (__netif_rx(skb) == NET_RX_SUCCESS) {

		amt_update_relay_status(tunnel, AMT_STATUS_RECEIVED_UPDATE,

					true);

		dev_sw_netstats_rx_add(amt->dev, len);

drivers/net/geneve.c

+2 −2
Original line number Diff line number Diff line
@@ -925,7 +925,7 @@ static int geneve_xmit_skb(struct sk_buff *skb, struct net_device *dev, 
		}



		skb->protocol = eth_type_trans(skb, geneve->dev);

		netif_rx(skb);

		__netif_rx(skb);

		dst_release(&rt->dst);

		return -EMSGSIZE;

	}
@@ -1021,7 +1021,7 @@ static int geneve6_xmit_skb(struct sk_buff *skb, struct net_device *dev, 
		}



		skb->protocol = eth_type_trans(skb, geneve->dev);

		netif_rx(skb);

		__netif_rx(skb);

		dst_release(dst);

		return -EMSGSIZE;

	}

drivers/net/gtp.c

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ static int gtp_rx(struct pdp_ctx *pctx, struct sk_buff *skb, 


	dev_sw_netstats_rx_add(pctx->dev, skb->len);



	netif_rx(skb);

	__netif_rx(skb);

	return 0;



err:

drivers/net/loopback.c

+2 −2
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ static netdev_tx_t loopback_xmit(struct sk_buff *skb, 


	skb_orphan(skb);



	/* Before queueing this packet to netif_rx(),

	/* Before queueing this packet to __netif_rx(),

	 * make sure dst is refcounted.

	 */

	skb_dst_force(skb);
@@ -86,7 +86,7 @@ static netdev_tx_t loopback_xmit(struct sk_buff *skb, 
	skb->protocol = eth_type_trans(skb, dev);



	len = skb->len;

	if (likely(netif_rx(skb) == NET_RX_SUCCESS))

	if (likely(__netif_rx(skb) == NET_RX_SUCCESS))

		dev_lstats_add(dev, len);



	return NETDEV_TX_OK;

drivers/net/macsec.c

+3 −3
Original line number Diff line number Diff line
@@ -1033,7 +1033,7 @@ static enum rx_handler_result handle_not_macsec(struct sk_buff *skb) 
				else

					nskb->pkt_type = PACKET_MULTICAST;



				netif_rx(nskb);

				__netif_rx(nskb);

			}

			continue;

		}
@@ -1056,7 +1056,7 @@ static enum rx_handler_result handle_not_macsec(struct sk_buff *skb) 


		nskb->dev = ndev;



		if (netif_rx(nskb) == NET_RX_SUCCESS) {

		if (__netif_rx(nskb) == NET_RX_SUCCESS) {

			u64_stats_update_begin(&secy_stats->syncp);

			secy_stats->stats.InPktsUntagged++;

			u64_stats_update_end(&secy_stats->syncp);
@@ -1288,7 +1288,7 @@ static rx_handler_result_t macsec_handle_frame(struct sk_buff **pskb) 


		macsec_reset_skb(nskb, macsec->secy.netdev);



		ret = netif_rx(nskb);

		ret = __netif_rx(nskb);

		if (ret == NET_RX_SUCCESS) {

			u64_stats_update_begin(&secy_stats->syncp);

			secy_stats->stats.InPktsUnknownSCI++;