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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 744AFCAC587 for ; Tue, 9 Sep 2025 13:29:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CB0CE8E0020; Tue, 9 Sep 2025 09:29:24 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C88518E000F; Tue, 9 Sep 2025 09:29:24 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B9EB98E0020; Tue, 9 Sep 2025 09:29:24 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id AA43C8E000F for ; Tue, 9 Sep 2025 09:29:24 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 6EE72B9C7A for ; Tue, 9 Sep 2025 13:29:24 +0000 (UTC) X-FDA: 83869793448.05.B116B4B Received: from tor.source.kernel.org (tor.source.kernel.org [172.105.4.254]) by imf09.hostedemail.com (Postfix) with ESMTP id C7AEF14000F for ; Tue, 9 Sep 2025 13:29:22 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=jsG+qsUJ; spf=pass (imf09.hostedemail.com: domain of leon@kernel.org designates 172.105.4.254 as permitted sender) smtp.mailfrom=leon@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1757424562; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=a5WY4Vqi9EWQquRRNalN/tM7qFg/VUudcPB5gYO/EeU=; b=JVeWxCgd5y2g+p6B4MY3ObDHFYi4wtlS3pWsinZ6U7rzGv34KMSYemqSfFbu6klT1ggab1 +QMFJm2nBMBSa/wXO49CHtBpKiEWCHtoqftaxOVRq36jvF7vc3SI8vGhOPcnGLSICu6hUW ZZAMKQoK3NvDfoienXgkZClKnyLcojw= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=jsG+qsUJ; spf=pass (imf09.hostedemail.com: domain of leon@kernel.org designates 172.105.4.254 as permitted sender) smtp.mailfrom=leon@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1757424562; a=rsa-sha256; cv=none; b=baU3rCSGuX6QWNmz4obyduh6yb+JcsyxRrg/XaLlBoS80ppaazgLSuRwwCAKLmV6+CqR0E 3coHwiwZ9tF+kmy1G/pDlCG6nZiUPghsEKh5sxlZz/An6DIadxGPYyG0neB6zjBMiQ5nag mrhA5Z1UJScXC6/4JfxmUbUJCc4Ke7I= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 1B15F6022C; Tue, 9 Sep 2025 13:29:22 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D7C94C4CEF5; Tue, 9 Sep 2025 13:29:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1757424561; bh=iTHTFebdJnIM4qjuR28g9oSbyH9qTLhzazcpZ251F1w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jsG+qsUJK7ffZ/z3OPchqA7x0yHguyPrENB1hNDceKyevn8Y0UY23vIlJKogKoOAV mdweaZvTaV73xdPNvzuLcSgBCkcKJinDpA+AFFif7FJFzPv/yP0eacNr7loyHWPJQl oDjSg5lytMZ5QZs3srGmQGs2aZnhiieWxGdijxV8InWTHYLEbMLD5nMB8zsJzQ7Y5/ n6m5X6Og8JA73w+GsQKGuK+FDZc8VM+Pv/R0ANeQAPkMSUkS/Z7Crlwiferwk3j/aY bciFy1DVrMp5bQJF6IrE2GwiFytJBqVGnuxPc5FU5fznd5ZzC/Ro1XzYA9SknCnnqK nq4YmMAH6+QaA== From: Leon Romanovsky To: Marek Szyprowski Cc: Leon Romanovsky , Jason Gunthorpe , Abdiel Janulgue , Alexander Potapenko , Alex Gaynor , Andrew Morton , Christoph Hellwig , Danilo Krummrich , David Hildenbrand , iommu@lists.linux.dev, Jason Wang , Jens Axboe , Joerg Roedel , Jonathan Corbet , Juergen Gross , kasan-dev@googlegroups.com, Keith Busch , linux-block@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-nvme@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, linux-trace-kernel@vger.kernel.org, Madhavan Srinivasan , Masami Hiramatsu , Michael Ellerman , "Michael S. Tsirkin" , Miguel Ojeda , Robin Murphy , rust-for-linux@vger.kernel.org, Sagi Grimberg , Stefano Stabellini , Steven Rostedt , virtualization@lists.linux.dev, Will Deacon , xen-devel@lists.xenproject.org Subject: [PATCH v6 16/16] nvme-pci: unmap MMIO pages with appropriate interface Date: Tue, 9 Sep 2025 16:27:44 +0300 Message-ID: X-Mailer: git-send-email 2.51.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: pcduwefnfu3sk869jznqzunyirp4sjjq X-Rspam-User: X-Rspamd-Queue-Id: C7AEF14000F X-Rspamd-Server: rspam04 X-HE-Tag: 1757424562-736607 X-HE-Meta: U2FsdGVkX19dUq+5UH4P5D48DF469gLWeP+U2BbUTguk9Z0NFKtNmCkOGo7CyID+snsFOgAH6vgekowmdiIPYh/38hLLozN2h8sDHICRfDY4/68UI5Gy/VSwYV+qWNyO4yo7KdYMpJDg8U3LZtSPLU2+Yt/qs1SCIxJIScTBQ7C9pQ+XchdgcqLHfsdp464CbqRgEta0cNkNHsuasPRYfKGVxqJKZtsShvRk0d+2+H2FiMg/BneAeT5OEVoBNJmfKkSYaU+tr1CAIPsh6Lg3nYMcShxvh9sDjpEnSege9uM47l0gifO0q//FeUm0MPUzxFGiw4tSj7zB/D6VZPWuq8bSfFkiv3J2DCUPkujKQYp3drxUo3Tx3OZavTB7GIO8HZZla8XBmP65GKvUZBp08PvCzOBMaTVvVicl8c5mQkRnoRckSmqEFdHc12lSETjJRhrJDn6FJoX9I5tausjECHIfVZglb2eF2M/6QI6uj5dgl/5BpyEeQjDubvxMAGxwfSHkftPLg+O7rk/rxl+gsA4Lf3MsS75Bjp4V2ZORXQTVnOwV4Ah0KZSbBO8WNJ1j+XaBxGBm1u53V/mOgS+aRh3ABgfoHyJ1tStcUFGbvMbmHdo4tXVhaE47PVYXLBahixfcoH1SCGTB9pU+I6XUJRM44X9i16H/zFazBSreJK3txXlPgPEgIElIN3Nij7IN8h7U4YvLGhl98+iezpXPjJTY2qkVdmZ8KmSU2TvnhERTT6VVGez+gOrgyzKU0f1k/Yr+VZak9e7SKRDn8RUzeHioPO/D/hX0AOMgosmvdUbqY3OBne7IJt3PXuAMExc/IIuBtUS5bFdk0W3Uoiysmpu94IBplHCXbeJBtlefidJ5ofInABU/ykDdwCS96h7R4XysrlInH+G6SvXbe9W054Pnq9JFDwAIltdosr4NCsIk8r3bsD/ekVM5glWuOHINKVNMoHlqvujctbLLpER qJJ3sguI YlvJgULXCg+LX0B8yVd8dxeo6VcNyyiNlKbddoqGGBjHrZ1wDf+1x2bhw+yjC4xD2uqWtHu1OnueBBXWISYDE8Vjnv9Z2RBH60ZKZcgIEzbeyXY9GNuDD3xAga134f9FSZRQrRh7xeIVBSy9wEsCyH4Ywf5ToYFBteK3O07cmspKiWnVVPU9t9CkDjfzZHkrdymTXjHh/M0ufFe5uiOr8Ja2zJ0RJNid9IQPo7AuyyjjcxJ7JGaaG3crOI/5PeX9Ww0DsRUgzXK10ACw1tyHcHv7a3b864nyrkGZi X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: Leon Romanovsky Block layer maps MMIO memory through dma_map_phys() interface with help of DMA_ATTR_MMIO attribute. There is a need to unmap that memory with the appropriate unmap function, something which wasn't possible before adding new REQ attribute to block layer in previous patch. Reviewed-by: Keith Busch Signed-off-by: Leon Romanovsky --- drivers/nvme/host/pci.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 2c6d9506b1725..f8ecc0e0f576d 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -682,11 +682,15 @@ static void nvme_free_prps(struct request *req) { struct nvme_iod *iod = blk_mq_rq_to_pdu(req); struct nvme_queue *nvmeq = req->mq_hctx->driver_data; + unsigned int attrs = 0; unsigned int i; + if (req->cmd_flags & REQ_MMIO) + attrs = DMA_ATTR_MMIO; + for (i = 0; i < iod->nr_dma_vecs; i++) - dma_unmap_page(nvmeq->dev->dev, iod->dma_vecs[i].addr, - iod->dma_vecs[i].len, rq_dma_dir(req)); + dma_unmap_phys(nvmeq->dev->dev, iod->dma_vecs[i].addr, + iod->dma_vecs[i].len, rq_dma_dir(req), attrs); mempool_free(iod->dma_vecs, nvmeq->dev->dmavec_mempool); } @@ -699,15 +703,19 @@ static void nvme_free_sgls(struct request *req) unsigned int sqe_dma_len = le32_to_cpu(iod->cmd.common.dptr.sgl.length); struct nvme_sgl_desc *sg_list = iod->descriptors[0]; enum dma_data_direction dir = rq_dma_dir(req); + unsigned int attrs = 0; + + if (req->cmd_flags & REQ_MMIO) + attrs = DMA_ATTR_MMIO; if (iod->nr_descriptors) { unsigned int nr_entries = sqe_dma_len / sizeof(*sg_list), i; for (i = 0; i < nr_entries; i++) - dma_unmap_page(dma_dev, le64_to_cpu(sg_list[i].addr), - le32_to_cpu(sg_list[i].length), dir); + dma_unmap_phys(dma_dev, le64_to_cpu(sg_list[i].addr), + le32_to_cpu(sg_list[i].length), dir, attrs); } else { - dma_unmap_page(dma_dev, sqe_dma_addr, sqe_dma_len, dir); + dma_unmap_phys(dma_dev, sqe_dma_addr, sqe_dma_len, dir, attrs); } } -- 2.51.0