From: "Martin K. Petersen" <martin.petersen@oracle.com>
To: herbert@gondor.apana.org.au
Cc: Jeff.Lien@wdc.com, ard.biesheuvel@linaro.org,
david.darrington@wdc.com, hch@infradead.org,
jeff.furlong@wdc.com, linux-block@vger.kernel.org,
linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-scsi@vger.kernel.org, martin.petersen@oracle.com,
tim.c.chen@linux.intel.com
Subject: [PATCH 4/4] block: Integrity profile init function to trigger module loads
Date: Sat, 25 Aug 2018 22:40:06 -0400 [thread overview]
Message-ID: <20180826024006.13800-4-martin.petersen@oracle.com> (raw)
In-Reply-To: <20180826024006.13800-1-martin.petersen@oracle.com>
The T10 CRC library function is built into the kernel and therefore
registered early. The hardware-accelerated CRC helpers are typically
loaded as modules and only become available later in the boot
sequence. A separate patch modifies the T10 CRC library to subscribe
to notifications from crypto and permits switching from the
table-based algorithm to a hardware accelerated ditto once the
relevant module is loaded.
However, since the dependency for "crc10dif" is already satisfied,
nothing is going to cause the hardware-accelerated kernel modules to
get loaded. Introduce an init_fn in the integrity profile that can be
called to trigger a load of modules providing the T10 CRC calculation
capability. This function will ony get called when a new integrity
profile is registered during device discovery.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
---
block/blk-integrity.c | 5 +++++
block/t10-pi.c | 10 ++++++++++
include/linux/blkdev.h | 2 ++
3 files changed, 17 insertions(+)
diff --git a/block/blk-integrity.c b/block/blk-integrity.c
index 6121611e1316..5cacae9a2dc2 100644
--- a/block/blk-integrity.c
+++ b/block/blk-integrity.c
@@ -27,6 +27,7 @@
#include <linux/scatterlist.h>
#include <linux/export.h>
#include <linux/slab.h>
+#include <linux/module.h>
#include "blk.h"
@@ -391,6 +392,7 @@ static blk_status_t blk_integrity_nop_fn(struct blk_integrity_iter *iter)
static const struct blk_integrity_profile nop_profile = {
.name = "nop",
+ .init_fn = NULL,
.generate_fn = blk_integrity_nop_fn,
.verify_fn = blk_integrity_nop_fn,
};
@@ -418,6 +420,9 @@ void blk_integrity_register(struct gendisk *disk, struct blk_integrity *template
bi->tuple_size = template->tuple_size;
bi->tag_size = template->tag_size;
+ if (bi->profile->init_fn)
+ bi->profile->init_fn();
+
disk->queue->backing_dev_info->capabilities |= BDI_CAP_STABLE_WRITES;
}
EXPORT_SYMBOL(blk_integrity_register);
diff --git a/block/t10-pi.c b/block/t10-pi.c
index a98db384048f..b83278f9163a 100644
--- a/block/t10-pi.c
+++ b/block/t10-pi.c
@@ -24,6 +24,7 @@
#include <linux/t10-pi.h>
#include <linux/blkdev.h>
#include <linux/crc-t10dif.h>
+#include <linux/module.h>
#include <net/checksum.h>
typedef __be16 (csum_fn) (void *, unsigned int);
@@ -157,8 +158,14 @@ static blk_status_t t10_pi_type3_verify_ip(struct blk_integrity_iter *iter)
return t10_pi_verify(iter, t10_pi_ip_fn, 3);
}
+static void t10_pi_crc_init(void)
+{
+ request_module_nowait(CRC_T10DIF_STRING);
+}
+
const struct blk_integrity_profile t10_pi_type1_crc = {
.name = "T10-DIF-TYPE1-CRC",
+ .init_fn = t10_pi_crc_init,
.generate_fn = t10_pi_type1_generate_crc,
.verify_fn = t10_pi_type1_verify_crc,
};
@@ -166,6 +173,7 @@ EXPORT_SYMBOL(t10_pi_type1_crc);
const struct blk_integrity_profile t10_pi_type1_ip = {
.name = "T10-DIF-TYPE1-IP",
+ .init_fn = NULL,
.generate_fn = t10_pi_type1_generate_ip,
.verify_fn = t10_pi_type1_verify_ip,
};
@@ -173,6 +181,7 @@ EXPORT_SYMBOL(t10_pi_type1_ip);
const struct blk_integrity_profile t10_pi_type3_crc = {
.name = "T10-DIF-TYPE3-CRC",
+ .init_fn = t10_pi_crc_init,
.generate_fn = t10_pi_type3_generate_crc,
.verify_fn = t10_pi_type3_verify_crc,
};
@@ -180,6 +189,7 @@ EXPORT_SYMBOL(t10_pi_type3_crc);
const struct blk_integrity_profile t10_pi_type3_ip = {
.name = "T10-DIF-TYPE3-IP",
+ .init_fn = NULL,
.generate_fn = t10_pi_type3_generate_ip,
.verify_fn = t10_pi_type3_verify_ip,
};
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 79226ca8f80f..a43c02e4f43d 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -1806,10 +1806,12 @@ struct blk_integrity_iter {
};
typedef blk_status_t (integrity_processing_fn) (struct blk_integrity_iter *);
+typedef void (integrity_init_fn) (void);
struct blk_integrity_profile {
integrity_processing_fn *generate_fn;
integrity_processing_fn *verify_fn;
+ integrity_init_fn *init_fn;
const char *name;
};
--
2.17.1
next prev parent reply other threads:[~2018-08-26 2:41 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-10 19:12 [PATCH] Performance Improvement in CRC16 Calculations Jeff Lien
2018-08-10 19:23 ` Joe Perches
2018-08-10 20:02 ` Nicolas Pitre
2018-08-11 0:11 ` Joe Perches
2018-08-11 0:34 ` Nicolas Pitre
2018-08-11 2:39 ` Douglas Gilbert
2018-08-11 9:04 ` Joe Perches
2018-08-11 15:06 ` Joe Perches
2018-08-13 18:41 ` Jeffrey Lien
2018-08-13 3:36 ` Douglas Gilbert
2018-08-13 4:29 ` Joe Perches
2018-08-10 20:00 ` Nicolas Pitre
2018-08-10 20:16 ` Eric Biggers
2018-08-16 14:02 ` Jeffrey Lien
2018-08-16 14:22 ` Douglas Gilbert
2018-08-16 15:41 ` Christophe LEROY
2018-08-16 17:38 ` Douglas Gilbert
2018-08-17 3:20 ` Martin K. Petersen
2018-08-16 15:47 ` Christophe LEROY
2018-08-10 20:56 ` Douglas Gilbert
2018-08-11 15:36 ` Martin K. Petersen
2018-08-11 16:35 ` Joe Perches
2018-08-22 1:40 ` Martin K. Petersen
2018-08-22 6:20 ` Christoph Hellwig
2018-08-24 15:32 ` Jeffrey Lien
2018-08-24 15:39 ` Ard Biesheuvel
2018-08-24 16:29 ` Martin K. Petersen
2018-08-24 17:38 ` Ard Biesheuvel
2018-08-24 21:46 ` Martin K. Petersen
2018-08-24 21:54 ` Ard Biesheuvel
2018-08-24 22:12 ` Martin K. Petersen
2018-08-25 6:12 ` Herbert Xu
2018-08-26 2:35 ` Martin K. Petersen
2018-08-26 2:40 ` [PATCH 1/4] crypto: Introduce notifier for new crypto algorithms Martin K. Petersen
2018-08-26 2:40 ` [PATCH 2/4] crc-t10dif: Pick better transform if one becomes available Martin K. Petersen
2018-08-27 6:13 ` Herbert Xu
2018-08-26 2:40 ` [PATCH 3/4] crc-t10dif: Allow current transform to be inspected in sysfs Martin K. Petersen
2018-08-26 2:40 ` Martin K. Petersen [this message]
2018-08-26 8:22 ` [PATCH 4/4] block: Integrity profile init function to trigger module loads Ard Biesheuvel
2018-08-26 13:30 ` Martin K. Petersen
2018-08-26 13:44 ` Ard Biesheuvel
2018-08-26 13:48 ` Martin K. Petersen
2018-08-27 6:09 ` [PATCH 1/4] crypto: Introduce notifier for new crypto algorithms Herbert Xu
2018-08-30 14:57 ` Martin K. Petersen
2018-08-30 15:00 ` [PATCH v2 1/3] " Martin K. Petersen
2018-08-30 15:00 ` [PATCH v2 2/3] crc-t10dif: Pick better transform if one becomes available Martin K. Petersen
2018-08-30 15:00 ` [PATCH v2 3/3] crc-t10dif: Allow current transform to be inspected in sysfs Martin K. Petersen
2018-08-31 17:17 ` [PATCH v2 1/3] crypto: Introduce notifier for new crypto algorithms Jeffrey Lien
2018-09-04 5:21 ` Herbert Xu
2018-09-04 13:30 ` Torsten Duwe
2018-08-24 16:30 ` [PATCH] Performance Improvement in CRC16 Calculations Martin K. Petersen
2018-08-13 4:44 ` Chaitanya Kulkarni
2018-08-13 11:45 ` David Laight
2018-08-13 13:50 ` David Laight
2018-08-13 22:44 ` Tim Chen
2018-08-15 12:51 ` Jeffrey Lien
2018-08-15 18:31 ` Pavel Machek
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=20180826024006.13800-4-martin.petersen@oracle.com \
--to=martin.petersen@oracle.com \
--cc=Jeff.Lien@wdc.com \
--cc=ard.biesheuvel@linaro.org \
--cc=david.darrington@wdc.com \
--cc=hch@infradead.org \
--cc=herbert@gondor.apana.org.au \
--cc=jeff.furlong@wdc.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=tim.c.chen@linux.intel.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;
as well as URLs for NNTP newsgroup(s).