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 6C247A0350 for ; Mon, 28 Feb 2022 22:22:49 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5CD61411AE; Mon, 28 Feb 2022 22:22:49 +0100 (CET) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mails.dpdk.org (Postfix) with ESMTP id D1FDD411AE for ; Mon, 28 Feb 2022 22:22:46 +0100 (CET) Received: by mail-wr1-f41.google.com with SMTP id d3so17475621wrf.1 for ; Mon, 28 Feb 2022 13:22:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Y5nmaz+XmSHduPgVVEhTuflmfABWP3EBCwaEUBeZzbs=; b=oJ1uCoTlXGH21ESH4jyYZu74u9Q1Pfsds86NC3usrz/7exrL7Z1Nt8aZsSQhVLrect 4fmuv3AnZOIVHRQ/6uYLJs0T+RZGkWOjKcg7DQ4dd7BtS4nGQFnpIzI+3SGGAp6Ho1+S ujdrzipxnDUyMbVdBvj3Q21OX8VHIqNyLwlZeL+eP8aSCfAIz1vdbDOrnnVwt+nCbBaF 0cOTO+woOuggx9DYKPWWTEcdhml3GGWUmO676GwHia+cEUtypb1SZKINzKksxZDUWI8v zzfIopc9957gnrzMFHO4q75qRcsaOxUFuYhqH4XBIU5NCAHsI7LlqLfcMG6uVVpntbV7 1eBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Y5nmaz+XmSHduPgVVEhTuflmfABWP3EBCwaEUBeZzbs=; b=uv6eCNc7okfVtaNHQ6SqTz6BxBhEaI9WhGdcEqkVTZllPgPxFCEpcnpahQBYjNn10h CUO6Re2JWgZA4x+O+kQTLLi9OXp3gU1snNYNU3oVEXnEFflMA7J7xmN0rtLmpXkVQjak XHhJCClLmmskYiCFM/b8Ob/xDzV+rkdOn+rM45AjQkBK4mZl4rR+xiVXzxvKy7BAfZ0n JlByAPGZphDUFleseq9em2FmtuXZ/VrmzosOozrSOuaBexwsLmLNL6x1nC+XM1YSoexc wzG1CFYKNLWDX3m4jn+/zRlBF13rmAR4+ixIKkim14zQOmuQSfhq698aEIu+z5AYtTGG PolQ== X-Gm-Message-State: AOAM530mwYQeg1Mf+Phwdb0PEq8UcgxxWpjFjI7YNllw0CzS2PNa+oOq FKOCZzO45rmWpQiMnL5FfGg= X-Google-Smtp-Source: ABdhPJyOrQL4SMjLCI85FtUHV42zSi/5PEzvo7J5nw9+aRJapx67lljfLqJ94hd+GnJ9yv1it0F/RA== X-Received: by 2002:a5d:4a08:0:b0:1ed:b997:46d8 with SMTP id m8-20020a5d4a08000000b001edb99746d8mr16957908wrq.440.1646083366609; Mon, 28 Feb 2022 13:22:46 -0800 (PST) Received: from localhost ([2a01:4b00:f41a:3600:360b:9754:2e3a:c344]) by smtp.gmail.com with ESMTPSA id m26-20020a05600c3b1a00b003817ab146e9sm740509wms.44.2022.02.28.13.22.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Feb 2022 13:22:46 -0800 (PST) From: luca.boccassi@gmail.com 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 20.11.5 Date: Mon, 28 Feb 2022 21:20:35 +0000 Message-Id: <20220228212047.3341966-39-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220228212047.3341966-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-122-luca.boccassi@gmail.com> <20220228212047.3341966-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 20.11.5 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/02/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/c73e88da7076b205534dbe3bf4591471865900c6 Thanks. Luca Boccassi --- >From c73e88da7076b205534dbe3bf4591471865900c6 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 f17679e3f8..98661e864b 100644 --- a/drivers/net/ena/ena_ethdev.c +++ b/drivers/net/ena/ena_ethdev.c @@ -1712,6 +1712,13 @@ ena_set_queues_placement_policy(struct ena_adapter *adapter, return 0; } + 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)) { PMD_INIT_LOG(WARNING, "Failed to config dev mode. " @@ -1724,13 +1731,6 @@ ena_set_queues_placement_policy(struct ena_adapter *adapter, if (ena_dev->tx_mem_queue_type == ENA_ADMIN_PLACEMENT_POLICY_HOST) 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; return 0; -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-28 21:17:57.071503670 +0000 +++ 0039-net-ena-check-memory-BAR-before-initializing-LLQ.patch 2022-02-28 21:17:54.004932825 +0000 @@ -1 +1 @@ -From 9ae7a13f8247319f63402107c8304ba57c3f4308 Mon Sep 17 00:00:00 2001 +From c73e88da7076b205534dbe3bf4591471865900c6 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 f17679e3f8..98661e864b 100644 @@ -28 +29 @@ -@@ -1953,6 +1953,13 @@ ena_set_queues_placement_policy(struct ena_adapter *adapter, +@@ -1712,6 +1712,13 @@ ena_set_queues_placement_policy(struct ena_adapter *adapter, @@ -41,2 +42,2 @@ - PMD_INIT_LOG(WARNING, -@@ -1965,13 +1972,6 @@ ena_set_queues_placement_policy(struct ena_adapter *adapter, + PMD_INIT_LOG(WARNING, "Failed to config dev mode. " +@@ -1724,13 +1731,6 @@ ena_set_queues_placement_policy(struct ena_adapter *adapter, @@ -47,2 +48,2 @@ -- PMD_DRV_LOG(ERR, -- "Unable to access LLQ BAR resource. Fallback to host mode policy.\n"); +- PMD_DRV_LOG(ERR, "Unable to access LLQ bar resource. " +- "Fallback to host mode policy.\n.");