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 D90094624E for ; Mon, 17 Feb 2025 18:08:52 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D19B6400EF; Mon, 17 Feb 2025 18:08:52 +0100 (CET) Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by mails.dpdk.org (Postfix) with ESMTP id A40DA400EF for ; Mon, 17 Feb 2025 18:08:51 +0100 (CET) Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-436ce2ab251so31497185e9.1 for ; Mon, 17 Feb 2025 09:08:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739812131; x=1740416931; 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=wYi5wITyYyHxbHKzqmR3p/7PGG7gOY1Zc+4SCbF5L74=; b=QRgc8xX6WTndEkkp119A/QGOGmk4Ocnqe9+t11LN24DDs0JFcRjr2jm0ndw3MHcdVv mXrq7p7uoqnqi44zgLHeTtvTDTkm6xBs2uyRz+Kv7NtODNJPb1yqgy8OAvzuA1cOgJ3b gXIztdNdX2ysNKFhwDCXyOJC2FmbT8x0PhN/ZZihbhJsY2nPQHE95MyfHdPtKPEoSNPE lzjy8uQtTHhT+uzmgn830IofTrlNSXnUnJvvFqmYU2wFd41fr5aTI3g9ooEKf9dt1r/q oUXv2yOdQqH2qdi4neEU4ZY3IhnBVEKQDgOPbxH6qf7j1UOYlBG4Ujmi+oQNbNI/J3sv ZwZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739812131; x=1740416931; 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=wYi5wITyYyHxbHKzqmR3p/7PGG7gOY1Zc+4SCbF5L74=; b=L1XMB8O243zH7iN/odTVRFiHDpdCeFDbxARgQdjV89nBvTktpKsRiewmP74LZy5KF2 4bXHU5ScztE0egwB01iAUauqFBnRY5ikkhO9102OlHZulCmTQG5Ogb5mgSILXoH3Irra JPXODzLPB20cr2A57IqRDqXnnHMB40CQSisz+Fo0xD+alVSD//8XKEUWbW4PH63EmSsg r/x40vX4rgMkASFSO0StW5/xtvalGrQgGo9Mq8bbKSoq7RTWHYkvzFABksFu+SGtGAaT d47rYeh0Jb5urloInBmXbgFU2I2OiLNgx/P10e0XouNYgHLqWY2uwf5/blP1M9djM2K/ kLFg== X-Forwarded-Encrypted: i=1; AJvYcCWxd2j6wLXY6sYt0kr7Q4d/LdleAnINNjjT7TlFNgeYHuVe73L4Bwuw99dDPsXVVN3auJevDvM=@dpdk.org X-Gm-Message-State: AOJu0YyBgswRoflcOE2ogwjsfPqx8TdUH0pklnhzJFkc55mjPBUy090T EGKarotJPUcfnyjxrWFI5ULRSHQe2cAOzQjXoPw5ilfOLcTZ5zSd X-Gm-Gg: ASbGncvHUjO7tZ6nlqLc6NP5JCLxnOQSx+J4leLopuSvzDc/gdxiIH0BKtLMZSKxuir ZOhENKK28gnMP8jucQ4nD0xyG/7cnX4OaonfuF/jF5VReXctkHIuGDGb70HWFEc7vHE36hPnHN6 KsLAtc57vS/KNnCdGcY0OERNSuUf/KpFxIbo2uid0Nd37pqXkevLWq86EZ+rWFtwTGANZfl3Ojh Dc7f2Xaz0q49/wUyg2q7/kAVpt6348ObTN3XaRC72/Chwcwe+bYrOf5jPMfWAhapUL09UrDsT6q d2yp2Yoa83RQy8NDz43hcA== X-Google-Smtp-Source: AGHT+IGgjjGbL0XQu+gXeGeyqOS56PY+on/TJ5IjX8pwYV7iWxTA9TpktUe3o5vm1VwQEkVBx435mA== X-Received: by 2002:a05:600c:19c9:b0:439:6a24:1067 with SMTP id 5b1f17b1804b1-4396e6fae48mr108431415e9.16.1739812131173; Mon, 17 Feb 2025 09:08:51 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:f83c:95e7:29fd:a997]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-4396713feccsm102447895e9.39.2025.02.17.09.08.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Feb 2025 09:08:50 -0800 (PST) From: luca.boccassi@gmail.com To: Stephen Hemminger Cc: Hemant Agrawal , dpdk stable Subject: patch 'event/dpaa: fix bitmask truncation' has been queued to stable release 22.11.8 Date: Mon, 17 Feb 2025 17:04:44 +0000 Message-ID: <20250217170456.1068278-71-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/fb6a97ae23a7c71e87463b719e61f85dd88e87b5 Thanks. Luca Boccassi --- >From fb6a97ae23a7c71e87463b719e61f85dd88e87b5 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 2532abbe78..12fc11f425 100644 --- a/drivers/event/dpaa/dpaa_eventdev.c +++ b/drivers/event/dpaa/dpaa_eventdev.c @@ -101,7 +101,7 @@ dpaa_event_enqueue_burst(void *port, const struct rte_event ev[], qman_dca_index(ev[i].impl_opaque, 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--; break; default: @@ -204,11 +204,11 @@ dpaa_event_dequeue_burst(void *port, struct rte_event ev[], /* Check if there are atomic contexts to be released */ 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--; } i++; @@ -274,11 +274,11 @@ dpaa_event_dequeue_burst_intr(void *port, struct rte_event ev[], /* Check if there are atomic contexts to be released */ 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--; } i++; -- 2.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-17 16:13:19.337444044 +0000 +++ 0071-event-dpaa-fix-bitmask-truncation.patch 2025-02-17 16:13:16.870441592 +0000 @@ -1 +1 @@ -From a82888ed6edc599f82263a1bd067a7edb7cceeee Mon Sep 17 00:00:00 2001 +From fb6a97ae23a7c71e87463b719e61f85dd88e87b5 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a82888ed6edc599f82263a1bd067a7edb7cceeee ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index 853cc1ecf9..400e0ecd1c 100644 +index 2532abbe78..12fc11f425 100644 @@ -21 +22 @@ -@@ -102,7 +102,7 @@ dpaa_event_enqueue_burst(void *port, const struct rte_event ev[], +@@ -101,7 +101,7 @@ dpaa_event_enqueue_burst(void *port, const struct rte_event ev[], @@ -30 +31 @@ -@@ -199,11 +199,11 @@ dpaa_event_dequeue_burst(void *port, struct rte_event ev[], +@@ -204,11 +204,11 @@ dpaa_event_dequeue_burst(void *port, struct rte_event ev[], @@ -44 +45 @@ -@@ -263,11 +263,11 @@ dpaa_event_dequeue_burst_intr(void *port, struct rte_event ev[], +@@ -274,11 +274,11 @@ dpaa_event_dequeue_burst_intr(void *port, struct rte_event ev[],