Merge tag 'for-5.16/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git...

[platform/kernel/linux-starfive.git] / drivers / md / dm-crypt.c

diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
index 292f789..d4ae315 100644 (file)
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
@@ -42,6 +42,8 @@
 
 #include <linux/device-mapper.h>
 
+#include "dm-audit.h"
+
 #define DM_MSG_PREFIX "crypt"
 
 /*
@@ -1363,8 +1365,12 @@ static int crypt_convert_block_aead(struct crypt_config *cc,
 
        if (r == -EBADMSG) {
                char b[BDEVNAME_SIZE];
-               DMERR_LIMIT("%s: INTEGRITY AEAD ERROR, sector %llu", bio_devname(ctx->bio_in, b),
-                           (unsigned long long)le64_to_cpu(*sector));
+               sector_t s = le64_to_cpu(*sector);
+
+               DMERR_LIMIT("%s: INTEGRITY AEAD ERROR, sector %llu",
+                           bio_devname(ctx->bio_in, b), s);
+               dm_audit_log_bio(DM_MSG_PREFIX, "integrity-aead",
+                                ctx->bio_in, s, 0);
        }
 
        if (!r && cc->iv_gen_ops && cc->iv_gen_ops->post)
@@ -2174,8 +2180,12 @@ static void kcryptd_async_done(struct crypto_async_request *async_req,
 
        if (error == -EBADMSG) {
                char b[BDEVNAME_SIZE];
-               DMERR_LIMIT("%s: INTEGRITY AEAD ERROR, sector %llu", bio_devname(ctx->bio_in, b),
-                           (unsigned long long)le64_to_cpu(*org_sector_of_dmreq(cc, dmreq)));
+               sector_t s = le64_to_cpu(*org_sector_of_dmreq(cc, dmreq));
+
+               DMERR_LIMIT("%s: INTEGRITY AEAD ERROR, sector %llu",
+                           bio_devname(ctx->bio_in, b), s);
+               dm_audit_log_bio(DM_MSG_PREFIX, "integrity-aead",
+                                ctx->bio_in, s, 0);
                io->error = BLK_STS_PROTECTION;
        } else if (error < 0)
                io->error = BLK_STS_IOERR;
@@ -2735,6 +2745,8 @@ static void crypt_dtr(struct dm_target *ti)
        dm_crypt_clients_n--;
        crypt_calculate_pages_per_client();
        spin_unlock(&dm_crypt_clients_lock);
+
+       dm_audit_log_dtr(DM_MSG_PREFIX, ti, 1);
 }
 
 static int crypt_ctr_ivmode(struct dm_target *ti, const char *ivmode)
@@ -3351,21 +3363,22 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
        spin_lock_init(&cc->write_thread_lock);
        cc->write_tree = RB_ROOT;
 
-       cc->write_thread = kthread_create(dmcrypt_write, cc, "dmcrypt_write/%s", devname);
+       cc->write_thread = kthread_run(dmcrypt_write, cc, "dmcrypt_write/%s", devname);
        if (IS_ERR(cc->write_thread)) {
                ret = PTR_ERR(cc->write_thread);
                cc->write_thread = NULL;
                ti->error = "Couldn't spawn write thread";
                goto bad;
        }
-       wake_up_process(cc->write_thread);
 
        ti->num_flush_bios = 1;
        ti->limit_swap_bios = true;
 
+       dm_audit_log_ctr(DM_MSG_PREFIX, ti, 1);
        return 0;
 
 bad:
+       dm_audit_log_ctr(DM_MSG_PREFIX, ti, 0);
        crypt_dtr(ti);
        return ret;
 }