[PATCH 0/2] crypto: inside-secure: Handle load errors better

public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed

* [PATCH 0/2] crypto: inside-secure: Handle load errors better
@ 2023-02-23 22:10 Jonathan McDowell
  2023-02-28 18:28 ` [PATCH v2 " Jonathan McDowell
  0 siblings, 1 reply; 5+ messages in thread
From: Jonathan McDowell @ 2023-02-23 22:10 UTC (permalink / raw)
  To: Antoine Tenart, Herbert Xu, David S. Miller; +Cc: linux-crypto, linux-kernel

2 minor patches to improve the error handling of the safexcel driver
when it fails to load.

Firstly, make it clear when the reason for a load failure is because the
firmware is not available.

Secondly, ensure we clean up the ring workqueues / IRQ affinity settings
to avoid a kernel warning when the driver fails to load.

Jonathan McDowell (2):
  crypto: inside-secure: Raise firmware load failure message to error
  crypto: inside-secure: Cleanup ring IRQ workqueues on load failure

 drivers/crypto/inside-secure/safexcel.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

-- 
2.39.1

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH v2 0/2] crypto: inside-secure: Handle load errors better
  2023-02-23 22:10 [PATCH 0/2] crypto: inside-secure: Handle load errors better Jonathan McDowell
@ 2023-02-28 18:28 ` Jonathan McDowell
  2023-02-28 18:28   ` [PATCH v2 1/2] crypto: inside-secure: Raise firmware load failure message to error Jonathan McDowell
                     ` (2 more replies)
  0 siblings, 3 replies; 5+ messages in thread
From: Jonathan McDowell @ 2023-02-28 18:28 UTC (permalink / raw)
  To: Antoine Tenart, Herbert Xu, David S. Miller; +Cc: linux-crypto, linux-kernel

2 minor patches to improve the error handling of the safexcel driver
when it fails to load.

Firstly, make it clear when the reason for a load failure is because the
firmware is not available.

Secondly, ensure we clean up the ring workqueues / IRQ affinity settings
to avoid a kernel warning when the driver fails to load.

v2:
 - Expand error clean up to cover ring initialisation failures

Jonathan McDowell (2):
  crypto: inside-secure: Raise firmware load failure message to error
  crypto: inside-secure - Cleanup ring IRQ workqueues on load failure

 drivers/crypto/inside-secure/safexcel.c | 39 ++++++++++++++++++-------
 1 file changed, 28 insertions(+), 11 deletions(-)

-- 
2.39.2

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH v2 1/2] crypto: inside-secure: Raise firmware load failure message to error
  2023-02-28 18:28 ` [PATCH v2 " Jonathan McDowell
@ 2023-02-28 18:28   ` Jonathan McDowell
  2023-02-28 18:28   ` [PATCH v2 2/2] crypto: inside-secure - Cleanup ring IRQ workqueues on load failure Jonathan McDowell
  2023-03-10 11:31   ` [PATCH v2 0/2] crypto: inside-secure: Handle load errors better Herbert Xu
  2 siblings, 0 replies; 5+ messages in thread
From: Jonathan McDowell @ 2023-02-28 18:28 UTC (permalink / raw)
  To: Antoine Tenart, Herbert Xu, David S. Miller; +Cc: linux-crypto, linux-kernel

At the moment if there is no firmware available for the safexcel driver
it will fail to load with a cryptic:

crypto-safexcel f2800000.crypto: TRC init: 15360d,80a (48r,256h)
crypto-safexcel f2800000.crypto: HW init failed (-2)

Raise the logging level of the firmware load failure to err rather than
dbg so that it's obvious what the reason for the HW init failure is.

Signed-off-by: Jonathan McDowell <noodles@earth.li>
Reviewed-by: Antoine Tenart <atenart@kernel.org>
---
 drivers/crypto/inside-secure/safexcel.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/crypto/inside-secure/safexcel.c b/drivers/crypto/inside-secure/safexcel.c
index 6858753af6b3..5e10ab24be3b 100644
--- a/drivers/crypto/inside-secure/safexcel.c
+++ b/drivers/crypto/inside-secure/safexcel.c
@@ -474,7 +474,7 @@ static int eip197_load_firmwares(struct safexcel_crypto_priv *priv)
 		goto retry_fw;
 	}
 
-	dev_dbg(priv->dev, "Firmware load failed.\n");
+	dev_err(priv->dev, "Firmware load failed.\n");
 
 	return ret;
 }
-- 
2.39.2


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [PATCH v2 2/2] crypto: inside-secure - Cleanup ring IRQ workqueues on load failure
  2023-02-28 18:28 ` [PATCH v2 " Jonathan McDowell
  2023-02-28 18:28   ` [PATCH v2 1/2] crypto: inside-secure: Raise firmware load failure message to error Jonathan McDowell
@ 2023-02-28 18:28   ` Jonathan McDowell
  2023-03-10 11:31   ` [PATCH v2 0/2] crypto: inside-secure: Handle load errors better Herbert Xu
  2 siblings, 0 replies; 5+ messages in thread
From: Jonathan McDowell @ 2023-02-28 18:28 UTC (permalink / raw)
  To: Antoine Tenart, Herbert Xu, David S. Miller; +Cc: linux-crypto, linux-kernel

A failure loading the safexcel driver results in the following warning
on boot, because the IRQ affinity has not been correctly cleaned up.
Ensure we clean up the affinity and workqueues on a failure to load the
driver.

crypto-safexcel: probe of f2800000.crypto failed with error -2
------------[ cut here ]------------
WARNING: CPU: 1 PID: 232 at kernel/irq/manage.c:1913 free_irq+0x300/0x340
Modules linked in: hwmon mdio_i2c crypto_safexcel(+) md5 sha256_generic libsha256 authenc libdes omap_rng rng_core nft_masq nft_nat nft_chain_nat nf_nat nft_ct nf_conntrack nf_defrag_ipv6 nf_defrag_ipv4 nf_tables libcrc32c nfnetlink fuse autofs4
CPU: 1 PID: 232 Comm: systemd-udevd Tainted: G        W          6.1.6-00002-g9d4898824677 #3
Hardware name: MikroTik RB5009 (DT)
pstate: 600000c5 (nZCv daIF -PAN -UAO -TCO -DIT -SSBS BTYPE=--)
pc : free_irq+0x300/0x340
lr : free_irq+0x2e0/0x340
sp : ffff800008fa3890
x29: ffff800008fa3890 x28: 0000000000000000 x27: 0000000000000000
x26: ffff8000008e6dc0 x25: ffff000009034cac x24: ffff000009034d50
x23: 0000000000000000 x22: 000000000000004a x21: ffff0000093e0d80
x20: ffff000009034c00 x19: ffff00000615fc00 x18: 0000000000000000
x17: 0000000000000000 x16: 0000000000000000 x15: 000075f5c1584c5e
x14: 0000000000000017 x13: 0000000000000000 x12: 0000000000000040
x11: ffff000000579b60 x10: ffff000000579b62 x9 : ffff800008bbe370
x8 : ffff000000579dd0 x7 : 0000000000000000 x6 : ffff000000579e18
x5 : ffff000000579da8 x4 : ffff800008ca0000 x3 : ffff800008ca0188
x2 : 0000000013033204 x1 : ffff000009034c00 x0 : ffff8000087eadf0
Call trace:
 free_irq+0x300/0x340
 devm_irq_release+0x14/0x20
 devres_release_all+0xa0/0x100
 device_unbind_cleanup+0x14/0x60
 really_probe+0x198/0x2d4
 __driver_probe_device+0x74/0xdc
 driver_probe_device+0x3c/0x110
 __driver_attach+0x8c/0x190
 bus_for_each_dev+0x6c/0xc0
 driver_attach+0x20/0x30
 bus_add_driver+0x148/0x1fc
 driver_register+0x74/0x120
 __platform_driver_register+0x24/0x30
 safexcel_init+0x48/0x1000 [crypto_safexcel]
 do_one_initcall+0x4c/0x1b0
 do_init_module+0x44/0x1cc
 load_module+0x1724/0x1be4
 __do_sys_finit_module+0xbc/0x110
 __arm64_sys_finit_module+0x1c/0x24
 invoke_syscall+0x44/0x110
 el0_svc_common.constprop.0+0xc0/0xe0
 do_el0_svc+0x20/0x80
 el0_svc+0x14/0x4c
 el0t_64_sync_handler+0xb0/0xb4
 el0t_64_sync+0x148/0x14c
---[ end trace 0000000000000000 ]---

Fixes: 1b44c5a60c13 ("inside-secure - add SafeXcel EIP197 crypto engine driver")
Signed-off-by: Jonathan McDowell <noodles@earth.li>
Cc: stable@vger.kernel.org
---
v2:
 - Expand error clean up to cover ring initialisation failures
---
 drivers/crypto/inside-secure/safexcel.c | 37 ++++++++++++++++++-------
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/drivers/crypto/inside-secure/safexcel.c b/drivers/crypto/inside-secure/safexcel.c
index 5e10ab24be3b..9ff02b5abc4a 100644
--- a/drivers/crypto/inside-secure/safexcel.c
+++ b/drivers/crypto/inside-secure/safexcel.c
@@ -1628,19 +1628,23 @@ static int safexcel_probe_generic(void *pdev,
 						     &priv->ring[i].rdr);
 		if (ret) {
 			dev_err(dev, "Failed to initialize rings\n");
-			return ret;
+			goto err_cleanup_rings;
 		}
 
 		priv->ring[i].rdr_req = devm_kcalloc(dev,
 			EIP197_DEFAULT_RING_SIZE,
 			sizeof(*priv->ring[i].rdr_req),
 			GFP_KERNEL);
-		if (!priv->ring[i].rdr_req)
-			return -ENOMEM;
+		if (!priv->ring[i].rdr_req) {
+			ret = -ENOMEM;
+			goto err_cleanup_rings;
+		}
 
 		ring_irq = devm_kzalloc(dev, sizeof(*ring_irq), GFP_KERNEL);
-		if (!ring_irq)
-			return -ENOMEM;
+		if (!ring_irq) {
+			ret = -ENOMEM;
+			goto err_cleanup_rings;
+		}
 
 		ring_irq->priv = priv;
 		ring_irq->ring = i;
@@ -1654,7 +1658,8 @@ static int safexcel_probe_generic(void *pdev,
 						ring_irq);
 		if (irq < 0) {
 			dev_err(dev, "Failed to get IRQ ID for ring %d\n", i);
-			return irq;
+			ret = irq;
+			goto err_cleanup_rings;
 		}
 
 		priv->ring[i].irq = irq;
@@ -1666,8 +1671,10 @@ static int safexcel_probe_generic(void *pdev,
 		snprintf(wq_name, 9, "wq_ring%d", i);
 		priv->ring[i].workqueue =
 			create_singlethread_workqueue(wq_name);
-		if (!priv->ring[i].workqueue)
-			return -ENOMEM;
+		if (!priv->ring[i].workqueue) {
+			ret = -ENOMEM;
+			goto err_cleanup_rings;
+		}
 
 		priv->ring[i].requests = 0;
 		priv->ring[i].busy = false;
@@ -1684,16 +1691,26 @@ static int safexcel_probe_generic(void *pdev,
 	ret = safexcel_hw_init(priv);
 	if (ret) {
 		dev_err(dev, "HW init failed (%d)\n", ret);
-		return ret;
+		goto err_cleanup_rings;
 	}
 
 	ret = safexcel_register_algorithms(priv);
 	if (ret) {
 		dev_err(dev, "Failed to register algorithms (%d)\n", ret);
-		return ret;
+		goto err_cleanup_rings;
 	}
 
 	return 0;
+
+err_cleanup_rings:
+	for (i = 0; i < priv->config.rings; i++) {
+		if (priv->ring[i].irq)
+			irq_set_affinity_hint(priv->ring[i].irq, NULL);
+		if (priv->ring[i].workqueue)
+			destroy_workqueue(priv->ring[i].workqueue);
+	}
+
+	return ret;
 }
 
 static void safexcel_hw_reset_rings(struct safexcel_crypto_priv *priv)
-- 
2.39.2


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH v2 0/2] crypto: inside-secure: Handle load errors better
  2023-02-28 18:28 ` [PATCH v2 " Jonathan McDowell
  2023-02-28 18:28   ` [PATCH v2 1/2] crypto: inside-secure: Raise firmware load failure message to error Jonathan McDowell
  2023-02-28 18:28   ` [PATCH v2 2/2] crypto: inside-secure - Cleanup ring IRQ workqueues on load failure Jonathan McDowell
@ 2023-03-10 11:31   ` Herbert Xu
  2 siblings, 0 replies; 5+ messages in thread
From: Herbert Xu @ 2023-03-10 11:31 UTC (permalink / raw)
  To: Jonathan McDowell
  Cc: Antoine Tenart, David S. Miller, linux-crypto, linux-kernel

On Tue, Feb 28, 2023 at 06:28:23PM +0000, Jonathan McDowell wrote:
> 2 minor patches to improve the error handling of the safexcel driver
> when it fails to load.
> 
> Firstly, make it clear when the reason for a load failure is because the
> firmware is not available.
> 
> Secondly, ensure we clean up the ring workqueues / IRQ affinity settings
> to avoid a kernel warning when the driver fails to load.
> 
> v2:
>  - Expand error clean up to cover ring initialisation failures
> 
> Jonathan McDowell (2):
>   crypto: inside-secure: Raise firmware load failure message to error
>   crypto: inside-secure - Cleanup ring IRQ workqueues on load failure
> 
>  drivers/crypto/inside-secure/safexcel.c | 39 ++++++++++++++++++-------
>  1 file changed, 28 insertions(+), 11 deletions(-)
> 
> -- 
> 2.39.2

All applied.  Thanks.
-- 
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2023-03-10 11:32 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-02-23 22:10 [PATCH 0/2] crypto: inside-secure: Handle load errors better Jonathan McDowell
2023-02-28 18:28 ` [PATCH v2 " Jonathan McDowell
2023-02-28 18:28   ` [PATCH v2 1/2] crypto: inside-secure: Raise firmware load failure message to error Jonathan McDowell
2023-02-28 18:28   ` [PATCH v2 2/2] crypto: inside-secure - Cleanup ring IRQ workqueues on load failure Jonathan McDowell
2023-03-10 11:31   ` [PATCH v2 0/2] crypto: inside-secure: Handle load errors better Herbert Xu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox