From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by dpdk.org (Postfix) with ESMTP id 3F6C22A62 for ; Sun, 22 Apr 2018 17:11:14 +0200 (CEST) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id E100C212DE; Sun, 22 Apr 2018 11:11:13 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Sun, 22 Apr 2018 11:11:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fridaylinux.org; h=cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=P3N7Wh02h+8Gggrrm MzcW+5VVmxN+stTHEnZOky/IK4=; b=LGZw6uCNV4S2NVa4adsq+EWEn2icI7277 f5l280RrWeu2POu8+bKGT+qwzfX+HLclKyXQOCtaejjMlsBlWaCrVEDQC/NqMX04 QWqVuHm4fUPLl6qDmtEoKNkMot+37nLXF5kNKn6sd9OMDcPfzKZj3s8PFCgkuGQY ciElEd1gIFUPK3IWlmtwCGHIlekNjW7lu0pgK4kVMCeyVSg/0CYbgYPl21LBhd9a /t0SF69PjyEOtkQDnTp6q7efUfHkq/eDIZRnAUHYqUkQ4PVLJ2v33yy6kNYbiokE OdIaAq7m+cD0x7F5MeklpM34WnCDVCsWGHiylG9TSnNUcT9l6Ljdw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=P3N7Wh02h+8GggrrmMzcW+5VVmxN+stTHEnZOky/IK4=; b=e9di/7mH 8XdPmlw2HxCRBvwaMf+MrruAVP3aRqPhBXlI5XfgkfVNRpNStx0ljP/NugiwuHOo 1tYEsoNhc4P0MwAOCRW3MglSvii/hDXWNvJgyOGDPfSZkAhOa8RDt3j+xZ/iyRct WPzQ+2SHj+DVvHTnoVp3HTosK6QrBH8EBU81yKVkvwgNCpcJOK2IXhLq5/bh7hbc +1MZ48ILtgen7aeVAB2A9G8R4edOAFPWKyaJ+nyzSlw/LCkpGvjI2Sgkq/0Vrp0t QxjjI2rD2k+stsvXJeUuEUi9oI1uHhYvL14bVaEAmeYHxi7rT3dt+fvIq6pgoqks mAhNZ937u410ow== X-ME-Sender: Received: from yuanhanliu-NB0.tencent.com (unknown [223.74.148.66]) by mail.messagingengine.com (Postfix) with ESMTPA id 1F08D10261; Sun, 22 Apr 2018 11:11:11 -0400 (EDT) From: Yuanhan Liu To: Chas Williams Cc: Shrikrishna Khare , dpdk stable Date: Sun, 22 Apr 2018 23:09:15 +0800 Message-Id: <20180422150949.17523-25-yliu@fridaylinux.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180422150949.17523-1-yliu@fridaylinux.org> References: <20180422150949.17523-1-yliu@fridaylinux.org> Subject: [dpdk-stable] patch 'net/vmxnet3: set the queue shared buffer at start' has been queued to LTS release 17.11.2 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: Sun, 22 Apr 2018 15:11:14 -0000 Hi, FYI, your patch has been queued to LTS release 17.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 04/29/18. So please shout if anyone has objections. Thanks. --yliu --- >>From 0cef16ac7a9ef0e2be016f54e515883afda528a6 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 93d96499c..7669c64d0 100644 --- a/drivers/net/vmxnet3/vmxnet3_ethdev.c +++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c @@ -670,6 +670,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; @@ -690,6 +692,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 aa396ab28..940068ff2 100644 --- a/drivers/net/vmxnet3/vmxnet3_rxtx.c +++ b/drivers/net/vmxnet3/vmxnet3_rxtx.c @@ -937,7 +937,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; @@ -1040,7 +1040,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.11.0