From: Satya Tangirala <satyat@google.com>
To: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Jens Axboe <axboe@kernel.dk>, Eric Biggers <ebiggers@google.com>,
Satya Tangirala <satyat@google.com>
Subject: [PATCH 2/7] block: blk-crypto: Introduce blk_crypto_bio_sectors_alignment()
Date: Thu, 14 Jan 2021 15:47:18 +0000 [thread overview]
Message-ID: <20210114154723.2495814-3-satyat@google.com> (raw)
In-Reply-To: <20210114154723.2495814-1-satyat@google.com>
The size of any bio must be aligned to the data unit size of the bio crypt
context (if it exists) of that bio. This must also be ensured whenever a
bio is split. Introduce blk_crypto_bio_sectors_alignment() that returns
the required alignment in sectors. The number of sectors passed to
any call of bio_split() should be aligned to
blk_crypto_bio_sectors_alignment().
Signed-off-by: Satya Tangirala <satyat@google.com>
---
block/blk-crypto-internal.h | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/block/blk-crypto-internal.h b/block/blk-crypto-internal.h
index 0d36aae538d7..304e90ed99f5 100644
--- a/block/blk-crypto-internal.h
+++ b/block/blk-crypto-internal.h
@@ -60,6 +60,19 @@ static inline bool blk_crypto_rq_is_encrypted(struct request *rq)
return rq->crypt_ctx;
}
+/*
+ * Returns the alignment requirement for the number of sectors in this bio based
+ * on its bi_crypt_context. Any bios split from this bio must follow this
+ * alignment requirement as well.
+ */
+static inline unsigned int blk_crypto_bio_sectors_alignment(struct bio *bio)
+{
+ if (!bio_has_crypt_ctx(bio))
+ return 1;
+ return bio->bi_crypt_context->bc_key->crypto_cfg.data_unit_size >>
+ SECTOR_SHIFT;
+}
+
#else /* CONFIG_BLK_INLINE_ENCRYPTION */
static inline bool bio_crypt_rq_ctx_compatible(struct request *rq,
@@ -93,6 +106,11 @@ static inline bool blk_crypto_rq_is_encrypted(struct request *rq)
return false;
}
+static inline unsigned int blk_crypto_bio_sectors_alignment(struct bio *bio)
+{
+ return 1;
+}
+
#endif /* CONFIG_BLK_INLINE_ENCRYPTION */
void __bio_crypt_advance(struct bio *bio, unsigned int bytes);
--
2.30.0.284.gd98b1dd5eaa7-goog
next prev parent reply other threads:[~2021-01-14 15:48 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-14 15:47 [PATCH 0/7] ensure bios aren't split in middle of crypto data unit Satya Tangirala
2021-01-14 15:47 ` [PATCH 1/7] block: make blk_bio_segment_split() able to fail and return error Satya Tangirala
2021-01-14 15:47 ` Satya Tangirala [this message]
2021-01-14 15:47 ` [PATCH 3/7] block: respect blk_crypto_bio_sectors_alignment() in bounce.c Satya Tangirala
2021-01-21 17:13 ` Christoph Hellwig
2021-01-14 15:47 ` [PATCH 4/7] block: respect blk_crypto_bio_sectors_alignment() in blk-crypto-fallback Satya Tangirala
2021-01-14 15:47 ` [PATCH 5/7] block: respect blk_crypto_bio_sectors_alignment() in blk-merge Satya Tangirala
2021-01-14 15:47 ` [PATCH 6/7] block: add WARN() in bio_split() for sector alignment Satya Tangirala
2021-01-14 15:47 ` [PATCH 7/7] block: compute nsegs more accurately in blk_bio_segment_split() Satya Tangirala
2021-01-21 17:11 ` [PATCH 0/7] ensure bios aren't split in middle of crypto data unit Christoph Hellwig
2021-03-25 21:41 ` Satya Tangirala
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=20210114154723.2495814-3-satyat@google.com \
--to=satyat@google.com \
--cc=axboe@kernel.dk \
--cc=ebiggers@google.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).