diff mbox

[dpdk-dev,v2] enic: fix incorrect setting of rx descriptor limit

Message ID 1458326014-30910-1-git-send-email-johndale@cisco.com (mailing list archive)
State Accepted, archived
Delegated to: Bruce Richardson
Headers

Commit Message

John Daley (johndale) March 18, 2016, 6:33 p.m. UTC 
From: Nelson Escobar <neescoba@cisco.com>

On initialization, the rq descriptor count was set to the limit
of the vic.  When the requested number of rx descriptors was
less than this count, enic_alloc_rq() was incorrectly setting
the count to the lower value.  This results in later calls to
enic_alloc_rq() incorrectly using the lower value as the adapter
limit.

Signed-off-by: Nelson Escobar <neescoba@cisco.com>
Fixes: fefed3d1e62c ("enic: new driver")
Reviewed-by: John Daley <johndale@cisco.com>
---
fix checkin comment
 drivers/net/enic/enic_main.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

Comments

Bruce Richardson March 22, 2016, 5:32 p.m. UTC | #1 
On Fri, Mar 18, 2016 at 11:33:34AM -0700, John Daley wrote:
> From: Nelson Escobar <neescoba@cisco.com>
> 
> On initialization, the rq descriptor count was set to the limit
> of the vic.  When the requested number of rx descriptors was
> less than this count, enic_alloc_rq() was incorrectly setting
> the count to the lower value.  This results in later calls to
> enic_alloc_rq() incorrectly using the lower value as the adapter
> limit.
> 
> Signed-off-by: Nelson Escobar <neescoba@cisco.com>
> Fixes: fefed3d1e62c ("enic: new driver")
> Reviewed-by: John Daley <johndale@cisco.com>

Please put the fixes line above the signoffs, not in the middle of them. It just
makes it easier to read. I'll fix this for this patch when applying it.

/Bruce
Bruce Richardson March 22, 2016, 5:33 p.m. UTC | #2 
On Tue, Mar 22, 2016 at 05:32:41PM +0000, Bruce Richardson wrote:
> On Fri, Mar 18, 2016 at 11:33:34AM -0700, John Daley wrote:
> > From: Nelson Escobar <neescoba@cisco.com>
> > 
> > On initialization, the rq descriptor count was set to the limit
> > of the vic.  When the requested number of rx descriptors was
> > less than this count, enic_alloc_rq() was incorrectly setting
> > the count to the lower value.  This results in later calls to
> > enic_alloc_rq() incorrectly using the lower value as the adapter
> > limit.
> > 
> > Signed-off-by: Nelson Escobar <neescoba@cisco.com>
> > Fixes: fefed3d1e62c ("enic: new driver")
> > Reviewed-by: John Daley <johndale@cisco.com>
> 
> Please put the fixes line above the signoffs, not in the middle of them. It just
> makes it easier to read. I'll fix this for this patch when applying it.
> 
> /Bruce

Applied to dpdk-next-net/rel_16_04

/Bruce
diff mbox

Patch

diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c
index 9fff020..cd7857f 100644
--- a/drivers/net/enic/enic_main.c
+++ b/drivers/net/enic/enic_main.c
@@ -524,24 +524,22 @@  int enic_alloc_rq(struct enic *enic, uint16_t queue_idx,
 				"policy.  Applying the value in the adapter "\
 				"policy (%d).\n",
 				queue_idx, nb_desc, enic->config.rq_desc_count);
-		} else if (nb_desc != enic->config.rq_desc_count) {
-			enic->config.rq_desc_count = nb_desc;
-			dev_info(enic,
-				"RX Queues - effective number of descs:%d\n",
-				nb_desc);
+			nb_desc = enic->config.rq_desc_count;
 		}
+		dev_info(enic, "RX Queues - effective number of descs:%d\n",
+			 nb_desc);
 	}
 
 	/* Allocate queue resources */
 	rc = vnic_rq_alloc(enic->vdev, rq, queue_idx,
-		enic->config.rq_desc_count, sizeof(struct rq_enet_desc));
+		nb_desc, sizeof(struct rq_enet_desc));
 	if (rc) {
 		dev_err(enic, "error in allocation of rq\n");
 		goto err_exit;
 	}
 
 	rc = vnic_cq_alloc(enic->vdev, &enic->cq[queue_idx], queue_idx,
-		socket_id, enic->config.rq_desc_count,
+		socket_id, nb_desc,
 		sizeof(struct cq_enet_rq_desc));
 	if (rc) {
 		dev_err(enic, "error in allocation of cq for rq\n");
@@ -550,7 +548,7 @@  int enic_alloc_rq(struct enic *enic, uint16_t queue_idx,
 
 	/* Allocate the mbuf ring */
 	rq->mbuf_ring = (struct rte_mbuf **)rte_zmalloc_socket("rq->mbuf_ring",
-			sizeof(struct rte_mbuf *) * enic->config.rq_desc_count,
+			sizeof(struct rte_mbuf *) * nb_desc,
 			RTE_CACHE_LINE_SIZE, rq->socket_id);
 
 	if (rq->mbuf_ring != NULL)