From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by dpdk.org (Postfix) with ESMTP id AF5771C0B for ; Mon, 30 Apr 2018 16:07:56 +0200 (CEST) Received: by mail-wr0-f193.google.com with SMTP id 94-v6so6853985wrf.5 for ; Mon, 30 Apr 2018 07:07:56 -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=FgbpzhBo2QWaaUdogK5Z4Hqat16ihXyUVHungB57yf4=; b=b23pjjda3HN2kDE4ApGqeoTXTX/wELI4rrXFyTOZP+3XhA/mFV/rTaM/50r5k3czCV r+hgos6VK4YWErH37eCnUbPGimcQ7KEh8GCGV2/lymnlCMwWYn49XZYWQdHzyodPDvIf 5Xm8gdeQ/TZdrBwk5BOv1E4U+5teqiNHbc4CjwzDrL/tPDJsoskHSpT/+xyeqv0nBFCx KIqSThMEVm9xMzZVI84+p8NHieQR0iWoPhRJndtUfWuVZOwfRbsts/Ba9xrKBOZ6k24Z 7U9lxKPtw3bONl7ZCKx2IU6AsZN1S80jZiTB33I2qPm1bVPzVoQ8li7RpOcIOJt1GxXC YO/Q== 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=FgbpzhBo2QWaaUdogK5Z4Hqat16ihXyUVHungB57yf4=; b=jR2ZUIbP60+3StoKaYc7pdxA120tDLjcSBTj0ctApWMCI9yvwGwXwDdmIl4hyFaXQB cDidSgDtGslakTRgn1RwdWVJwCmffvCrNADpBHhPCHBmx9NjxyQ5R+uECkW2EEpxV7hc d+34ehLiNpAIB/0ZosmvDHS812off95RdjgwTU0+jCxVypNcdMA2XRkFZdIOf97YN/38 reY0KMz7Emy86g3egOPiNtT9E6NY9BN18d9Mu2XWkxdkMAtlFI7oBUSQLzZapU/MhM1G k59cRaLQZJSYSY3eHIdkpiDZxgSsWumcURXfYgC/kwXKyWt0v/3dPbnQ70e3cq6N9A8s 4UTg== X-Gm-Message-State: ALQs6tBLs+BDSiSPte84dz1U9RQ/8o4QZvzqrUXPU/r7zUpfrVLIjNFi b9PPIAsZ4ER2wp16+Rah1Mc= X-Google-Smtp-Source: AB8JxZrDevnoxVwVbZcPFFL9fTIVEwoBa48id+Bu4yq4Gj8ggTAzwF3ceke07H8HptXdmONqksGpTA== X-Received: by 2002:adf:c3cd:: with SMTP id d13-v6mr4213208wrg.282.1525097276430; Mon, 30 Apr 2018 07:07:56 -0700 (PDT) Received: from localhost ([2a00:23c5:be9a:5200:ce4c:82c0:d567:ecbb]) by smtp.gmail.com with ESMTPSA id k28-v6sm3599886wrk.46.2018.04.30.07.07.55 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 30 Apr 2018 07:07:55 -0700 (PDT) From: luca.boccassi@gmail.com To: Chas Williams Cc: Shrikrishna Khare , dpdk stable Date: Mon, 30 Apr 2018 15:03:36 +0100 Message-Id: <20180430140606.4615-58-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20180430140606.4615-1-luca.boccassi@gmail.com> References: <20180430140606.4615-1-luca.boccassi@gmail.com> Subject: [dpdk-stable] patch 'net/vmxnet3: set the queue shared buffer at start' has been queued to stable release 18.02.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: Mon, 30 Apr 2018 14:07:56 -0000 Hi, FYI, your patch has been queued to stable release 18.02.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 05/02/18. So please shout if anyone has objections. Thanks. Luca Boccassi --- >>From 278a1228bb45a9ed999c91e250b44d95a47f4111 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 4e68aae6b..f1c24c7bc 100644 --- a/drivers/net/vmxnet3/vmxnet3_ethdev.c +++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c @@ -644,6 +644,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; @@ -664,6 +666,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 3a8c62fc1..57557492e 100644 --- a/drivers/net/vmxnet3/vmxnet3_rxtx.c +++ b/drivers/net/vmxnet3/vmxnet3_rxtx.c @@ -910,7 +910,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; @@ -1013,7 +1013,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