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 9474445804 for ; Fri, 23 Aug 2024 18:22:49 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8F23B4338B; Fri, 23 Aug 2024 18:22:49 +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 A71184338B for ; Fri, 23 Aug 2024 18:22:48 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724430168; 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=kiX6t1lhVnZwp55OvCJQojfYjyVM1lob6Uz9wlXNDeI=; b=Qz4+knxxIuzEt33udp9l5YbiQqaCXlMSxSAihMAA3uS+31nsyAnGcHV6yWj87EoyZ0QlrK QzmJJvdz/xcbJy1khZ+Jlbb+97keO2DIIwcwjbgyBLAcoQ2n5amLKdlVyvlfEwvdXxjHeT 7JITsl2bh52H3/P+vzln/NuHiO+T7sk= Received: from mx-prod-mc-01.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-138-WVBxHw1dO_Os2egxvMY-DA-1; Fri, 23 Aug 2024 12:22:45 -0400 X-MC-Unique: WVBxHw1dO_Os2egxvMY-DA-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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 031661955D48; Fri, 23 Aug 2024 16:22:44 +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 3FCD71956053; Fri, 23 Aug 2024 16:22:41 +0000 (UTC) From: Kevin Traynor To: Chinh Cao Cc: Ian Stokes , Bruce Richardson , dpdk stable Subject: patch 'net/ice/base: fix return type of bitmap hamming weight' has been queued to stable release 21.11.8 Date: Fri, 23 Aug 2024 17:18:35 +0100 Message-ID: <20240823161929.1004778-87-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/8d4ee9a574b6776413f0488255ea522545fd27e2 Thanks. Kevin --- >From 8d4ee9a574b6776413f0488255ea522545fd27e2 Mon Sep 17 00:00:00 2001 From: Chinh Cao Date: Wed, 26 Jun 2024 12:41:11 +0100 Subject: [PATCH] net/ice/base: fix return type of bitmap hamming weight [ upstream commit 509c55f699d1e13f38abaaf85df7bd9b585f5b87 ] "count" is the returned value, and in this function, value of "count" and "bit" are the same, so there is no reason why these values should be declared as different types, and for returned value data type to be different. Fixes: 6d288fa5f72b ("net/ice/base: introduce and use bitmap hamming weight API") Signed-off-by: Chinh Cao Signed-off-by: Ian Stokes Acked-by: Bruce Richardson --- drivers/net/ice/base/ice_bitops.h | 4 ++-- drivers/net/ice/base/ice_switch.c | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/net/ice/base/ice_bitops.h b/drivers/net/ice/base/ice_bitops.h index 21ec2014e1..7e61fec5ef 100644 --- a/drivers/net/ice/base/ice_bitops.h +++ b/drivers/net/ice/base/ice_bitops.h @@ -409,8 +409,8 @@ ice_bitmap_set(ice_bitmap_t *dst, u16 pos, u16 num_bits) * ice_declare_bitmap. */ -static inline int +static inline u16 ice_bitmap_hweight(ice_bitmap_t *bm, u16 size) { - int count = 0; + u16 count = 0; u16 bit = 0; diff --git a/drivers/net/ice/base/ice_switch.c b/drivers/net/ice/base/ice_switch.c index 7c6a258255..468d58cdb9 100644 --- a/drivers/net/ice/base/ice_switch.c +++ b/drivers/net/ice/base/ice_switch.c @@ -7122,5 +7122,5 @@ ice_find_free_recp_res_idx(struct ice_hw *hw, const ice_bitmap_t *profiles, /* return number of free indexes */ - return (u16)ice_bitmap_hweight(free_idx, ICE_MAX_FV_WORDS); + return ice_bitmap_hweight(free_idx, ICE_MAX_FV_WORDS); } @@ -7839,4 +7839,5 @@ ice_add_adv_recipe(struct ice_hw *hw, struct ice_adv_lkup_elem *lkups, struct ice_sw_recipe *rm; u8 i; + u16 cnt; if (!ice_is_prof_rule(rinfo->tun_type) && !lkups_cnt) -- 2.46.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-23 17:18:12.299112687 +0100 +++ 0087-net-ice-base-fix-return-type-of-bitmap-hamming-weigh.patch 2024-08-23 17:18:09.776430301 +0100 @@ -1 +1 @@ -From 509c55f699d1e13f38abaaf85df7bd9b585f5b87 Mon Sep 17 00:00:00 2001 +From 8d4ee9a574b6776413f0488255ea522545fd27e2 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 509c55f699d1e13f38abaaf85df7bd9b585f5b87 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 3b71c1b7f5..5c17bcb674 100644 +index 21ec2014e1..7e61fec5ef 100644 @@ -26 +27 @@ -@@ -419,8 +419,8 @@ ice_bitmap_set(ice_bitmap_t *dst, u16 pos, u16 num_bits) +@@ -409,8 +409,8 @@ ice_bitmap_set(ice_bitmap_t *dst, u16 pos, u16 num_bits) @@ -38 +39 @@ -index 711a6cfbbe..fa5bd94c58 100644 +index 7c6a258255..468d58cdb9 100644 @@ -41 +42 @@ -@@ -7468,5 +7468,5 @@ ice_find_free_recp_res_idx(struct ice_hw *hw, const ice_bitmap_t *profiles, +@@ -7122,5 +7122,5 @@ ice_find_free_recp_res_idx(struct ice_hw *hw, const ice_bitmap_t *profiles, @@ -48 +49,2 @@ -@@ -8179,4 +8179,5 @@ ice_add_adv_recipe(struct ice_hw *hw, struct ice_adv_lkup_elem *lkups, +@@ -7839,4 +7839,5 @@ ice_add_adv_recipe(struct ice_hw *hw, struct ice_adv_lkup_elem *lkups, + struct ice_sw_recipe *rm; @@ -50 +51,0 @@ - int status = ICE_SUCCESS;