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=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 0230EC4338F for ; Fri, 13 Aug 2021 07:43:07 +0000 (UTC) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C0D4360F14 for ; Fri, 13 Aug 2021 07:43:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org C0D4360F14 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.linux-foundation.org Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 9E63240540; Fri, 13 Aug 2021 07:43:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RqX9FKgJ-Gi2; Fri, 13 Aug 2021 07:43:02 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp4.osuosl.org (Postfix) with ESMTPS id 3154640563; Fri, 13 Aug 2021 07:43:02 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 09912C001A; Fri, 13 Aug 2021 07:43:02 +0000 (UTC) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) by lists.linuxfoundation.org (Postfix) with ESMTP id BE64DC000E for ; Fri, 13 Aug 2021 07:43:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id BB97B606EA for ; Fri, 13 Aug 2021 07:43:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp3.osuosl.org (amavisd-new); dkim=pass (1024-bit key) header.d=chromium.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id q2X2JCo6mwZV for ; Fri, 13 Aug 2021 07:42:56 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-pl1-x62c.google.com (mail-pl1-x62c.google.com [IPv6:2607:f8b0:4864:20::62c]) by smtp3.osuosl.org (Postfix) with ESMTPS id D373B60642 for ; Fri, 13 Aug 2021 07:42:56 +0000 (UTC) Received: by mail-pl1-x62c.google.com with SMTP id c17so5498341plz.2 for ; Fri, 13 Aug 2021 00:42:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tBsX0MVHwtbJoJcOekTIeXMGpx0HIEfEiJde7/PcK80=; b=OmALWYXMW8a4RIeVEpkPuSzowOM17UfLHCl7A8woHWDiUnqiMEb/dnd9S9b9OfPDDh pFQOxURfwi4vrcRQsb3n5uFdBlbwXlnXgdiRXUsSM6V3CnRYoWmBU/UNv8dC1DURp/Io 35X3hEW1qK3Y9Hb3FLtbu/OVA9dCGRkbT4WnI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tBsX0MVHwtbJoJcOekTIeXMGpx0HIEfEiJde7/PcK80=; b=qx67wlABIYy7lZ8ueU6KqRtKrHfu1OPRizTUeoefVtSruMw7HTkzkKAxLaodSENi++ Ew+zZabXShza79y0GtysbrIy9O/wIsxoaq2KDjAvqYQ8rRoUMauz2xpoSlBMwEVrUn09 DInKYQ+BL2r6eHwTHrZ+HG8E7AGMIWMkUzIHjU7zWXbTLgO5Bf4xBuWU7RS2BAdE5r+z AOwVfGUfpotgfqPTMno/CggEpFMHMa5+iinbnIZLTXAorMc+fXfmwM1i0yj8XvPLoiQq 0gS9Q3OjPlRSXdq3HncS2bAbYauXcUw9xybD/1xpMa35ZrYJmywRlC/uSa1A0x0u4u4p QuSA== X-Gm-Message-State: AOAM532tB/KNtXQ6T4VoMUjQrMaA/LK7U3iW0HKihFew1Aoi6JCNrjfh Vuj8wOpasfafQsjNCxWZqKn3Ew== X-Google-Smtp-Source: ABdhPJx4DgrNW9FkJnyV1CwX0zsYlc9O2kkn4hO3RVn6NxwFOFMmSXfXqcLcSPIXABh5/bAjaFy84g== X-Received: by 2002:a63:594e:: with SMTP id j14mr1181232pgm.249.1628840576305; Fri, 13 Aug 2021 00:42:56 -0700 (PDT) Received: from localhost ([2401:fa00:8f:203:cbc8:5998:527e:5f43]) by smtp.gmail.com with UTF8SMTPSA id nn18sm640606pjb.21.2021.08.13.00.42.54 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 13 Aug 2021 00:42:55 -0700 (PDT) From: David Stevens X-Google-Original-From: David Stevens To: Robin Murphy , Christoph Hellwig Subject: [PATCH v4 6/6] dma-iommu: account for min_align_mask Date: Fri, 13 Aug 2021 16:38:39 +0900 Message-Id: <20210813073839.1562438-7-stevensd@google.com> X-Mailer: git-send-email 2.33.0.rc1.237.g0d66db33f3-goog In-Reply-To: <20210813073839.1562438-1-stevensd@google.com> References: <20210813073839.1562438-1-stevensd@google.com> MIME-Version: 1.0 Cc: linux-kernel@vger.kernel.org, Tom Murphy , iommu@lists.linux-foundation.org, David Stevens , Will Deacon X-BeenThere: iommu@lists.linux-foundation.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Development issues for Linux IOMMU support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: iommu-bounces@lists.linux-foundation.org Sender: "iommu" From: David Stevens For devices which set min_align_mask, swiotlb preserves the offset of the original physical address within that mask. Since __iommu_dma_map accounts for non-aligned addresses, passing a non-aligned swiotlb address with the swiotlb aligned size results in the offset being accounted for twice in the size passed to iommu_map_atomic. The extra page exposed to DMA is also not cleaned up by __iommu_dma_unmap, since that function unmaps with the correct size. This causes mapping failures if the iova gets reused, due to collisions in the iommu page tables. To fix this, pass the original size to __iommu_dma_map, since that function already handles alignment. Additionally, when swiotlb returns non-aligned addresses, there is padding at the start of the bounce buffer that needs to be cleared. Fixes: 1f221a0d0dbf ("swiotlb: respect min_align_mask") Signed-off-by: David Stevens --- drivers/iommu/dma-iommu.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c index b1b0327cc2f6..b44b367839c2 100644 --- a/drivers/iommu/dma-iommu.c +++ b/drivers/iommu/dma-iommu.c @@ -788,7 +788,6 @@ static dma_addr_t iommu_dma_map_page(struct device *dev, struct page *page, struct iommu_domain *domain = iommu_get_dma_domain(dev); struct iommu_dma_cookie *cookie = domain->iova_cookie; struct iova_domain *iovad = &cookie->iovad; - size_t aligned_size = size; dma_addr_t iova, dma_mask = dma_get_mask(dev); /* @@ -797,8 +796,8 @@ static dma_addr_t iommu_dma_map_page(struct device *dev, struct page *page, */ if (IS_ENABLED(CONFIG_SWIOTLB) && dev_use_swiotlb(dev) && iova_offset(iovad, phys | size)) { - void *padding_start; - size_t padding_size; + void *tlb_start; + size_t aligned_size, iova_off, mapping_end_off; aligned_size = iova_align(iovad, size); phys = swiotlb_tbl_map_single(dev, phys, size, aligned_size, @@ -807,24 +806,27 @@ static dma_addr_t iommu_dma_map_page(struct device *dev, struct page *page, if (phys == DMA_MAPPING_ERROR) return DMA_MAPPING_ERROR; - /* Cleanup the padding area. */ - padding_start = phys_to_virt(phys); - padding_size = aligned_size; + iova_off = iova_offset(iovad, phys); + tlb_start = phys_to_virt(phys - iova_off); if (!(attrs & DMA_ATTR_SKIP_CPU_SYNC) && (dir == DMA_TO_DEVICE || dir == DMA_BIDIRECTIONAL)) { - padding_start += size; - padding_size -= size; + /* Cleanup the padding area. */ + mapping_end_off = iova_off + size; + memset(tlb_start, 0, iova_off); + memset(tlb_start + mapping_end_off, 0, + aligned_size - mapping_end_off); + } else { + /* Nothing was sync'ed, so clear the whole buffer. */ + memset(tlb_start, 0, aligned_size); } - - memset(padding_start, 0, padding_size); } if (!coherent && !(attrs & DMA_ATTR_SKIP_CPU_SYNC)) arch_sync_dma_for_device(phys, size, dir); - iova = __iommu_dma_map(dev, phys, aligned_size, prot, dma_mask); + iova = __iommu_dma_map(dev, phys, size, prot, dma_mask); if (iova == DMA_MAPPING_ERROR && is_swiotlb_buffer(phys)) swiotlb_tbl_unmap_single(dev, phys, size, dir, attrs); return iova; -- 2.33.0.rc1.237.g0d66db33f3-goog _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu