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 4BE0F455AD for ; Mon, 15 Jul 2024 17:29:37 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 485F140DD1; Mon, 15 Jul 2024 17:29:37 +0200 (CEST) Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mails.dpdk.org (Postfix) with ESMTP id BFA6040A71 for ; Mon, 15 Jul 2024 17:29:36 +0200 (CEST) Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-426636ef8c9so29858345e9.2 for ; Mon, 15 Jul 2024 08:29:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721057376; x=1721662176; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Y/Uw9ruF1xscpGAYHVXcXrSzj+zCMvkgLvINO5yw0Gc=; b=lMEkD8K14t/NQGph/94O7kpbvEsEHJ+sNnRxPX/zW2bYH7AMtK1+jXl4QrYBVwvOuU xGVjNeqTb+CDFPeLERza/uk0jpOXsqVH+3Nf4isPxrhVCzOLpOOIgkVu0LMraY4hJSV0 pJ7UFJSQUIg+F3doHKj8DzORX9rKVmO6AiHNvTpkdjzPRN14dACBf3OsQ+VjBK4NQdhZ 6TVOdUbBDtpY2zAa/fSOUVVliUVz+qcPJzn3ZMLApv0yo4lHjRcqVWGpouwyiGh9mBMx xgmjs8ICLJhXN0+OofXOILhS8z1Y1OJN4qlJUXuGQFQ6YZT7HfACgDPE+JDrErwgIYqE YW+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721057376; x=1721662176; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Y/Uw9ruF1xscpGAYHVXcXrSzj+zCMvkgLvINO5yw0Gc=; b=epMpapEls1j1095RQ+8OWDoTbHenRCu+NMW7K2UmZCZK8YSiy2tmyRrUKzUVDZFEi1 k48S09BDmTl7niO+yWZ/+PoCPKo5fLh/wUVGfPp2IeEtMWHecMppl6IxPBw8XaygOyjo yhynFsziVDQ9XO+loepfUDSrCjhNddOHzjTHcr9A7Q+ahxfLerVgbTwdjVd1MJ7UTQ47 BkqYIDhvtkE1KgS8RFufLs6kZ63sLW7Ij4lTjHW0BOdVpMtMCOKiWm5UDPZ3Y9ol/yoo zyu4pheR/i1SADsQIhKWryO+eSh449n1+tpSrRO0M2gWmo1P4W25MnM2Qr0YP61WQ9ul bMIA== X-Forwarded-Encrypted: i=1; AJvYcCWsxWsxIxYSR4gqyjl1qo47QYp8JEmKH1597ZElljKO67FJNY5jNgXJW9sQtkMUpF7NyWv53+okVthsXl39l3M= X-Gm-Message-State: AOJu0YxeEmkyceYfM4Lb9Eaf3y6/A4by2SuWbjwN4COFU60AFs7y4Iu7 148TaC5wPvbL49+lQAO0rkCsMsdRbk0DFyw35j8Ozz4FoFIofgex X-Google-Smtp-Source: AGHT+IEcmDdVkWufRrnu8/17ZSIvruzi/bI98+FMSv7kYODtJVhYfAETEPpNLhLMOHUoEPJ7r2O/5g== X-Received: by 2002:a05:600c:3209:b0:426:62c5:4742 with SMTP id 5b1f17b1804b1-426707ce959mr136398705e9.7.1721057376298; Mon, 15 Jul 2024 08:29:36 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:7aef:1aaa:3dff:d546]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-427ae750519sm28666165e9.1.2024.07.15.08.29.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jul 2024 08:29:35 -0700 (PDT) From: luca.boccassi@gmail.com To: Jesse Brandeburg Cc: Ian Stokes , Bruce Richardson , dpdk stable Subject: patch 'net/ice/base: fix sign extension' has been queued to stable release 22.11.6 Date: Mon, 15 Jul 2024 16:26:24 +0100 Message-Id: <20240715152704.2229503-46-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240715152704.2229503-1-luca.boccassi@gmail.com> References: <20240624235907.885628-81-luca.boccassi@gmail.com> <20240715152704.2229503-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 22.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/17/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/7fdbc3da5bd6a7dac5e933fb70f2864ce108331e Thanks. Luca Boccassi --- >From 7fdbc3da5bd6a7dac5e933fb70f2864ce108331e 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 b6bc0062a3..e1c5e00c91 100644 --- a/drivers/net/ice/base/ice_flex_pipe.c +++ b/drivers/net/ice/base/ice_flex_pipe.c @@ -1534,16 +1534,14 @@ ice_write_prof_mask_reg(struct ice_hw *hw, enum ice_block blk, u16 mask_idx, switch (blk) { 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: offset = GLQF_FDMASK(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: ice_debug(hw, ICE_DBG_PKG, "No profile masks for block %d\n", -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-15 16:19:36.964447872 +0100 +++ 0046-net-ice-base-fix-sign-extension.patch 2024-07-15 16:19:34.580206719 +0100 @@ -1 +1 @@ -From 4fe3f901f86243bf2dc5925e870030995f229888 Mon Sep 17 00:00:00 2001 +From 7fdbc3da5bd6a7dac5e933fb70f2864ce108331e 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 b6bc0062a3..e1c5e00c91 100644