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 51832A034E for ; Mon, 21 Feb 2022 16:38:20 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4C95F4013F; Mon, 21 Feb 2022 16:38:20 +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 3D260410E0 for ; Mon, 21 Feb 2022 16:38:18 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645457897; 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=9i/BRNscCKu3KzY1uJUi9lT/XRUpJupVWhuVg1XYXGs=; b=KEI2KoCl1salz8tM3GRTlOQbO8SNw+YfRlsMazWxpj56qynTGtvew1SjQxT94i+TqasDWN 99xK2dUXn+sYypHRbdA950mQNdQQlvQeogge2RXkOaNAaxGaV3bW0JiyMd7tUa2P5vRLCa 1NhONd7aBtKQTFt+YOUK0ntIf65dfIE= 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-258-rDTw5_gGPwmnvu3aizQcgQ-1; Mon, 21 Feb 2022 10:38:15 -0500 X-MC-Unique: rDTw5_gGPwmnvu3aizQcgQ-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 331A22F4A; Mon, 21 Feb 2022 15:38:14 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0006C7E2EF; Mon, 21 Feb 2022 15:38:12 +0000 (UTC) From: Kevin Traynor To: Dmitry Kozlyuk Cc: Stephen Hemminger , Matan Azrad , dpdk stable Subject: patch 'net/mlx5: fix GCC uninitialized variable warning' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:33:56 +0000 Message-Id: <20220221153625.152324-47-ktraynor@redhat.com> In-Reply-To: <20220221153625.152324-1-ktraynor@redhat.com> References: <20220221153625.152324-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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-Type: text/plain; charset=UTF-8 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 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 02/26/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/ab06c7bf9bbd6276cdeebaf9e4c810823b1839f7 Thanks. Kevin --- >From ab06c7bf9bbd6276cdeebaf9e4c810823b1839f7 Mon Sep 17 00:00:00 2001 From: Dmitry Kozlyuk Date: Tue, 28 Dec 2021 11:17:03 +0200 Subject: [PATCH] net/mlx5: fix GCC uninitialized variable warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit be8cda4932eb256caaca90090fe0c6d9c756f852 ] When building with -Db_sanitize=thread, GCC gives a warning: drivers/net/mlx5/mlx5_flow_meter.c: In function ‘mlx5_flow_meter_create’: drivers/net/mlx5/mlx5_flow_meter.c:1170:33: warning: ‘legacy_fm’ may be used uninitialized in this function [-Wmaybe-uninitialized] This is a false-positive: legacy_fm is initialized and used if and only if priv->sh->meter_aso_en is false. Work around this by initializing legacy_fm to NULL. Add an assertion before legacy_fm use in case the logic changes. Fixes: 444320186393 ("net/mlx5: support meter creation with policy") Reported-by: Stephen Hemminger Signed-off-by: Dmitry Kozlyuk Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_flow_meter.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_meter.c b/drivers/net/mlx5/mlx5_flow_meter.c index 0e4e6ac3d5..0dc7fbfb32 100644 --- a/drivers/net/mlx5/mlx5_flow_meter.c +++ b/drivers/net/mlx5/mlx5_flow_meter.c @@ -1168,5 +1168,6 @@ mlx5_flow_meter_create(struct rte_eth_dev *dev, uint32_t meter_id, struct mlx5_flow_meter_profile *fmp; struct mlx5_flow_meter_info *fm; - struct mlx5_legacy_flow_meter *legacy_fm; + /* GCC fails to infer legacy_fm is set when !priv->sh->meter_aso_en. */ + struct mlx5_legacy_flow_meter *legacy_fm = NULL; struct mlx5_flow_meter_policy *mtr_policy = NULL; struct mlx5_indexed_pool_config flow_ipool_cfg = { @@ -1274,6 +1275,8 @@ mlx5_flow_meter_create(struct rte_eth_dev *dev, uint32_t meter_id, goto error; /* Add to the flow meter list. */ - if (!priv->sh->meter_aso_en) + if (!priv->sh->meter_aso_en) { + MLX5_ASSERT(legacy_fm != NULL); TAILQ_INSERT_TAIL(fms, legacy_fm, next); + } /* Add to the flow meter list. */ fm->active_state = 1; /* Config meter starts as active. */ -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:45.674203318 +0000 +++ 0047-net-mlx5-fix-GCC-uninitialized-variable-warning.patch 2022-02-21 15:22:44.105704157 +0000 @@ -1 +1 @@ -From be8cda4932eb256caaca90090fe0c6d9c756f852 Mon Sep 17 00:00:00 2001 +From ab06c7bf9bbd6276cdeebaf9e4c810823b1839f7 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit be8cda4932eb256caaca90090fe0c6d9c756f852 ] + @@ -21 +22,0 @@ -Cc: stable@dpdk.org