Skip to contentSkip to conversation

crypto: engine: disable BH during completion

PATCH In review Corentin Labbe 2 participants 2 messages Jan 27, 2022 – Feb 5, 2022 Crypto API

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 crypto: engine: disable BH during completion

When doing iperf over ipsec with crypto hardware sun8i-ce, I hit some spinlock recursion bug.

This is due to crypto/crypto_engine not disabling BH when calling completion function.

Fixes 735d37b5424b ("crypto: engine - Introduce the block request crypto engine framework")
---
 crypto/crypto_engine.c | 3 +++
 1 file changed, 3 insertions(+)
crypto/crypto_engine.c +3 -0
index fb07da9920ee..b3844f6d98a3 100644
@@ -7,6 +7,7 @@
  * Author: Baolin Wang <[email protected]>
  */
 
+#include <linux/bottom_half.h>
 #include <linux/err.h>
 #include <linux/delay.h>
 #include <linux/device.h>
@@ -53,7 +54,9 @@ static void crypto_finalize_request(struct crypto_engine *engine,
 				dev_err(engine->dev, "failed to unprepare request\n");
 		}
 	}
+	local_bh_disable();
 	req->complete(req, err);
+	local_bh_enable();
 
 	kthread_queue_work(engine->kworker, &engine->pump_requests);
 }
Signature · 1 line
2.34.1
maintainer
#1 lore raw
Quoted 25 lines · Corentin Labbe

When doing iperf over ipsec with crypto hardware sun8i-ce, I hit some spinlock recursion bug.

This is due to crypto/crypto_engine not disabling BH when calling completion function.

Fixes 735d37b5424b ("crypto: engine - Introduce the block request crypto engine framework")
---
 crypto/crypto_engine.c | 3 +++
 1 file changed, 3 insertions(+)
crypto/crypto_engine.c +1 -0
index fb07da9920ee..b3844f6d98a3 100644
@@ -7,6 +7,7 @@
  * Author: Baolin Wang <[email protected]>
  */
 
+#include <linux/bottom_half.h>
 #include <linux/err.h>
 #include <linux/delay.h>
 #include <linux/device.h>

crypto/crypto_engine.c static void crypto_finalize_request(struct crypto_engine *engine, · line 59

Quoted 6 lines
crypto/crypto_engine.c +2 -0
@@ -53,7 +54,9 @@ static void crypto_finalize_request(struct crypto_engine *engine,
 				dev_err(engine->dev, "failed to unprepare request\n");
 		}
 	}
+	local_bh_disable();
 	req->complete(req, err);
+	local_bh_enable();

Most other drivers call this function in softirq context. In general crypto API callback functions expect to be called in softirq context.

So I think we should fix the driver to do the bh disable instead.

However, it's probably a good idea to add a check in this spot to detect drivers that are calling this in the wrong context, e.g., lockdep_assert_in_softirq().

Thanks,

Signature · 3 lines
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt