From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AE75338D012 for ; Sat, 28 Feb 2026 22:13:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.171 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772316831; cv=none; b=FFenlli47JIxk32QNRmlP3IAe2dNfS7uayBpMAmO+A8uElk94EmGWbK3vpztBvdAY2DdaFpzFrrwwmcesw891C7ORUg10iXaOyN+p6q33JmNmwes9J+NFpl9mcbFtl4VoAzBkzfbJ73xpWpFw+uemnz4IxJiD2pepTY6M5rEfCg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772316831; c=relaxed/simple; bh=Jac4gfotNi0DAxmvnR0gHDUo2CGlLaT5iQGpBT7GjC4=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=nXRGGnUnKbuFk5KaXfqdFh4UGsJj4IkhRA9mLVLgIAz7ZVUg9B5F10Fm9mCYz1L0zwCFpO6ptHv6f7ClGnCwSXGJdNK6qDVFphwCaCcEvgjn2zX0LWn3xlfyuFGQs3l4I5KZJNT+GE1ntIfATTRvIMOAjQD3cqOH1Zr/vWOCO6s= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=ggfO8tlA; arc=none smtp.client-ip=209.85.210.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ggfO8tlA" Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-82735a41985so1865870b3a.2 for ; Sat, 28 Feb 2026 14:13:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772316830; x=1772921630; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=DOMW7lLqJkPCgTyPACAEGaBRlsYC7CH2Bm6ysbwwZRI=; b=ggfO8tlA/Lo8ma2bU8GcINQx6jWWRkCAukyMtQgrb4jnx5XNgFTXBUrU/XIvEMpWxz JqOx3mGEEzcs6x3oxAMlatbtl9HalvZWqUpY6aE8wFI77BkNhv32zgDn83Z7NgTDlF0W CakPhVItR+isxNZ8kbz21qqwSs50SL4/loHQjLa6Q2aAOCuxjO8DF0XLkiRrRToP5GJc qm0++d3o45seeTRRp3b9/kVvn5NFf1Lcyw6iPQVv3BBy1KM4eq3xBceakEc8hy6BVrIU oFkDLVGTZ0Wpj3FSuaW0ySlnOlmIz/FM3drx+dchE3SJMIo/holydEkOFeiqMuBRy56e 4cOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772316830; x=1772921630; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=DOMW7lLqJkPCgTyPACAEGaBRlsYC7CH2Bm6ysbwwZRI=; b=tzTbt2aclHaLQq1lUFCGGodUx21Me9pUK/fLsoxejeDyvgm/W5Lpn/O5PTZFzVuPu6 g2UKU54a01cUrCDrzQ2AuoLZ7GkOljmGpGQ06zTEyZgvIub7AvawVNXTj39/UGm0ojSU IaL5qHSKbqC+/XcJQ37nkbL4mUbAEylZJdV63p4aaqVgCSwKC1lyKcIpkZOoXgHW7t7d 1QO4JkXtSPSk+YCFxLwatupoxJnK0rCuo3n97AJIg47Kih0Nxnej/GG6Z9WU3vXRgyqh lbg30xQ+1BS+X4pDgLwL6ydugkDIWS2pWz2K4j8zbrJDD7R+F6TUdZMc7e5kjq/wTjcK nNmQ== X-Gm-Message-State: AOJu0YwbEakKtYgwHvnthLarEyzbyCCQbt0yAw67mmXTFsPi8qJ59vgl S9oPhBzT9UAIE75qoGC8kUxElYqiEdu8NitCsNMby2dY03ftF5I+R+1Y X-Gm-Gg: ATEYQzzq5fcFJ7DzNnnwMqZZRyjYCcv0n6LVcwZa+jdfw55fPDbZbkWC+iMGzvr63Tw 0vXW9dbqIXifNd3xNDe/1RZt90T2TZSjiJy+Uw6p7EAmHyTpk6RPOu7ayXjvw9AFN5XYlAKmkiz 5oJ71fl8xS3Grs0BCPaCFZeauddZgd+T155ObI4wEMT/8Vym4EUG8zYwb8jGtXbFU2iSSym7uaU lI95vTVwtr1ULDbn7mAnoLT0Oal6LuCyuvQVvFGBY22d26pJRSrn2s4b0aA/2bnTgX/R4Wb4CZs I69+N0EhN+MAtRoaEesDRh3WeyQuuEul+Ns9nGftuPBBlvmeL/EtuPI1HUkTdyZk90Fw8pDuexw qHEIR8HTEd3G2eICn82EviOTAmZS1qc1rW2j9v0gHs8Ur3aVdUXHDjusgVEWe/6+I5JOT8ti3pR zIDt+93dEJqlPw3TGgnUyqoNR3KoOEAvlqIebGBbSqLAFz01Y= X-Received: by 2002:a17:90b:1ccc:b0:340:b912:536 with SMTP id 98e67ed59e1d1-35965cec355mr6169958a91.31.1772316829957; Sat, 28 Feb 2026 14:13:49 -0800 (PST) Received: from Barrys-MBP.hub ([47.72.129.29]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-35912f87d0csm8275940a91.1.2026.02.28.14.13.43 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 28 Feb 2026 14:13:49 -0800 (PST) From: Barry Song <21cnbao@gmail.com> To: catalin.marinas@arm.com, m.szyprowski@samsung.com, robin.murphy@arm.com, will@kernel.org, iommu@lists.linux.dev, linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, Barry Song , Ada Couprie Diaz , Ard Biesheuvel , Marc Zyngier , Anshuman Khandual , Ryan Roberts , Suren Baghdasaryan , Tangquan Zheng , Leon Romanovsky , Xueyuan Chen Subject: [PATCH v3 5/5] dma-mapping: Support batch mode for dma_direct_{map,unmap}_sg Date: Sun, 1 Mar 2026 06:13:37 +0800 Message-Id: <20260228221337.59951-1-21cnbao@gmail.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Barry Song Extending these APIs with a flush argument: dma_direct_unmap_phys(), dma_direct_map_phys(), and dma_direct_sync_single_for_cpu(). For single-buffer cases, flush=true would be used, while for SG cases flush=false would be used, followed by a single flush after all cache operations are issued in dma_direct_{map,unmap}_sg(). This ultimately benefits dma_map_sg() and dma_unmap_sg(). Cc: Catalin Marinas Cc: Will Deacon Cc: Marek Szyprowski Cc: Robin Murphy Cc: Ada Couprie Diaz Cc: Ard Biesheuvel Cc: Marc Zyngier Cc: Anshuman Khandual Cc: Ryan Roberts Cc: Suren Baghdasaryan Cc: Tangquan Zheng Reviewed-by: Leon Romanovsky Tested-by: Xueyuan Chen Signed-off-by: Barry Song --- kernel/dma/direct.c | 17 +++++++++++++---- kernel/dma/direct.h | 16 ++++++++++------ kernel/dma/mapping.c | 6 +++--- 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c index c7666e5d5e7c..ec887f443741 100644 --- a/kernel/dma/direct.c +++ b/kernel/dma/direct.c @@ -444,14 +444,19 @@ void dma_direct_unmap_sg(struct device *dev, struct scatterlist *sgl, { struct scatterlist *sg; int i; + bool need_sync = false; for_each_sg(sgl, sg, nents, i) { - if (sg_dma_is_bus_address(sg)) + if (sg_dma_is_bus_address(sg)) { sg_dma_unmark_bus_address(sg); - else + } else { + need_sync = true; dma_direct_unmap_phys(dev, sg->dma_address, - sg_dma_len(sg), dir, attrs); + sg_dma_len(sg), dir, attrs, false); + } } + if (need_sync && !dev_is_dma_coherent(dev)) + arch_sync_dma_flush(); } #endif @@ -461,6 +466,7 @@ int dma_direct_map_sg(struct device *dev, struct scatterlist *sgl, int nents, struct pci_p2pdma_map_state p2pdma_state = {}; struct scatterlist *sg; int i, ret; + bool need_sync = false; for_each_sg(sgl, sg, nents, i) { switch (pci_p2pdma_state(&p2pdma_state, dev, sg_page(sg))) { @@ -472,8 +478,9 @@ int dma_direct_map_sg(struct device *dev, struct scatterlist *sgl, int nents, */ break; case PCI_P2PDMA_MAP_NONE: + need_sync = true; sg->dma_address = dma_direct_map_phys(dev, sg_phys(sg), - sg->length, dir, attrs); + sg->length, dir, attrs, false); if (sg->dma_address == DMA_MAPPING_ERROR) { ret = -EIO; goto out_unmap; @@ -492,6 +499,8 @@ int dma_direct_map_sg(struct device *dev, struct scatterlist *sgl, int nents, sg_dma_len(sg) = sg->length; } + if (need_sync && !dev_is_dma_coherent(dev)) + arch_sync_dma_flush(); return nents; out_unmap: diff --git a/kernel/dma/direct.h b/kernel/dma/direct.h index cbdbf9ddc8cc..ac8ff3feff51 100644 --- a/kernel/dma/direct.h +++ b/kernel/dma/direct.h @@ -67,13 +67,15 @@ static inline void dma_direct_sync_single_for_device(struct device *dev, } static inline void dma_direct_sync_single_for_cpu(struct device *dev, - dma_addr_t addr, size_t size, enum dma_data_direction dir) + dma_addr_t addr, size_t size, enum dma_data_direction dir, + bool flush) { phys_addr_t paddr = dma_to_phys(dev, addr); if (!dev_is_dma_coherent(dev)) { arch_sync_dma_for_cpu(paddr, size, dir); - arch_sync_dma_flush(); + if (flush) + arch_sync_dma_flush(); arch_sync_dma_for_cpu_all(); } @@ -82,7 +84,7 @@ static inline void dma_direct_sync_single_for_cpu(struct device *dev, static inline dma_addr_t dma_direct_map_phys(struct device *dev, phys_addr_t phys, size_t size, enum dma_data_direction dir, - unsigned long attrs) + unsigned long attrs, bool flush) { dma_addr_t dma_addr; @@ -111,7 +113,8 @@ static inline dma_addr_t dma_direct_map_phys(struct device *dev, if (!dev_is_dma_coherent(dev) && !(attrs & (DMA_ATTR_SKIP_CPU_SYNC | DMA_ATTR_MMIO))) { arch_sync_dma_for_device(phys, size, dir); - arch_sync_dma_flush(); + if (flush) + arch_sync_dma_flush(); } return dma_addr; @@ -124,7 +127,8 @@ static inline dma_addr_t dma_direct_map_phys(struct device *dev, } static inline void dma_direct_unmap_phys(struct device *dev, dma_addr_t addr, - size_t size, enum dma_data_direction dir, unsigned long attrs) + size_t size, enum dma_data_direction dir, unsigned long attrs, + bool flush) { phys_addr_t phys; @@ -134,7 +138,7 @@ static inline void dma_direct_unmap_phys(struct device *dev, dma_addr_t addr, phys = dma_to_phys(dev, addr); if (!(attrs & DMA_ATTR_SKIP_CPU_SYNC)) - dma_direct_sync_single_for_cpu(dev, addr, size, dir); + dma_direct_sync_single_for_cpu(dev, addr, size, dir, flush); swiotlb_tbl_unmap_single(dev, phys, size, dir, attrs | DMA_ATTR_SKIP_CPU_SYNC); diff --git a/kernel/dma/mapping.c b/kernel/dma/mapping.c index 3928a509c44c..78d8b4039c3e 100644 --- a/kernel/dma/mapping.c +++ b/kernel/dma/mapping.c @@ -166,7 +166,7 @@ dma_addr_t dma_map_phys(struct device *dev, phys_addr_t phys, size_t size, if (dma_map_direct(dev, ops) || (!is_mmio && arch_dma_map_phys_direct(dev, phys + size))) - addr = dma_direct_map_phys(dev, phys, size, dir, attrs); + addr = dma_direct_map_phys(dev, phys, size, dir, attrs, true); else if (use_dma_iommu(dev)) addr = iommu_dma_map_phys(dev, phys, size, dir, attrs); else if (ops->map_phys) @@ -207,7 +207,7 @@ void dma_unmap_phys(struct device *dev, dma_addr_t addr, size_t size, BUG_ON(!valid_dma_direction(dir)); if (dma_map_direct(dev, ops) || (!is_mmio && arch_dma_unmap_phys_direct(dev, addr + size))) - dma_direct_unmap_phys(dev, addr, size, dir, attrs); + dma_direct_unmap_phys(dev, addr, size, dir, attrs, true); else if (use_dma_iommu(dev)) iommu_dma_unmap_phys(dev, addr, size, dir, attrs); else if (ops->unmap_phys) @@ -373,7 +373,7 @@ void __dma_sync_single_for_cpu(struct device *dev, dma_addr_t addr, size_t size, BUG_ON(!valid_dma_direction(dir)); if (dma_map_direct(dev, ops)) - dma_direct_sync_single_for_cpu(dev, addr, size, dir); + dma_direct_sync_single_for_cpu(dev, addr, size, dir, true); else if (use_dma_iommu(dev)) iommu_dma_sync_single_for_cpu(dev, addr, size, dir); else if (ops->sync_single_for_cpu) -- 2.39.3 (Apple Git-146)