From patchwork Fri Feb 5 21:52:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Troy Kisky X-Patchwork-Id: 8239961 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 987B79F37A for ; Fri, 5 Feb 2016 22:00:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B88A92034A for ; Fri, 5 Feb 2016 22:00:18 +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 E620D20268 for ; Fri, 5 Feb 2016 22:00:17 +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 1aRoP0-0007Rc-53; Fri, 05 Feb 2016 21:58:54 +0000 Received: from mail-pf0-x22a.google.com ([2607:f8b0:400e:c00::22a]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aRoLq-0004MM-Vw for linux-arm-kernel@lists.infradead.org; Fri, 05 Feb 2016 21:55:41 +0000 Received: by mail-pf0-x22a.google.com with SMTP id o185so75231893pfb.1 for ; Fri, 05 Feb 2016 13:55:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=boundarydevices-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=sqSowBALByyHX5HQK96z73xD2OUaiC21ppcKN9jQZh0=; b=BItG4dYjoAyLWRF/W17CWVBDQONhuNPcAxbUYc+e+RnI5QoSmFH7y50iKsrMlE71VY kddUW+gxfUvNfEOIoQbK9+BkRFvh6Ljoe/bO5D74N43Ye+49lCEvj7IgZOAvTvSCJdGH LbTdmK7hVIiJZ8CfPagHppNA/o/w5nO9QUdEFb+EsomI8HA+TsfKMBic/Nmwj0g5bNwP guZPqAFXMtUVqJfuqsN19BvjNk9AmCccD9n3kH/GhTB7eDmooUfmvLiK+Mw/QI7pek5C ndxxPl2BPtuh8Kk+P4/s7WSr0hsbs4K0ovOhqTwVXedyw+rwt3f6Kxk3RralEco4ZiCZ KVMA== 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=sqSowBALByyHX5HQK96z73xD2OUaiC21ppcKN9jQZh0=; b=FWyg4q6QZTn5v32sewPZaxfliNNwf3FAIv2XSHzQoCcFHq6Q/DCP6MDRVfPQ2aj9EH Wc3MioEy3ZH2sglwEoqu2w+zAhe5TJ3fhqXbpkfoFZsVf12t9QPvEeuR9Mwk/B46A8CZ NEGYYfzRgHRRiZqAyEFGIbLukTDUHM8tZQjtypNta2oKUqv19RwEUEvfviHJYF4L6dtx eswAAsuq+X8rJqbUvHlN7djiBh67KeDYpWjaAPgy7Szyf/0Vkvm82eXTqALmBMYMcOdo Yn7w0XvEaJzl5KU0boUmB9piVz+tyAnVv5kigM0V/LmktjSc7pjj+azwiZUvEqkS0bBd xdMA== X-Gm-Message-State: AG10YOS6HKbImPWO+AjbmWvZngLQGGpDlErV1X2G4zB+fibUPkQD8fb/eM5i3GSg3IXBBA== X-Received: by 10.98.64.4 with SMTP id n4mr10314728pfa.58.1454709318198; Fri, 05 Feb 2016 13:55:18 -0800 (PST) Received: from localhost.localdomain (wsip-70-184-93-199.ph.ph.cox.net. [70.184.93.199]) by smtp.googlemail.com with ESMTPSA id v75sm26628688pfa.39.2016.02.05.13.55.16 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 05 Feb 2016 13:55:17 -0800 (PST) From: Troy Kisky To: netdev@vger.kernel.org, davem@davemloft.net, B38611@freescale.com Subject: [PATCH net-next V2 8/8] net: fec: improve error handling Date: Fri, 5 Feb 2016 14:52:50 -0700 Message-Id: <1454709170-19527-9-git-send-email-troy.kisky@boundarydevices.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1454709170-19527-1-git-send-email-troy.kisky@boundarydevices.com> References: <1454709170-19527-1-git-send-email-troy.kisky@boundarydevices.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160205_135539_324150_EA5F8E67 X-CRM114-Status: GOOD ( 11.58 ) 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: fabio.estevam@freescale.com, andrew@lunn.ch, linux@arm.linux.org.uk, arnd@arndb.de, Troy Kisky , laci@boundarydevices.com, johannes@sipsolutions.net, l.stach@pengutronix.de, shawnguo@kernel.org, linux-arm-kernel@lists.infradead.org, tremyfr@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.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,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 Unmap initial buffer on error. Don't free skb until it has been unmapped. Move cbd_bufaddr assignment closer to the mapping function. Signed-off-by: Troy Kisky --- drivers/net/ethernet/freescale/fec_main.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index 97ca72a..ef18ca5 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -382,7 +382,6 @@ fec_enet_txq_submit_frag_skb(struct fec_enet_priv_tx_q *txq, addr = dma_map_single(&fep->pdev->dev, bufaddr, frag_len, DMA_TO_DEVICE); if (dma_mapping_error(&fep->pdev->dev, addr)) { - dev_kfree_skb_any(skb); if (net_ratelimit()) netdev_err(ndev, "Tx DMA memory map failed\n"); goto dma_mapping_error; @@ -467,8 +466,12 @@ static int fec_enet_txq_submit_skb(struct fec_enet_priv_tx_q *txq, if (nr_frags) { last_bdp = fec_enet_txq_submit_frag_skb(txq, skb, ndev); - if (IS_ERR(last_bdp)) + if (IS_ERR(last_bdp)) { + dma_unmap_single(&fep->pdev->dev, addr, + buflen, DMA_TO_DEVICE); + dev_kfree_skb_any(skb); return NETDEV_TX_OK; + } } else { status |= (BD_ENET_TX_INTR | BD_ENET_TX_LAST); if (fep->bufdesc_ex) { @@ -478,6 +481,8 @@ static int fec_enet_txq_submit_skb(struct fec_enet_priv_tx_q *txq, estatus |= BD_ENET_TX_TS; } } + bdp->cbd_bufaddr = cpu_to_fec32(addr); + bdp->cbd_datlen = cpu_to_fec16(buflen); if (fep->bufdesc_ex) { @@ -501,8 +506,6 @@ static int fec_enet_txq_submit_skb(struct fec_enet_priv_tx_q *txq, /* Save skb pointer */ txq->tx_skbuff[index] = skb; - bdp->cbd_datlen = cpu_to_fec16(buflen); - bdp->cbd_bufaddr = cpu_to_fec32(addr); /* Make sure the updates to rest of the descriptor are performed before * transferring ownership. */