[PATCH] Fix late crypto work queue initialization

[PATCH] Fix late crypto work queue initialization

[Tim Chen]

The crypto algorithm modules utilizing the crypto daemon could
be used early when the system start up.  Using module_init
does not guarantee that the daemon's work queue is initialized
when the cypto alorithm depending on crypto_wq starts.  It is necessary
to initialize the crypto work queue earlier at the subsystem
init time to make sure that it is initialized
when used.

Signed-off-by: Tim Chen <tim.c.chen@linux.intel.com>
---
 crypto/crypto_wq.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/crypto_wq.c b/crypto/crypto_wq.c
index adad92a..2f1b8d1 100644
--- a/crypto/crypto_wq.c
+++ b/crypto/crypto_wq.c
@@ -33,7 +33,7 @@ static void __exit crypto_wq_exit(void)
 	destroy_workqueue(kcrypto_wq);
 }
 
-module_init(crypto_wq_init);
+subsys_initcall(crypto_wq_init);
 module_exit(crypto_wq_exit);
 
 MODULE_LICENSE("GPL");
-- 
1.7.11.7

Re: [PATCH] Fix late crypto work queue initialization

[Tim Chen]

On Mon, 2014-03-17 at 16:52 -0700, Tim Chen wrote:
> The crypto algorithm modules utilizing the crypto daemon could
> be used early when the system start up.  Using module_init
> does not guarantee that the daemon's work queue is initialized
> when the cypto alorithm depending on crypto_wq starts.  It is necessary
> to initialize the crypto work queue earlier at the subsystem
> init time to make sure that it is initialized
> when used.
> 
> Signed-off-by: Tim Chen <tim.c.chen@linux.intel.com>
> ---
>  crypto/crypto_wq.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/crypto/crypto_wq.c b/crypto/crypto_wq.c
> index adad92a..2f1b8d1 100644
> --- a/crypto/crypto_wq.c
> +++ b/crypto/crypto_wq.c
> @@ -33,7 +33,7 @@ static void __exit crypto_wq_exit(void)
>  	destroy_workqueue(kcrypto_wq);
>  }
>  
> -module_init(crypto_wq_init);
> +subsys_initcall(crypto_wq_init);
>  module_exit(crypto_wq_exit);
>  
>  MODULE_LICENSE("GPL");

Herbert,

Any feedback on this patch?

Thanks.

Tim

Re: [PATCH] Fix late crypto work queue initialization

[Herbert Xu]

On Mon, Mar 17, 2014 at 04:52:26PM -0700, Tim Chen wrote:
> The crypto algorithm modules utilizing the crypto daemon could
> be used early when the system start up.  Using module_init
> does not guarantee that the daemon's work queue is initialized
> when the cypto alorithm depending on crypto_wq starts.  It is necessary
> to initialize the crypto work queue earlier at the subsystem
> init time to make sure that it is initialized
> when used.
> 
> Signed-off-by: Tim Chen <tim.c.chen@linux.intel.com>

Patch applied.
-- 
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

Re: [PATCH] Fix late crypto work queue initialization

[Tim Chen]

On Fri, 2014-03-21 at 22:40 +0800, Herbert Xu wrote:
> On Mon, Mar 17, 2014 at 04:52:26PM -0700, Tim Chen wrote:
> > The crypto algorithm modules utilizing the crypto daemon could
> > be used early when the system start up.  Using module_init
> > does not guarantee that the daemon's work queue is initialized
> > when the cypto alorithm depending on crypto_wq starts.  It is necessary
> > to initialize the crypto work queue earlier at the subsystem
> > init time to make sure that it is initialized
> > when used.
> > 
> > Signed-off-by: Tim Chen <tim.c.chen@linux.intel.com>
> 
> Patch applied.

Herbert,

Probably this patch should go to the stable patches as well.
Copying Greg.

Thanks.

Tim

Re: [PATCH] Fix late crypto work queue initialization

[Greg Kroah-Hartman]

On Tue, Mar 25, 2014 at 04:40:56PM -0700, Tim Chen wrote:
> On Fri, 2014-03-21 at 22:40 +0800, Herbert Xu wrote:
> > On Mon, Mar 17, 2014 at 04:52:26PM -0700, Tim Chen wrote:
> > > The crypto algorithm modules utilizing the crypto daemon could
> > > be used early when the system start up.  Using module_init
> > > does not guarantee that the daemon's work queue is initialized
> > > when the cypto alorithm depending on crypto_wq starts.  It is necessary
> > > to initialize the crypto work queue earlier at the subsystem
> > > init time to make sure that it is initialized
> > > when used.
> > > 
> > > Signed-off-by: Tim Chen <tim.c.chen@linux.intel.com>
> > 
> > Patch applied.
> 
> Herbert,
> 
> Probably this patch should go to the stable patches as well.
> Copying Greg.

<formletter>

This is not the correct way to submit patches for inclusion in the
stable kernel tree.  Please read Documentation/stable_kernel_rules.txt
for how to do this properly.

</formletter>