summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMilan Broz <mbroz@redhat.com>2008-02-08 02:11:04 +0000
committerAlasdair G Kergon <agk@redhat.com>2008-02-08 02:11:04 +0000
commit01482b7671d014aa44f2efbc1153f4e3f48d7fb3 (patch)
tree12017dac7b6b1b680649b59470d91f6dd9baf55f
parent899c95d36c896f9fb7bc5f4f03b4abd86bda292c (diff)
dm crypt: extract scatterlist processing
dm-crypt: Use crypto ablkcipher interface Move scatterlists to separate dm_crypt_struct and pick out block processing from crypt_convert. Signed-off-by: Milan Broz <mbroz@redhat.com> Signed-off-by: Alasdair G Kergon <agk@redhat.com>
-rw-r--r--drivers/md/dm-crypt.c63
1 files changed, 39 insertions, 24 deletions
diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
index 44e1aa30e3f6..2da9b9536afb 100644
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
@@ -55,6 +55,11 @@ struct dm_crypt_io {
sector_t sector;
};
+struct dm_crypt_request {
+ struct scatterlist sg_in;
+ struct scatterlist sg_out;
+};
+
struct crypt_config;
struct crypt_iv_operations {
@@ -339,6 +344,39 @@ static void crypt_convert_init(struct crypt_config *cc,
ctx->sector = sector + cc->iv_offset;
}
+static int crypt_convert_block(struct crypt_config *cc,
+ struct convert_context *ctx)
+{
+ struct bio_vec *bv_in = bio_iovec_idx(ctx->bio_in, ctx->idx_in);
+ struct bio_vec *bv_out = bio_iovec_idx(ctx->bio_out, ctx->idx_out);
+ struct dm_crypt_request dmreq;
+
+ sg_init_table(&dmreq.sg_in, 1);
+ sg_set_page(&dmreq.sg_in, bv_in->bv_page, 1 << SECTOR_SHIFT,
+ bv_in->bv_offset + ctx->offset_in);
+
+ sg_init_table(&dmreq.sg_out, 1);
+ sg_set_page(&dmreq.sg_out, bv_out->bv_page, 1 << SECTOR_SHIFT,
+ bv_out->bv_offset + ctx->offset_out);
+
+ ctx->offset_in += 1 << SECTOR_SHIFT;
+ if (ctx->offset_in >= bv_in->bv_len) {
+ ctx->offset_in = 0;
+ ctx->idx_in++;
+ }
+
+ ctx->offset_out += 1 << SECTOR_SHIFT;
+ if (ctx->offset_out >= bv_out->bv_len) {
+ ctx->offset_out = 0;
+ ctx->idx_out++;
+ }
+
+ return crypt_convert_scatterlist(cc, &dmreq.sg_out, &dmreq.sg_in,
+ dmreq.sg_in.length,
+ bio_data_dir(ctx->bio_in) == WRITE,
+ ctx->sector);
+}
+
/*
* Encrypt / decrypt data from one bio to another one (can be the same one)
*/
@@ -349,30 +387,7 @@ static int crypt_convert(struct crypt_config *cc,
while(ctx->idx_in < ctx->bio_in->bi_vcnt &&
ctx->idx_out < ctx->bio_out->bi_vcnt) {
- struct bio_vec *bv_in = bio_iovec_idx(ctx->bio_in, ctx->idx_in);
- struct bio_vec *bv_out = bio_iovec_idx(ctx->bio_out, ctx->idx_out);
- struct scatterlist sg_in, sg_out;
-
- sg_init_table(&sg_in, 1);
- sg_set_page(&sg_in, bv_in->bv_page, 1 << SECTOR_SHIFT, bv_in->bv_offset + ctx->offset_in);
-
- sg_init_table(&sg_out, 1);
- sg_set_page(&sg_out, bv_out->bv_page, 1 << SECTOR_SHIFT, bv_out->bv_offset + ctx->offset_out);
-
- ctx->offset_in += sg_in.length;
- if (ctx->offset_in >= bv_in->bv_len) {
- ctx->offset_in = 0;
- ctx->idx_in++;
- }
-
- ctx->offset_out += sg_out.length;
- if (ctx->offset_out >= bv_out->bv_len) {
- ctx->offset_out = 0;
- ctx->idx_out++;
- }
-
- r = crypt_convert_scatterlist(cc, &sg_out, &sg_in, sg_in.length,
- bio_data_dir(ctx->bio_in) == WRITE, ctx->sector);
+ r = crypt_convert_block(cc, ctx);
if (r < 0)
break;