2022-09-01 02:23:06

by Koba Ko

[permalink] [raw]
Subject: [PATCH V2] crypto: ccp - Release dma channels before dmaengine unrgister

A warning is shown during shutdown,

__dma_async_device_channel_unregister called while 2 clients hold a reference
WARNING: CPU: 15 PID: 1 at drivers/dma/dmaengine.c:1110 __dma_async_device_channel_unregister+0xb7/0xc0

Call dma_release_channel for occupied channles before dma_async_device_unregister.

Fixes: 4cbe9bc34ed0 ("crypto: ccp - ccp_dmaengine_unregister release dma channels")
Reported-by: kernel test robot <[email protected]>
Signed-off-by: Koba Ko <[email protected]>
---
V2: Fix the unused warning
---
drivers/crypto/ccp/ccp-dmaengine.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/crypto/ccp/ccp-dmaengine.c b/drivers/crypto/ccp/ccp-dmaengine.c
index 7d4b4ad1db1f3..9f753cb4f5f18 100644
--- a/drivers/crypto/ccp/ccp-dmaengine.c
+++ b/drivers/crypto/ccp/ccp-dmaengine.c
@@ -641,6 +641,10 @@ static void ccp_dma_release(struct ccp_device *ccp)
for (i = 0; i < ccp->cmd_q_count; i++) {
chan = ccp->ccp_dma_chan + i;
dma_chan = &chan->dma_chan;
+
+ if (dma_chan->client_count)
+ dma_release_channel(dma_chan);
+
tasklet_kill(&chan->cleanup_tasklet);
list_del_rcu(&dma_chan->device_node);
}
@@ -766,8 +770,8 @@ void ccp_dmaengine_unregister(struct ccp_device *ccp)
if (!dmaengine)
return;

- dma_async_device_unregister(dma_dev);
ccp_dma_release(ccp);
+ dma_async_device_unregister(dma_dev);

kmem_cache_destroy(ccp->dma_desc_cache);
kmem_cache_destroy(ccp->dma_cmd_cache);
--
2.25.1


2022-09-01 13:55:04

by Tom Lendacky

[permalink] [raw]
Subject: Re: [PATCH V2] crypto: ccp - Release dma channels before dmaengine unrgister

On 8/31/22 21:16, Koba Ko wrote:
> A warning is shown during shutdown,
>
> __dma_async_device_channel_unregister called while 2 clients hold a reference
> WARNING: CPU: 15 PID: 1 at drivers/dma/dmaengine.c:1110 __dma_async_device_channel_unregister+0xb7/0xc0
>
> Call dma_release_channel for occupied channles before dma_async_device_unregister.
>
> Fixes: 4cbe9bc34ed0 ("crypto: ccp - ccp_dmaengine_unregister release dma channels")

I can't find this Fixes: tag. I did find:

54cce8ecb925 ("crypto: ccp - ccp_dmaengine_unregister release dma channels")

Not sure if Herbert can take care of that or if you'll need a v3.

With the change to the Fixes: tag

Acked-by: Tom Lendacky <[email protected]>

> Reported-by: kernel test robot <[email protected]>
> Signed-off-by: Koba Ko <[email protected]>
> ---
> V2: Fix the unused warning
> ---
> drivers/crypto/ccp/ccp-dmaengine.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/crypto/ccp/ccp-dmaengine.c b/drivers/crypto/ccp/ccp-dmaengine.c
> index 7d4b4ad1db1f3..9f753cb4f5f18 100644
> --- a/drivers/crypto/ccp/ccp-dmaengine.c
> +++ b/drivers/crypto/ccp/ccp-dmaengine.c
> @@ -641,6 +641,10 @@ static void ccp_dma_release(struct ccp_device *ccp)
> for (i = 0; i < ccp->cmd_q_count; i++) {
> chan = ccp->ccp_dma_chan + i;
> dma_chan = &chan->dma_chan;
> +
> + if (dma_chan->client_count)
> + dma_release_channel(dma_chan);
> +
> tasklet_kill(&chan->cleanup_tasklet);
> list_del_rcu(&dma_chan->device_node);
> }
> @@ -766,8 +770,8 @@ void ccp_dmaengine_unregister(struct ccp_device *ccp)
> if (!dmaengine)
> return;
>
> - dma_async_device_unregister(dma_dev);
> ccp_dma_release(ccp);
> + dma_async_device_unregister(dma_dev);
>
> kmem_cache_destroy(ccp->dma_desc_cache);
> kmem_cache_destroy(ccp->dma_cmd_cache);

2022-09-01 14:18:38

by Koba Ko

[permalink] [raw]
Subject: Re: [PATCH V2] crypto: ccp - Release dma channels before dmaengine unrgister

On Thu, Sep 1, 2022 at 9:42 PM Tom Lendacky <[email protected]> wrote:
>
> On 8/31/22 21:16, Koba Ko wrote:
> > A warning is shown during shutdown,
> >
> > __dma_async_device_channel_unregister called while 2 clients hold a reference
> > WARNING: CPU: 15 PID: 1 at drivers/dma/dmaengine.c:1110 __dma_async_device_channel_unregister+0xb7/0xc0
> >
> > Call dma_release_channel for occupied channles before dma_async_device_unregister.
> >
> > Fixes: 4cbe9bc34ed0 ("crypto: ccp - ccp_dmaengine_unregister release dma channels")
>
> I can't find this Fixes: tag. I did find:
>
> 54cce8ecb925 ("crypto: ccp - ccp_dmaengine_unregister release dma channels")
>
> Not sure if Herbert can take care of that or if you'll need a v3.

Sorry, it should be 54cce8ecb925("crypto: ccp -
ccp_dmaengine_unregister release dma channels")

>
> With the change to the Fixes: tag
>
> Acked-by: Tom Lendacky <[email protected]>
>
> > Reported-by: kernel test robot <[email protected]>
> > Signed-off-by: Koba Ko <[email protected]>
> > ---
> > V2: Fix the unused warning
> > ---
> > drivers/crypto/ccp/ccp-dmaengine.c | 6 +++++-
> > 1 file changed, 5 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/crypto/ccp/ccp-dmaengine.c b/drivers/crypto/ccp/ccp-dmaengine.c
> > index 7d4b4ad1db1f3..9f753cb4f5f18 100644
> > --- a/drivers/crypto/ccp/ccp-dmaengine.c
> > +++ b/drivers/crypto/ccp/ccp-dmaengine.c
> > @@ -641,6 +641,10 @@ static void ccp_dma_release(struct ccp_device *ccp)
> > for (i = 0; i < ccp->cmd_q_count; i++) {
> > chan = ccp->ccp_dma_chan + i;
> > dma_chan = &chan->dma_chan;
> > +
> > + if (dma_chan->client_count)
> > + dma_release_channel(dma_chan);
> > +
> > tasklet_kill(&chan->cleanup_tasklet);
> > list_del_rcu(&dma_chan->device_node);
> > }
> > @@ -766,8 +770,8 @@ void ccp_dmaengine_unregister(struct ccp_device *ccp)
> > if (!dmaengine)
> > return;
> >
> > - dma_async_device_unregister(dma_dev);
> > ccp_dma_release(ccp);
> > + dma_async_device_unregister(dma_dev);
> >
> > kmem_cache_destroy(ccp->dma_desc_cache);
> > kmem_cache_destroy(ccp->dma_cmd_cache);

2022-09-01 14:26:55

by Koba Ko

[permalink] [raw]
Subject: Re: [PATCH V2] crypto: ccp - Release dma channels before dmaengine unrgister

On Thu, Sep 1, 2022 at 9:57 PM Koba Ko <[email protected]> wrote:
>
> On Thu, Sep 1, 2022 at 9:42 PM Tom Lendacky <[email protected]> wrote:
> >
> > On 8/31/22 21:16, Koba Ko wrote:
> > > A warning is shown during shutdown,
> > >
> > > __dma_async_device_channel_unregister called while 2 clients hold a reference
> > > WARNING: CPU: 15 PID: 1 at drivers/dma/dmaengine.c:1110 __dma_async_device_channel_unregister+0xb7/0xc0
> > >
> > > Call dma_release_channel for occupied channles before dma_async_device_unregister.
> > >
> > > Fixes: 4cbe9bc34ed0 ("crypto: ccp - ccp_dmaengine_unregister release dma channels")
> >
> > I can't find this Fixes: tag. I did find:
> >
> > 54cce8ecb925 ("crypto: ccp - ccp_dmaengine_unregister release dma channels")
> >
> > Not sure if Herbert can take care of that or if you'll need a v3.
>
> Sorry, it should be 54cce8ecb925("crypto: ccp -
> ccp_dmaengine_unregister release dma channels")
>
> >
> > With the change to the Fixes: tag
> >
> > Acked-by: Tom Lendacky <[email protected]>

Should I add acked-by in V3 by myself? thanks

> > > Reported-by: kernel test robot <[email protected]>
> > > Signed-off-by: Koba Ko <[email protected]>
> > > ---
> > > V2: Fix the unused warning
> > > ---
> > > drivers/crypto/ccp/ccp-dmaengine.c | 6 +++++-
> > > 1 file changed, 5 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/drivers/crypto/ccp/ccp-dmaengine.c b/drivers/crypto/ccp/ccp-dmaengine.c
> > > index 7d4b4ad1db1f3..9f753cb4f5f18 100644
> > > --- a/drivers/crypto/ccp/ccp-dmaengine.c
> > > +++ b/drivers/crypto/ccp/ccp-dmaengine.c
> > > @@ -641,6 +641,10 @@ static void ccp_dma_release(struct ccp_device *ccp)
> > > for (i = 0; i < ccp->cmd_q_count; i++) {
> > > chan = ccp->ccp_dma_chan + i;
> > > dma_chan = &chan->dma_chan;
> > > +
> > > + if (dma_chan->client_count)
> > > + dma_release_channel(dma_chan);
> > > +
> > > tasklet_kill(&chan->cleanup_tasklet);
> > > list_del_rcu(&dma_chan->device_node);
> > > }
> > > @@ -766,8 +770,8 @@ void ccp_dmaengine_unregister(struct ccp_device *ccp)
> > > if (!dmaengine)
> > > return;
> > >
> > > - dma_async_device_unregister(dma_dev);
> > > ccp_dma_release(ccp);
> > > + dma_async_device_unregister(dma_dev);
> > >
> > > kmem_cache_destroy(ccp->dma_desc_cache);
> > > kmem_cache_destroy(ccp->dma_cmd_cache);

2022-09-01 14:29:36

by Tom Lendacky

[permalink] [raw]
Subject: Re: [PATCH V2] crypto: ccp - Release dma channels before dmaengine unrgister

On 9/1/22 09:23, Koba Ko wrote:
> On Thu, Sep 1, 2022 at 9:57 PM Koba Ko <[email protected]> wrote:
>>
>> On Thu, Sep 1, 2022 at 9:42 PM Tom Lendacky <[email protected]> wrote:
>>>
>>> On 8/31/22 21:16, Koba Ko wrote:
>>>> A warning is shown during shutdown,
>>>>
>>>> __dma_async_device_channel_unregister called while 2 clients hold a reference
>>>> WARNING: CPU: 15 PID: 1 at drivers/dma/dmaengine.c:1110 __dma_async_device_channel_unregister+0xb7/0xc0
>>>>
>>>> Call dma_release_channel for occupied channles before dma_async_device_unregister.
>>>>
>>>> Fixes: 4cbe9bc34ed0 ("crypto: ccp - ccp_dmaengine_unregister release dma channels")
>>>
>>> I can't find this Fixes: tag. I did find:
>>>
>>> 54cce8ecb925 ("crypto: ccp - ccp_dmaengine_unregister release dma channels")
>>>
>>> Not sure if Herbert can take care of that or if you'll need a v3.
>>
>> Sorry, it should be 54cce8ecb925("crypto: ccp -
>> ccp_dmaengine_unregister release dma channels")
>>
>>>
>>> With the change to the Fixes: tag
>>>
>>> Acked-by: Tom Lendacky <[email protected]>
>
> Should I add acked-by in V3 by myself? thanks

Yep.

Thanks,
Tom

>
>>>> Reported-by: kernel test robot <[email protected]>
>>>> Signed-off-by: Koba Ko <[email protected]>
>>>> ---
>>>> V2: Fix the unused warning
>>>> ---
>>>> drivers/crypto/ccp/ccp-dmaengine.c | 6 +++++-
>>>> 1 file changed, 5 insertions(+), 1 deletion(-)
>>>>
>>>> diff --git a/drivers/crypto/ccp/ccp-dmaengine.c b/drivers/crypto/ccp/ccp-dmaengine.c
>>>> index 7d4b4ad1db1f3..9f753cb4f5f18 100644
>>>> --- a/drivers/crypto/ccp/ccp-dmaengine.c
>>>> +++ b/drivers/crypto/ccp/ccp-dmaengine.c
>>>> @@ -641,6 +641,10 @@ static void ccp_dma_release(struct ccp_device *ccp)
>>>> for (i = 0; i < ccp->cmd_q_count; i++) {
>>>> chan = ccp->ccp_dma_chan + i;
>>>> dma_chan = &chan->dma_chan;
>>>> +
>>>> + if (dma_chan->client_count)
>>>> + dma_release_channel(dma_chan);
>>>> +
>>>> tasklet_kill(&chan->cleanup_tasklet);
>>>> list_del_rcu(&dma_chan->device_node);
>>>> }
>>>> @@ -766,8 +770,8 @@ void ccp_dmaengine_unregister(struct ccp_device *ccp)
>>>> if (!dmaengine)
>>>> return;
>>>>
>>>> - dma_async_device_unregister(dma_dev);
>>>> ccp_dma_release(ccp);
>>>> + dma_async_device_unregister(dma_dev);
>>>>
>>>> kmem_cache_destroy(ccp->dma_desc_cache);
>>>> kmem_cache_destroy(ccp->dma_cmd_cache);