From: Jinyoung CHOI <j-young.choi@samsung.com>
To: Jinyoung CHOI <j-young.choi@samsung.com>,
"axboe@kernel.dk" <axboe@kernel.dk>, "hch@lst.de" <hch@lst.de>,
"martin.petersen@oracle.com" <martin.petersen@oracle.com>,
"linux-block@vger.kernel.org" <linux-block@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: [PATCH 02/15] block: blk-integiry: add helper functions for bio_integrity_add_page
Date: Wed, 03 May 2023 19:02:20 +0900 [thread overview]
Message-ID: <20230503100220epcms2p33e69fd7d5f04b305c621799792e8155f@epcms2p3> (raw)
In-Reply-To: <20230503094912epcms2p4bef206eab1c41a92eba2583a69c74323@epcms2p4>
Add functions that use the hardware limit to merge the page with
integrity's bio_vec.
Using the added functions, the physically continuous pages are made of
one bio_vec.
Previously, physically continuous pages were not created as one
bio_vec, but separately created.
Cc: Christoph Hellwig <hch@lst.de>
Cc: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Jinyoung Choi <j-young.choi@samsung.com>
---
block/bio-integrity.c | 58 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 58 insertions(+)
diff --git a/block/bio-integrity.c b/block/bio-integrity.c
index 4533eb491661..06b6a2c178d2 100644
--- a/block/bio-integrity.c
+++ b/block/bio-integrity.c
@@ -111,6 +111,64 @@ void bio_integrity_free(struct bio *bio)
bio->bi_opf &= ~REQ_INTEGRITY;
}
+/**
+ * bip_full - check if the bip is full
+ * @bip: bip to check
+ * @len: length of one segment to be added
+ *
+ * Return true if @bip is full and one segment with @len bytes can't be
+ * added to the bip, otherwise return false
+ */
+static inline bool bip_full(struct bio_integrity_payload *bip, unsigned int len)
+{
+ if (bip->bip_vcnt >= bip->bip_max_vcnt)
+ return true;
+ if (bip->bip_iter.bi_size > UINT_MAX - len)
+ return true;
+ return false;
+}
+
+/**
+ * bip_try_merge_hw_seg - try to merge a page into a segment, while
+ * obeying the hardware segment size limit
+ * @q: the target queue
+ * @bip: bip to check
+ * @page: page containing integrity metadata
+ * @len: number of bytes of integrity metadata in page
+ * @offset: start offset within page
+ * @same_page: return if the segment has been merged inside the same page
+ *
+ * Return true if @page is merged to @bip, otherwise return false
+ */
+static bool bip_try_merge_hw_seg(struct request_queue *q,
+ struct bio_integrity_payload *bip,
+ struct page *page, unsigned int len,
+ unsigned int offset, bool *same_page)
+{
+ struct bio_vec *bv = &bip->bip_vec[bip->bip_vcnt - 1];
+ unsigned long mask = queue_segment_boundary(q);
+ phys_addr_t addr1 = page_to_phys(bv->bv_page) + bv->bv_offset;
+ phys_addr_t addr2 = page_to_phys(page) + offset + len - 1;
+
+ if ((addr1 | mask) != (addr2 | mask))
+ return false;
+ if (bv->bv_len + len > queue_max_segment_size(q))
+ return false;
+
+ if (bip->bip_vcnt > 0) {
+ if (bio_page_is_mergeable(bv, page, len, offset, same_page)) {
+ if (bip->bip_iter.bi_size > UINT_MAX - len) {
+ *same_page = false;
+ return false;
+ }
+ bv->bv_len += len;
+ bip->bip_iter.bi_size += len;
+ return true;
+ }
+ }
+ return false;
+}
+
/**
* bio_integrity_add_page - Attach integrity metadata
* @bio: bio to update
--
2.34.1
next prev parent reply other threads:[~2023-05-03 10:02 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20230503094912epcms2p4bef206eab1c41a92eba2583a69c74323@epcms2p4>
2023-05-03 9:49 ` [PATCH 00/15] Change the integrity configuration method in block Jinyoung CHOI
[not found] ` <CGME20230503094912epcms2p4bef206eab1c41a92eba2583a69c74323@epcms2p3>
2023-05-03 10:02 ` Jinyoung CHOI [this message]
2023-05-03 15:55 ` [PATCH 02/15] block: blk-integiry: add helper functions for bio_integrity_add_page hch
[not found] ` <CGME20230503094912epcms2p4bef206eab1c41a92eba2583a69c74323@epcms2p7>
2023-05-04 6:46 ` Jinyoung CHOI
2023-05-03 10:09 ` [PATCH 04/15] block: bio-integiry: cleanup bio_integrity_prep Jinyoung CHOI
2023-05-03 15:55 ` hch
2023-05-03 10:18 ` [PATCH 09/15] scsi: add scsi_alloc_integrity_sgtables() for integrity process Jinyoung CHOI
2023-05-03 10:25 ` [PATCH 13/15] block: add helper function for iteration of bip's bvec Jinyoung CHOI
[not found] ` <CGME20230503094912epcms2p4bef206eab1c41a92eba2583a69c74323@epcms2p6>
2023-05-03 10:10 ` [PATCH 05/15] block: fix not to apply bip information in blk_rq_bio_prep() Jinyoung CHOI
2023-05-03 12:56 ` kernel test robot
2023-05-03 15:57 ` hch
2023-05-03 17:23 ` kernel test robot
2023-05-03 19:06 ` kernel test robot
[not found] ` <CGME20230503094912epcms2p4bef206eab1c41a92eba2583a69c74323@epcms2p1>
2023-05-04 6:10 ` Jinyoung CHOI
2023-05-03 10:13 ` [PATCH 07/15] block: blk-merge: fix merging two requests in ll_merge_requests_fn Jinyoung CHOI
[not found] ` <CGME20230503094912epcms2p4bef206eab1c41a92eba2583a69c74323@epcms2p2>
2023-05-03 10:00 ` [PATCH 01/15] block: bio: rename page_is_mergeable to bio_page_is_mergeable and make non-static Jinyoung CHOI
2023-05-03 15:52 ` hch
2023-05-03 10:12 ` [PATCH 06/15] block: blk-merge: fix to add the number of integrity segments to the request twice Jinyoung CHOI
2023-05-04 6:24 ` RE:(2) [PATCH 01/15] block: bio: rename page_is_mergeable to bio_page_is_mergeable and make non-static Jinyoung CHOI
[not found] ` <CGME20230503094912epcms2p4bef206eab1c41a92eba2583a69c74323@epcms2p5>
2023-05-03 10:06 ` [PATCH 03/15] block: bio-integrity: modify bio_integrity_add_page() Jinyoung CHOI
2023-05-03 10:16 ` [PATCH 08/15] block: add helper function to get the number of integrity segments Jinyoung CHOI
2023-05-03 10:20 ` [PATCH 10/15] scsi: change to use blk_rq_nr_integrity_segments() instead of blk_rq_count_integrity_sg() Jinyoung CHOI
2023-05-03 10:21 ` [PATCH 11/15] block: blk-integrity: change how to find the number of integrity of bio Jinyoung CHOI
2023-05-03 10:23 ` [PATCH 12/15] nvme: rdma: change how to find the number of integrity of request Jinyoung CHOI
[not found] ` <CGME20230503094912epcms2p4bef206eab1c41a92eba2583a69c74323@epcms2p8>
2023-05-03 10:28 ` [PATCH 15/15] block: blk-integrity: remove blk_rq_count_integrity_sg() Jinyoung CHOI
2023-05-03 10:27 ` [PATCH 14/15] block: blk-integrity: change sg-table configuration method for integrity Jinyoung CHOI
2023-05-03 14:29 ` kernel test robot
2023-05-03 20:07 ` kernel test robot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230503100220epcms2p33e69fd7d5f04b305c621799792e8155f@epcms2p3 \
--to=j-young.choi@samsung.com \
--cc=axboe@kernel.dk \
--cc=hch@lst.de \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=martin.petersen@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®