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 419ED4624E for ; Mon, 17 Feb 2025 18:08:57 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 36B84400EF; Mon, 17 Feb 2025 18:08:57 +0100 (CET) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mails.dpdk.org (Postfix) with ESMTP id 220E8402BC for ; Mon, 17 Feb 2025 18:08:54 +0100 (CET) Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-4395f81db4dso27483945e9.1 for ; Mon, 17 Feb 2025 09:08:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739812134; x=1740416934; 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=675LV05swZZYsbGsPk//wCaBZUJ3TP+GZ6ShSER15Hw=; b=Rqa4uDwTthtZI+f1AlhVv0Erf0ELZdDuIBy0u+dGttRAFlQd7b6pLiFXUfBq+mbOJk lY24sAJaa02o58tUfYidzQraSMXa75Si2CpJAmBxuDfbF5nDWtj+rx3EakTYTF1fOghu HOtAE+QLRTJgpF1ua3beVq4SUYDhgKh57plUYT7S4gvTbYvTBE7RimROlXAbIjKoLAh5 8o4ivPu5mAVHzjaznHiaeCvEwDxrcYBAtrqTEhQ14BnVqwUyEyOIPWsNcsyv/oo0n4s4 J+83ChsPEe0bnfka15KzoBGiZ3i5O3ewn2Y3uEVy/03W1hjIepDxwGFpBjqhJdpuokbA jngQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739812134; x=1740416934; 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=675LV05swZZYsbGsPk//wCaBZUJ3TP+GZ6ShSER15Hw=; b=KZgEWpIH5LA1jv2L+SNIzW4IbPf7Q8uuRkFQ/quOEgF7eM2vTaWwpLbNSAm+l8jJWJ vhu5oCKPsuQOtiivH3YyFUm80My8ll+oI1jCDQ4qmXxSWgbOF3mx0DByaWrgvqoDeJt1 Il1cODQs+W1tn7QUdOJtvCf6ghAR4x5bujA/TMeRySFslSf4BnVUe8Mc8n5m64kFslmr 11d9ZsJ1b39cZZl1ol/x2uUv5zPmFaOj0fxKkfBxCabOeQhLWfN9Zz5klaZabLAz+lTp qzihFEU9jS7jXvc9pJjF9Xh+D1AyfiQXDIyFtu77zFzGyIR4kgHeJmlNWxVW4aAoZTIV RKoA== X-Forwarded-Encrypted: i=1; AJvYcCVPYB4JdKA9zH5nyNhhKYne1T/rKhqFedzMEllXmBJUC9zeZGwiDxdzuTOQKJz12jAP28yhMi4=@dpdk.org X-Gm-Message-State: AOJu0YxHiOYpoe8sQq8Mo8nIEYKwo/sVz52xhXUBgrgr2Z6UAU4kluTM WVZll2of/ESA8ZyCYkpUHqhs3aENp7WOuTYCtjBgEi9wU0G5WWT9zrIxyrmfcG8bbQ== X-Gm-Gg: ASbGncuwDNac9FbXdRPvk/zp2i6MWTzHFDO5jChR0NRBu7nn82YK2i6j+GFvpcSuWTd Gl5R9Pt+wtv0NDrCWOKj5dTaOHBKbbzK296w2Pyu21unouIegcJ89TdkdcD8/GYPp3z8n9hxqAq pR1OhCnVtquMwEYVvcd0ZSL73oWQz/zHen5UGWIspO/xbEKQplJKzJLHm4iOx3o9/bFmWyP74nW iHzk+NGTnzKu7L/MxfOy4hxChLd9V/6Kkil/nWOiIylWNfLab4MtktdHEzRL13XUJqD3gdeTKeN Q7wnC+wSlus6VfFah4f9kA== X-Google-Smtp-Source: AGHT+IEk4huFrMbN870+mimk3q1LK1zkQfksTW0LpN8mg105HbAflWcjnjOEehcASEXhD3DCkRi31g== X-Received: by 2002:a05:600c:5124:b0:434:f9ad:7222 with SMTP id 5b1f17b1804b1-4396ec31d4amr93159805e9.7.1739812132254; Mon, 17 Feb 2025 09:08:52 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:f83c:95e7:29fd:a997]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-43959d3d5f3sm158437775e9.0.2025.02.17.09.08.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Feb 2025 09:08:51 -0800 (PST) From: luca.boccassi@gmail.com To: Stephen Hemminger Cc: Hemant Agrawal , dpdk stable Subject: patch 'net/dpaa: fix bitmask truncation' has been queued to stable release 22.11.8 Date: Mon, 17 Feb 2025 17:04:45 +0000 Message-ID: <20250217170456.1068278-72-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/d79a2588410f792767dad5c82cba8ed4e04c31ed Thanks. Luca Boccassi --- >From d79a2588410f792767dad5c82cba8ed4e04c31ed Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 5 Feb 2025 08:23:16 -0800 Subject: [PATCH] net/dpaa: fix bitmask truncation [ upstream commit 8f64c187ad8e4e0b953439b2ce92d8573721eda3 ] 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: 5e7455931442 ("net/dpaa: support Rx queue configurations with eventdev") Signed-off-by: Stephen Hemminger Acked-by: Hemant Agrawal --- drivers/net/dpaa/dpaa_rxtx.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/net/dpaa/dpaa_rxtx.c b/drivers/net/dpaa/dpaa_rxtx.c index 018d55bbdc..31412c0715 100644 --- a/drivers/net/dpaa/dpaa_rxtx.c +++ b/drivers/net/dpaa/dpaa_rxtx.c @@ -683,7 +683,7 @@ dpaa_rx_cb_atomic(void *event, /* Save active dqrr entries */ index = DQRR_PTR2IDX(dqrr); DPAA_PER_LCORE_DQRR_SIZE++; - DPAA_PER_LCORE_DQRR_HELD |= 1 << index; + DPAA_PER_LCORE_DQRR_HELD |= UINT64_C(1) << index; DPAA_PER_LCORE_DQRR_MBUF(index) = mbuf; ev->impl_opaque = index + 1; *dpaa_seqn(mbuf) = (uint32_t)index + 1; @@ -1108,13 +1108,12 @@ dpaa_eth_queue_tx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs) seqn = *dpaa_seqn(mbuf); if (seqn != DPAA_INVALID_MBUF_SEQN) { index = seqn - 1; - if (DPAA_PER_LCORE_DQRR_HELD & (1 << index)) { + if (DPAA_PER_LCORE_DQRR_HELD & (UINT64_C(1) << index)) { flags[loop] = ((index & QM_EQCR_DCA_IDXMASK) << 8); flags[loop] |= QMAN_ENQUEUE_FLAG_DCA; DPAA_PER_LCORE_DQRR_SIZE--; - DPAA_PER_LCORE_DQRR_HELD &= - ~(1 << index); + DPAA_PER_LCORE_DQRR_HELD &= ~(UINT64_C(1) << index); } } -- 2.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-17 16:13:19.368388428 +0000 +++ 0072-net-dpaa-fix-bitmask-truncation.patch 2025-02-17 16:13:16.870441592 +0000 @@ -1 +1 @@ -From 8f64c187ad8e4e0b953439b2ce92d8573721eda3 Mon Sep 17 00:00:00 2001 +From d79a2588410f792767dad5c82cba8ed4e04c31ed Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8f64c187ad8e4e0b953439b2ce92d8573721eda3 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index 247e7b92ba..05bd73becf 100644 +index 018d55bbdc..31412c0715 100644 @@ -25 +26 @@ -@@ -842,7 +842,7 @@ dpaa_rx_cb_atomic(void *event, +@@ -683,7 +683,7 @@ dpaa_rx_cb_atomic(void *event, @@ -34 +35 @@ -@@ -1338,13 +1338,12 @@ dpaa_eth_queue_tx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs) +@@ -1108,13 +1108,12 @@ dpaa_eth_queue_tx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs)