From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) (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 4D999367F5E for ; Wed, 7 Oct 2026 01:32:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.45 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791336749; cv=none; b=EWxRrGW9LrAAu4uJ166Ndi+hX5Wni/nem2M+o2suvDPU3bDW5NXZt24gPAPaWocPJ6R8IM0gVi2BDIZDNoj4mVu1oSOLKlCyQqJRDVUnWlfXkq+84cv3KqzbdG/ybGIakf5ybzQnIFTlEWh6Ji8yJGQOU3pXBq96MvL3ertkgeo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791336749; c=relaxed/simple; bh=Pm6Rb7wT+j3sduRH8AC/hPaPOXEeHtixW7LlbFfv5Wo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CDtMRdAztEtFDePzzg9IcgbtP4Yo2pApcnVD8f3R0MU9ag2aa7njqDIYXHs0zsDvH6AYV4q9awUPnswvKh1Lvq6xX0AJ+819KtbD7lCRcVDn1VU+nmquQeS0UYViuykhrPzpGXH4gFHd+oW+AC9asmGAgLVf8EQnU1tm/nTRP04= 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=VvX3Dnx0; arc=none smtp.client-ip=209.85.128.45 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="VvX3Dnx0" Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-4a0213948d3so8584925e9.2 for ; Tue, 06 Oct 2026 18:32:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1791336745; x=1791941545; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=fZk+12RxIUpX87ik4Sju0ydtLd9LDkS9K++2ovit7qo=; b=VvX3Dnx0qoDL8lSf7nEbY3mWcro6KK91o33rMqefIYfGDOMQyZbwwHy6oyBkpFUP9F tLe0SAzOqmpS9DtfJRAZX5OgjtMW6rbQQ6osFMrunIW/4NowZ2JNiZ2jAhFZWsJ0Rs05 0CpZhhyREuzpYQ19abt1Db3hicTjHt9z/GZNpjSGeUi0kcJdISN5trFGERatm2ui/5BQ ceRWyQXYeD4ixnLXQ2F+ECqUQbE9oTKn6EbtyGAgKzycRRxQTCzUWozDaTTQJoGjsR3q gXVnH0X5LdEqo0IQROLXyrwYEA3YHI4QYmnJpx37+8c+pjVrENQykHXIXHaZsj0zBg1z g98w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791336745; x=1791941545; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=fZk+12RxIUpX87ik4Sju0ydtLd9LDkS9K++2ovit7qo=; b=rZGpZjp72A44vMGpJEJf2lyFpfIiJhBlZlCg+FlH/SG5a/3ZVVw1lM+4RpY+MAGfwU 3BE46aBgKYO2DaLUonh8tG1jarD31az+VW2lunobamq4Mnwzd8AiiGGaFwM5ruL6+zT9 uZAzLZPcfXnegyWH+WN/cVE35k6fh8+2ZSTQcS8634chjOvEDCciXEaQj1rcGGMYHCxz rTmqD+4lYNbvyXL/9dNJ5OK/eqRMrF7nsV+Y9/KMtij98Fy+8Vxlq3GAw/JNDH51XMCS 565EaqgCbGLOhL2EzzHerfr0XzdYE/ObNueYJG5mYR9jOLgaUjwzSY1nx3sVeYV0lQBd 9PIA== X-Gm-Message-State: AFuF++n0gcEPhXVV3ASl1Su62FwrSv1LisyvpTLhqJsKSRC5uCNfjW+O 3BEbuPMB0lYsV99XJNK4qTnmcQPfvCINi2hN5YCifF/ZiLELRBH9tDu/CT+umA== X-Gm-Gg: AYBFou0V+kGTQKO2b88cz75tvCnqBlexf9G77T199U/+pNYqiUsunxCTl7iuIz1qa1P qOsJFI0DhuDqiZw/B1we+R18JgCcNPvRpw22JUzYGvrbf+7G0DiAE0XfxiGZuubj8IiEbupfHbG dxrclgpZ+0vInDu7a4bldtprCY9Rel46lb9BVmW9c6JhFdHHY+O8kAPNg2tRcrdFMAzwPfdzDD4 grdUAroyUhGXwBmkiFH/0YjiKtnDyzBvuAYRIkcFXaSq1E+EC1r4XxmA/ArGmLlsEg1YXQH1T+d 8PYVlL/gFyy0BbGDWg3aO+e9LF0w2hCt7CNeZugHPgGuhfBJtpu2yMqyf7kN/9CW6AzrvSm8ydm UZm81OMX90OhYfcisf5Hil4XZmNQGR6B0t0rs3+Q8O8dnZBS7q3x74TDhkLiI0nOBH2SeaUjS/N PqoVlHRvuaF48y1J4Y12bfOaDciYnAgivq7fR5yXdp3BrU3mEt+92T16cnaZf7uxTJEhTSTMrB+ XdQ08DOL/ZdmctfzZaP1CtkFPoBm8N3x2aDMHIkiw40WF2UrN+6XWfjW7hBXbLgv822zA71UA1N X-Received: by 2002:a05:600c:3b8d:b0:49f:fbad:29c1 with SMTP id 5b1f17b1804b1-4a1806611acmr8359665e9.33.1791336745490; Tue, 06 Oct 2026 18:32:25 -0700 (PDT) Received: from 127.mynet ([2a01:4b00:bd21:4f00:7cc6:d3ca:494:116c]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4a17f6538b7sm21183615e9.13.2026.10.06.18.32.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Oct 2026 18:32:23 -0700 (PDT) From: Pavel Begunkov To: linux-block@vger.kernel.org Cc: asml.silence@gmail.com, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org, linux-nvme@lists.infradead.org, linux-fsdevel@vger.kernel.org, io-uring@vger.kernel.org, Christoph Hellwig , Sumit Semwal , =?UTF-8?q?Christian=20K=C3=B6nig?= , Keith Busch , Sagi Grimberg , Alexander Viro , Christian Brauner , Jan Kara , Andrew Morton , Jens Axboe , Nitesh Shetty , Kanchan Joshi , Anuj Gupta , Tushar Gohad , William Power , Matthew Brost , Alasdair Kergon , Mike Snitzer , Mikulas Patocka , Benjamin Marzinski , dm-devel@lists.linux.dev Subject: [PATCH v8 08/13] nvme sgl fixup Date: Wed, 7 Oct 2026 02:31:51 +0100 Message-ID: X-Mailer: git-send-email 2.54.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Signed-off-by: Pavel Begunkov --- drivers/nvme/host/pci.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 651f7654d73b..79b3c1092e4d 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -1287,16 +1287,15 @@ static blk_status_t nvme_rq_setup_dmabuf_sgl(struct request *req, struct nvme_queue *nvmeq, unsigned int entries) { struct nvme_iod *iod = blk_mq_rq_to_pdu(req); - struct bio *bio = req->bio; - struct nvme_dmabuf_map *map = to_nvme_dmabuf_map(bio->bi_dmabuf_map); + struct nvme_dmabuf_map *map = nvme_req_to_map(req); size_t length = blk_rq_payload_bytes(req); struct nvme_sgl_desc *sg_list = &iod->cmd.common.dptr.sgl; + size_t offset = req->bio->bi_iter.bi_offset; bool pooled = entries > 1; dma_addr_t sgl_dma = 0; unsigned int mapped = 0; unsigned long tmp; struct scatterlist *sg; - size_t offset = bio->bi_iter.bi_offset; size_t remaining = length; if (!entries) @@ -1305,8 +1304,6 @@ static blk_status_t nvme_rq_setup_dmabuf_sgl(struct request *req, iod->cmd.common.flags = NVME_CMD_SGL_METABUF; iod->total_len = length; - nvme_dmabuf_map_sync_for_device(nvmeq->dev, req); - /* entries == 1 fits in the inline descriptor; more needs a pool. */ if (pooled) { if (entries <= NVME_SMALL_POOL_SIZE / sizeof(*sg_list)) -- 2.54.0