From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) (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 235AA47728A for ; Tue, 28 Jul 2026 21:29:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785274195; cv=none; b=qk61Bl8fJe2LfLJjk6haAee8rKFrkahZ8vf4gzJrmryb7nH3pY6b+kg2fTu6RzxZOKu5Z4Jx8NWNBo3XojWIcjhSQA36oU9N1FmJT59Nsgp+TigRSQS1TrCXBdSgKRxoCJIdlKs1EG6XApV0kHNNxk2viVkwE7R6YAxsmL6ujvE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785274195; c=relaxed/simple; bh=8xr8MwL4FN52J9Jpo5i7viXCOQG0jJEsaEIs2M6dEzM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=U5Ccuo9cwHkXWFiiIqqvtHPcBQI9WzIpcnhTwE7pYctw249kuwcmev0Xz81lRp+jVQDISq2MHY/1QaAkTNlhfvKpsT1Uq8EyDP4PX68fBOt1nk/mnEGphZOwmcmZ86VNBs/wg6kB7xIfUHCctPkasr0ayfSiKL4lXwRrST6IGlQ= 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=csI9HarM; arc=none smtp.client-ip=209.85.221.52 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="csI9HarM" Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-47f703a9d05so213534f8f.0 for ; Tue, 28 Jul 2026 14:29:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785274190; x=1785878990; 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=9CVR7oFwap/NcOYCsrr92EnvOtaWQ9jX22O00IMi0SM=; b=csI9HarMjiyZMEy8p92p2UaIw77xnaj7XHbu4CDwG0PS5oFO+HFKqsfrV/yrow+89p KIlVLLeDX97AE7sKi+LzJFcJhL0CyL50wGCN4Z+TSo7IxfS28IwuoYfzErnb+dSgye4k 866bJbyC0kpSZop+QCDFPKHL5WpzjyJOlL9w57r/6PGuy2rydHRD+amCYAPPtPXdZRVe uosMCrRaRKC4CNvoMts/WOEQy4U/VG3hAj48E0ptCLS0xGkNkOxKpCS1I6pxDveApMYk rSTFWITiT6y9w0zRcopYEUB6kexi53uJcIdCJhIE+R6p4ri1MZVpulnIxdRbyQOPcWUP jATw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785274190; x=1785878990; 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=9CVR7oFwap/NcOYCsrr92EnvOtaWQ9jX22O00IMi0SM=; b=P4oFqKdi6y4lLJkaEunNYXBeY2FAM42YzRlDizhxFNsDRVcrboFxam8rEvFtnYB/EN 2wKOSzYF9H/8OqXBq4C33N8FgN4UP9r/fpC7AYrvnBX+r7Z/S+nBiePuGo0ilD52gaaA jETu04x8Myf3zhwPxOTKFxHpfXF3zE/W4YwNT6C6KHmltzWp6I+/wnvzK6Bv4uyQEdIK 2CFBdn1peqJ8537XRYzsBQYu28xCkVVphTLQSbUvArzJOgFKo66vF415XH7DvZTdqCCn N/cwEsLudz9DAeYwlFuSiLbaYp3/lpr1U0yfZmLg4O7FeHVBgb4yWY4VRlIJ0nPujkTX M6CA== X-Forwarded-Encrypted: i=1; AHgh+Rq4qlDRc7yrV0NAzrdyVezDkv03VBCkomxRCY0KtIcOOg6hilfkaRSy3ucPTwTFYeD/nQsgjPtRPrOavI0=@vger.kernel.org X-Gm-Message-State: AOJu0YxVT2n3ln+0Ve3EGDoziDHW6aLDKXjKnl0qG+Vv+IZ4+7sD4aHV uQIr7XD9KZAc4S+lozxlmEHt54VQug4wi9bDWQjcwgBCJtDz1BmiUw7c X-Gm-Gg: AR+sD12Wqc6mD4OgqGd5yRw/ec07C/fhLlhY2L7Zoedoq4gbt/oqmjYZpEQohRnLZ5+ ugQ68kHV/q9FejhA5471qTyUSBUDZL1reclaQDEurs9B6GSdnVAsgCmsmIiAngYTNPA1R4JrvTf Gs/mdMKD7e8RcYgrPf3OGMEPXfQ8LU1Yi/YPNh3ySkoBvpjsslgEwnwPWuLhz2w4OIHqiGdNNNh rzjh+jKn4ScYCGI+CRJsSJhZEFtwEj1uQk4dnYwRw1t82ewgQZFATlzoel67XTw7OE2oCQsxsBI 9lgxKbADaiwhjcMm9IkYIIjgWT/4LLCojsH3ERQ5ECMkP3gxw7BxgWq6xSBJg9lJBymqgoT09qa DloOcqEZsR2DNH+CH/ConbIWKOGnbXK0vDhQl+g/jxOfWucVsp91eml2Gby0xu2L8WfRcCfALHV Zg7o5WAX1zL4xMbNDHR9Vhmeu01YLdH5VRDUB+bg8cSgC+b/50VY1NAICdeMvB8KxJEQ1q6Pl0M dJWALZy X-Received: by 2002:a5d:584e:0:b0:47f:95ec:a49b with SMTP id ffacd0b85a97d-47fb1ea7d64mr4772853f8f.34.1785274190146; Tue, 28 Jul 2026 14:29:50 -0700 (PDT) Received: from 127.mynet ([2a01:4b00:bd21:4f00:7cc6:d3ca:494:116c]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-47fb6ac44bcsm2245329f8f.11.2026.07.28.14.29.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Jul 2026 14:29:48 -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 v4 04/14] block: always adjust bi_offset on bio_advance_iter Date: Tue, 28 Jul 2026 22:29:16 +0100 Message-ID: <8d4f786e3cb9ac6002bde5f3271dcb6d22c498b0.1785274111.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 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 8f33f717b14f..dea9f567379d 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