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 C3D3C46211 for ; Thu, 13 Feb 2025 11:04:07 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BB42642EE7; Thu, 13 Feb 2025 11:04:07 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 19B5942F81 for ; Thu, 13 Feb 2025 11:04:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739441045; 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=bX7gKowjMb3dmRnVvkcwGIqT48Bh8x3zpUxMaaJrNcA=; b=ia/kLi+yoQiywqBX59XXZqA5ATXZkuxApKfWJAva5Gyr7T4c9PBqftDQelGVS8J0OsXm2S Nf/YqzfSlcs2jFLDZrvcJxTfPfFuPnWCLqEqw2au1XdDjF9arLBdo5yShNcG80AfM7jCsD X/MiyeoRqzHBNKDmEGiQr0EnAOd15uA= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-491-wqyugdV8MF-WlDzH4vIcUA-1; Thu, 13 Feb 2025 05:04:04 -0500 X-MC-Unique: wqyugdV8MF-WlDzH4vIcUA-1 X-Mimecast-MFC-AGG-ID: wqyugdV8MF-WlDzH4vIcUA Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 32DFA1800874; Thu, 13 Feb 2025 10:04:03 +0000 (UTC) Received: from rh.Home (unknown [10.45.224.21]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id BE5771800872; Thu, 13 Feb 2025 10:04:01 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: Hemant Agrawal , dpdk stable Subject: patch 'event/dpaa: fix bitmask truncation' has been queued to stable release 24.11.2 Date: Thu, 13 Feb 2025 09:59:20 +0000 Message-ID: <20250213095933.362078-113-ktraynor@redhat.com> In-Reply-To: <20250213095933.362078-1-ktraynor@redhat.com> References: <20250213095933.362078-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 9lJ_z8aZJuqW9x0wQX2ymPX7wLcoXoZ4PDnlR1OkkRk_1739441043 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 24.11.2 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/17/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/dc4d8ee070bfd211cc3b2a4360d343e0184cbec2 Thanks. Kevin --- >From dc4d8ee070bfd211cc3b2a4360d343e0184cbec2 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 5 Feb 2025 08:23:15 -0800 Subject: [PATCH] event/dpaa: fix bitmask truncation [ upstream commit a82888ed6edc599f82263a1bd067a7edb7cceeee ] More bitmask truncation from mask computation. Fixes: 0ee17f79ebd0 ("event/dpaa: add enqueue/dequeue") Signed-off-by: Stephen Hemminger Acked-by: Hemant Agrawal --- drivers/event/dpaa/dpaa_eventdev.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/event/dpaa/dpaa_eventdev.c b/drivers/event/dpaa/dpaa_eventdev.c index 853cc1ecf9..400e0ecd1c 100644 --- a/drivers/event/dpaa/dpaa_eventdev.c +++ b/drivers/event/dpaa/dpaa_eventdev.c @@ -103,5 +103,5 @@ dpaa_event_enqueue_burst(void *port, const struct rte_event ev[], mbuf = DPAA_PER_LCORE_DQRR_MBUF(i); *dpaa_seqn(mbuf) = DPAA_INVALID_MBUF_SEQN; - DPAA_PER_LCORE_DQRR_HELD &= ~(1 << i); + DPAA_PER_LCORE_DQRR_HELD &= ~(UINT64_C(1) << i); DPAA_PER_LCORE_DQRR_SIZE--; break; @@ -200,9 +200,9 @@ dpaa_event_dequeue_burst(void *port, struct rte_event ev[], i = 0; while (DPAA_PER_LCORE_DQRR_SIZE) { - if (DPAA_PER_LCORE_DQRR_HELD & (1 << i)) { + if (DPAA_PER_LCORE_DQRR_HELD & (UINT64_C(1) << i)) { qman_dca_index(i, 0); mbuf = DPAA_PER_LCORE_DQRR_MBUF(i); *dpaa_seqn(mbuf) = DPAA_INVALID_MBUF_SEQN; - DPAA_PER_LCORE_DQRR_HELD &= ~(1 << i); + DPAA_PER_LCORE_DQRR_HELD &= ~(UINT64_C(1) << i); DPAA_PER_LCORE_DQRR_SIZE--; } @@ -264,9 +264,9 @@ dpaa_event_dequeue_burst_intr(void *port, struct rte_event ev[], i = 0; while (DPAA_PER_LCORE_DQRR_SIZE) { - if (DPAA_PER_LCORE_DQRR_HELD & (1 << i)) { + if (DPAA_PER_LCORE_DQRR_HELD & (UINT64_C(1) << i)) { qman_dca_index(i, 0); mbuf = DPAA_PER_LCORE_DQRR_MBUF(i); *dpaa_seqn(mbuf) = DPAA_INVALID_MBUF_SEQN; - DPAA_PER_LCORE_DQRR_HELD &= ~(1 << i); + DPAA_PER_LCORE_DQRR_HELD &= ~(UINT64_C(1) << i); DPAA_PER_LCORE_DQRR_SIZE--; } -- 2.48.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-12 17:29:46.459154476 +0000 +++ 0113-event-dpaa-fix-bitmask-truncation.patch 2025-02-12 17:29:34.645947690 +0000 @@ -1 +1 @@ -From a82888ed6edc599f82263a1bd067a7edb7cceeee Mon Sep 17 00:00:00 2001 +From dc4d8ee070bfd211cc3b2a4360d343e0184cbec2 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a82888ed6edc599f82263a1bd067a7edb7cceeee ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org