From d3278472561b51720e02a752e45f6272d8908b36 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 12 Dec 2023 09:38:11 +0100 Subject: [PATCH] drop queue-4.19/block-introduce-multi-page-bvec-helpers.patch --- ...ck-introduce-multi-page-bvec-helpers.patch | 117 ------------------ queue-4.19/series | 1 - 2 files changed, 118 deletions(-) delete mode 100644 queue-4.19/block-introduce-multi-page-bvec-helpers.patch diff --git a/queue-4.19/block-introduce-multi-page-bvec-helpers.patch b/queue-4.19/block-introduce-multi-page-bvec-helpers.patch deleted file mode 100644 index cf9f6c20926..00000000000 --- a/queue-4.19/block-introduce-multi-page-bvec-helpers.patch +++ /dev/null @@ -1,117 +0,0 @@ -From 8ae400c0add40e6d7fd80c616b3f6f7974b2f254 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 15 Feb 2019 19:13:10 +0800 -Subject: block: introduce multi-page bvec helpers - -From: Ming Lei - -[ Upstream commit 3d75ca0adef4280650c6690a0c4702a74a6f3c95 ] - -This patch introduces helpers of 'mp_bvec_iter_*' for multi-page bvec -support. - -The introduced helpers treate one bvec as real multi-page segment, -which may include more than one pages. - -The existed helpers of bvec_iter_* are interfaces for supporting current -bvec iterator which is thought as single-page by drivers, fs, dm and -etc. These introduced helpers will build single-page bvec in flight, so -this way won't break current bio/bvec users, which needn't any change. - -Follows some multi-page bvec background: - -- bvecs stored in bio->bi_io_vec is always multi-page style - -- bvec(struct bio_vec) represents one physically contiguous I/O - buffer, now the buffer may include more than one page after - multi-page bvec is supported, and all these pages represented - by one bvec is physically contiguous. Before multi-page bvec - support, at most one page is included in one bvec, we call it - single-page bvec. - -- .bv_page of the bvec points to the 1st page in the multi-page bvec - -- .bv_offset of the bvec is the offset of the buffer in the bvec - -The effect on the current drivers/filesystem/dm/bcache/...: - -- almost everyone supposes that one bvec only includes one single - page, so we keep the sp interface not changed, for example, - bio_for_each_segment() still returns single-page bvec - -- bio_for_each_segment_all() will return single-page bvec too - -- during iterating, iterator variable(struct bvec_iter) is always - updated in multi-page bvec style, and bvec_iter_advance() is kept - not changed - -- returned(copied) single-page bvec is built in flight by bvec - helpers from the stored multi-page bvec - -Reviewed-by: Christoph Hellwig -Reviewed-by: Omar Sandoval -Signed-off-by: Ming Lei -Signed-off-by: Jens Axboe -Signed-off-by: Sasha Levin ---- - include/linux/bvec.h | 30 +++++++++++++++++++++++++++--- - 1 file changed, 27 insertions(+), 3 deletions(-) - -diff --git a/include/linux/bvec.h b/include/linux/bvec.h -index bc1f16e9f3f4d..cd43c03e31129 100644 ---- a/include/linux/bvec.h -+++ b/include/linux/bvec.h -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - - /* - * was unsigned short, but we might as well be ready for > 64kB I/O pages -@@ -52,16 +53,39 @@ struct bvec_iter { - */ - #define __bvec_iter_bvec(bvec, iter) (&(bvec)[(iter).bi_idx]) - --#define bvec_iter_page(bvec, iter) \ -+/* multi-page (mp_bvec) helpers */ -+#define mp_bvec_iter_page(bvec, iter) \ - (__bvec_iter_bvec((bvec), (iter))->bv_page) - --#define bvec_iter_len(bvec, iter) \ -+#define mp_bvec_iter_len(bvec, iter) \ - min((iter).bi_size, \ - __bvec_iter_bvec((bvec), (iter))->bv_len - (iter).bi_bvec_done) - --#define bvec_iter_offset(bvec, iter) \ -+#define mp_bvec_iter_offset(bvec, iter) \ - (__bvec_iter_bvec((bvec), (iter))->bv_offset + (iter).bi_bvec_done) - -+#define mp_bvec_iter_page_idx(bvec, iter) \ -+ (mp_bvec_iter_offset((bvec), (iter)) / PAGE_SIZE) -+ -+#define mp_bvec_iter_bvec(bvec, iter) \ -+((struct bio_vec) { \ -+ .bv_page = mp_bvec_iter_page((bvec), (iter)), \ -+ .bv_len = mp_bvec_iter_len((bvec), (iter)), \ -+ .bv_offset = mp_bvec_iter_offset((bvec), (iter)), \ -+}) -+ -+/* For building single-page bvec in flight */ -+ #define bvec_iter_offset(bvec, iter) \ -+ (mp_bvec_iter_offset((bvec), (iter)) % PAGE_SIZE) -+ -+#define bvec_iter_len(bvec, iter) \ -+ min_t(unsigned, mp_bvec_iter_len((bvec), (iter)), \ -+ PAGE_SIZE - bvec_iter_offset((bvec), (iter))) -+ -+#define bvec_iter_page(bvec, iter) \ -+ nth_page(mp_bvec_iter_page((bvec), (iter)), \ -+ mp_bvec_iter_page_idx((bvec), (iter))) -+ - #define bvec_iter_bvec(bvec, iter) \ - ((struct bio_vec) { \ - .bv_page = bvec_iter_page((bvec), (iter)), \ --- -2.42.0 - diff --git a/queue-4.19/series b/queue-4.19/series index 4c45080f8af..63d7111d408 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -3,7 +3,6 @@ spi-imx-move-wml-setting-to-later-than-setup_transfe.patch spi-imx-correct-wml-as-the-last-sg-length.patch spi-imx-mx51-ecspi-move-some-initialisation-to-prepa.patch media-davinci-vpif_capture-fix-potential-double-free.patch -block-introduce-multi-page-bvec-helpers.patch hrtimers-push-pending-hrtimers-away-from-outgoing-cp.patch netfilter-ipset-fix-race-condition-between-swap-dest.patch tg3-move-the-rt-x_dropped-counters-to-tg3_napi.patch -- 2.47.3