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: 549509 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 27638140319 for ; Sat, 28 Nov 2015 02:46:18 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=semihalf-com.20150623.gappssmtp.com header.i=@semihalf-com.20150623.gappssmtp.com header.b=16bv/Az9; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755141AbbK0PqI (ORCPT ); Fri, 27 Nov 2015 10:46:08 -0500 Received: from mail-lf0-f47.google.com ([209.85.215.47]:34874 "EHLO mail-lf0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754972AbbK0Poj (ORCPT ); Fri, 27 Nov 2015 10:44:39 -0500 Received: by lfdl133 with SMTP id l133so132901675lfd.2 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=M4zztW6gbn6Yn3FpbmZIjvxwiuWJQUK4PymQwwFEtNgzX8lEINyavBNJMzPL8PzdfF k5Jlp0SRj1IOm3PeP4ylLpHxy4awuglShp/8g3KmuU9A9x3uNyNhH5jnAztn9TpCqjSc hulr1n55aeFGug3EQi0WrGhHHUSGW2rIVkJYiNEG/pPCPJEWxRjAv/m1on0pbC7L9+dr J0L5WyWTwDvFyMBoz3vVLTAss6If3EzTDLCgzf914BllpI+DX86JU9/CKti9FUXyj2s5 EbaxIPNn/Cuc11PAl30FY3O6eYB8AY8AEaoRrYKdtidB4cwyRvjKhzoNxpCpe5VMkYRr vj6g== X-Gm-Message-State: ALoCoQlN5/lWAiu0IV+Xnm8Q0wxHq3DzgRkigqP/rWp/kK2yobxH8PbjVjpA3MVGKxJRNVcZoqwX 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 Cc: davem@davemloft.net, linux@arm.linux.org.uk, sebastian.hesselbarth@gmail.com, andrew@lunn.ch, jason@lakedaemon.net, thomas.petazzoni@free-electrons.com, gregory.clement@free-electrons.com, simon.guinot@sequanux.org, nadavh@marvell.com, alior@marvell.com, xswang@marvell.com, myair@marvell.com, nitroshift@yahoo.com, mw@semihalf.com, jaz@semihalf.com, tn@semihalf.com, 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> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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;