From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751971AbdB0Kas (ORCPT ); Mon, 27 Feb 2017 05:30:48 -0500 Received: from mail.kapsi.fi ([217.30.184.167]:43877 "EHLO mail.kapsi.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751914AbdB0Kaf (ORCPT ); Mon, 27 Feb 2017 05:30:35 -0500 Subject: Re: [PATCH 3/7] net: stmmac: Check for DMA mapping errors To: Thierry Reding , "David S . Miller" References: <20170223172438.14770-1-thierry.reding@gmail.com> <20170223172438.14770-4-thierry.reding@gmail.com> Cc: Giuseppe Cavallaro , Alexandre Torgue , Rob Herring , Mark Rutland , Joao Pinto , Alexandre Courbot , Jon Hunter , netdev@vger.kernel.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org From: Mikko Perttunen Message-ID: <35dec9cd-65db-c62b-f35f-c90cf35b27f2@kapsi.fi> Date: Mon, 27 Feb 2017 11:37:24 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2.0 MIME-Version: 1.0 In-Reply-To: <20170223172438.14770-4-thierry.reding@gmail.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-SA-Exim-Connect-IP: 62.209.167.43 X-SA-Exim-Mail-From: cyndis@kapsi.fi X-SA-Exim-Scanned: No (on mail.kapsi.fi); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 23.02.2017 19:24, Thierry Reding wrote: > From: Thierry Reding > > When DMA mapping an SKB fragment, the mapping must be checked for > errors, otherwise the DMA debug code will complain upon unmap. > > Signed-off-by: Thierry Reding > --- > drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > index 6b7a5ce19589..d7387919bdb6 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > @@ -2072,6 +2072,8 @@ static netdev_tx_t stmmac_tso_xmit(struct sk_buff *skb, struct net_device *dev) > des = skb_frag_dma_map(priv->device, frag, 0, > skb_frag_size(frag), > DMA_TO_DEVICE); > + if (dma_mapping_error(priv->device, des)) > + goto dma_map_err; If this map fails, we should also unmap the previously mapped fragments and the separate mapping made using dma_map_single. > > stmmac_tso_allocator(priv, des, skb_frag_size(frag), > (i == nfrags - 1)); >