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 F0D9A45804 for ; Fri, 23 Aug 2024 18:22:41 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E7AFB4338A; Fri, 23 Aug 2024 18:22:41 +0200 (CEST) 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 CCDFA402BE for ; Fri, 23 Aug 2024 18:22:39 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724430159; 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=fk5NgWW8dMzXsLxb3BkyD+dWTnFyRnK/CXVxK2aGK3g=; b=REXPvMopeCziU7NYEZjDAnJlxJpOOtfE/fp6yY8VJ3eFdoiNPg5vHXto5P1/QryNrGp4L2 YFzANZYKHiV8YvPndwfrFaF78wECD7OH7OlvLDnNB8ZiJdbY3+6Z7tqpLyXI/Eccwr5Hvd Su5lYTMOmGCEzSaYDJDIqq3Pbjv8v/M= Received: from mx-prod-mc-05.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-644-zfEPy8tFNaqj2Hvt3TPqnQ-1; Fri, 23 Aug 2024 12:22:38 -0400 X-MC-Unique: zfEPy8tFNaqj2Hvt3TPqnQ-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 1BAA6195608A; Fri, 23 Aug 2024 16:22:37 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.193.224]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 35CA01956053; Fri, 23 Aug 2024 16:22:34 +0000 (UTC) From: Kevin Traynor To: Jesse Brandeburg Cc: Ian Stokes , Bruce Richardson , dpdk stable Subject: patch 'net/ice/base: fix sign extension' has been queued to stable release 21.11.8 Date: Fri, 23 Aug 2024 17:18:32 +0100 Message-ID: <20240823161929.1004778-84-ktraynor@redhat.com> In-Reply-To: <20240823161929.1004778-1-ktraynor@redhat.com> References: <20240823161929.1004778-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 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.8 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/28/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/ae432145def90264490e3ba13f827372562346d2 Thanks. Kevin --- >From ae432145def90264490e3ba13f827372562346d2 Mon Sep 17 00:00:00 2001 From: Jesse Brandeburg Date: Wed, 26 Jun 2024 12:41:03 +0100 Subject: [PATCH] net/ice/base: fix sign extension [ upstream commit 4fe3f901f86243bf2dc5925e870030995f229888 ] Fix a static analysis warning where if the 16-bit value in mask has the high-bit set, it will be sign extended by the shift left (which converts it to a signed integer). Avoid this by casting to a u32 to make sure the conversion happens before the shift and that it stays unsigned. Fixes: 9467486f179f ("net/ice/base: enable masking for RSS and FD field vectors") Signed-off-by: Jesse Brandeburg Signed-off-by: Ian Stokes Acked-by: Bruce Richardson --- drivers/net/ice/base/ice_flex_pipe.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/net/ice/base/ice_flex_pipe.c b/drivers/net/ice/base/ice_flex_pipe.c index 3918169001..d1a1503631 100644 --- a/drivers/net/ice/base/ice_flex_pipe.c +++ b/drivers/net/ice/base/ice_flex_pipe.c @@ -3369,7 +3369,6 @@ ice_write_prof_mask_reg(struct ice_hw *hw, enum ice_block blk, u16 mask_idx, case ICE_BLK_RSS: offset = GLQF_HMASK(mask_idx); - val = (idx << GLQF_HMASK_MSK_INDEX_S) & - GLQF_HMASK_MSK_INDEX_M; - val |= (mask << GLQF_HMASK_MASK_S) & GLQF_HMASK_MASK_M; + val = (idx << GLQF_HMASK_MSK_INDEX_S) & GLQF_HMASK_MSK_INDEX_M; + val |= ((u32)mask << GLQF_HMASK_MASK_S) & GLQF_HMASK_MASK_M; break; case ICE_BLK_FD: @@ -3377,6 +3376,5 @@ ice_write_prof_mask_reg(struct ice_hw *hw, enum ice_block blk, u16 mask_idx, val = (idx << GLQF_FDMASK_MSK_INDEX_S) & GLQF_FDMASK_MSK_INDEX_M; - val |= (mask << GLQF_FDMASK_MASK_S) & - GLQF_FDMASK_MASK_M; + val |= ((u32)mask << GLQF_FDMASK_MASK_S) & GLQF_FDMASK_MASK_M; break; default: -- 2.46.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-23 17:18:12.223417612 +0100 +++ 0084-net-ice-base-fix-sign-extension.patch 2024-08-23 17:18:09.764430259 +0100 @@ -1 +1 @@ -From 4fe3f901f86243bf2dc5925e870030995f229888 Mon Sep 17 00:00:00 2001 +From ae432145def90264490e3ba13f827372562346d2 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 4fe3f901f86243bf2dc5925e870030995f229888 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index e06dbb0885..413b6f8ece 100644 +index 3918169001..d1a1503631 100644 @@ -25 +26 @@ -@@ -1535,7 +1535,6 @@ ice_write_prof_mask_reg(struct ice_hw *hw, enum ice_block blk, u16 mask_idx, +@@ -3369,7 +3369,6 @@ ice_write_prof_mask_reg(struct ice_hw *hw, enum ice_block blk, u16 mask_idx, @@ -35 +36 @@ -@@ -1543,6 +1542,5 @@ ice_write_prof_mask_reg(struct ice_hw *hw, enum ice_block blk, u16 mask_idx, +@@ -3377,6 +3376,5 @@ ice_write_prof_mask_reg(struct ice_hw *hw, enum ice_block blk, u16 mask_idx,