From patchwork Mon Nov 30 12:27:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcin Wojtas X-Patchwork-Id: 7723811 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 558C4BEEE1 for ; Mon, 30 Nov 2015 12:31:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 742E020527 for ; Mon, 30 Nov 2015 12:31:03 +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 AC0E1204DE for ; Mon, 30 Nov 2015 12:31:02 +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 1a3NZw-00049a-27; Mon, 30 Nov 2015 12:29:12 +0000 Received: from mail-lf0-x234.google.com ([2a00:1450:4010:c07::234]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1a3NYr-0003Vr-TS for linux-arm-kernel@lists.infradead.org; Mon, 30 Nov 2015 12:28:07 +0000 Received: by lfs39 with SMTP id 39so191538185lfs.3 for ; Mon, 30 Nov 2015 04:27:44 -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=bDB3VsfO7znCzzJKIVZR5cQqsPv1lhOFQO3ROjyazJGg4lsTWRj2CuDRstze352Gd5 t6DFzSwD2N06lenmFt1ucFTX5ipVXy7QWNXg5290KF2NcuZCQu9zK47HrxACzh1930Cw PMv39tQjpIhLaM5nT7rSF3XDfzs9OHJpNqaAXwn/vews5BqTK9uJzMcJOYtuUuvEAutu AOZoWKyu3Ypqpdlu98zvCnvmpEERwd/23OM45DaOcaH+cbkeZHseG8F+JrHSmx6FhZnI 3a5soOgtD60Wq/2drMbOAAoNHTTM7QMcvC5P5cTNkKoVe3itFOQTcfyHZFui3mzGePbv RDBA== 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=AJc1WY4PUkUPvLxvSUL0+8epc5Ym7jiwt6n+set9Kd+79KXUxVDN0seNgcfm/sy/fk eCTEa5OajpkKv3F5JJNFnm0X5lARsBbM2ficvR6SlzuxsjXtNKcjH7G+c4gbmdc7g4J4 7iQGwNwBZUv775XIKthD6+Xhy39bx4+aSdwuF/46vPIsGLGaYVDVffor6qk3lLV9AOmE /hs8ENpnoQPm7sNlRcvKBW5YSDGKCEBd8QSJ9bV5p0GKJAO91NvEaC7VcaCeztzOoHtA ZGgKvtdQDGTMs6cE5HbCaTarH4NP3l1jVO6mGCVcD6IEIM799QYHVXLJTMG1mXRbSnfv QgCQ== X-Gm-Message-State: ALoCoQlpD6m/aUP+DJXDK6e4ohZBjgsGEmndL5e6LMJQvo+3pPCEFmnWyyTAgwF/R2qzuy7TOClg X-Received: by 10.25.26.68 with SMTP id a65mr13913980lfa.72.1448886464876; Mon, 30 Nov 2015 04:27:44 -0800 (PST) Received: from enkidu.semihalf.local ([80.82.22.190]) by smtp.gmail.com with ESMTPSA id l67sm7325249lfl.26.2015.11.30.04.27.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 30 Nov 2015 04:27:44 -0800 (PST) From: Marcin Wojtas To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org Subject: [PATCH v4 net 4/6] net: mvneta: fix error path for building skb Date: Mon, 30 Nov 2015 13:27:44 +0100 Message-Id: <1448886466-31538-5-git-send-email-mw@semihalf.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1448886466-31538-1-git-send-email-mw@semihalf.com> References: <1448886466-31538-1-git-send-email-mw@semihalf.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151130_042806_293164_16161F01 X-CRM114-Status: GOOD ( 12.33 ) 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;