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 83F3E4624E for ; Mon, 17 Feb 2025 18:07:47 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7BABB400EF; Mon, 17 Feb 2025 18:07:47 +0100 (CET) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mails.dpdk.org (Postfix) with ESMTP id 87FA4400EF for ; Mon, 17 Feb 2025 18:07:45 +0100 (CET) Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-43690d4605dso28673225e9.0 for ; Mon, 17 Feb 2025 09:07:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739812065; x=1740416865; 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=C3iMNzy2wV+zxedlcxIRiDLQLiijLbAvw40FRWYNWMY=; b=COFJBlWBet4zmhHNfB26J/97l/0cOKMdQQrBmWRozbYnaZOUjxaswMopVYW75seYk7 X4O23XoyTNS8mdiJxifoHr0pmdFy7eJ0/d8AF9KkY5WyoIiNa7ySpyHATvg3ebU70jPG 3TbZyLtVfyiWJ9mxY5BcT/Qpq92uVw5eNnImzajVqjSuXz2ahKZUibOQHvznbMlAb3pr WibCIHhE9WaqXvVCDJllT8aTo4itz4pNpUoqIePPOW9xogq+JlMa7cpuOAaWoWu90MJU 8S1Ute5uOfzS6IFjPQ98BBDNJRmYPKdQk67nxHFGe1dsEQt28WOcM6JmrSYMk3BMKp48 F7KA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739812065; x=1740416865; 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=C3iMNzy2wV+zxedlcxIRiDLQLiijLbAvw40FRWYNWMY=; b=UKx54KywAP6W1AyefTxhD+emmWlD9VNDSliQM/a/2YMwISD3IsI0K/mtwDqTKODsxz 4rCbq2ekVkhFz19aJEVD9eowE5pOlg6mAu1HAC+kwrfXUwvsGZg9x+Ro3OoQONljek+s cSjyK9cL3YpWzZH2eC7+r38zqN+5CzmdsNVhen/g0/fzBXBcLQ7pPyOHRs6ANJ3Vgflo RLwQ6Qd0diMUg3NhWPSY/0GIFhEbrFSjWwNAOVI2C/imGgvYrBbkBvkJH9xjo7+7E5Oo KraqHVodjy5qG6qR/uQvZqIprbktUaI8sy8ruf7D7ieb/xfQ5/odv8rf0Ba4cILNY9rL 9HuQ== X-Forwarded-Encrypted: i=1; AJvYcCU8U8jXnhjU2rrt4zYHXn8a4MwrUCOb83S0cET6JCrw/lfaY5OUtIPO3ibrlIX6idKm27HqeOY=@dpdk.org X-Gm-Message-State: AOJu0YxW5OOJHw6fZtlO+OEXYuiGf0vISDat5PgXrzK5DYLsNgOMIT7K 9YKKC77WkapFnSZVtRfkWVGuQ1muYZE2VzVQpv9XrSTqUjzgkZltMhOox+PQNkU2Kw== X-Gm-Gg: ASbGncu6UqnRvsFQ/Uxt+jLb5E3oP8xYgENI81iyS3D83EzUUxm0vlxNGGHZZHxlC3r S5LMvQnNmqzhCArrd5TJ7puB8yahYfIfAWYGRdNjjg3onblTJBTgZab10dzTquQASlR2N4yuYBb Tz4m+k3UGSIowp+Fxx5pVa3f4ULLRKUYNmvFKEr/ds529Ck1YJlBknn0DhDaGiNxUEiQ59PpE1z eMsL0mWtmXmnNk1r2Q7qnb7ldlMltmAurpzHemesql7koO531TPT7lnd5N3XqJwRRGtQL3Aa3+f zJZcmPPuBJObsaBmVLiPcw== X-Google-Smtp-Source: AGHT+IGNj1JDcDrfqPc2lHNrGfnocQxFFDloqzqniABhES3jIkdtRAkOxv2kAj3SK06Yf6pZsY/H/w== X-Received: by 2002:a05:6000:188c:b0:38f:22ed:f9e9 with SMTP id ffacd0b85a97d-38f33f42692mr13012245f8f.21.1739812064945; Mon, 17 Feb 2025 09:07:44 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:f83c:95e7:29fd:a997]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-38f258ddbe0sm12921005f8f.39.2025.02.17.09.07.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Feb 2025 09:07:44 -0800 (PST) From: luca.boccassi@gmail.com To: Barbara Skobiej Cc: Anatoly Burakov , Bruce Richardson , dpdk stable Subject: patch 'net/e1000/base: fix data type in MAC hash' has been queued to stable release 22.11.8 Date: Mon, 17 Feb 2025 17:04:24 +0000 Message-ID: <20250217170456.1068278-51-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250217170456.1068278-1-luca.boccassi@gmail.com> References: <20250217170456.1068278-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.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 02/19/25. 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/40990fddbb7b3a80842cfa132bde384f0375e0df Thanks. Luca Boccassi --- >From 40990fddbb7b3a80842cfa132bde384f0375e0df Mon Sep 17 00:00:00 2001 From: Barbara Skobiej Date: Thu, 6 Feb 2025 16:08:41 +0000 Subject: [PATCH] net/e1000/base: fix data type in MAC hash [ upstream commit 458734aaac3225d98aeee5f4c45b3d39a7d82949 ] One of the bit shifts in MAC hash calculation triggers a static analysis warning about a potential overflow. Fix the data type to avoid this. Fixes: af75078fece3 ("first public release") Signed-off-by: Barbara Skobiej Signed-off-by: Anatoly Burakov Acked-by: Bruce Richardson --- drivers/net/e1000/base/e1000_mac.c | 6 ++++-- drivers/net/e1000/base/e1000_vf.c | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/net/e1000/base/e1000_mac.c b/drivers/net/e1000/base/e1000_mac.c index 2b8482e114..5bb77d9e09 100644 --- a/drivers/net/e1000/base/e1000_mac.c +++ b/drivers/net/e1000/base/e1000_mac.c @@ -541,8 +541,10 @@ u32 e1000_hash_mc_addr_generic(struct e1000_hw *hw, u8 *mc_addr) break; } - hash_value = hash_mask & (((mc_addr[4] >> (8 - bit_shift)) | - (((u16) mc_addr[5]) << bit_shift))); + hash_value = (u32)mc_addr[4]; + hash_value = hash_value >> (8 - bit_shift); + hash_value |= (((u32)mc_addr[5]) << bit_shift); + hash_value &= hash_mask; return hash_value; } diff --git a/drivers/net/e1000/base/e1000_vf.c b/drivers/net/e1000/base/e1000_vf.c index 3d0383fcbb..fc30357c17 100644 --- a/drivers/net/e1000/base/e1000_vf.c +++ b/drivers/net/e1000/base/e1000_vf.c @@ -345,8 +345,10 @@ STATIC u32 e1000_hash_mc_addr_vf(struct e1000_hw *hw, u8 *mc_addr) while (hash_mask >> bit_shift != 0xFF && bit_shift < 4) bit_shift++; - hash_value = hash_mask & (((mc_addr[4] >> (8 - bit_shift)) | - (((u16) mc_addr[5]) << bit_shift))); + hash_value = (u32)mc_addr[4]; + hash_value = hash_value >> (8 - bit_shift); + hash_value |= (((u32)mc_addr[5]) << bit_shift); + hash_value &= hash_mask; return hash_value; } -- 2.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-17 16:13:18.659792207 +0000 +++ 0051-net-e1000-base-fix-data-type-in-MAC-hash.patch 2025-02-17 16:13:16.846441592 +0000 @@ -1 +1 @@ -From 458734aaac3225d98aeee5f4c45b3d39a7d82949 Mon Sep 17 00:00:00 2001 +From 40990fddbb7b3a80842cfa132bde384f0375e0df Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 458734aaac3225d98aeee5f4c45b3d39a7d82949 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -16,2 +17,2 @@ - drivers/net/intel/e1000/base/e1000_mac.c | 6 ++++-- - drivers/net/intel/e1000/base/e1000_vf.c | 6 ++++-- + drivers/net/e1000/base/e1000_mac.c | 6 ++++-- + drivers/net/e1000/base/e1000_vf.c | 6 ++++-- @@ -20 +21 @@ -diff --git a/drivers/net/intel/e1000/base/e1000_mac.c b/drivers/net/intel/e1000/base/e1000_mac.c +diff --git a/drivers/net/e1000/base/e1000_mac.c b/drivers/net/e1000/base/e1000_mac.c @@ -22,2 +23,2 @@ ---- a/drivers/net/intel/e1000/base/e1000_mac.c -+++ b/drivers/net/intel/e1000/base/e1000_mac.c +--- a/drivers/net/e1000/base/e1000_mac.c ++++ b/drivers/net/e1000/base/e1000_mac.c @@ -37 +38 @@ -diff --git a/drivers/net/intel/e1000/base/e1000_vf.c b/drivers/net/intel/e1000/base/e1000_vf.c +diff --git a/drivers/net/e1000/base/e1000_vf.c b/drivers/net/e1000/base/e1000_vf.c @@ -39,2 +40,2 @@ ---- a/drivers/net/intel/e1000/base/e1000_vf.c -+++ b/drivers/net/intel/e1000/base/e1000_vf.c +--- a/drivers/net/e1000/base/e1000_vf.c ++++ b/drivers/net/e1000/base/e1000_vf.c