From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6203DA034F for ; Tue, 1 Mar 2022 11:45:47 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5D178407FF; Tue, 1 Mar 2022 11:45:47 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 83BAA426ED for ; Tue, 1 Mar 2022 11:45:46 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646131546; 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=4PZS3FPyP5r2haMhyOHiw9vsZCRncA429WT2CN6c5NA=; b=B1Ib2w8HSSIIyOrZXGaNDzTUxF6e5g2lrJo2nNGVHLYuS2rZ6H+L66H8JkUVhIjuU7mCPv LDfMpiWOor6DGwVoDToL/VDeADiGwDbgI0hBzcySKshwZh1wk0uB8CmbcazJsiwHiF5j9s KowaMwqRQ2uJzWG7Br53tTxAVsFCkKk= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-166-N3LxZxfoMUqkeml0IzHQRw-1; Tue, 01 Mar 2022 05:45:43 -0500 X-MC-Unique: N3LxZxfoMUqkeml0IzHQRw-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EAA6F186833B; Tue, 1 Mar 2022 10:45:41 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.142]) by smtp.corp.redhat.com (Postfix) with ESMTP id ADF41752C7; Tue, 1 Mar 2022 10:45:40 +0000 (UTC) From: Kevin Traynor To: Dawid Gorecki Cc: Michal Krawczyk , Shai Brandes , dpdk stable Subject: patch 'net/ena: check memory BAR before initializing LLQ' has been queued to stable release 21.11.1 Date: Tue, 1 Mar 2022 10:42:33 +0000 Message-Id: <20220301104300.334382-77-ktraynor@redhat.com> In-Reply-To: <20220301104300.334382-1-ktraynor@redhat.com> References: <20220301104300.334382-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 Hi, FYI, your patch has been queued to stable release 21.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/06/22. 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 This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/9ec0a2b6cf2eee8e416f08538656ad2017054439 Thanks. Kevin --- >From 9ec0a2b6cf2eee8e416f08538656ad2017054439 Mon Sep 17 00:00:00 2001 From: Dawid Gorecki Date: Wed, 23 Feb 2022 13:19:42 +0100 Subject: [PATCH] net/ena: check memory BAR before initializing LLQ [ upstream commit 9ae7a13f8247319f63402107c8304ba57c3f4308 ] The ena_com_config_dev_mode() performs many calculations related to LLQ and then performs an admin queue call to configure LLQ in the device. All of the operations performed by ena_com_config_dev_mode() are unnecessary if membar hasn't been found. Move the dev_mem_base check before ena_com_config_dev_mode() call. This prevents the unnecessary operations from being performed. Fixes: 2fca2a98c0d1 ("net/ena: support LLQv2") Signed-off-by: Dawid Gorecki Reviewed-by: Michal Krawczyk Reviewed-by: Shai Brandes --- drivers/net/ena/ena_ethdev.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c index 87eef882db..80fcaf300a 100644 --- a/drivers/net/ena/ena_ethdev.c +++ b/drivers/net/ena/ena_ethdev.c @@ -1689,4 +1689,11 @@ ena_set_queues_placement_policy(struct ena_adapter *adapter, } + if (adapter->dev_mem_base == NULL) { + PMD_DRV_LOG(ERR, + "LLQ is advertised as supported, but device doesn't expose mem bar\n"); + ena_dev->tx_mem_queue_type = ENA_ADMIN_PLACEMENT_POLICY_HOST; + return 0; + } + rc = ena_com_config_dev_mode(ena_dev, llq, llq_default_configurations); if (unlikely(rc)) { @@ -1701,11 +1708,4 @@ ena_set_queues_placement_policy(struct ena_adapter *adapter, return 0; - if (!adapter->dev_mem_base) { - PMD_DRV_LOG(ERR, - "Unable to access LLQ BAR resource. Fallback to host mode policy.\n"); - ena_dev->tx_mem_queue_type = ENA_ADMIN_PLACEMENT_POLICY_HOST; - return 0; - } - ena_dev->mem_bar = adapter->dev_mem_base; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-01 10:41:03.531597487 +0000 +++ 0077-net-ena-check-memory-BAR-before-initializing-LLQ.patch 2022-03-01 10:41:01.397244117 +0000 @@ -1 +1 @@ -From 9ae7a13f8247319f63402107c8304ba57c3f4308 Mon Sep 17 00:00:00 2001 +From 9ec0a2b6cf2eee8e416f08538656ad2017054439 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 9ae7a13f8247319f63402107c8304ba57c3f4308 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -25 +26 @@ -index b471102ea9..151c688eec 100644 +index 87eef882db..80fcaf300a 100644 @@ -28 +29 @@ -@@ -1954,4 +1954,11 @@ ena_set_queues_placement_policy(struct ena_adapter *adapter, +@@ -1689,4 +1689,11 @@ ena_set_queues_placement_policy(struct ena_adapter *adapter, @@ -40 +41 @@ -@@ -1966,11 +1973,4 @@ ena_set_queues_placement_policy(struct ena_adapter *adapter, +@@ -1701,11 +1708,4 @@ ena_set_queues_placement_policy(struct ena_adapter *adapter,