From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by dpdk.org (Postfix) with ESMTP id 5BA0D2C23 for ; Tue, 1 May 2018 12:46:59 +0200 (CEST) Received: by mail-wr0-f194.google.com with SMTP id i14-v6so7313425wre.2 for ; Tue, 01 May 2018 03:46:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=wSXAOm+ZgBEPHnRXoazGrgxt7rZuuczP+Eg/Kmei+08=; b=PyhXPTt0NA8FQnDETQjWuJVRCjLLWwBJml2YLhDgepW5nEk4TWSbObVvfszMDEGFIE UcUL8H8mJYyZvPOcWuab5/trzL55IJ4cm74bKwmreEvwl0loFt+3X1MeJh2enWgVkVk4 ysJ0fgPh+WlxOi7yshFP7R8Hd1u0noKonvoc7Un4EJn+74So//YGlpGXEECBFOQRYR66 0jEe+U4ha68UoGXH4wFbyNBoEE8tmbDfQWliQn2CSPAaB5bSaYZqvJ7qhdT6u3pVXJUa +jgN1FUPX1NDMBm6oK8pGOEY0IRWHiPEfz8atAOUqwaWNsJ/Yg5+LAt1CT3NC5omQcwT 2Pnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=wSXAOm+ZgBEPHnRXoazGrgxt7rZuuczP+Eg/Kmei+08=; b=GVC4yLfvoszM3rYDaTM110Q8NQJtLDT90I3qe9Nqu1NTvxoz2l4lGYp2Vnf2nSKokV W50/lcw96ofsy3xVvVV+sr6vTMcgry3UIXVCJd5XRCEM1NTa7lurNVEQs60M8dWTT851 BImeYzvtddCFEeNSL1gVTEUsryY2xf0nMGrKF+VExsWfXu7JnnTTTnZWBTuAbLkrlqzS QelctydFNm2UtUY1zXHkAOywtj3zmu1MDMt0MCSUzJF0FtWpcd1WIHW6EY74IDvjOW5h RtsKOqTxTUsgZv+QTd6gvJxz57Ape9uLM3ib+L/LpbqWsy+uow4KTW1CsI+xDxzF/xcW ql/A== X-Gm-Message-State: ALQs6tA2hrs0iCi85FjS57DmiAf2HUKOXFCcTAedHMnnaJTV8PkVqZ8n JVonNab2W1/7EkfomqGtJX8sSk0KReA= X-Google-Smtp-Source: AB8JxZrbSO/y1QJpFmHU4Yjr5zKQRgtcrLippEzR7bbKlEHwaR1cFtX3sSt+9XXfnDX6xq36PgPAfg== X-Received: by 2002:adf:a6f8:: with SMTP id t111-v6mr11308474wrc.161.1525171618688; Tue, 01 May 2018 03:46:58 -0700 (PDT) Received: from localhost (slip139-92-244-193.lon.uk.prserv.net. [139.92.244.193]) by smtp.gmail.com with ESMTPSA id u187sm8323880wmu.46.2018.05.01.03.46.57 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 01 May 2018 03:46:57 -0700 (PDT) From: luca.boccassi@gmail.com To: Chas Williams Cc: Shrikrishna Khare , dpdk stable Date: Tue, 1 May 2018 11:44:39 +0100 Message-Id: <20180501104509.17238-16-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20180501104509.17238-1-luca.boccassi@gmail.com> References: <20180501104509.17238-1-luca.boccassi@gmail.com> Subject: [dpdk-stable] patch 'net/vmxnet3: set the queue shared buffer at start' has been queued to LTS release 16.11.7 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 May 2018 10:46:59 -0000 Hi, FYI, your patch has been queued to LTS release 16.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/03/18. So please shout if anyone has objections. Thanks. Luca Boccassi --- >>From 515e9bcd87792530f384a6f40649a7cf8c008734 Mon Sep 17 00:00:00 2001 From: Chas Williams Date: Wed, 17 Jan 2018 10:04:56 -0500 Subject: [PATCH] net/vmxnet3: set the queue shared buffer at start [ upstream commit 3e5810f31d9cafe1a49a098372467c1eda3bf4aa ] If a reconfiguration happens, queuedesc is reallocated. Any queues that are preserved point to the previous queuedesc since the queues are only configured during queue setup. Delay configuration of the shared queue pointers until device start when queuedesc is no longer changing. Fixes: 8618d19b52b1 ("net/vmxnet3: reallocate shared memzone on re-config") Signed-off-by: Chas Williams Acked-by: Shrikrishna Khare --- drivers/net/vmxnet3/vmxnet3_ethdev.c | 4 ++++ drivers/net/vmxnet3/vmxnet3_rxtx.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c index 9a889c6fb..effb360b4 100644 --- a/drivers/net/vmxnet3/vmxnet3_ethdev.c +++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c @@ -488,6 +488,8 @@ vmxnet3_setup_driver_shared(struct rte_eth_dev *dev) Vmxnet3_TxQueueDesc *tqd = &hw->tqd_start[i]; vmxnet3_tx_queue_t *txq = dev->data->tx_queues[i]; + txq->shared = &hw->tqd_start[i]; + tqd->ctrl.txNumDeferred = 0; tqd->ctrl.txThreshold = 1; tqd->conf.txRingBasePA = txq->cmd_ring.basePA; @@ -507,6 +509,8 @@ vmxnet3_setup_driver_shared(struct rte_eth_dev *dev) Vmxnet3_RxQueueDesc *rqd = &hw->rqd_start[i]; vmxnet3_rx_queue_t *rxq = dev->data->rx_queues[i]; + rxq->shared = &hw->rqd_start[i]; + rqd->conf.rxRingBasePA[0] = rxq->cmd_ring[0].basePA; rqd->conf.rxRingBasePA[1] = rxq->cmd_ring[1].basePA; rqd->conf.compRingBasePA = rxq->comp_ring.basePA; diff --git a/drivers/net/vmxnet3/vmxnet3_rxtx.c b/drivers/net/vmxnet3/vmxnet3_rxtx.c index 5ef7773b1..0a695883e 100644 --- a/drivers/net/vmxnet3/vmxnet3_rxtx.c +++ b/drivers/net/vmxnet3/vmxnet3_rxtx.c @@ -862,7 +862,7 @@ vmxnet3_dev_tx_queue_setup(struct rte_eth_dev *dev, txq->queue_id = queue_idx; txq->port_id = dev->data->port_id; - txq->shared = &hw->tqd_start[queue_idx]; + txq->shared = NULL; /* set in vmxnet3_setup_driver_shared() */ txq->hw = hw; txq->qid = queue_idx; txq->stopped = TRUE; @@ -963,7 +963,7 @@ vmxnet3_dev_rx_queue_setup(struct rte_eth_dev *dev, rxq->mp = mp; rxq->queue_id = queue_idx; rxq->port_id = dev->data->port_id; - rxq->shared = &hw->rqd_start[queue_idx]; + rxq->shared = NULL; /* set in vmxnet3_setup_driver_shared() */ rxq->hw = hw; rxq->qid1 = queue_idx; rxq->qid2 = queue_idx + hw->num_rx_queues; -- 2.14.2