From patchwork Thu Mar 3 17:14:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Andrzej Siewior X-Patchwork-Id: 12767788 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9C358C433FE for ; Thu, 3 Mar 2022 17:15:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235252AbiCCRQF (ORCPT ); Thu, 3 Mar 2022 12:16:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44934 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230229AbiCCRQE (ORCPT ); Thu, 3 Mar 2022 12:16:04 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0352E5B3DE; Thu, 3 Mar 2022 09:15:18 -0800 (PST) From: Sebastian Andrzej Siewior DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1646327716; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sJEo/FhG0+j8UsdQWenNrIjooNO4Jwq8CGdtxHF/zeI=; b=lFVdN1Hp5xaSgOcs7eb8Oxnhj/5XLuwqCyMudQfNAzb+z1UMJbVsm9VK1QstHTdd/ZTS2q 1sGeeBoObfQ2ygF9tmMro+vwNUBRkBvQV3WjKlFKB4MG78ssdkW1pBTxOObNPbHTraZMHE rJquukny7bKJhxg1F1+1Tx2SR9LFJqjYdojrEUXLrDWJjyEIys6pLBC7ldMdz10ins8R38 YarfMwKLzsl4nqMK9K+9YnA4v9Jm0inUqOmm32lZ6deQ3ju02snlXA6VL+N+TiiYDxE4d7 pfKJSPawAh5aFkO1op6OYNWvkKUVsrg8T3E6/gFbsUCnPAAbNepYXxsdpfwJ2A== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1646327716; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sJEo/FhG0+j8UsdQWenNrIjooNO4Jwq8CGdtxHF/zeI=; b=BPMI86KfF6GXBN/QhYJlJnL779jZMWgzmIJvAm6xKjR6GrO5p0Mt68XpaapjkMOtLiAd22 ttDPQO7UVeCBcSDg== To: netdev@vger.kernel.org Cc: "David S. Miller" , Jakub Kicinski , Thomas Gleixner , Sebastian Andrzej Siewior , Jonathan Corbet , linux-doc@vger.kernel.org Subject: [PATCH net-next 1/9] docs: networking: Use netif_rx(). Date: Thu, 3 Mar 2022 18:14:57 +0100 Message-Id: <20220303171505.1604775-2-bigeasy@linutronix.de> In-Reply-To: <20220303171505.1604775-1-bigeasy@linutronix.de> References: <20220303171505.1604775-1-bigeasy@linutronix.de> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org 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 Cc: linux-doc@vger.kernel.org Signed-off-by: Sebastian Andrzej Siewior --- 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 ^^^^^^^^^^^^^^^^^^^ From patchwork Thu Mar 3 17:14:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Andrzej Siewior X-Patchwork-Id: 12767792 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 69DF8C433F5 for ; Thu, 3 Mar 2022 17:15:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235263AbiCCRQL (ORCPT ); Thu, 3 Mar 2022 12:16:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44970 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234834AbiCCRQE (ORCPT ); Thu, 3 Mar 2022 12:16:04 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 37084179268 for ; Thu, 3 Mar 2022 09:15:18 -0800 (PST) From: Sebastian Andrzej Siewior DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1646327716; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=v6avL7gFEL0Bm+XKhuKhhXsuKw8YShUKlLrcuALpbyM=; b=SZ9JOl5+nFbEL8S7OasPe7GOeXis6i/XKgnc8LMuOJBeNXbfWWwm1iW1EjVmwhctJU6U3s 8BRcGXeLYQPxgnnX9SKoZdl2r/QMYKzYCCF59krhoaxJ9twe2KeznXaav986MZ0G1ZPkXb OjU5ncZMtKqK/AykIK25UTfhCHfGUlzUX/NCwU0eDa6gbIOX121tZzqQxZZt0+7HxYc0WA sZuFFMrLESP849Ici5CYdsln5EYigq5yg0u+SjFtlUyUnHBsU71OYwvdxrqyIJJT4AWcis dLKfOK8P0hpbMdr8hu1U5QAxFtA5Wa53aWQX8QABIokUEFrmFUVe1c0LuWBdXQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1646327716; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=v6avL7gFEL0Bm+XKhuKhhXsuKw8YShUKlLrcuALpbyM=; b=PXJSuMnvz5EYmvW8/QBZHOzWYN7JI+q1bNeRNfuUtNimn4nwfycGX3y0oEHXeh0heDaY1z YGvwp6lwN8lsjbBw== To: netdev@vger.kernel.org Cc: "David S. Miller" , Jakub Kicinski , Thomas Gleixner , Sebastian Andrzej Siewior , Chris Zankel , Max Filippov , linux-xtensa@linux-xtensa.org Subject: [PATCH net-next 2/9] net: xtensa: Use netif_rx(). Date: Thu, 3 Mar 2022 18:14:58 +0100 Message-Id: <20220303171505.1604775-3-bigeasy@linutronix.de> In-Reply-To: <20220303171505.1604775-1-bigeasy@linutronix.de> References: <20220303171505.1604775-1-bigeasy@linutronix.de> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org 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 Cc: Max Filippov Cc: linux-xtensa@linux-xtensa.org Signed-off-by: Sebastian Andrzej Siewior Acked-by: Max Filippov --- 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); From patchwork Thu Mar 3 17:14:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Andrzej Siewior X-Patchwork-Id: 12767789 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 66B38C433F5 for ; Thu, 3 Mar 2022 17:15:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235080AbiCCRQJ (ORCPT ); Thu, 3 Mar 2022 12:16:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44942 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233621AbiCCRQE (ORCPT ); Thu, 3 Mar 2022 12:16:04 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9B37D16EA8D for ; Thu, 3 Mar 2022 09:15:18 -0800 (PST) From: Sebastian Andrzej Siewior DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1646327717; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=M6AzOvxp2CuL8zOXMMvPfKvtXsvb54t/lP6F2jVGxpQ=; b=tpNH4KzAF1IU9uKg/D9GNzWvi9sNM91yyHsRSbel94cNsifQN6yj/iIen4Yzek05RRHzzm wGobYwu1ocbtEvEZx04QomL0VjGyiISJhpl0Q5qfNWXFYB+KO0/E4MMeo0LPDftJaHs1t8 GECspYnxeq0GUfmFe6kNtePxbgogvkN4KM9uwN0Z4uKHt+p9u/aIwWiD9l/nbVIKqk8blF /dHgcHnesH0w/1GYqMRxD8ddqDOGp1WQGyMRmJWoRqi80m7jvtEpKkq5XCOrqyvQdfVmYR NYdahsHeQMVxIfUWEYIDFAkaKaz/5oL4nXtPjEPUr/vgB8ylpT8vB7L4vwM67w== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1646327717; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=M6AzOvxp2CuL8zOXMMvPfKvtXsvb54t/lP6F2jVGxpQ=; b=4vxAz9Els4CE+L/etP9IoK5MjKALsGCuZxYCkM86JU/6uRa3FG+Ri05zF8t4JRYz2qWOJs 5HD5DEWF4dlPZUDA== To: netdev@vger.kernel.org Cc: "David S. Miller" , Jakub Kicinski , Thomas Gleixner , Sebastian Andrzej Siewior , Robin Holt , Steve Wahl , Mike Travis Subject: [PATCH net-next 3/9] net: sgi-xp: Use netif_rx(). Date: Thu, 3 Mar 2022 18:14:59 +0100 Message-Id: <20220303171505.1604775-4-bigeasy@linutronix.de> In-Reply-To: <20220303171505.1604775-1-bigeasy@linutronix.de> References: <20220303171505.1604775-1-bigeasy@linutronix.de> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org 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 Cc: Steve Wahl Cc: Mike Travis Signed-off-by: Sebastian Andrzej Siewior Reviewed-by: Steve Wahl --- 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); } From patchwork Thu Mar 3 17:15:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Andrzej Siewior X-Patchwork-Id: 12767791 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 989E1C4332F for ; Thu, 3 Mar 2022 17:15:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235260AbiCCRQK (ORCPT ); Thu, 3 Mar 2022 12:16:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44972 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234870AbiCCRQE (ORCPT ); Thu, 3 Mar 2022 12:16:04 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 377EF197B54 for ; Thu, 3 Mar 2022 09:15:18 -0800 (PST) From: Sebastian Andrzej Siewior DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1646327717; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7HrmKgGF9OFAsF8rh9LZsbc2ElOejWJpegOQY5Xhhc8=; b=XEIDBAl+3xWDeSjywTk3uAyi4IePU5sy5gNkoxqYQWQTrAAYrYvWB1DyB7p8SOrz9zm2k1 J42kKY3xZVgZhEpRj6Gzb6X9dUD3scnbutDGuR1xT3oAhOi+/1Nm7QNhWZOk8ZEnGWFKiW lU+YNFgbsEknmsYaTzWlVdDYlAiHo91lzKSqzS/m7nRXoKEmlVD8zWTgoXknOf76lH9ixK BllY64eGeJOSbkT1HYJ858ytB5TcWx9CptLGMeAPa6aryOBDBrYRhvsCY6vglg24xjNEil HOGNT1SahgKOz3teCK7wO0XVYxkYYbt39zIgSgwAzSVzZAIZf+8fu5YAyvyvRg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1646327717; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7HrmKgGF9OFAsF8rh9LZsbc2ElOejWJpegOQY5Xhhc8=; b=Svjf0LzCwu8P/AyQxCqlrOnqvlVAvsdlsd/AzLI8GadFVjUE3IgtJNerpAIpbkuPx3nzxl WN71BKC4XyEiFJCg== To: netdev@vger.kernel.org Cc: "David S. Miller" , Jakub Kicinski , Thomas Gleixner , Sebastian Andrzej Siewior Subject: [PATCH net-next 4/9] net: caif: Use netif_rx(). Date: Thu, 3 Mar 2022 18:15:00 +0100 Message-Id: <20220303171505.1604775-5-bigeasy@linutronix.de> In-Reply-To: <20220303171505.1604775-1-bigeasy@linutronix.de> References: <20220303171505.1604775-1-bigeasy@linutronix.de> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org 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 --- 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++; From patchwork Thu Mar 3 17:15:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Andrzej Siewior X-Patchwork-Id: 12767790 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4619EC433EF for ; Thu, 3 Mar 2022 17:15:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235258AbiCCRQH (ORCPT ); Thu, 3 Mar 2022 12:16:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44986 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235069AbiCCRQF (ORCPT ); Thu, 3 Mar 2022 12:16:05 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5B193197B58 for ; Thu, 3 Mar 2022 09:15:19 -0800 (PST) From: Sebastian Andrzej Siewior DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1646327717; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FwygLdXkmKhmmrSQtJBJgNajuAtGjMghtrXBMYbmki4=; b=OOn+2InW0uZutIiZKF9FvTGEKyjVE8AH5DnSdqOzz701GppqsO/8k775Nxgn4vM1nQ4EhM Iw3BahTyxnuU2vcuMHjc8EKr/m9g1uG21fATL7Qfm6XbB8cLOLktKOA8memSHFDb0Ql1UL 9r34FBvWNXbWyKDzUn/QY9OrPL/EFM6W8l5uLnhPqs59DzxlY8prIR3FETyX0fHT4USvsq wektw0VQoBgnosImiTVQQeSh3Jp6NfDFflaC1Wyq/+r2J06pp/cSYcTMlkjO8aOQ0gws3i +5dl7+NKJE2+HWLA9FkISiMfPbUvYpide2xD7U0WVzBivF7uSuEkOU+yibQbDg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1646327717; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FwygLdXkmKhmmrSQtJBJgNajuAtGjMghtrXBMYbmki4=; b=KCfReICS1CGplPZMe1l1rTpEnZxmUlTXbFHv/uPNG1Yx26cLZeqzFFUT4/jbJz0gbL0eEb 0VmZKY3ZSmdAnLCQ== To: netdev@vger.kernel.org Cc: "David S. Miller" , Jakub Kicinski , Thomas Gleixner , Sebastian Andrzej Siewior , Kurt Kanzenbach , Andrew Lunn , Vivien Didelot , Florian Fainelli , Vladimir Oltean Subject: [PATCH net-next 5/9] net: dsa: Use netif_rx(). Date: Thu, 3 Mar 2022 18:15:01 +0100 Message-Id: <20220303171505.1604775-6-bigeasy@linutronix.de> In-Reply-To: <20220303171505.1604775-1-bigeasy@linutronix.de> References: <20220303171505.1604775-1-bigeasy@linutronix.de> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org 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 Cc: Andrew Lunn Cc: Vivien Didelot Cc: Florian Fainelli Cc: Vladimir Oltean Signed-off-by: Sebastian Andrzej Siewior Acked-by: Kurt Kanzenbach # hellcreek --- 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) From patchwork Thu Mar 3 17:15:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sebastian Andrzej Siewior X-Patchwork-Id: 12767793 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5850BC433EF for ; Thu, 3 Mar 2022 17:15:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235266AbiCCRQM (ORCPT ); Thu, 3 Mar 2022 12:16:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45000 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235232AbiCCRQF (ORCPT ); Thu, 3 Mar 2022 12:16:05 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A9634197B68 for ; Thu, 3 Mar 2022 09:15:19 -0800 (PST) From: Sebastian Andrzej Siewior DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1646327718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NDyEXrSgu++LN+TwId7EjroyoxMIxKLh8Nb9voTrcxM=; b=YlUm4ayWfULACwYCma59QmgAUUpm4lNkjoUC+UkFja04DsIp0jgG2pcf5V+nEfxgo8NrmS BoGMYNthiJyYhjtA8uyX8nhTEAzZFd4QlcjZuX2BJRgACgAgy4d/6MjB7eM0MHYOwyVKnE rG1uBWdcj9ruBACNYXp2x1dBYzGLtkKTGjvt3jRhrUaWgu5+q51aUu5ZRPKz1wc/BYdhrj AaNB1i+viiyTBBCdoxu2aXtwR8nBUtLeZKnH64j/za7dGu5+xOJik1uNUEZTJJQ7RHnIMU pn9F/wCFTfW34aWzk07igHV9AprxS/RcmY390m0x5wioHIkg22T/aUNtipwqXQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1646327718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NDyEXrSgu++LN+TwId7EjroyoxMIxKLh8Nb9voTrcxM=; b=jyMjlcGzl0kMUIUZmJVI9aAiWLe/gfHTIY+c1meH+92C29syrb4HBhZfxsRE7TOBB6UXaQ x9SXOR0xjajVY+Bw== To: netdev@vger.kernel.org Cc: "David S. Miller" , Jakub Kicinski , Thomas Gleixner , Sebastian Andrzej Siewior , =?utf-8?q?=C5=81ukasz_St?= =?utf-8?q?elmach?= , Horatiu Vultur , UNGLinuxDriver@microchip.com Subject: [PATCH net-next 6/9] net: ethernet: Use netif_rx(). Date: Thu, 3 Mar 2022 18:15:02 +0100 Message-Id: <20220303171505.1604775-7-bigeasy@linutronix.de> In-Reply-To: <20220303171505.1604775-1-bigeasy@linutronix.de> References: <20220303171505.1604775-1-bigeasy@linutronix.de> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org 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 Cc: Horatiu Vultur Cc: UNGLinuxDriver@microchip.com Signed-off-by: Sebastian Andrzej Siewior Acked-by: Łukasz Stelmach --- 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); } From patchwork Thu Mar 3 17:15:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Andrzej Siewior X-Patchwork-Id: 12767794 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6732EC433F5 for ; Thu, 3 Mar 2022 17:15:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235273AbiCCRQP (ORCPT ); Thu, 3 Mar 2022 12:16:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45008 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235255AbiCCRQF (ORCPT ); Thu, 3 Mar 2022 12:16:05 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 91DB5199D44 for ; Thu, 3 Mar 2022 09:15:20 -0800 (PST) From: Sebastian Andrzej Siewior DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1646327718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ma4J9ocKpCHf06EncgSsmQwBMmUomI5W80Q4vzDVqt4=; b=gBkasA8X12HzhBufYeEYVZ8eQ6FXI3N94zaNcv9rgy9vkSA4GJuacTZEWGLVSFhN2OrEjN ZWHGLlhn75XfWSJqminWviu+dV/0m3eItDVybJbIsTbhFC7R6IAM0Tom86NFU4MblV/U5z NFm8mqO9OL9f7Zx98cjhbM7pP8VPYB61YYiV99Jr7jwETPv5zuhAuAXPUhyRtOjFM99pUa rV76bcd+GER6i9lnFfZSR83kuQOVPAX7AV9wEsca7ZZGQ482O4bLxxHD5mTcm+0HHjt8D5 QIt/OuOb0qo5ikZKI7ou7PGQQ9pjgC8/6OAXnbfKtUQcLktu5MDt4FhVe1U47Q== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1646327718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ma4J9ocKpCHf06EncgSsmQwBMmUomI5W80Q4vzDVqt4=; b=euYUfly+1sCmj9kU9rxCHefUOZCAv/UeT3zkKFXUbkrjSHGnVM+mFDtydBzy/sYdiFlM1b f+jKNtdUr3O7YrCA== To: netdev@vger.kernel.org Cc: "David S. Miller" , Jakub Kicinski , Thomas Gleixner , Sebastian Andrzej Siewior Subject: [PATCH net-next 7/9] net: macvlan: Use netif_rx(). Date: Thu, 3 Mar 2022 18:15:03 +0100 Message-Id: <20220303171505.1604775-8-bigeasy@linutronix.de> In-Reply-To: <20220303171505.1604775-1-bigeasy@linutronix.de> References: <20220303171505.1604775-1-bigeasy@linutronix.de> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org 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 --- 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); } From patchwork Thu Mar 3 17:15:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Andrzej Siewior X-Patchwork-Id: 12767796 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 11592C433FE for ; Thu, 3 Mar 2022 17:15:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235269AbiCCRQO (ORCPT ); Thu, 3 Mar 2022 12:16:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45006 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235254AbiCCRQF (ORCPT ); Thu, 3 Mar 2022 12:16:05 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 86E73F47ED for ; Thu, 3 Mar 2022 09:15:20 -0800 (PST) From: Sebastian Andrzej Siewior DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1646327718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ekfc/m1gUeDgqzbzoOq4tlU805jIirBBBnL0GRluSkE=; b=UbMgbC00q9J4LNhJMOvTENKvy3Gri3V1n229kBj6hgGjbGQICe3eYEMvI6xhFdTkClbv2r RM1YZBzT3GtTAWII8P3Ts9VzP591Q8o52R5x1cLNsv68yl/0pl1LfQ790b21peETOc3Pdw KBuDTEHPcasoFr61+HGiU5fkWVbdulo/1/0khDoLv1bgmAmWBqAJiVQAn6l+53P4/1ilpX dUDoS66IxZbMYtswEOazSlsP9QAdFuKQrVC8rpyL+6WbIG0WiKj8YVHAM80OzQq4GAgi25 RnZXd+D0gv/OQkCScT/rDjoqrMpz1be6OCsfQ8UQmIfH46CdIzprMJQXxO6p0g== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1646327718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ekfc/m1gUeDgqzbzoOq4tlU805jIirBBBnL0GRluSkE=; b=q2mFoyOzA9IBZHmwMV9PJdWFOCZ2KzMNCHINJ1mDRUnl1liF35lOCv2Te4hyM8xo9sHRt8 B8Vy/0Z9hWoV7rBA== To: netdev@vger.kernel.org Cc: "David S. Miller" , Jakub Kicinski , Thomas Gleixner , Sebastian Andrzej Siewior , Roopa Prabhu , Nikolay Aleksandrov , bridge@lists.linux-foundation.org Subject: [PATCH net-next 8/9] net: bridge: Use netif_rx(). Date: Thu, 3 Mar 2022 18:15:04 +0100 Message-Id: <20220303171505.1604775-9-bigeasy@linutronix.de> In-Reply-To: <20220303171505.1604775-1-bigeasy@linutronix.de> References: <20220303171505.1604775-1-bigeasy@linutronix.de> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org 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 Cc: Nikolay Aleksandrov Cc: bridge@lists.linux-foundation.org Signed-off-by: Sebastian Andrzej Siewior --- 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); } } From patchwork Thu Mar 3 17:15:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Andrzej Siewior X-Patchwork-Id: 12767795 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 33381C433EF for ; Thu, 3 Mar 2022 17:15:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235274AbiCCRQQ (ORCPT ); Thu, 3 Mar 2022 12:16:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45010 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235256AbiCCRQG (ORCPT ); Thu, 3 Mar 2022 12:16:06 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BC21516EA8D for ; Thu, 3 Mar 2022 09:15:20 -0800 (PST) From: Sebastian Andrzej Siewior DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1646327718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OwjDDf387N2nqGj6mQbSWEaRcWwCy2X0eRWV7vYSTEY=; b=B7zhT7WLMvaKVmhcvlqgpVNEgxP5AcpGCatqqLvuLxjfOTgzUErWRO1QupO/VZ5eujKDTq lsFheVbvonB8TmppDTdzJC+M1he4N/syT5tcbam2Rrw+iKrGSqGoGpvI7RFJ0F08KinFGh OR6RVZgvJMRI5F2+Qy7eLVOPTJd1SeTi9X7Itt8Qom6qlnO7TpmatpoN4L+kqNoDQofEwP HgLwOZA/Uq+k5XtXGqi0froq6s0v4jZi6fTYfEpkXrv2SU0rxpBFGpZ3CzPcJTSbpxkV3k SfLMVixraawovJAD06wgbzoJjRUBtFqzYgs6mX0ww2aecDH3Nc7HXOvwT6ceZQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1646327718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OwjDDf387N2nqGj6mQbSWEaRcWwCy2X0eRWV7vYSTEY=; b=U1HfqwVuexiTYZAgJ8ZsXd2e/+2iPKYSr3gxrhrgxKXRZAOQVOOitwSY6c9HlGM6XZDPEe 9o7495nq/gnearBA== To: netdev@vger.kernel.org Cc: "David S. Miller" , Jakub Kicinski , Thomas Gleixner , Sebastian Andrzej Siewior Subject: [PATCH net-next 9/9] net: dev: Use netif_rx(). Date: Thu, 3 Mar 2022 18:15:05 +0100 Message-Id: <20220303171505.1604775-10-bigeasy@linutronix.de> In-Reply-To: <20220303171505.1604775-1-bigeasy@linutronix.de> References: <20220303171505.1604775-1-bigeasy@linutronix.de> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org 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 --- 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); }