From patchwork Sun Jul 17 19:48:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksander Jan Bajkowski X-Patchwork-Id: 12920640 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 A48C1C43334 for ; Sun, 17 Jul 2022 19:48:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232177AbiGQTsd (ORCPT ); Sun, 17 Jul 2022 15:48:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42664 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229535AbiGQTsc (ORCPT ); Sun, 17 Jul 2022 15:48:32 -0400 Received: from mx4.wp.pl (mx4.wp.pl [212.77.101.11]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 74894CE17 for ; Sun, 17 Jul 2022 12:48:29 -0700 (PDT) Received: (wp-smtpd smtp.wp.pl 1122 invoked from network); 17 Jul 2022 21:48:25 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wp.pl; s=1024a; t=1658087305; bh=hoNiCJO2/RjDbGyrWqCPW679YWsLHmKqfqfWZbZ8ep4=; h=From:To:Subject; b=XSaMKBbCtRPfXBRH/tT+opplmBKFDP1gfirqzFC6sRzqO6OH7ylUkoCsieX+XC319 krUa3fJyYFnWsaId9/1/+LhUh9kHcqhMIlNss6Wu7kYrAtPELhQLn3AhZ0Gogmznxr 6d10KhgNKAyKtk8DbRHBIYsLxFobk7pcWWGSdLkI= Received: from ip-137-21.ds.pw.edu.pl (HELO LAPTOP-OLEK.lan) (olek2@wp.pl@[194.29.137.21]) (envelope-sender ) by smtp.wp.pl (WP-SMTPD) with ECDHE-RSA-AES256-GCM-SHA384 encrypted SMTP for ; 17 Jul 2022 21:48:25 +0200 From: Aleksander Jan Bajkowski To: hauke@hauke-m.de, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, olek2@wp.pl, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net 1/2] net: lantiq_xrx200: confirm skb is allocated before using Date: Sun, 17 Jul 2022 21:48:23 +0200 Message-Id: <20220717194824.1017750-1-olek2@wp.pl> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-WP-MailID: 39c774bf949039ef96cbd730d46b43c8 X-WP-AV: skaner antywirusowy Poczty Wirtualnej Polski X-WP-SPAM: NO 0000000 [cZNU] Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org xrx200_hw_receive() assumes build_skb() always works and goes straight to skb_reserve(). However, build_skb() can fail under memory pressure. Add a check in case build_skb() failed to allocate and return NULL. Fixes: e015593573b3 ("net: lantiq_xrx200: convert to build_skb ") Reported-by: Eric Dumazet Signed-off-by: Aleksander Jan Bajkowski --- drivers/net/ethernet/lantiq_xrx200.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/net/ethernet/lantiq_xrx200.c b/drivers/net/ethernet/lantiq_xrx200.c index 5edb68a8aab1..6a83a6c19484 100644 --- a/drivers/net/ethernet/lantiq_xrx200.c +++ b/drivers/net/ethernet/lantiq_xrx200.c @@ -239,6 +239,13 @@ static int xrx200_hw_receive(struct xrx200_chan *ch) } skb = build_skb(buf, priv->rx_skb_size); + if (!skb) { + skb_free_frag(buf); + net_dev->stats.rx_dropped++; + netdev_err(net_dev, "failed to build skb\n"); + return -ENOMEM; + } + skb_reserve(skb, NET_SKB_PAD); skb_put(skb, len); From patchwork Sun Jul 17 19:48:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksander Jan Bajkowski X-Patchwork-Id: 12920641 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 C26DAC43334 for ; Sun, 17 Jul 2022 19:48:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232570AbiGQTsj (ORCPT ); Sun, 17 Jul 2022 15:48:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42690 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232460AbiGQTse (ORCPT ); Sun, 17 Jul 2022 15:48:34 -0400 Received: from mx3.wp.pl (mx3.wp.pl [212.77.101.10]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B7FD611829 for ; Sun, 17 Jul 2022 12:48:32 -0700 (PDT) Received: (wp-smtpd smtp.wp.pl 10730 invoked from network); 17 Jul 2022 21:48:29 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wp.pl; s=1024a; t=1658087309; bh=UI6nLD4Fx97G6PDxnH7Sa3zKSOR84nHPMQHr6vxLvAM=; h=From:To:Subject; b=ppP9K6g0FJrQCEjuWTkxvrDQ/4bQGVlh+1TSWK771fs7UaShztN5nZjBpedY/j0Bt XYNQ2a+l7xYM3hVgD0qGQIylaTQHP3xU6LlYS3nYxddM80dOAWufCz8sbik03CajPG bLX4dl6YBgEKcBXjil4OvThN+0dD+xEqDiJ26+l0= Received: from ip-137-21.ds.pw.edu.pl (HELO LAPTOP-OLEK.lan) (olek2@wp.pl@[194.29.137.21]) (envelope-sender ) by smtp.wp.pl (WP-SMTPD) with ECDHE-RSA-AES256-GCM-SHA384 encrypted SMTP for ; 17 Jul 2022 21:48:29 +0200 From: Aleksander Jan Bajkowski To: hauke@hauke-m.de, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, olek2@wp.pl, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net 2/2] net: lantiq_xrx200: fix return value in ENOMEM case Date: Sun, 17 Jul 2022 21:48:24 +0200 Message-Id: <20220717194824.1017750-2-olek2@wp.pl> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220717194824.1017750-1-olek2@wp.pl> References: <20220717194824.1017750-1-olek2@wp.pl> MIME-Version: 1.0 X-WP-MailID: 072c0a6f35c53f5a85f852b1be7cdddc X-WP-AV: skaner antywirusowy Poczty Wirtualnej Polski X-WP-SPAM: NO 0000000 [QdPE] Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org The xrx200_hw_receive() function can return: * XRX200_DMA_PACKET_IN_PROGRESS (the next descriptor contains the further part of the packet), * XRX200_DMA_PACKET_COMPLETE (a complete packet has been received), * -ENOMEM (a memory allocation error occurred). Currently, the third of these cases is incorrectly handled. The NAPI poll function returns then a negative value (-ENOMEM). Correctly in such a situation, the driver should try to receive next packet in the hope that this time the memory allocation for the next descriptor will succeed. This patch replaces the XRX200_DMA_PACKET_IN_PROGRESS definition with -EINPROGRESS to simplify the driver. Fixes: c3e6b2c35b34 ("net: lantiq_xrx200: add ingress SG DMA support") Signed-off-by: Aleksander Jan Bajkowski --- drivers/net/ethernet/lantiq_xrx200.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/lantiq_xrx200.c b/drivers/net/ethernet/lantiq_xrx200.c index 6a83a6c19484..2865d07f3fc8 100644 --- a/drivers/net/ethernet/lantiq_xrx200.c +++ b/drivers/net/ethernet/lantiq_xrx200.c @@ -27,9 +27,6 @@ #define XRX200_DMA_TX 1 #define XRX200_DMA_BURST_LEN 8 -#define XRX200_DMA_PACKET_COMPLETE 0 -#define XRX200_DMA_PACKET_IN_PROGRESS 1 - /* cpu port mac */ #define PMAC_RX_IPG 0x0024 #define PMAC_RX_IPG_MASK 0xf @@ -272,9 +269,8 @@ static int xrx200_hw_receive(struct xrx200_chan *ch) netif_receive_skb(ch->skb_head); ch->skb_head = NULL; ch->skb_tail = NULL; - ret = XRX200_DMA_PACKET_COMPLETE; } else { - ret = XRX200_DMA_PACKET_IN_PROGRESS; + ret = -EINPROGRESS; } return ret; @@ -292,10 +288,8 @@ static int xrx200_poll_rx(struct napi_struct *napi, int budget) if ((desc->ctl & (LTQ_DMA_OWN | LTQ_DMA_C)) == LTQ_DMA_C) { ret = xrx200_hw_receive(ch); - if (ret == XRX200_DMA_PACKET_IN_PROGRESS) + if (ret) continue; - if (ret != XRX200_DMA_PACKET_COMPLETE) - return ret; rx++; } else { break;