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 85688A0093 for ; Tue, 19 May 2020 15:09:08 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7E83D1D689; Tue, 19 May 2020 15:09:08 +0200 (CEST) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by dpdk.org (Postfix) with ESMTP id 63C641D689 for ; Tue, 19 May 2020 15:09:07 +0200 (CEST) Received: by mail-wr1-f65.google.com with SMTP id v12so15783996wrp.12 for ; Tue, 19 May 2020 06:09:07 -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 :mime-version:content-transfer-encoding; bh=PBoS7wyBE64bfLDQvdjii4UZlhxWXLUaN2zkXkeZy8k=; b=okuXUqvpO2avWzms5+9mcUNx9N8/PHMjbcf9SPotfLUuZoj2dnKz591UiM8vzOieGU NvX981IKmkCUTrt+3x6m02ymtbluIo5IKfVXRpWlPFCSkcj+l6MHHQzA6DrKcOX9GpIT E0KCW/FX7xFdyZJT3sqZdFYp6/cRT7YGkMikv0TIkRHkq8gjZNztVKic8xVpDX8i8zFQ hy9B3rjj343ysxQ1Gcjm5/IYyqA40iMbLroXlktifmEerQqOfZDkM/Hg9mBpq5itKnTd D7YszKNXoddXCrJeGa6D/HT7QW8k6qSiLSFMmWPBz0DMuK+Udt4d5Ww+1CbFZRl7RMhA 9gbw== 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:mime-version:content-transfer-encoding; bh=PBoS7wyBE64bfLDQvdjii4UZlhxWXLUaN2zkXkeZy8k=; b=XmCPRrsy7m54IdItFHPL4+t7HClpWQ6XVlDiKcG+fb1buZuk9geCD600lbON32WRKM btwmx9LdSjMBfULpUj6j7uu8Pu02atmv5HXV3qre+oZeUq40+/4PlHKZjMKYIoc88hOP OFYB9oDa5u77D1DBKWi2oQTij7rNWcQigpZQE5cL1yQePVkfJCH+YhiPW6BZoEEiv3ow ojOevrV2LGeGudxqLADX340YGniMsbaq4L6R2bM1Zq8Mi6lqim1gWA6lUMkHLWkA9KD1 BOUsIRYtxFaUNFs1+mHq/7Z7irO3C2JBqg+/1tm97RgovtYwOBDfIYUdnYeEmqkSpRnZ FrWw== X-Gm-Message-State: AOAM530Sm/4kQMqnM299DRcW9HfMyELVrEh/pb3pzZdWx4MqCu3oNwgb Zk0iy9vtsijgbPSqyNiHtrzTEDfNSE4wtR4m X-Google-Smtp-Source: ABdhPJz8GyxbRf/PPt4n1UIlZXHlbjf+CuY7+0O0/OQuWUGrOF2aqyrIzpgvzb8gu+ZtGcKXQTdHYg== X-Received: by 2002:adf:fdc5:: with SMTP id i5mr24820850wrs.176.1589893747159; Tue, 19 May 2020 06:09:07 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id u7sm3842256wmm.8.2020.05.19.06.09.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:09:06 -0700 (PDT) From: luca.boccassi@gmail.com To: Michal Krawczyk Cc: Igor Chauskin , Guy Tzalik , dpdk stable Date: Tue, 19 May 2020 14:03:16 +0100 Message-Id: <20200519130549.112823-61-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> <20200519130549.112823-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ena: set IO ring size to valid value' has been queued to stable release 19.11.3 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 stable release 19.11.3 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/21/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. Thanks. Luca Boccassi --- >From 2c0c0e482038746ef7994021ba805dd2061823d2 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 758d68d10b..36e9b4ad9e 100644 --- a/drivers/net/ena/ena_ethdev.c +++ b/drivers/net/ena/ena_ethdev.c @@ -1079,16 +1079,15 @@ static int ena_create_io_queue(struct ena_ring *ring) ena_qid = ENA_IO_TXQ_IDX(ring->id); 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; } else { 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 */ ctx.numa_node = ring->numa_socket_id; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:46.979293429 +0100 +++ 0061-net-ena-set-IO-ring-size-to-valid-value.patch 2020-05-19 14:04:44.208648228 +0100 @@ -1,8 +1,10 @@ -From badc3a6aa133a886a61b9e3ad666e5675f7ec3d3 Mon Sep 17 00:00:00 2001 +From 2c0c0e482038746ef7994021ba805dd2061823d2 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. @@ -10,7 +12,6 @@ the adapter which is indicating the maximum allowed value. Fixes: df238f84c0a2 ("net/ena: recreate HW IO rings on start and stop") -Cc: stable@dpdk.org Signed-off-by: Michal Krawczyk Reviewed-by: Igor Chauskin @@ -20,10 +21,10 @@ 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c -index f1202d99f2..62e26a2a16 100644 +index 758d68d10b..36e9b4ad9e 100644 --- a/drivers/net/ena/ena_ethdev.c +++ b/drivers/net/ena/ena_ethdev.c -@@ -1099,16 +1099,15 @@ static int ena_create_io_queue(struct ena_ring *ring) +@@ -1079,16 +1079,15 @@ static int ena_create_io_queue(struct ena_ring *ring) ena_qid = ENA_IO_TXQ_IDX(ring->id); ctx.direction = ENA_COM_IO_QUEUE_DIRECTION_TX; ctx.mem_queue_type = ena_dev->tx_mem_queue_type;