From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm2-f13.google.com (mail-wm2-f13.google.com [74.125.225.141]) (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 5CE8D4A1E15 for ; Mon, 21 Sep 2026 13:39:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.225.141 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789997975; cv=none; b=ptaD4f7DgvGmsFpjnXboyRCE4J7SXKVCbTvaHMlPqKFEN8eGcahWI2Vt0jYNVbJENp9EO6rhnuxaE9048Dr7ltpwbvtioopfPmCmLMvCAn6nmRJ7dWUL+VkIBRuFk1YvvB/kzhQYgOxX8tShEkHJ5GKysYqewUuHPEShJ07DRlU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789997975; c=relaxed/simple; bh=lqtmMOq9NyJHWkCTixF/EfRvdzo9ti4x7BRbdW0dvpo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=l1L0nYpksj9HfFYQ9m+51ezg+HjrI/bIyyuTqO4qGGnTB/gSyq6dydD4CeWwj4pQn5w0fotegiWy/rOK0sTo9FMY9mj2371EkIZ9tfkAHm/q77xhH+2/L/hsCcs46ir++KM4ky13OfgENEpkvspBaPB8/fBBGHvSrqVOfSyAHrs= 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=knfo6iGm; arc=none smtp.client-ip=74.125.225.141 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="knfo6iGm" Received: by mail-wm2-f13.google.com with SMTP id 5b1f17b1804b1-49b912d37b6so14023485e9.0 for ; Mon, 21 Sep 2026 06:39:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1789997970; x=1790602770; 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=BooWm7URUcyrH2E2qkRWxlx7KQoz7GWFpr53v56Fl9k=; b=knfo6iGma+p5YGcX3sMSvqn1cE2jcWgAb6FR1sf0KBcsHhjevqWGwL62g0WiVWH9QJ sWgyh70nu9IKWRBj8XEB9jUkkeFvfLXHWLalsArfPtCBJ3D3Tg+r+2Cuo3BcyADPcEo3 4JmrQsMvNG/kwKpbfkzdsP56gViW31u9cssaB6RQ2dWvsWXo+GU54HD29p6uDFzMTOf1 uMt4nhViArd593RfEJdF/K2iI+XuF5U4Apza/2hmuN9BM+zw89gFCw7jvd04fK7MRE5m wDy6w27RO7GItjGoRvKawp8A6E2+iE2UESJhHD9by/Qr/iDMYlaa5NumYkYIO/S+hPZj q6oA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789997970; x=1790602770; 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=BooWm7URUcyrH2E2qkRWxlx7KQoz7GWFpr53v56Fl9k=; b=qSw3Uh5AFwW3HV7c0/2Jk/F5614vCwyIOU4p/4x2P3zIhtu/aReIdnXDSDoOWT6233 HkR9b2Kb9y0Hq0nQynArlSvG9WZTs0Rz/t3keJSyPbk7BRg5FQhbCFtALHUc5pcn9Opw UCbRNjub7UxJpcOR7zwXWyPqX8WKAxjY3m1NFRcSUQnd13PHYozkKU4c3/Vfp7kKRJdb Of88EouoFMtVsgAx//amQAm08PURsKfWQOVLhcNR06eaJ1e2c4UNh47rxenpOQflJEsp rVBRmJ1DjLb0DhPfDqyJWViNczWYsTyZYJ7UpvLEtOtvDjWba5VsBCpGxzmBCnKcbslQ jgpw== X-Gm-Message-State: AFuF++mdZe2ieboJ+K2OnJOLjkeE1+V8odq3QThR11rxBYBBIFSJKMVh 8bMLRuRMHDBD+Uclf50CRhNNSTNDt1uvo8nKYt8akXDY7EwhbFoIFW6seriZ2A== X-Gm-Gg: AYBFou2DHtiABikmAKvr3ahOvj4T0JzS18S44bnNSr8Gkeh1wTOwge/kvJcFBuAlkIQ ijXgIpDZiscaZn6f75OgHEJlcXY1I3ckQfp6rm05C0zzxMZOmo3XcGhgwFrIw0GGz79SSGrFDNa 55MfV4mkJFvVCEol38hQw/lryWJOyMNqp1XIMlcJ0NDI5I4gxg0dsrPx88NtMRl7qqFR+aKVWQW 6QQ1Q1yG1kqCPNmG/D5/CdZeEzpLSNtcnu8LJzFL8/TYCE1x6T/vpy5NjxFDO6IHgyY0unqUz4C RIGkPyYWQnN7T9qyGQiX9RjLcVvkevT8wXtOvPr98Z6IOiYXSFGgb6pj9nCRdtDCgoI7PuoovC7 P1quBAaAxHPfqS1DpxloFMvCgF2vbNeWJJIycqZmiMFeJ9IGIA07QenW48hAWi17RewL/jEOouw HsJhNzgRiDOWSL+F3d0vos5jba0K07E9czmFLVZEDeDi3SFFc7qdrQaoQKDpRvpjyppavIQ6qZQ S8wveboK2wmA0iAvr0WVtPYYG0M1JkkU07Vc5d2yGtXczkdcAkB/6eJRIPqGguPrwBDFj2zZlcT CjBV8dmxGc29PFJ5AZfURBVEMYl3lQ== X-Received: by 2002:a05:600c:c0c3:10b0:49e:823a:9dec with SMTP id 5b1f17b1804b1-49fc5a10b5fmr145292005e9.3.1789997970323; Mon, 21 Sep 2026 06:39:30 -0700 (PDT) Received: from 127.0.0.1localhost (82-132-213-26.dab.02.net. [82.132.213.26]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49fc585920fsm617171605e9.4.2026.09.21.06.39.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Sep 2026 06:39:29 -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 , Phil Cayton , Matthew Brost , Alasdair Kergon , Mike Snitzer , Mikulas Patocka , Benjamin Marzinski , dm-devel@lists.linux.dev Subject: [PATCH v6 03/13] block: always adjust bi_offset on bio_advance_iter Date: Mon, 21 Sep 2026 14:38:47 +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 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 17944e44b584..892ca469c570 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