From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0E94BC43219 for ; Mon, 29 Apr 2019 08:36:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C4CAA20578 for ; Mon, 29 Apr 2019 08:36:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=geanix.com header.i=@geanix.com header.b="KZMzVQ3Q" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727985AbfD2Iga (ORCPT ); Mon, 29 Apr 2019 04:36:30 -0400 Received: from first.geanix.com ([116.203.34.67]:49962 "EHLO first.geanix.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727711AbfD2IfC (ORCPT ); Mon, 29 Apr 2019 04:35:02 -0400 Received: from localhost (unknown [193.163.1.7]) by first.geanix.com (Postfix) with ESMTPSA id EE9FA308E8C; Mon, 29 Apr 2019 08:33:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=geanix.com; s=first; t=1556526818; bh=kBuhGD+tQqRGMTFLDCOwN4VlK8tZ2dL1x7CaTog3pJw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=KZMzVQ3Q7KoOpA3dke/c3LhxS8iHMqVw86U0Fo8S56sKnFDYZ4vH5lYUdJaB5Z4Gh Naw8UIJ9I6BE2TIUIFJSq35j/kleyjKCdeuVFJXec6C+0XXfL4AtN/6qfzfr9iw/rD wsWeicjyEeQQ+zXILFFlkN46NQOleE55MJ8fUtsXyCeUglcUBopAvBGHAiDcZeoR/j QUPgJJ62sAvwqmGb2ou3f2JDWMk7Bfi8dhea4SZLZDRx74p4lmvQmXH2m3oPTlfGLo HC/2JQR5XFGZ1tyPhuvPgFn/ZoUkr0mYzailrkVqL6Z+IBVGnAInSOh4FSb1Ei/j4G teiwd9cjZoSuw== From: Esben Haabendal To: netdev@vger.kernel.org Cc: "David S. Miller" , Michal Simek , YueHaibing , Yang Wei , Luis Chamberlain , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 08/12] net: ll_temac: Fix iommu/swiotlb leak Date: Mon, 29 Apr 2019 10:34:18 +0200 Message-Id: <20190429083422.4356-9-esben@geanix.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190429083422.4356-1-esben@geanix.com> References: <20190426073231.4008-1-esben@geanix.com> <20190429083422.4356-1-esben@geanix.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Unmap the actual buffer length, not the amount of data received, avoiding resource exhaustion of swiotlb (seen on x86_64 platform). Signed-off-by: Esben Haabendal --- drivers/net/ethernet/xilinx/ll_temac_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c index 1c5d126..72ec338 100644 --- a/drivers/net/ethernet/xilinx/ll_temac_main.c +++ b/drivers/net/ethernet/xilinx/ll_temac_main.c @@ -821,7 +821,7 @@ static void ll_temac_recv(struct net_device *ndev) length = be32_to_cpu(cur_p->app4) & 0x3FFF; dma_unmap_single(ndev->dev.parent, be32_to_cpu(cur_p->phys), - length, DMA_FROM_DEVICE); + XTE_MAX_JUMBO_FRAME_SIZE, DMA_FROM_DEVICE); skb_put(skb, length); skb->protocol = eth_type_trans(skb, ndev); -- 2.4.11