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 6169545DB9 for ; Wed, 27 Nov 2024 18:23:09 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5A07C402DE; Wed, 27 Nov 2024 18:23:09 +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 755E840A70 for ; Wed, 27 Nov 2024 18:23:07 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1732728187; 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=K0gOyYloT2onXejwrp54DtEhRQYyIoEHfz77RT1pIPc=; b=flBthFsljD7EdZjc7rbSDGs/hbVZ7L7voYv0gAOX8Rc2ybCUJWACiVa5+J/PRpGWcqb+Dq e01svozZAj6Y/XMY5DaDW+r3hlk6XA5E2jKe/6WS17DoXhS/evPjRBklVSVbFhFIErcyx9 dJ3/fT5Vatvej8jPY7AA1ZKJvKzNfRU= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-604-MiIPcYW8PfqnbUAUylLwPA-1; Wed, 27 Nov 2024 12:23:04 -0500 X-MC-Unique: MiIPcYW8PfqnbUAUylLwPA-1 X-Mimecast-MFC-AGG-ID: MiIPcYW8PfqnbUAUylLwPA Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A4CB41955E8D; Wed, 27 Nov 2024 17:23:03 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.52]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 7514F300019E; Wed, 27 Nov 2024 17:23:02 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: dpdk stable Subject: patch 'net/bnx2x: fix always true expression' has been queued to stable release 21.11.9 Date: Wed, 27 Nov 2024 17:18:49 +0000 Message-ID: <20241127171916.690404-102-ktraynor@redhat.com> In-Reply-To: <20241127171916.690404-1-ktraynor@redhat.com> References: <20241127171916.690404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: laZFFgpQhpL64ouHfkd4nGiaW84abj-TjeJCt5NZXkc_1732728183 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true 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.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 12/02/24. 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/e727bfdcf18ce2b526165ad9c43d42be40891505 Thanks. Kevin --- >From e727bfdcf18ce2b526165ad9c43d42be40891505 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 12 Nov 2024 09:43:54 -0800 Subject: [PATCH] net/bnx2x: fix always true expression [ upstream commit fb6b0e9a36326a4f13f496b00f7f92aaffe1d5f4 ] Coverity spotted that the check to enable single interrupt mode would evaluate as always true since: The or condition sc->interrupt_mode != 2 || sc->interrupt_mode != 3 will always be true because sc->interrupt_mode cannot be equal to two different values at the same time, so it must be not equal to at least one of them. Coverity issue: 362046 Fixes: 540a211084a7 ("bnx2x: driver core") Signed-off-by: Stephen Hemminger --- drivers/net/bnx2x/bnx2x.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/bnx2x/bnx2x.c b/drivers/net/bnx2x/bnx2x.c index 55a91fad78..8e6d2c5c80 100644 --- a/drivers/net/bnx2x/bnx2x.c +++ b/drivers/net/bnx2x/bnx2x.c @@ -11196,9 +11196,7 @@ static int bnx2x_init_hw_func(struct bnx2x_softc *sc) * INT#x or MSI */ - if ((sc->interrupt_mode != INTR_MODE_MSIX) - || (sc->interrupt_mode != INTR_MODE_SINGLE_MSIX)) { + if (sc->interrupt_mode == INTR_MODE_INTX || + sc->interrupt_mode == INTR_MODE_MSI) pf_conf |= IGU_PF_CONF_SINGLE_ISR_EN; - } - /* * Timers workaround bug: function init part. -- 2.47.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-27 17:17:41.463522376 +0000 +++ 0102-net-bnx2x-fix-always-true-expression.patch 2024-11-27 17:17:38.319269860 +0000 @@ -1 +1 @@ -From fb6b0e9a36326a4f13f496b00f7f92aaffe1d5f4 Mon Sep 17 00:00:00 2001 +From e727bfdcf18ce2b526165ad9c43d42be40891505 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit fb6b0e9a36326a4f13f496b00f7f92aaffe1d5f4 ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index 3153cc4d80..af31ac4604 100644 +index 55a91fad78..8e6d2c5c80 100644 @@ -27 +28 @@ -@@ -11190,9 +11190,7 @@ static int bnx2x_init_hw_func(struct bnx2x_softc *sc) +@@ -11196,9 +11196,7 @@ static int bnx2x_init_hw_func(struct bnx2x_softc *sc)