From patchwork Fri Nov 27 15:44:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcin Wojtas X-Patchwork-Id: 7713891 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 09B89C01BB for ; Fri, 27 Nov 2015 15:47:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 24290206C3 for ; Fri, 27 Nov 2015 15:47:33 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3CDEC20748 for ; Fri, 27 Nov 2015 15:47:32 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1a2LDZ-0006iH-SE; Fri, 27 Nov 2015 15:45:49 +0000 Received: from mail-lf0-x230.google.com ([2a00:1450:4010:c07::230]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1a2LCm-0005C7-BA for linux-arm-kernel@lists.infradead.org; Fri, 27 Nov 2015 15:45:01 +0000 Received: by lfs39 with SMTP id 39so130752284lfs.3 for ; Fri, 27 Nov 2015 07:44:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Bxc8VbPjt6q0YHieHi6DQ8tIfTOGeGzDlvbpGwSZDA8=; b=16bv/Az9tMClYzm72QprzHHez4Th9k6P1V2Sauiit34HTU9z34hmUstZ0wc8ZsdtwW n9hNUyp1Ckl/PU1sF4HA8fu+KCC4ONUD5hbnbmdPRKdGkaraX7wN4oNicecgGAigQnmc WN1UvxsNkQ4YnF4awQpVaPe6yqJGMyX7hP6PzrXQr5yxTWMZazSDJAi14O1OWAmhaGlg qEj22HNhj82j/F4phdd8mmahjD1MEOQd/VMvKQdAI8iroCC/1YuSJcICLQVK9oMn34D1 jtZdD50v/PaH8ARazts+vTcBzXYH9pQTOlyrb96Yz6MQ5bbA/Fzijz5zqwO99mpIYNP6 dBwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Bxc8VbPjt6q0YHieHi6DQ8tIfTOGeGzDlvbpGwSZDA8=; b=SZwGIWUq2WO1NEQwLUMJyx1rqQQ2OoPdVbUwC+JL8wX7PxzKdul3dQeWdqWJm1Bwc7 ERZe67mKaAoc7qlxAs3y1yhw7fVTwMwj5cDXaaat7+m8iehzF7yLwjS35NaP4AVPk0X0 qVHOxnlftHoIc5rPOhbW3c1yfzJW4AhnP/XnSlzFCg1VWj8+CiD+Tt+/YGm0AEXjsAGy IRxI+tvrPGfXdilcXEM3D+ix2bxuf4bDeDFl258luvI5m0IFKHKTGIVN0WjlZB7gfkls QbPXXZIynjbGsi2hTMeG5BxhgnL035dlROveONL5fD/1DAauUCEre0vvvnvGXbTJ4SrB qLYw== X-Gm-Message-State: ALoCoQknE6n1ZsBdY8yVPEKNewWUQdTkComuyiGOkLgN1NedCr+Dn58yZ+0mbDzEgyULo9svsclM X-Received: by 10.25.27.147 with SMTP id b141mr17674231lfb.87.1448639078465; Fri, 27 Nov 2015 07:44:38 -0800 (PST) Received: from enkidu.semihalf.local ([80.82.22.190]) by smtp.gmail.com with ESMTPSA id k189sm5096651lfd.12.2015.11.27.07.44.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 27 Nov 2015 07:44:37 -0800 (PST) From: Marcin Wojtas To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org Subject: [PATCH v3 net 4/6] net: mvneta: fix error path for building skb Date: Fri, 27 Nov 2015 16:44:24 +0100 Message-Id: <1448639066-13074-5-git-send-email-mw@semihalf.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1448639066-13074-1-git-send-email-mw@semihalf.com> References: <1448639066-13074-1-git-send-email-mw@semihalf.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151127_074500_752730_8A9820FC X-CRM114-Status: GOOD ( 11.83 ) X-Spam-Score: -2.6 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thomas.petazzoni@free-electrons.com, andrew@lunn.ch, linux@arm.linux.org.uk, jason@lakedaemon.net, myair@marvell.com, jaz@semihalf.com, simon.guinot@sequanux.org, xswang@marvell.com, nadavh@marvell.com, alior@marvell.com, stable@vger.kernel.org, tn@semihalf.com, gregory.clement@free-electrons.com, nitroshift@yahoo.com, mw@semihalf.com, davem@davemloft.net, sebastian.hesselbarth@gmail.com MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In the actual RX processing, there is same error path for both descriptor ring refilling and building skb fails. This is not correct, because after successful refill, the ring is already updated with newly allocated buffer. Then, in case of build_skb() fail, hitherto code left the original buffer unmapped. This patch fixes above situation by swapping error check of skb build with DMA-unmap of original buffer. Signed-off-by: Marcin Wojtas Acked-by: Simon Guinot Cc: # v4.2+ Fixes a84e32894191 ("net: mvneta: fix refilling for Rx DMA buffers") --- drivers/net/ethernet/marvell/mvneta.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c index 5dffb68..5a98c5d 100644 --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c @@ -1580,12 +1580,16 @@ static int mvneta_rx(struct mvneta_port *pp, int rx_todo, } skb = build_skb(data, pp->frag_size > PAGE_SIZE ? 0 : pp->frag_size); - if (!skb) - goto err_drop_frame; + /* After refill old buffer has to be unmapped regardless + * the skb is successfully built or not. + */ dma_unmap_single(dev->dev.parent, phys_addr, MVNETA_RX_BUF_SIZE(pp->pkt_size), DMA_FROM_DEVICE); + if (!skb) + goto err_drop_frame; + rcvd_pkts++; rcvd_bytes += rx_bytes;