Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1278863
| Path | csiph.com!eternal-september.org!feeder.eternal-september.org!aioe.org!bofh.it!news.nic.it!robomod |
|---|---|
| From | Marcin Wojtas <mw@semihalf.com> |
| Newsgroups | linux.kernel |
| Subject | [PATCH v3 net 4/6] net: mvneta: fix error path for building skb |
| Date | Fri, 27 Nov 2015 16:50:03 +0100 |
| Message-ID | <qztrB-4LC-35@gated-at.bofh.it> (permalink) |
| References | <qztrA-4LC-13@gated-at.bofh.it> |
| X-Original-To | linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org |
| 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=fbZxccTfVshVvAOyVpS9mXiGmS4K4fZfkonF+Y8jXfkmMy4w867kPjrc0YygI2OrTv QGiLh2wx4B0WXjXqmiQ1f0Rhc7t+tFcVKxz0E3SbPcy8/4O3kvjiUCpYKjNjy1srpoa0 4gkgc9I3mkD7ZC5FOWbgbifvoBeYfAj/bSluX5OPH6pnRh7hyXTD5w8CId1ccY1ngsh4 QX54ZfPmTsPIc4gtJApJBL1XPkSXoXjim4zvEXIImqC02e1mdQyipDH4ArEiGYxPOTKg uvSPIgCk2zpRNZxS67PUOapK/8JbWRpU2o9oMi51IHXxDiuwJuXzcirGcYBo8KZilGKS Qbsw== |
| X-Gm-Message-State | ALoCoQm30tMoiSeL0b3VuxVNNCrG7KoFqkd/5QU5PVk/tpuA66axHkD7Qac7SHZFs7ic6H0RwIuM |
| X-Received | by 10.25.27.147 with SMTP id b141mr17674231lfb.87.1448639078465; Fri, 27 Nov 2015 07:44:38 -0800 (PST) |
| X-Mailer | git-send-email 1.8.3.1 |
| Sender | robomod@news.nic.it |
| List-ID | <linux-kernel.vger.kernel.org> |
| X-Mailing-List | linux-kernel@vger.kernel.org |
| Approved | robomod@news.nic.it |
| Lines | 48 |
| Organization | linux.* mail to news gateway |
| X-Original-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, <stable@vger.kernel.org> |
| X-Original-Date | Fri, 27 Nov 2015 16:44:24 +0100 |
| X-Original-Message-ID | <1448639066-13074-5-git-send-email-mw@semihalf.com> |
| X-Original-References | <1448639066-13074-1-git-send-email-mw@semihalf.com> |
| X-Original-Sender | linux-kernel-owner@vger.kernel.org |
| Xref | csiph.com linux.kernel:1278863 |
Show key headers only | View raw
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 <mw@semihalf.com>
Acked-by: Simon Guinot <simon.guinot@sequanux.org>
Cc: <stable@vger.kernel.org> # 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;
--
1.8.3.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v2 net 0/6] Marvell Armada XP/370/38X Neta fixes Marcin Wojtas <mw@semihalf.com> - 2015-11-27 16:50 +0100 [PATCH v3 net 4/6] net: mvneta: fix error path for building skb Marcin Wojtas <mw@semihalf.com> - 2015-11-27 16:50 +0100 [PATCH v3 net 2/6] net: mvneta: fix bit assignment in MVNETA_RXQ_CONFIG_REG Marcin Wojtas <mw@semihalf.com> - 2015-11-27 16:50 +0100
csiph-web