crypto: ccp - Register SNP panic notifier only if SNP is enabled

Currently, the SNP panic notifier is registered on module initialization
regardless of whether SNP is being enabled or initialized.

Instead, register the SNP panic notifier only when SNP is actually
initialized and unregister the notifier when SNP is shutdown.

Reviewed-by: Dionna Glaze <dionnaglaze@google.com>
Reviewed-by: Alexey Kardashevskiy <aik@amd.com>
Reviewed-by: Tom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: Ashish Kalra <ashish.kalra@amd.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/ccp/sev-dev.c b/drivers/crypto/ccp/sev-dev.c
index 08a6160f0072ef375c3085e7e749a6bafb90c745..6fdbb3bf44b5cf37e6af143ac29df27e6fa81470 100644 (file)
--- a/drivers/crypto/ccp/sev-dev.c
+++ b/drivers/crypto/ccp/sev-dev.c
@@ -111,6 +111,13 @@ static struct sev_data_range_list *snp_range_list;
 
 static void __sev_firmware_shutdown(struct sev_device *sev, bool panic);
 
+static int snp_shutdown_on_panic(struct notifier_block *nb,
+                                unsigned long reason, void *arg);
+
+static struct notifier_block snp_panic_notifier = {
+       .notifier_call = snp_shutdown_on_panic,
+};
+
 static inline bool sev_version_greater_or_equal(u8 maj, u8 min)
 {
        struct sev_device *sev = psp_master->sev_data;
@@ -1200,6 +1207,9 @@ static int __sev_snp_init_locked(int *error)
        dev_info(sev->dev, "SEV-SNP API:%d.%d build:%d\n", sev->api_major,
                 sev->api_minor, sev->build);
 
+       atomic_notifier_chain_register(&panic_notifier_list,
+                                      &snp_panic_notifier);
+
        sev_es_tmr_size = SNP_TMR_SIZE;
 
        return 0;
@@ -1778,6 +1788,9 @@ static int __sev_snp_shutdown_locked(int *error, bool panic)
        sev->snp_initialized = false;
        dev_dbg(sev->dev, "SEV-SNP firmware shutdown\n");
 
+       atomic_notifier_chain_unregister(&panic_notifier_list,
+                                        &snp_panic_notifier);
+
        /* Reset TMR size back to default */
        sev_es_tmr_size = SEV_TMR_SIZE;
 
@@ -2489,10 +2502,6 @@ static int snp_shutdown_on_panic(struct notifier_block *nb,
        return NOTIFY_DONE;
 }
 
-static struct notifier_block snp_panic_notifier = {
-       .notifier_call = snp_shutdown_on_panic,
-};
-
 int sev_issue_cmd_external_user(struct file *filep, unsigned int cmd,
                                void *data, int *error)
 {
@@ -2538,8 +2547,6 @@ void sev_pci_init(void)
                dev_err(sev->dev, "SEV: failed to INIT error %#x, rc %d\n",
                        args.error, rc);
 
-       atomic_notifier_chain_register(&panic_notifier_list,
-                                      &snp_panic_notifier);
        return;
 
 err:
@@ -2556,7 +2563,4 @@ void sev_pci_exit(void)
                return;
 
        sev_firmware_shutdown(sev);
-
-       atomic_notifier_chain_unregister(&panic_notifier_list,
-                                        &snp_panic_notifier);
 }