Received: by 2002:a05:7412:31a9:b0:e2:908c:2ebd with SMTP id et41csp2443659rdb; Tue, 12 Sep 2023 01:51:53 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHmAV5DR2+/1zegTC6by4uvYgJV8AjMAxLNGgY16h4oinLJVrO2HHI7RPfIAzUst56Uru8o X-Received: by 2002:a17:902:854b:b0:1bd:fdda:5675 with SMTP id d11-20020a170902854b00b001bdfdda5675mr9445772plo.5.1694508713293; Tue, 12 Sep 2023 01:51:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694508713; cv=none; d=google.com; s=arc-20160816; b=yAsXat1DmP6x6SbmMNyJyQBfNkmHA4HsFM7/YE0IwtSIO2Qc/6vVAV88Yy4v5Mzi98 H3al7p+MLk18oZCtVKZpQbD1V1gA56l+dfdTqf1A2I5p6LHmAc9suWNBENd9C9N4wnXW GlZaedlrrPd5r3D5DhTB8DfSTqLilJHddzmokCccQnuwCZSwdAguvo6RyA4ErSmNfeJu V8ijq7oXrym8AZoHI/bhX7yO5E0onyJ5fs99Ay6cFjsdjiIFyK/n+hwj53RrGMqDqeWo gPNz3VpquZfuFgcCgHSJ904qbIvxJLYtwdBfE/R6Yhiv9leyzzFHqWNiKEoHOktHAkM6 g1Cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=RNFCuor3hmQ2yr5sRDKcIQd/I4H94xFmz/DMsiWOOQM=; fh=Z7JQxSVtwGr/fL148INo1D9UZgQyopYphFpEtCrkQ7g=; b=DeaSPp9qKAilCzaCPifiYL/exOtZ3etlS3xPAJRAa4vh/y8ZS/cJ8xk6JsKsL/yNgG wz0NB+hlCNeDH/Pzt7zy8bws3A5sC9tDi4+zCnJLcK1BeqpKNBH7tWiY3Y8veTNgH0yZ RTRnnBKQ6jd6eMQLDh+qeA5XFkNLx0KlnWK5OA4maj331fqfhkd25v+57pEKZYAwvVW2 6nemhoSRWPynuT0RXJ7AgNFqGeZhtiVGsbsgmdy/hWuJGpBAQmBlnTebSg5GOz2mxC5x ttBvKhRxV8eV655raswjP5oife8DWE9rYqPyJmp/1msUfDS0ojs1MyPCQyP3h+IolKSK wSpQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Return-Path: Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id m1-20020a170902d18100b001b9e9b21287si7502949plb.427.2023.09.12.01.51.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 01:51:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id EAC88807F4B1; Tue, 12 Sep 2023 01:40:19 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232755AbjILIkS (ORCPT + 99 others); Tue, 12 Sep 2023 04:40:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33782 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232775AbjILIkQ (ORCPT ); Tue, 12 Sep 2023 04:40:16 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 41B24E7F for ; Tue, 12 Sep 2023 01:40:12 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 177E9C15; Tue, 12 Sep 2023 01:40:49 -0700 (PDT) Received: from entos-ampere02.shanghai.arm.com (unknown [10.169.212.213]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id BC5663F738; Tue, 12 Sep 2023 01:40:09 -0700 (PDT) From: Jia He To: Christoph Hellwig , Marek Szyprowski , Robin Murphy , iommu@lists.linux.dev Cc: linux-kernel@vger.kernel.org, Jia He Subject: [PATCH] dma-mapping: fix dma_addressing_limited if dma_range_map is scanned Date: Tue, 12 Sep 2023 08:40:02 +0000 Message-Id: <20230912084002.2168-1-justin.he@arm.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Tue, 12 Sep 2023 01:40:20 -0700 (PDT) X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email After scanning the dma_range_map, if it is found that not all of the system RAM ranges are encompassed within it, an incorrect calculation occurs for dma_addressing_limited(), which prevents the nvme device dma mapping in the checking path of phys_to_dma(). E.g. On an Armv8 Ampere server, the dsdt ACPI table is: Method (_DMA, 0, Serialized) // _DMA: Direct Memory Access { Name (RBUF, ResourceTemplate () { QWordMemory (ResourceConsumer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite, 0x0000000000000000, // Granularity 0x0000000000000000, // Range Minimum 0x00000000FFFFFFFF, // Range Maximum 0x0000000000000000, // Translation Offset 0x0000000100000000, // Length ,, , AddressRangeMemory, TypeStatic) QWordMemory (ResourceConsumer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite, 0x0000000000000000, // Granularity 0x0000006010200000, // Range Minimum 0x000000602FFFFFFF, // Range Maximum 0x0000000000000000, // Translation Offset 0x000000001FE00000, // Length ,, , AddressRangeMemory, TypeStatic) QWordMemory (ResourceConsumer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite, 0x0000000000000000, // Granularity 0x00000060F0000000, // Range Minimum 0x00000060FFFFFFFF, // Range Maximum 0x0000000000000000, // Translation Offset 0x0000000010000000, // Length ,, , AddressRangeMemory, TypeStatic) QWordMemory (ResourceConsumer, PosDecode, MinFixed, MaxFixed, Cacheable, ReadWrite, 0x0000000000000000, // Granularity 0x0000007000000000, // Range Minimum 0x000003FFFFFFFFFF, // Range Maximum 0x0000000000000000, // Translation Offset 0x0000039000000000, // Length ,, , AddressRangeMemory, TypeStatic) }) But the System RAM ranges are: cat /proc/iomem |grep -i ram 90000000-91ffffff : System RAM 92900000-fffbffff : System RAM 880000000-fffffffff : System RAM 8800000000-bff5990fff : System RAM bff59d0000-bff5a4ffff : System RAM bff8000000-bfffffffff : System RAM So some RAM ranges are out of dma_range_map. Fixes it by checking whether each of the system RAM resources can be properly encompassed within the dma_range_map. Signed-off-by: Jia He --- include/linux/dma-mapping.h | 8 +++++-- kernel/dma/mapping.c | 45 +++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 2 deletions(-) diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h index f0ccca16a0ac..d9d1c67c8579 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h @@ -144,6 +144,7 @@ bool dma_pci_p2pdma_supported(struct device *dev); int dma_set_mask(struct device *dev, u64 mask); int dma_set_coherent_mask(struct device *dev, u64 mask); u64 dma_get_required_mask(struct device *dev); +bool all_ram_in_dma_range_map(struct device *dev); size_t dma_max_mapping_size(struct device *dev); size_t dma_opt_mapping_size(struct device *dev); bool dma_need_sync(struct device *dev, dma_addr_t dma_addr); @@ -475,8 +476,11 @@ static inline int dma_coerce_mask_and_coherent(struct device *dev, u64 mask) */ static inline bool dma_addressing_limited(struct device *dev) { - return min_not_zero(dma_get_mask(dev), dev->bus_dma_limit) < - dma_get_required_mask(dev); + if (min_not_zero(dma_get_mask(dev), dev->bus_dma_limit) < + dma_get_required_mask(dev)) + return true; + + return !all_ram_in_dma_range_map(dev); } static inline unsigned int dma_get_max_seg_size(struct device *dev) diff --git a/kernel/dma/mapping.c b/kernel/dma/mapping.c index e323ca48f7f2..ab407deb81b8 100644 --- a/kernel/dma/mapping.c +++ b/kernel/dma/mapping.c @@ -14,6 +14,7 @@ #include #include #include +#include #include "debug.h" #include "direct.h" @@ -819,6 +820,50 @@ size_t dma_opt_mapping_size(struct device *dev) } EXPORT_SYMBOL_GPL(dma_opt_mapping_size); +/* + * To check whether all ram resource ranges are mapped in dma range map + * Returns 0 when continuous check is needed + * Returns 1 if there is some ram range can't be mapped to dma_range_map + */ +static int check_ram_in_range_map(unsigned long start_pfn, + unsigned long nr_pages, void *data) +{ + phys_addr_t end_paddr = (start_pfn + nr_pages) << PAGE_SHIFT; + phys_addr_t start_paddr = start_pfn << PAGE_SHIFT; + struct device *dev = (struct device *)data; + struct bus_dma_region *region = NULL; + const struct bus_dma_region *m; + + while (start_paddr < end_paddr) { + // find region containing start_paddr + for (m = dev->dma_range_map; m->size; m++) { + if (start_paddr >= m->cpu_start + && start_paddr - m->cpu_start < m->size) { + region = (struct bus_dma_region *)m; + break; + } + } + if (!region) + return 1; + + start_paddr = region->cpu_start + region->size; + /* handle overflow of phys_addr_t */ + if (start_paddr == 0) + break; + } + + return 0; +} + +bool all_ram_in_dma_range_map(struct device *dev) +{ + if (!dev->dma_range_map) + return 1; + + return !walk_system_ram_range(0, ULONG_MAX, dev, check_ram_in_range_map); +} +EXPORT_SYMBOL_GPL(all_ram_in_dma_range_map); + bool dma_need_sync(struct device *dev, dma_addr_t dma_addr) { const struct dma_map_ops *ops = get_dma_ops(dev); -- 2.25.1