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 11A054624E for ; Mon, 17 Feb 2025 18:08:55 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 07C8B400EF; Mon, 17 Feb 2025 18:08:55 +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 C586C402AB for ; Mon, 17 Feb 2025 18:08:53 +0100 (CET) Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-43971025798so12211865e9.1 for ; Mon, 17 Feb 2025 09:08:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739812133; x=1740416933; 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=nNt50HuZ6emjG9swzob0W73QOtCPs2QPy13UTHrT20U=; b=kedK5NuWIvpIb9EngBmLYKbug0oe0OysJYELZ6wKA3DdhwNQQ0qR7hWzsn/KyqbU77 7ToH0pA8xHk6MdTjGKP6ZQxqiBA3qTqKOey86NxPcmeAtYw8+Ten99gCkCY1G+AxyyXT t8DqahKIpgzYUqOLePiNNn1vSr9WPlfIZIgXsTbBySvjwf54fFSslcEZPGqrkj5DHPyA c7dgZV5VyBNbi5KpheZ6PCTUr6NHzSi5u5XxWDtt9nbcAgqZ8FqCVWq4xjUZqI73slO0 N6DTh6ufRpY93l6cnb3hw2bxjdmLAWNk6xk6P7+u04k+4+F1LX6SPCkgXBloV6/EBY08 SCdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739812133; x=1740416933; 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=nNt50HuZ6emjG9swzob0W73QOtCPs2QPy13UTHrT20U=; b=oss88s7cSyTZUP5QsXwtDlCUbtNvC82ZJan2Rszen0EdYtrWMBLdARsfPCIK1votim BvOhP8qzH0dk8YAhspf/0Et7NrdwCpLzIcmWuq3SJhoRR4iXPIdB2mGsk/HPbEw8vo53 bdSKLivTvOLotXTR19/boeglTC9IrJzKXAtQ9d0RygM/dFomEDtW1/apwIekRoWSkV1c SWPAqmNgj1XGY5q2RHq5KXIg/OfDSEddr/UwxUDf/8z85V/XCkSR1cMGBDmej8GAMc1p flxC7WW3AV2I6RmId+Yi4CCf6pwUTwkYixiavs3Xf4QtnIUn9Q9mr+0JbWrB0CsmnhL8 okVg== X-Forwarded-Encrypted: i=1; AJvYcCVxMNAIiBda4Q54pEsjVY3py+a/B11cDib2bZOMA3cRTo3MS1gAJn16ot19HzftNKz2pMmORys=@dpdk.org X-Gm-Message-State: AOJu0YzrQtLJUofrBoBarPfuIMZpSTwLiJfGOHJB4soAK2MPM1SF09ox 8c42JpgbvMORh7OzOq/Jm9EdUqEAgwL6TQ4YtHpYKaTt33nZb59W X-Gm-Gg: ASbGncvTcCWbSfabGuTWsnaLQFaGJMwNwjqekYHGWUmY+HPw9sW1GvfNzUrH15VZ318 eFlH2oJmfQNRmnrwwdb7IAMy1c7hgVCgPoQuoG0F9chLh4gs2XsHdxRA1w5MbKrOZ3/TUx3MmGu OUK7q5NoESRyvFHcWQYhvq7q80WtR/16ywIsgn6zrwNeVjvyknpNjaizz0ARKwMgzi5GAfyB5Oq zNW+DuY90txAsN4ZyRA+LWJfrZFEFc8L/tThEeo4017p4CA2HwlHbANrcW+e1ep4Rzdn/x71QNv Im4/WoM3ZYDfQANlojZGlQ== X-Google-Smtp-Source: AGHT+IFSh/myvnv9mojHsnQsioN3h+CkmorqOwSHFnert4LZ5NuuP+OSO2xXa8pK+9Mz6B/vJkwukQ== X-Received: by 2002:a05:600c:1d28:b0:439:4d37:7f38 with SMTP id 5b1f17b1804b1-4396e7398e5mr85420495e9.22.1739812133344; Mon, 17 Feb 2025 09:08:53 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:f83c:95e7:29fd:a997]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-4395a04f8a2sm157601635e9.2.2025.02.17.09.08.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Feb 2025 09:08:53 -0800 (PST) From: luca.boccassi@gmail.com To: Stephen Hemminger Cc: Hemant Agrawal , dpdk stable Subject: patch 'net/dpaa2: fix bitmask truncation' has been queued to stable release 22.11.8 Date: Mon, 17 Feb 2025 17:04:46 +0000 Message-ID: <20250217170456.1068278-73-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/ef323a819f075cdd4b679dd683d4399278371f98 Thanks. Luca Boccassi --- >From ef323a819f075cdd4b679dd683d4399278371f98 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 5 Feb 2025 08:23:17 -0800 Subject: [PATCH] net/dpaa2: fix bitmask truncation [ upstream commit e4591c38b50e23fc6ac6b73803e78d49142ecf57 ] The dqrr_held mask is 64 bit but updates were getting truncated because 1 is of type int (32 bit) and the result shift of int is of type int (32 bit); therefore any value >= 32 would get truncated. Link: https://pvs-studio.com/en/blog/posts/cpp/1183/ Fixes: 2d3788631862 ("net/dpaa2: support atomic queues") Signed-off-by: Stephen Hemminger Acked-by: Hemant Agrawal --- drivers/net/dpaa2/dpaa2_rxtx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/dpaa2/dpaa2_rxtx.c b/drivers/net/dpaa2/dpaa2_rxtx.c index 85910bbd8f..a9de1c9f99 100644 --- a/drivers/net/dpaa2/dpaa2_rxtx.c +++ b/drivers/net/dpaa2/dpaa2_rxtx.c @@ -924,7 +924,7 @@ dpaa2_dev_process_atomic_event(struct qbman_swp *swp __rte_unused, dqrr_index = qbman_get_dqrr_idx(dq); *dpaa2_seqn(ev->mbuf) = dqrr_index + 1; DPAA2_PER_LCORE_DQRR_SIZE++; - DPAA2_PER_LCORE_DQRR_HELD |= 1 << dqrr_index; + DPAA2_PER_LCORE_DQRR_HELD |= UINT64_C(1) << dqrr_index; DPAA2_PER_LCORE_DQRR_MBUF(dqrr_index) = ev->mbuf; } @@ -1305,7 +1305,7 @@ dpaa2_dev_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) flags[loop] = QBMAN_ENQUEUE_FLAG_DCA | dqrr_index; DPAA2_PER_LCORE_DQRR_SIZE--; - DPAA2_PER_LCORE_DQRR_HELD &= ~(1 << dqrr_index); + DPAA2_PER_LCORE_DQRR_HELD &= ~(UINT64_C(1) << dqrr_index); *dpaa2_seqn(*bufs) = DPAA2_INVALID_MBUF_SEQN; } @@ -1544,7 +1544,7 @@ dpaa2_set_enqueue_descriptor(struct dpaa2_queue *dpaa2_q, dq_idx = *dpaa2_seqn(m) - 1; qbman_eq_desc_set_dca(eqdesc, 1, dq_idx, 0); DPAA2_PER_LCORE_DQRR_SIZE--; - DPAA2_PER_LCORE_DQRR_HELD &= ~(1 << dq_idx); + DPAA2_PER_LCORE_DQRR_HELD &= ~(UINT64_C(1) << dq_idx); } *dpaa2_seqn(m) = DPAA2_INVALID_MBUF_SEQN; } -- 2.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-17 16:13:19.400175541 +0000 +++ 0073-net-dpaa2-fix-bitmask-truncation.patch 2025-02-17 16:13:16.870441592 +0000 @@ -1 +1 @@ -From e4591c38b50e23fc6ac6b73803e78d49142ecf57 Mon Sep 17 00:00:00 2001 +From ef323a819f075cdd4b679dd683d4399278371f98 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e4591c38b50e23fc6ac6b73803e78d49142ecf57 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index bfb5542bbc..cad15d8f75 100644 +index 85910bbd8f..a9de1c9f99 100644 @@ -25 +26 @@ -@@ -933,7 +933,7 @@ dpaa2_dev_process_atomic_event(struct qbman_swp *swp __rte_unused, +@@ -924,7 +924,7 @@ dpaa2_dev_process_atomic_event(struct qbman_swp *swp __rte_unused, @@ -34 +35 @@ -@@ -1317,7 +1317,7 @@ dpaa2_dev_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) +@@ -1305,7 +1305,7 @@ dpaa2_dev_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) @@ -43 +44 @@ -@@ -1575,7 +1575,7 @@ dpaa2_set_enqueue_descriptor(struct dpaa2_queue *dpaa2_q, +@@ -1544,7 +1544,7 @@ dpaa2_set_enqueue_descriptor(struct dpaa2_queue *dpaa2_q,