Skip to contentSkip to conversation

mmc: cqhci: fix space allocated for transfer descriptor

PATCH In review Alamy Liu 3 participants 6 messages Feb 25, 2019 – Feb 27, 2019

Subsystems (3)
lore
Share & tools
lore

Alamy Liu

author
#0 lore raw

PATCH v2 1/2 mmc: cqhci: fix space allocated for transfer descriptor

There is not enough space being allocated when DCMD is disabled.

CQE_DCMD is not necessary to be enabled when CQE is enabled. (Software could halt CQE to send command)

In the case that CQE_DCMD is not enabled, it still needs to allocate space for data transfer. For instance:
CQE_DCMD is enabled: 31 slots space (one slot used by DCMD) CQE_DCMD is disabled: 32 slots space

Fixes a4080225f51d ("mmc: cqhci: support for command queue enabled host")
---
 drivers/mmc/host/cqhci.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mmc/host/cqhci.c +1 -1
index 4cc7863c13..974997b6cb 100644
@@ -202,7 +202,7 @@ static int cqhci_host_alloc_tdl(struct cqhci_host *cq_host)
 	cq_host->desc_size = cq_host->slot_sz * cq_host->num_slots;
 
 	cq_host->data_size = cq_host->trans_desc_len * cq_host->mmc->max_segs *
-		(cq_host->num_slots - 1);
+		cq_host->mmc->cqe_qdepth;
 
 	pr_debug("%s: cqhci: desc_size: %zu data_sz: %zu slot-sz: %d\n",
 		 mmc_hostname(cq_host->mmc), cq_host->desc_size, cq_host->data_size,
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH v2 2/2 mmc: cqhci: Fix a tiny potential memory leak on error condition

Free up the allocated memory in the case of error return

--- code study ---
The value of mmc_host->cqe_enabled stays 'false'.
Thus, cqhci_disable (mmc_cqe_ops->cqe_disable) won't be called to free the memory.
Also, cqhci_disable() seems to be designed to disable and free all resources, not suitable to handle this corner case.

Fixes a4080225f51d ("mmc: cqhci: support for command queue enabled host")
---
 drivers/mmc/host/cqhci.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/mmc/host/cqhci.c +10 -1
index 974997b6cb..795893ba47 100644
@@ -218,12 +218,21 @@ static int cqhci_host_alloc_tdl(struct cqhci_host *cq_host)
 						 cq_host->desc_size,
 						 &cq_host->desc_dma_base,
 						 GFP_KERNEL);
+	if (!cq_host->desc_base)
+		return -ENOMEM;
+
 	cq_host->trans_desc_base = dmam_alloc_coherent(mmc_dev(cq_host->mmc),
 					      cq_host->data_size,
 					      &cq_host->trans_desc_dma_base,
 					      GFP_KERNEL);
-	if (!cq_host->desc_base || !cq_host->trans_desc_base)
+	if (!cq_host->trans_desc_base) {
+		dmam_free_coherent(mmc_dev(cq_host->mmc), cq_host->desc_size,
+				   cq_host->desc_base,
+				   cq_host->desc_dma_base);
+		cq_host->desc_base = NULL;
+		cq_host->desc_dma_base = 0;
 		return -ENOMEM;
+	}
 
 	pr_debug("%s: cqhci: desc-base: 0x%p trans-base: 0x%p\n desc_dma 0x%llx trans_dma: 0x%llx\n",
 		 mmc_hostname(cq_host->mmc), cq_host->desc_base, cq_host->trans_desc_base,
Signature · 1 line
2.17.1
maintainer Acked-by on v2 2/2
#2 lore raw

Re: [PATCH v2 2/2] mmc: cqhci: Fix a tiny potential memory leak on error condition

Quoted 11 lines · Alamy Liu

Free up the allocated memory in the case of error return

--- code study ---
The value of mmc_host->cqe_enabled stays 'false'.
Thus, cqhci_disable (mmc_cqe_ops->cqe_disable) won't be called to free the memory.
Also, cqhci_disable() seems to be designed to disable and free all resources, not suitable to handle this corner case.

Fixes a4080225f51d ("mmc: cqhci: support for command queue enabled host")
Quoted 32 lines
---
 drivers/mmc/host/cqhci.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/mmc/host/cqhci.c +10 -1
index 974997b6cb..795893ba47 100644
@@ -218,12 +218,21 @@ static int cqhci_host_alloc_tdl(struct cqhci_host *cq_host)
 						 cq_host->desc_size,
 						 &cq_host->desc_dma_base,
 						 GFP_KERNEL);
+	if (!cq_host->desc_base)
+		return -ENOMEM;
+
 	cq_host->trans_desc_base = dmam_alloc_coherent(mmc_dev(cq_host->mmc),
 					      cq_host->data_size,
 					      &cq_host->trans_desc_dma_base,
 					      GFP_KERNEL);
-	if (!cq_host->desc_base || !cq_host->trans_desc_base)
+	if (!cq_host->trans_desc_base) {
+		dmam_free_coherent(mmc_dev(cq_host->mmc), cq_host->desc_size,
+				   cq_host->desc_base,
+				   cq_host->desc_dma_base);
+		cq_host->desc_base = NULL;
+		cq_host->desc_dma_base = 0;
 		return -ENOMEM;
+	}
 
 	pr_debug("%s: cqhci: desc-base: 0x%p trans-base: 0x%p\n desc_dma 0x%llx trans_dma: 0x%llx\n",
 		 mmc_hostname(cq_host->mmc), cq_host->desc_base, cq_host->trans_desc_base,
#3 lore raw

Re: [PATCH v2 2/2] mmc: cqhci: Fix a tiny potential memory leak on error condition

In reply to Alamy Liu
Quoted 4 lines · Alamy Liu

Free up the allocated memory in the case of error return

--- code study ---

Using three dashes makes "git am" believe this hole text snippet is a comment and drops it from the changelog. I fixed it up this time, no worries.

Quoted 8 lines

The value of mmc_host->cqe_enabled stays 'false'.
Thus, cqhci_disable (mmc_cqe_ops->cqe_disable) won't be called to free the memory.
Also, cqhci_disable() seems to be designed to disable and free all resources, not suitable to handle this corner case.

Fixes a4080225f51d ("mmc: cqhci: support for command queue enabled host")

Applied for fixes and added a stable tag, thanks!

Kind regards
Uffe

Quoted 34 lines
---
 drivers/mmc/host/cqhci.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/mmc/host/cqhci.c +10 -2
index 974997b6cb..795893ba47 100644
@@ -218,12 +218,21 @@ static int cqhci_host_alloc_tdl(struct cqhci_host *cq_host)
                                                 cq_host->desc_size,
                                                 &cq_host->desc_dma_base,
                                                 GFP_KERNEL);
+       if (!cq_host->desc_base)
+               return -ENOMEM;
+
        cq_host->trans_desc_base = dmam_alloc_coherent(mmc_dev(cq_host->mmc),
                                              cq_host->data_size,
                                              &cq_host->trans_desc_dma_base,
                                              GFP_KERNEL);
-       if (!cq_host->desc_base || !cq_host->trans_desc_base)
+       if (!cq_host->trans_desc_base) {
+               dmam_free_coherent(mmc_dev(cq_host->mmc), cq_host->desc_size,
+                                  cq_host->desc_base,
+                                  cq_host->desc_dma_base);
+               cq_host->desc_base = NULL;
+               cq_host->desc_dma_base = 0;
                return -ENOMEM;
+       }
 
        pr_debug("%s: cqhci: desc-base: 0x%p trans-base: 0x%p\n desc_dma 0x%llx trans_dma: 0x%llx\n",
                 mmc_hostname(cq_host->mmc), cq_host->desc_base, cq_host->trans_desc_base,
--

2.17.1

maintainer Acked-by on v2 1/2
#4 lore raw
In reply to Alamy Liu
Quoted 5 lines · Alamy Liu

There is not enough space being allocated when DCMD is disabled.

CQE_DCMD is not necessary to be enabled when CQE is enabled. (Software could halt CQE to send command)

Quoted 7 lines

In the case that CQE_DCMD is not enabled, it still needs to allocate space for data transfer. For instance:
CQE_DCMD is enabled: 31 slots space (one slot used by DCMD) CQE_DCMD is disabled: 32 slots space

Fixes a4080225f51d ("mmc: cqhci: support for command queue enabled host")
Quoted 18 lines
---
 drivers/mmc/host/cqhci.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mmc/host/cqhci.c +1 -1
index 4cc7863c13..974997b6cb 100644
@@ -202,7 +202,7 @@ static int cqhci_host_alloc_tdl(struct cqhci_host *cq_host)
 	cq_host->desc_size = cq_host->slot_sz * cq_host->num_slots;
 
 	cq_host->data_size = cq_host->trans_desc_len * cq_host->mmc->max_segs *
-		(cq_host->num_slots - 1);
+		cq_host->mmc->cqe_qdepth;
 
 	pr_debug("%s: cqhci: desc_size: %zu data_sz: %zu slot-sz: %d\n",
 		 mmc_hostname(cq_host->mmc), cq_host->desc_size, cq_host->data_size,
#5 lore raw
In reply to Alamy Liu
Quoted 6 lines · Alamy Liu

There is not enough space being allocated when DCMD is disabled.

CQE_DCMD is not necessary to be enabled when CQE is enabled. (Software could halt CQE to send command)

Quoted 7 lines

In the case that CQE_DCMD is not enabled, it still needs to allocate space for data transfer. For instance:
CQE_DCMD is enabled: 31 slots space (one slot used by DCMD) CQE_DCMD is disabled: 32 slots space

Fixes a4080225f51d ("mmc: cqhci: support for command queue enabled host")

Applied for fixes and added a stable tag, thanks!

Kind regards
Uffe

Quoted 20 lines
---
 drivers/mmc/host/cqhci.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mmc/host/cqhci.c +1 -2
index 4cc7863c13..974997b6cb 100644
@@ -202,7 +202,7 @@ static int cqhci_host_alloc_tdl(struct cqhci_host *cq_host)
        cq_host->desc_size = cq_host->slot_sz * cq_host->num_slots;
 
        cq_host->data_size = cq_host->trans_desc_len * cq_host->mmc->max_segs *
-               (cq_host->num_slots - 1);
+               cq_host->mmc->cqe_qdepth;
 
        pr_debug("%s: cqhci: desc_size: %zu data_sz: %zu slot-sz: %d\n",
                 mmc_hostname(cq_host->mmc), cq_host->desc_size, cq_host->data_size,
--

2.17.1