Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52ad0c48 authored by Mikulas Patocka's avatar Mikulas Patocka Committed by Eric Biggers
Browse files

BACKPORT: dm crypt: use shifts instead of sector_div 



sector_div is very slow, so we introduce a variable sector_shift and
use shift instead of sector_div.

Signed-off-by: default avatarMikulas Patocka <mpatocka@redhat.com>
Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>

(cherry picked from commit ff3af92b4461be773337111daea80bb91b2cd545)

Conflicts:
	drivers/md/dm-crypt.c

Change-Id: Ie2d31a58985e7284e094c940e282f304e325a48f
Bug: 112008522
Test: As series, see Ie247fd41b11adcf8520de0b1554568a1b7155860
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
parent c083ebe7

drivers/md/dm-crypt.c

+9 −6
Original line number Original line Diff line number Diff line
@@ -154,7 +154,8 @@ struct crypt_config { 
	} iv_gen_private;

	} iv_gen_private;

	sector_t iv_offset;

	sector_t iv_offset;

	unsigned int iv_size;

	unsigned int iv_size;

	unsigned int sector_size;

	unsigned short int sector_size;

	unsigned char sector_shift;





	/* ESSIV: struct crypto_cipher *essiv_tfm */

	/* ESSIV: struct crypto_cipher *essiv_tfm */

	void *iv_private;

	void *iv_private;
@@ -871,7 +872,7 @@ static int crypt_convert_block(struct crypt_config *cc, 




	dmreq->iv_sector = ctx->cc_sector;

	dmreq->iv_sector = ctx->cc_sector;

	if (test_bit(CRYPT_IV_LARGE_SECTORS, &cc->cipher_flags))

	if (test_bit(CRYPT_IV_LARGE_SECTORS, &cc->cipher_flags))

		sector_div(dmreq->iv_sector, cc->sector_size >> SECTOR_SHIFT);

		dmreq->iv_sector >>= cc->sector_shift;

	dmreq->ctx = ctx;

	dmreq->ctx = ctx;

	sg_init_table(&dmreq->sg_in, 1);

	sg_init_table(&dmreq->sg_in, 1);

	sg_set_page(&dmreq->sg_in, bv_in.bv_page, cc->sector_size,

	sg_set_page(&dmreq->sg_in, bv_in.bv_page, cc->sector_size,
@@ -941,7 +942,7 @@ static void crypt_free_req(struct crypt_config *cc, 
static int crypt_convert(struct crypt_config *cc,

static int crypt_convert(struct crypt_config *cc,

			 struct convert_context *ctx)

			 struct convert_context *ctx)

{

{

	unsigned int sector_step = cc->sector_size / (1 << SECTOR_SHIFT);

	unsigned int sector_step = cc->sector_size >> SECTOR_SHIFT;

	int r;

	int r;





	atomic_set(&ctx->cc_pending, 1);

	atomic_set(&ctx->cc_pending, 1);
@@ -1782,6 +1783,7 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv) 
	}

	}

	cc->key_size = key_size;

	cc->key_size = key_size;

	cc->sector_size = (1 << SECTOR_SHIFT);

	cc->sector_size = (1 << SECTOR_SHIFT);

	cc->sector_shift = 0;





	ti->private = cc;

	ti->private = cc;

	ret = crypt_ctr_cipher(ti, argv[0], argv[1]);

	ret = crypt_ctr_cipher(ti, argv[0], argv[1]);
@@ -1882,14 +1884,15 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv) 
			else if (!strcasecmp(opt_string, "submit_from_crypt_cpus"))

			else if (!strcasecmp(opt_string, "submit_from_crypt_cpus"))

				set_bit(DM_CRYPT_NO_OFFLOAD, &cc->flags);

				set_bit(DM_CRYPT_NO_OFFLOAD, &cc->flags);





			else if (sscanf(opt_string, "sector_size:%u%c",

			else if (sscanf(opt_string, "sector_size:%hu%c",

					&cc->sector_size, &dummy) == 1) {

					&cc->sector_size, &dummy) == 1) {

				if (cc->sector_size < (1 << SECTOR_SHIFT) ||

				if (cc->sector_size < (1 << SECTOR_SHIFT) ||

				    cc->sector_size > 4096 ||

				    cc->sector_size > 4096 ||

				    (1 << ilog2(cc->sector_size) != cc->sector_size)) {

				    (cc->sector_size & (cc->sector_size - 1))) {

					ti->error = "Invalid feature value for sector_size";

					ti->error = "Invalid feature value for sector_size";

					goto bad;

					goto bad;

				}

				}

				cc->sector_shift = __ffs(cc->sector_size) - SECTOR_SHIFT;

			} else if (!strcasecmp(opt_string, "iv_large_sectors"))

			} else if (!strcasecmp(opt_string, "iv_large_sectors"))

				set_bit(CRYPT_IV_LARGE_SECTORS, &cc->cipher_flags);

				set_bit(CRYPT_IV_LARGE_SECTORS, &cc->cipher_flags);

			else {

			else {
@@ -2022,7 +2025,7 @@ static void crypt_status(struct dm_target *ti, status_type_t type, 
		num_feature_args += !!ti->num_discard_bios;

		num_feature_args += !!ti->num_discard_bios;

		num_feature_args += test_bit(DM_CRYPT_SAME_CPU, &cc->flags);

		num_feature_args += test_bit(DM_CRYPT_SAME_CPU, &cc->flags);

		num_feature_args += test_bit(DM_CRYPT_NO_OFFLOAD, &cc->flags);

		num_feature_args += test_bit(DM_CRYPT_NO_OFFLOAD, &cc->flags);

		num_feature_args += (cc->sector_size != (1 << SECTOR_SHIFT)) ? 1 : 0;

		num_feature_args += cc->sector_size != (1 << SECTOR_SHIFT);

		num_feature_args += test_bit(CRYPT_IV_LARGE_SECTORS, &cc->cipher_flags);

		num_feature_args += test_bit(CRYPT_IV_LARGE_SECTORS, &cc->cipher_flags);

		if (num_feature_args) {

		if (num_feature_args) {

			DMEMIT(" %d", num_feature_args);

			DMEMIT(" %d", num_feature_args);