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]) by smtp.lore.kernel.org (Postfix) with ESMTP id 19641C369C2 for ; Tue, 22 Apr 2025 07:26:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CC6DA6B000D; Tue, 22 Apr 2025 03:26:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C76116B0010; Tue, 22 Apr 2025 03:26:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B173A6B0011; Tue, 22 Apr 2025 03:26:13 -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 940946B000D for ; Tue, 22 Apr 2025 03:26:13 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 2B29DBFF6B for ; Tue, 22 Apr 2025 07:26:14 +0000 (UTC) X-FDA: 83360846268.13.8A50972 Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf13.hostedemail.com (Postfix) with ESMTP id 8151120002 for ; Tue, 22 Apr 2025 07:26:12 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=T+kjxQ3D; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf13.hostedemail.com: domain of leon@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=leon@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1745306772; a=rsa-sha256; cv=none; b=XQ3luvycZYG+nUAKZbPOBQE3yI6A57h2Pu55stEFNdb6FZmxpEdL+TY+3eMNo+pObEGaQb h06oQRpVLi/1fDVL6SFHy4eEOHpFe8gwImZDkZTTrstGW+l28PcBrD/do7XWf3n28VzV67 FmFuSrBziWU9I44CtwVEPnI0MGUU648= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=T+kjxQ3D; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf13.hostedemail.com: domain of leon@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=leon@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1745306772; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Hiz0XZWPT72LbrWLyfmBYt1lYoLQTeN12HPNWRdYzoc=; b=x5a8gR+d4yXmOIQtNDCx2RIdIwRGKbTAVkX1jwZettUf601+pXsBaUPcZJryMCb37+x23A QtAwY9+nr1PTMK5pvaDq0XOZAjL6HnQthNg4rtlgQZcwm7l2PquStWLtwy+RjTnLEFvket iO4l11L27FllVHGz5eInv6w/d/6yQjw= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id A30A3A4B932; Tue, 22 Apr 2025 07:20:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8D2DEC4CEE9; Tue, 22 Apr 2025 07:26:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1745306771; bh=xN+WXXtReip5UqyzmA8L0bQhenwCbDjSz9Q+yfqmAMs=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=T+kjxQ3DEPfKwlnz4ZsUDQJrurgBpYIvnlrJCi1o7bGuhNceV40t7HE/1xO8wR9Yb XqXYR6OJwsS92ouacGloivohWNsdc7yQTCXlieXHyMZSDeI4gKtISD5bdXJ7qypls6 6bZi9HB9VfNpBB8VY/FRmXpBsoECeH0PTBRIxfT9fPPKnqee23MIdkAqBcDi3rUZ+4 /BJqBQFefNqgzuto6SdwGElfoODTNQUBkGR4gebKND6VNauPo2sYytZqQICgsqeqij kpC9oyp1tE0IjwFexsb18IzStSzuJpdjBQFiXvjt/3to/J7JYYIZd8gnhECeIAhlc7 0z3AdWi9XN8uA== Date: Tue, 22 Apr 2025 10:26:06 +0300 From: Leon Romanovsky To: Christoph Hellwig Cc: Marek Szyprowski , Jens Axboe , Keith Busch , Jake Edge , Jonathan Corbet , Jason Gunthorpe , Zhu Yanjun , Robin Murphy , Joerg Roedel , Will Deacon , Sagi Grimberg , Bjorn Helgaas , Logan Gunthorpe , Yishai Hadas , Shameer Kolothum , Kevin Tian , Alex Williamson , =?iso-8859-1?B?Suly9G1l?= Glisse , Andrew Morton , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, linux-rdma@vger.kernel.org, iommu@lists.linux.dev, linux-nvme@lists.infradead.org, linux-pci@vger.kernel.org, kvm@vger.kernel.org, linux-mm@kvack.org, Niklas Schnelle , Chuck Lever , Luis Chamberlain , Matthew Wilcox , Dan Williams , Kanchan Joshi , Chaitanya Kulkarni Subject: Re: [PATCH v8 23/24] nvme-pci: convert to blk_rq_dma_map Message-ID: <20250422072606.GC48485@unreal> References: <20250422050050.GB28077@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20250422050050.GB28077@lst.de> X-Rspamd-Queue-Id: 8151120002 X-Rspam-User: X-Rspamd-Server: rspam07 X-Stat-Signature: ocmnrg3fwk7m1tes94sapfgqnimzmt69 X-HE-Tag: 1745306772-272514 X-HE-Meta: U2FsdGVkX18wFVN8OfQHZNYEXwY1bRYp9iJO1ra93vbO0AXt96vgHQPtSFJSVZu6mINXMXhqVVEBGPcrSp96/7V3V5LdL05OsNT48gMa9Fc+buTfcr9e6IQCWVW8QCS5hJdBwhTTJwvRhk2t4MCd00vONxpCTbF0k7ZaIIzkbQZ8JU6jycvyvS2EpgeUvx0NyAQnUNmuAXBhTcTcI0dX7Ti1uo8+nxeMusAZzDYscRWtJtoBDUK3COdR7eDTtXzSgqkciSktb9U+B35j/TD7xpqwmvXIktGl7goFMMbllYG0/toWG2c1W8KAcHshjd0RKpqrV+FlcNmlH0b8WWt1yay8G864MeqASMEIJVgckkHQDNlH/RdPCCPVInjCf/G3/xB0xj63CScmzEX6giFqfgPq1Cdmg1ZUhEmbA39YZ9uJuoTwSCFWJEY/V1U5NHG1iOHHPmqp6bb6C568urNk3ih1yAnvK7ev56aZYo/cHV8SP/2ioUtBTrnrZWjgTuO7kddOFPJq1brveeKSGbv4Uofgb1K+OlmfGWDU2tm4i424vaeF1+at78JUNKGuiSLOXFFB8otEHkTQ5A4d6x5DZ/Avl1baEHLGO4KLMq6kO7OI2OGsSGfY0iNiTHOpHUXXjuhnzCyOZMrXF5XYaYJL6/07Md3JZhRQNOScBhR1xt4vS9dAF+1+tMUISLgu5OkbsUS8U+u1g/uTv57aeS5arj4ocC94vpMuh6KHuBImQDYqS8PYitInW2TSrEA0UueZLwoXrhqnDPnGmo8QmN3ytJOp4kKJ6u/h7/R1MWpkbetEciOMTCmG/Ad4JwRRYLwlnSicfnx1JxyqdyzJQVolSuB08mqEau47PpuQZ8m7Jg9JBvHoZIFgXTR5qCgNGIM+D8RHbR2nG6bRVQi3PDmkkigeWO/2MC6ILLON22Kaom1REmTgwZWHTReJuEgYcwqMxwEUPobRBpzrXk7bdly KUcWeoxg 6hjJG6WbLE5pTo1eu03Z0yeXOoByaeLZGsKUZDS+R6Lpiq+MfsDyqQEGi3NBvvCtxM3Tg5aDgiPwEPpOVxNXuB/2ZxqakFQQgNLjmpmGkOOx0FXMIqKIA0ddN+u3jqh1Uxz9oE6LusZX4f1b0M4Qnoe14sawbMYd64Pac0+/UZ2p09L/egM2Pi2ok4xsnbrUtM/QoGDi14AQ1oifH34Cwm1RzXpqDabJOLHYnDsZX9HGa4r9zJz36raIQNGB+FB+uzm1oBazX7GDj7JZVX8SJuQTl5fW7vhJCzpj1rL3PMXOUd9U= 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: On Tue, Apr 22, 2025 at 07:00:50AM +0200, Christoph Hellwig wrote: > > + dma_len = min_t(u32, length, NVME_CTRL_PAGE_SIZE - (dma_addr & (NVME_CTRL_PAGE_SIZE - 1))); > > And overly long line slipped in here during one of the rebases. > > > + /* > > + * We are in this mode as IOVA path wasn't taken and DMA length > > + * is morethan two sectors. In such case, mapping was perfoormed > > + * per-NVME_CTRL_PAGE_SIZE, so unmap accordingly. > > + */ > > Where does this comment come from? Lots of spelling errors, and I > also don't understand what it is talking about as setors are entirely > irrelevant here. I'm trying to say when this do {} while is taken and sector is a wrong word to describe NVME_CTRL_PAGE_SIZE. Let's remove this comment. > > > + if (!blk_rq_dma_unmap(req, dev->dev, &iod->dma_state, iod->total_len)) { > > + if (iod->cmd.common.flags & NVME_CMD_SGL_METABUF) > > + nvme_free_sgls(dev, req); > > With the addition of metadata SGL support this also needs to check > NVME_CMD_SGL_METASEG. > > The commit message should also really mentioned that someone > significantly altered the patch for merging with latest upstream, > as I as the nominal author can't recognize some of that code. Someone :), I thought that adding my SOB is enough. > > > + unsigned int entries = req->nr_integrity_segments; > > struct nvme_iod *iod = blk_mq_rq_to_pdu(req); > > > > + if (!blk_rq_dma_unmap(req, dev->dev, &iod->dma_meta_state, > > + iod->total_meta_len)) { > > + if (entries == 1) { > > + dma_unmap_page(dev->dev, iod->meta_dma, > > + rq_integrity_vec(req).bv_len, > > + rq_dma_dir(req)); > > + return; > > } > > } > > > > + dma_pool_free(dev->prp_small_pool, iod->meta_list, iod->meta_dma); > > This now doesn't unmap for entries > 1 in the non-IOVA case. I forgot to unmap SGL metadata, in non-SGL, the metadata is the size of one entry. There is no "entries > 1" for non-SGL path. WDYT? diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index a9c298a45bf1..73dbedd7daf6 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -839,13 +839,21 @@ static __always_inline void nvme_unmap_metadata(struct nvme_dev *dev, { unsigned int entries = req->nr_integrity_segments; struct nvme_iod *iod = blk_mq_rq_to_pdu(req); + struct nvme_sgl_desc *sg_list = iod->meta_list; + enum dma_data_direction dir = rq_dma_dir(req); if (!blk_rq_dma_unmap(req, dev->dev, &iod->dma_meta_state, iod->total_meta_len)) { - if (entries == 1) { + if (iod->cmd.common.flags & NVME_CMD_SGL_METASEG) { + unsigned int i; + + for (i = 0; i < entries; i++) + dma_unmap_page(dev->dev, + le64_to_cpu(sg_list[i].addr), + le32_to_cpu(sg_list[i].length), dir); + } else { dma_unmap_page(dev->dev, iod->meta_dma, - rq_integrity_vec(req).bv_len, - rq_dma_dir(req)); + rq_integrity_vec(req).bv_len, dir); return; } } >