From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.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 90EC721FF2A for ; Sat, 1 Aug 2026 15:48:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.171 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785599299; cv=none; b=f4bwHM69EbnPWGcsfHavxi+YFaFyKB5XivB4fNwnaerLAe5hJ6wCVVAnB8Nwbkgqt1dpc2AyRVICCTf87foxhnizh9LtvZ0hfyYXtZDhA7i49UoNuou1YHbtv+jZ7vENtqwZu2Drb7GEyxnllh99aK1tasVUwD+1OILBH2gGXoM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785599299; c=relaxed/simple; bh=X3zRjuSdVBD5i7gQmFjvEEAtiBuCzXBqrfu9vE0MnhU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=F2fr4lma21IsvK4ZXnvIsmPpZwyxLNLxb0Py17Y4w6wV4ZGOyDMp6MoYTa52dJS5FgpQkUqMrZLpNQZtwmCms1H9o1LvLyw4yjFc48QuJYbI6jqADz5RF/GiFLhPuoiRR8jdBhjV8/uYWeEh9VapqZ+KGsMsl6iEQ8Ygm+th4Ug= 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=s5Yo/707; arc=none smtp.client-ip=209.85.214.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="s5Yo/707" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-2cc891373e0so21196875ad.2 for ; Sat, 01 Aug 2026 08:48:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785599297; x=1786204097; 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=R0GcIDTsY2CDASlyPqk465WOkbyFB/dgtSdtycnJJZM=; b=s5Yo/707MVtufZXlHpHeR9eOrEXTbwgJPhF30vx7pJGrFzN0hryZ/O84JB91C4DJFA TbHYUGYAXTW6nMuGTNQtbiGKzpYEL73jW/itojS9/HilH4tYfy2jMvI15KYkZhiECBud CMwX7/yc3W6yyRGL1mBGzkmfAnYZ3XwdGBpwe024v1IsKk4ZBqgr7shg2iNzUU12r/pG VTCGh7jP54IJsoHCaPyqt86UdTYcW9xsmoaMvH+qVR033WqEJ6V+aeAoXboHyY87aam0 lWSJ+5dsyJmPYmlHC8trWpIu+mHIlM0FNORMvLLyxc/Zlayu05yoAXz/zvgDhti7Tz+C M7Tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785599297; x=1786204097; 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=R0GcIDTsY2CDASlyPqk465WOkbyFB/dgtSdtycnJJZM=; b=ajkZDZzdSCQLlAU0GZS9TR1jycKXtb7GiL58fk+JXMoR33mjFkq0OL/atY6C+E9Lli 32XYeiMKw6D934YVONSgBuz2SlSldsuMBELoV78yQ2VOaPxvqxXYXi73Nl2bTYZDPHg4 p7HlX3eo3mr9bpQiSHKm8c1FYfB2w3FVeURjCf1IRMkWCs5ssvceGILgZYEqrGA17IAX SDGB6NFO4OPjdehfS85pSKmV3epN9MYwenChMELrLatlS9b5G3X9Xbw+Im6Xw2PwDHk3 aofruQVJ4UkIrCtBIHXdCbu7vpCiMo8f1qkiDn8rNS7qq8nVMC3B1U/wUmAXZxNh+ytj AxlQ== X-Forwarded-Encrypted: i=1; AHgh+RpQQzRtc7w8FpKWL4OgQ7E7HhVMRXeMjSDsuGTqKpJfQGpPOYRszQ3gxiTIQ6swH5d7fyzLZLVKhf8I/+Q=@vger.kernel.org X-Gm-Message-State: AOJu0YzpXECpBXKYjttRtzzRCurD5DSMVKA0UGMGo2bBhwnHNiEu1KFG 1njulblHRRVxblXUKe3lbXVvMleucHjJBCb7BxYUO6f6hExi24C8i7a0 X-Gm-Gg: AR+sD127fJijh9zo9F+JT+qXvxgme0nzVcEpGy8c1rvnfC4lh8b7/LaFcLc6aKxU/G3 wwIPbSXUxqLSAXeiJcZt2PduvM6uLdziFmkiyqeTRmUnzc2ZVrFE2OYgyIb00WX8QKvs7mntFoK sN6TG7dgCDLLl6bPNRvSXcBO9d1UUjrBpSzyszkOLu0iP3nMGg6NiNABfzGejNXns5k4L0THGxv CWWz7a9vK4jGoqsin/PwzT0aXLnbqKgeNggFPcMQK16+rrwRt/VegZC8RyDByMX7QGUO9Rysfpe GvJg45kvkstTorc8V/dUb3ObX8MQbEiQJUwKwd/I/1F/gUUz6b0apNZ94Ez2JNzkKIzWgml2bSb hfEIZaSMTzqb5WeL3oVSFaSNjXz4nK2IhMEnJMrPiME5lIPvK/h8wOX1MEt1FMSpcSQ9uHEK9ZH FNWyyFpzqBfaCj62Yuhv551Pj6kmCV26SKh4SF40Z5g2yiiuBUbHfoZDySHtvbYkHGvPVpFfyVR Bn7XLBqhT3QAjMfhhYqNEPGfTVh4bcBQRPw9bysLtLUVTM= X-Received: by 2002:a17:903:22c3:b0:2c0:a555:80d6 with SMTP id d9443c01a7336-2d0521bcb54mr36749555ad.2.1785599297067; Sat, 01 Aug 2026 08:48:17 -0700 (PDT) Received: from 127.net ([2620:10d:c092:600::1:61d0]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2d04b12202bsm18287605ad.66.2026.08.01.08.47.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Aug 2026 08:48:16 -0700 (PDT) From: Pavel Begunkov To: Jens Axboe , Keith Busch , Christoph Hellwig , Sagi Grimberg , linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, linux-nvme@lists.infradead.org, linux-fsdevel@vger.kernel.org, io-uring@vger.kernel.org, linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org Cc: asml.silence@gmail.com, Alexander Viro , Christian Brauner , Andrew Morton , Sumit Semwal , =?UTF-8?q?Christian=20K=C3=B6nig?= , Nitesh Shetty , Kanchan Joshi , Anuj Gupta , Tushar Gohad , William Power , Phil Cayton , Jason Gunthorpe , Damien Le Moal , Alasdair Kergon , Mike Snitzer , Mikulas Patocka , Benjamin Marzinski , Vishal Verma , David Sterba , Ilya Dryomov , dm-devel@lists.linux.dev, nvdimm@lists.linux.dev, linux-btrfs@vger.kernel.org, ceph-devel@vger.kernel.org Subject: [PATCH v5 04/16] block: always adjust bi_offset on bio_advance_iter Date: Sat, 1 Aug 2026 16:46:16 +0100 Message-ID: <64f559a1d1ac43880149de5950187beee6bc2aaf.1785596451.git.asml.silence@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Extend bio_no_advance_iter() iteration to also increment the offset. It's not currently needed because the currently listed request types don't have a buffer, but will be useful once we add bios backed by dma-buf, which don't have a bvec but work with a single range. Suggested-by: Christoph Hellwig Reviewed-by: Christoph Hellwig Signed-off-by: Pavel Begunkov --- drivers/md/dm-io-rewind.c | 6 ++++-- include/linux/bio.h | 12 ++++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/md/dm-io-rewind.c b/drivers/md/dm-io-rewind.c index 04f3fc8aeb6f..b22719c6411c 100644 --- a/drivers/md/dm-io-rewind.c +++ b/drivers/md/dm-io-rewind.c @@ -113,10 +113,12 @@ static inline void dm_bio_rewind_iter(const struct bio *bio, iter->bi_sector -= bytes >> 9; /* No advance means no rewind */ - if (bio_no_advance_iter(bio)) + if (bio_no_advance_iter(bio)) { iter->bi_size += bytes; - else + iter->bi_offset -= bytes; + } else { dm_bvec_iter_rewind(bio->bi_io_vec, iter, bytes); + } } /** diff --git a/include/linux/bio.h b/include/linux/bio.h index 0445ecba3b24..f9b8903c6a87 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -113,11 +113,13 @@ static inline void bio_advance_iter(const struct bio *bio, { iter->bi_sector += bytes >> 9; - if (bio_no_advance_iter(bio)) + if (bio_no_advance_iter(bio)) { iter->bi_size -= bytes; - else + iter->bi_offset += bytes; + } else { bvec_iter_advance(bio->bi_io_vec, iter, bytes); /* TODO: It is reasonable to complete bio with error here. */ + } } /* @bytes should be less or equal to bvec[i->bi_idx].bv_len */ @@ -127,10 +129,12 @@ static inline void bio_advance_iter_single(const struct bio *bio, { iter->bi_sector += bytes >> 9; - if (bio_no_advance_iter(bio)) + if (bio_no_advance_iter(bio)) { iter->bi_size -= bytes; - else + iter->bi_offset += bytes; + } else { bvec_iter_advance_single(bio->bi_io_vec, iter, bytes); + } } void __bio_advance(struct bio *, unsigned bytes); -- 2.54.0