From patchwork Thu Jan 26 10:16:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Suhr Christensen X-Patchwork-Id: 13116831 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2C1DDC05027 for ; Thu, 26 Jan 2023 10:17:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=7Z0rmV8DexhClBr4XTKpjeqlySyDdWq2kxPaENDUzP4=; b=4ab4kh6aMYYi92 I1W94QYSqQpHvC4CYpcjDIbpHsV6ZrIXnlrfuui0Y3d2u5mreBPfC6CIr96hwyqtKWkIDwzdr9sUQ p6E/1b5VU1m9Au2miV7v26+1/7eP9YkQKCOytO8d9+O5IXm7gxQLYvMv6qpGlzY8kxrUIqkW4Ee+R A8iVSUbNGH9vc1h3iGAtj180DNfycAjK6EkInkVEvt06QerDhCbntjLRU81C/aydqi9lxpxYx0Ydd VzE/p13hbquIqujX8ovuwoPzm9pEfisbqW7LPvqNyEAygNYSlDfa/OUz6xRl8TMwXV/KNcxSpE7pk zfEkKD3+wpVLQY7cOuSw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pKzJL-00AOeE-FN; Thu, 26 Jan 2023 10:16:51 +0000 Received: from out4-smtp.messagingengine.com ([66.111.4.28]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pKzJH-00AOdI-Vk for linux-arm-kernel@lists.infradead.org; Thu, 26 Jan 2023 10:16:49 +0000 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 5AE475C013F; Thu, 26 Jan 2023 05:16:47 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Thu, 26 Jan 2023 05:16:47 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=umbraculum.org; h=cc:cc:content-transfer-encoding:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm2; t=1674728207; x= 1674814607; bh=j1DjTIMxlexzPaQjT5v9wphlTdFzrI3hxKFv78KoM+A=; b=b ze5jwaG6JBjVrKlQK3lNzpc1VpuCqwlwZveskHIvNTqCZhnmwNy1tRV/l2HrVAyu nIVi6WHXIlSLQaJEMO8jL4bMueMXMfk9NhGBy8MGZBKo4bmvEd2Z1amTywW58+K9 PmN72HDouqDUOM4l5BmWjxNmtmX1OH74guKqWAsRRZ9iNro3c7fTERpB0BJZD1yn W0/N7vb2hQPV3lPwmrirh/wfzmYRIhDPpm8UZ9b3M3+E6inqu4urhiKd5pNCD9u+ kWKQ4FByWaWGPp8Dy5nJFDC6PS7OtSoHbOzkQGe5yxkEvSvO7FhGFfzYU9VSmfM9 MlqkItyE1ekBZ2rvv7UhA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1674728207; x=1674814607; bh=j1DjTIMxlexzP aQjT5v9wphlTdFzrI3hxKFv78KoM+A=; b=lIixVRIBPkiHjEPKKEEgyNlZhgayX igCC/TJWJERLmo+bCUK7atHDtpXT/zytxO7XNb2NVdasR2uB7sBPPvLqQbm/6BTo Es9m493UTEssH2E5KXUVw4xE0wG0zzwddDA5i58HhsvOFmdBS2hC2p4hvcJwfdvT kvFgxu6sCqVaPA31FP71gXT7srkOX06VQAH73+xTpvLA55Mt4jD2ejX4vpZYBuqZ wDco43OtGkML6JvGpmisUFstr5F0sHlobFhp/QWpgFXClttikDG/uEG/uA46D3xN 21y1yvk+qfjgun0PR980md1XU2knRPw/vKxiF/ialkHDPNXUaJ06hlJYw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedruddvgedgudegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpeflohhnrghsucfuuhhhrhcuvehhrhhishhtvghnshgvnhcu oehjshgtsehumhgsrhgrtghulhhumhdrohhrgheqnecuggftrfgrthhtvghrnhepieevle eguedviefgfedtjeeuuddtjeekheffueffhfejieevleffffekjeffgedunecuvehluhhs thgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepjhhstgesuhhmsghrrg gtuhhluhhmrdhorhhg X-ME-Proxy: Feedback-ID: i06314781:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 26 Jan 2023 05:16:44 -0500 (EST) From: Jonas Suhr Christensen To: netdev@vger.kernel.org Cc: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, michal.simek@xilinx.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, esben@geanix.com, Jonas Suhr Christensen Subject: [PATCH 2/2] net: ll_temac: improve reset of buffer on dma mapping Date: Thu, 26 Jan 2023 11:16:07 +0100 Message-Id: <20230126101607.88407-2-jsc@umbraculum.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230126101607.88407-1-jsc@umbraculum.org> References: <20230126101607.88407-1-jsc@umbraculum.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230126_021648_125203_798BA8DC X-CRM114-Status: GOOD ( 10.69 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Free buffer and set pointer to null on dma mapping error. Signed-off-by: Jonas Suhr Christensen --- drivers/net/ethernet/xilinx/ll_temac_main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c index 66c04027f230..5595ba57a126 100644 --- a/drivers/net/ethernet/xilinx/ll_temac_main.c +++ b/drivers/net/ethernet/xilinx/ll_temac_main.c @@ -376,8 +376,11 @@ static int temac_dma_bd_init(struct net_device *ndev) skb_dma_addr = dma_map_single(ndev->dev.parent, skb->data, XTE_MAX_JUMBO_FRAME_SIZE, DMA_FROM_DEVICE); - if (dma_mapping_error(ndev->dev.parent, skb_dma_addr)) + if (dma_mapping_error(ndev->dev.parent, skb_dma_addr)) { + dev_kfree_skb(lp->rx_skb[i]); + lp->rx_skb[i] = NULL; goto out; + } lp->rx_bd_v[i].phys = cpu_to_be32(skb_dma_addr); lp->rx_bd_v[i].len = cpu_to_be32(XTE_MAX_JUMBO_FRAME_SIZE); lp->rx_bd_v[i].app0 = cpu_to_be32(STS_CTRL_APP0_IRQONEND);