linux-crypto.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] crypto: ccp: Fix double add when creating new DMA command
@ 2017-01-27 23:09 Gary R Hook
  2017-02-02 17:15 ` Gary R Hook
  2017-02-03 10:21 ` Herbert Xu
  0 siblings, 2 replies; 3+ messages in thread
From: Gary R Hook @ 2017-01-27 23:09 UTC (permalink / raw)
  To: linux-crypto; +Cc: thomas.lendacky, herbert, davem

Eliminate a double-add by creating a new list to manage
command descriptors when created; move the descriptor to
the pending list when the command is submitted. This


Signed-off-by: Gary R Hook <gary.hook@amd.com>
---
 drivers/crypto/ccp/ccp-dev.h       |    1 +
 drivers/crypto/ccp/ccp-dmaengine.c |    6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/crypto/ccp/ccp-dev.h b/drivers/crypto/ccp/ccp-dev.h
index 830f35e..649e561 100644
--- a/drivers/crypto/ccp/ccp-dev.h
+++ b/drivers/crypto/ccp/ccp-dev.h
@@ -238,6 +238,7 @@ struct ccp_dma_chan {
 	struct ccp_device *ccp;
 
 	spinlock_t lock;
+	struct list_head created;
 	struct list_head pending;
 	struct list_head active;
 	struct list_head complete;
diff --git a/drivers/crypto/ccp/ccp-dmaengine.c b/drivers/crypto/ccp/ccp-dmaengine.c
index 6553912..e5d9278 100644
--- a/drivers/crypto/ccp/ccp-dmaengine.c
+++ b/drivers/crypto/ccp/ccp-dmaengine.c
@@ -63,6 +63,7 @@ static void ccp_free_chan_resources(struct dma_chan *dma_chan)
 	ccp_free_desc_resources(chan->ccp, &chan->complete);
 	ccp_free_desc_resources(chan->ccp, &chan->active);
 	ccp_free_desc_resources(chan->ccp, &chan->pending);
+	ccp_free_desc_resources(chan->ccp, &chan->created);
 
 	spin_unlock_irqrestore(&chan->lock, flags);
 }
@@ -273,6 +274,7 @@ static dma_cookie_t ccp_tx_submit(struct dma_async_tx_descriptor *tx_desc)
 	spin_lock_irqsave(&chan->lock, flags);
 
 	cookie = dma_cookie_assign(tx_desc);
+	list_del(&desc->entry);
 	list_add_tail(&desc->entry, &chan->pending);
 
 	spin_unlock_irqrestore(&chan->lock, flags);
@@ -426,7 +428,7 @@ static struct ccp_dma_desc *ccp_create_desc(struct dma_chan *dma_chan,
 
 	spin_lock_irqsave(&chan->lock, sflags);
 
-	list_add_tail(&desc->entry, &chan->pending);
+	list_add_tail(&desc->entry, &chan->created);
 
 	spin_unlock_irqrestore(&chan->lock, sflags);
 
@@ -610,6 +612,7 @@ static int ccp_terminate_all(struct dma_chan *dma_chan)
 	/*TODO: Purge the complete list? */
 	ccp_free_desc_resources(chan->ccp, &chan->active);
 	ccp_free_desc_resources(chan->ccp, &chan->pending);
+	ccp_free_desc_resources(chan->ccp, &chan->created);
 
 	spin_unlock_irqrestore(&chan->lock, flags);
 
@@ -679,6 +682,7 @@ int ccp_dmaengine_register(struct ccp_device *ccp)
 		chan->ccp = ccp;
 
 		spin_lock_init(&chan->lock);
+		INIT_LIST_HEAD(&chan->created);
 		INIT_LIST_HEAD(&chan->pending);
 		INIT_LIST_HEAD(&chan->active);
 		INIT_LIST_HEAD(&chan->complete);

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

* Re: [PATCH] crypto: ccp: Fix double add when creating new DMA command
  2017-01-27 23:09 [PATCH] crypto: ccp: Fix double add when creating new DMA command Gary R Hook
@ 2017-02-02 17:15 ` Gary R Hook
  2017-02-03 10:21 ` Herbert Xu
  1 sibling, 0 replies; 3+ messages in thread
From: Gary R Hook @ 2017-02-02 17:15 UTC (permalink / raw)
  To: linux-crypto; +Cc: herbert, davem

On 01/27/2017 05:09 PM, Gary R Hook wrote:
> Eliminate a double-add by creating a new list to manage
> command descriptors when created; move the descriptor to
> the pending list when the command is submitted.

Herbert,

Another patch that could use some 4.10 love. Possible?

Thanks,
Gary

>
>
> Signed-off-by: Gary R Hook <gary.hook@amd.com>
> ---
>  drivers/crypto/ccp/ccp-dev.h       |    1 +
>  drivers/crypto/ccp/ccp-dmaengine.c |    6 +++++-
>  2 files changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/crypto/ccp/ccp-dev.h b/drivers/crypto/ccp/ccp-dev.h
> index 830f35e..649e561 100644
> --- a/drivers/crypto/ccp/ccp-dev.h
> +++ b/drivers/crypto/ccp/ccp-dev.h
> @@ -238,6 +238,7 @@ struct ccp_dma_chan {
>  	struct ccp_device *ccp;
>
>  	spinlock_t lock;
> +	struct list_head created;
>  	struct list_head pending;
>  	struct list_head active;
>  	struct list_head complete;
> diff --git a/drivers/crypto/ccp/ccp-dmaengine.c b/drivers/crypto/ccp/ccp-dmaengine.c
> index 6553912..e5d9278 100644
> --- a/drivers/crypto/ccp/ccp-dmaengine.c
> +++ b/drivers/crypto/ccp/ccp-dmaengine.c
> @@ -63,6 +63,7 @@ static void ccp_free_chan_resources(struct dma_chan *dma_chan)
>  	ccp_free_desc_resources(chan->ccp, &chan->complete);
>  	ccp_free_desc_resources(chan->ccp, &chan->active);
>  	ccp_free_desc_resources(chan->ccp, &chan->pending);
> +	ccp_free_desc_resources(chan->ccp, &chan->created);
>
>  	spin_unlock_irqrestore(&chan->lock, flags);
>  }
> @@ -273,6 +274,7 @@ static dma_cookie_t ccp_tx_submit(struct dma_async_tx_descriptor *tx_desc)
>  	spin_lock_irqsave(&chan->lock, flags);
>
>  	cookie = dma_cookie_assign(tx_desc);
> +	list_del(&desc->entry);
>  	list_add_tail(&desc->entry, &chan->pending);
>
>  	spin_unlock_irqrestore(&chan->lock, flags);
> @@ -426,7 +428,7 @@ static struct ccp_dma_desc *ccp_create_desc(struct dma_chan *dma_chan,
>
>  	spin_lock_irqsave(&chan->lock, sflags);
>
> -	list_add_tail(&desc->entry, &chan->pending);
> +	list_add_tail(&desc->entry, &chan->created);
>
>  	spin_unlock_irqrestore(&chan->lock, sflags);
>
> @@ -610,6 +612,7 @@ static int ccp_terminate_all(struct dma_chan *dma_chan)
>  	/*TODO: Purge the complete list? */
>  	ccp_free_desc_resources(chan->ccp, &chan->active);
>  	ccp_free_desc_resources(chan->ccp, &chan->pending);
> +	ccp_free_desc_resources(chan->ccp, &chan->created);
>
>  	spin_unlock_irqrestore(&chan->lock, flags);
>
> @@ -679,6 +682,7 @@ int ccp_dmaengine_register(struct ccp_device *ccp)
>  		chan->ccp = ccp;
>
>  		spin_lock_init(&chan->lock);
> +		INIT_LIST_HEAD(&chan->created);
>  		INIT_LIST_HEAD(&chan->pending);
>  		INIT_LIST_HEAD(&chan->active);
>  		INIT_LIST_HEAD(&chan->complete);
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-crypto" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>

-- 
This is my day job. Follow me at:
IG/Twitter/Facebook: @grhookphoto
IG/Twitter/Facebook: @grhphotographer

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

* Re: [PATCH] crypto: ccp: Fix double add when creating new DMA command
  2017-01-27 23:09 [PATCH] crypto: ccp: Fix double add when creating new DMA command Gary R Hook
  2017-02-02 17:15 ` Gary R Hook
@ 2017-02-03 10:21 ` Herbert Xu
  1 sibling, 0 replies; 3+ messages in thread
From: Herbert Xu @ 2017-02-03 10:21 UTC (permalink / raw)
  To: Gary R Hook; +Cc: linux-crypto, thomas.lendacky, davem

On Fri, Jan 27, 2017 at 05:09:04PM -0600, Gary R Hook wrote:
> Eliminate a double-add by creating a new list to manage
> command descriptors when created; move the descriptor to
> the pending list when the command is submitted. This
> 
> 
> Signed-off-by: Gary R Hook <gary.hook@amd.com>

Patch 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] 3+ messages in thread

end of thread, other threads:[~2017-02-03 10:22 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-27 23:09 [PATCH] crypto: ccp: Fix double add when creating new DMA command Gary R Hook
2017-02-02 17:15 ` Gary R Hook
2017-02-03 10:21 ` Herbert Xu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).