From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id DA19EA0093 for ; Thu, 28 May 2020 18:25:52 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C326F1DC10; Thu, 28 May 2020 18:25:52 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by dpdk.org (Postfix) with ESMTP id B27921DC23 for ; Thu, 28 May 2020 18:25:51 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590683151; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=thEoAnfCoQaoLcExr4/Ty5OI+Gd+XL5gSf3kivKfbZo=; b=SdGOGe+PHKkiYvsUPmImn14hj9w1qNZwh36fRdbsWEkM3c3sln3Iui8DY4RgZbk/N+TBbk Za9Uamhh0+ADAZJnsf7pHJKYLinPozZUD9MC0/4XkQ+pCum4ILonAz4pIRi/0g1afRRoFh TGVkM7iWibee1WDvY+uZPeth8zHww9U= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-127-fCLoK-PQPMul0whTIicBGA-1; Thu, 28 May 2020 12:25:47 -0400 X-MC-Unique: fCLoK-PQPMul0whTIicBGA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 54DD3108BD09; Thu, 28 May 2020 16:25:46 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.235]) by smtp.corp.redhat.com (Postfix) with ESMTP id 474F5610D6; Thu, 28 May 2020 16:25:45 +0000 (UTC) From: Kevin Traynor To: Michal Krawczyk Cc: Igor Chauskin , Guy Tzalik , dpdk stable Date: Thu, 28 May 2020 17:22:56 +0100 Message-Id: <20200528162322.7863-69-ktraynor@redhat.com> In-Reply-To: <20200528162322.7863-1-ktraynor@redhat.com> References: <20200528162322.7863-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ena: set IO ring size to valid value' has been queued to LTS release 18.11.9 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: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/03/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/f21655156b911dbbeb703cfd68e94fc14f712003 Thanks. Kevin. --- >From f21655156b911dbbeb703cfd68e94fc14f712003 Mon Sep 17 00:00:00 2001 From: Michal Krawczyk Date: Wed, 8 Apr 2020 10:29:08 +0200 Subject: [PATCH] net/ena: set IO ring size to valid value [ upstream commit badc3a6aa133a886a61b9e3ad666e5675f7ec3d3 ] IO rings were configured with the maximum allowed size for the Tx/Rx rings. However, the application could decide to create smaller rings. This patch is using value stored in the ring instead of the value from the adapter which is indicating the maximum allowed value. Fixes: df238f84c0a2 ("net/ena: recreate HW IO rings on start and stop") Signed-off-by: Michal Krawczyk Reviewed-by: Igor Chauskin Reviewed-by: Guy Tzalik --- drivers/net/ena/ena_ethdev.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c index 493111a2a0..8afd82bc87 100644 --- a/drivers/net/ena/ena_ethdev.c +++ b/drivers/net/ena/ena_ethdev.c @@ -1044,5 +1044,4 @@ static int ena_create_io_queue(struct ena_ring *ring) ctx.direction = ENA_COM_IO_QUEUE_DIRECTION_TX; ctx.mem_queue_type = ena_dev->tx_mem_queue_type; - ctx.queue_size = adapter->tx_ring_size; for (i = 0; i < ring->ring_size; i++) ring->empty_tx_reqs[i] = i; @@ -1050,8 +1049,8 @@ static int ena_create_io_queue(struct ena_ring *ring) ena_qid = ENA_IO_RXQ_IDX(ring->id); ctx.direction = ENA_COM_IO_QUEUE_DIRECTION_RX; - ctx.queue_size = adapter->rx_ring_size; for (i = 0; i < ring->ring_size; i++) ring->empty_rx_reqs[i] = i; } + ctx.queue_size = ring->ring_size; ctx.qid = ena_qid; ctx.msix_vector = -1; /* interrupts not used */ -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-28 17:13:02.665427793 +0100 +++ 0069-net-ena-set-IO-ring-size-to-valid-value.patch 2020-05-28 17:12:59.150555292 +0100 @@ -1 +1 @@ -From badc3a6aa133a886a61b9e3ad666e5675f7ec3d3 Mon Sep 17 00:00:00 2001 +From f21655156b911dbbeb703cfd68e94fc14f712003 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit badc3a6aa133a886a61b9e3ad666e5675f7ec3d3 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index f1202d99f2..62e26a2a16 100644 +index 493111a2a0..8afd82bc87 100644 @@ -26 +27 @@ -@@ -1100,5 +1100,4 @@ static int ena_create_io_queue(struct ena_ring *ring) +@@ -1044,5 +1044,4 @@ static int ena_create_io_queue(struct ena_ring *ring) @@ -32 +33 @@ -@@ -1106,8 +1105,8 @@ static int ena_create_io_queue(struct ena_ring *ring) +@@ -1050,8 +1049,8 @@ static int ena_create_io_queue(struct ena_ring *ring)