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 7C2314624E for ; Mon, 17 Feb 2025 18:08:39 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 77344402DF; Mon, 17 Feb 2025 18:08:39 +0100 (CET) Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by mails.dpdk.org (Postfix) with ESMTP id F208F400EF for ; Mon, 17 Feb 2025 18:08:37 +0100 (CET) Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-38f29a1a93bso2838679f8f.1 for ; Mon, 17 Feb 2025 09:08:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739812117; x=1740416917; 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=rawD31KGoJCWK0CcSQJ9HjknSlor87Kc811yb7TgBf8=; b=ngFoOCYKE3rRBAdwRnMSdqLJKUmQX/qJC6q/rb3pDbR/6TU9JtXytQhPTTnEIX2gti lyL8pngWYVxdWk2bli8YrSnDVcgKZrKAJay76Ew3VQXeSHEb2I2Xs49V15vyU1gWAmCC v4vYYpgSHiN4bhL+5wRJ5vXntsqAuUnqkvDyoEE/gNuw6NMqpzT++GlZwM+e7ZiN3A8T CEJUcfGS313cTl2Vj/0g+emR8GgoAg4m+lLvtljptwV2Mc20HJWcC27Uc3LjOf8Le/Ss y/HVjbhXBUwWHbtzzbLir5OI0oHeE2nS98qnOAJKzYG/b8iWZ9VBC92PBaKW78CCEfBP GosQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739812117; x=1740416917; 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=rawD31KGoJCWK0CcSQJ9HjknSlor87Kc811yb7TgBf8=; b=bs+w1EhlpYdqXn4PdOLACBrqbOAr9PFFsUit4ZLg7N9ZRuIEDdPaGFDeHLInP8+Rg4 eQ0/HSqPLrtEpzOOyzOjVMGeCJrFc+ZfcKZWbxUE5ePkm0X92/sbTnQfDbK6jA1E+s1Y vyzyNveYqdD2PPDKhuvvzSwNxwMh9Ocj+1YsT6aUihQ4M5YbIuzf0Ip/ALhLd0wY6M6N Zi2Tju5qm1mOGBOj3hS3yMeexxjB+cWQkd9r+Xs9EWwGdsCbty+jVDWlEULb+Kq4nHz1 nsV0rkDQxf3zy91Mp9fdWrpGKpWEL+F0r0x9It472Yc05u1Dr4H/1GKO0KiX4M3f71xn iWEQ== X-Forwarded-Encrypted: i=1; AJvYcCVUS5ZJbnILE1upkAXEiR4oTe1psSKX9aGDkz9psYXj3qWuOXeXRXrqOYWRveZNnskVfeVkyI4=@dpdk.org X-Gm-Message-State: AOJu0Yxq7XK5Dbjp4N8N3rpomE8dHWWEimRLECKi4YZXnguS48k6zD6Q mdVnNsmEybGwKORetvNZYXR9evKitbh0pLLi1IYMwzR8IHWFybQy X-Gm-Gg: ASbGncvU6s5/h5QrmM3Y8pXkKnMAEBXWFY/Yc43zr7M4eM9hPIhXV7TaZsjTWNl000p wEQp9aegXln2F7lDuXy1gK8DCoPijmjVHaGxox0WOLQwKUqLqj54EFvLf6aYf1EwPB3ZHJT+ZV7 qbFrkitFQxt/mL1bvemvuFPFWcUbh79+KClHH8HUDBuyGsx8m5KUAB0gnxOOpz3Bh+qGwU9MYfI FgnXPEDkjQLuBGdX5QtKG7bfJwqItk5f5fZjOe42vMMYYJGfH5tkxb3Lm0P45efUACjrmzoAh/6 nPwLkdJ4j4qhVkSaF9U38g== X-Google-Smtp-Source: AGHT+IG7tO0mafdeyWJ8BHg3xd3niSdulFBCS51uBClyTZXg6dY+DzxfcMp830s5mWXPPsB4puhqqw== X-Received: by 2002:a5d:6dae:0:b0:38f:3b59:2d80 with SMTP id ffacd0b85a97d-38f3b593108mr5668537f8f.19.1739812117472; Mon, 17 Feb 2025 09:08:37 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:f83c:95e7:29fd:a997]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-38f258f5fb6sm12580317f8f.44.2025.02.17.09.08.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Feb 2025 09:08:37 -0800 (PST) From: luca.boccassi@gmail.com To: Stephen Hemminger Cc: Hemant Agrawal , dpdk stable Subject: patch 'crypto/dpaa2_sec: fix bitmask truncation' has been queued to stable release 22.11.8 Date: Mon, 17 Feb 2025 17:04:42 +0000 Message-ID: <20250217170456.1068278-69-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/10a08b640b25a46f54aa5901cb6bd52feeb516bc Thanks. Luca Boccassi --- >From 10a08b640b25a46f54aa5901cb6bd52feeb516bc Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 5 Feb 2025 08:23:13 -0800 Subject: [PATCH] crypto/dpaa2_sec: fix bitmask truncation [ upstream commit 013ddc85bff5fdb85eb6006315ebdaa0c12eeece ] 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: a77db24643b7 ("crypto/dpaa2_sec: support atomic queues") Signed-off-by: Stephen Hemminger Acked-by: Hemant Agrawal --- drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c index a8c99bc4af..b9a82a92ad 100644 --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c @@ -1502,8 +1502,8 @@ dpaa2_sec_enqueue_burst(void *qp, struct rte_crypto_op **ops, if (*dpaa2_seqn((*ops)->sym->m_src)) { if (*dpaa2_seqn((*ops)->sym->m_src) & QBMAN_ENQUEUE_FLAG_DCA) { DPAA2_PER_LCORE_DQRR_SIZE--; - DPAA2_PER_LCORE_DQRR_HELD &= ~(1 << - *dpaa2_seqn((*ops)->sym->m_src) & + DPAA2_PER_LCORE_DQRR_HELD &= ~(UINT64_C(1) << + *dpaa2_seqn((*ops)->sym->m_src) & QBMAN_EQCR_DCA_IDXMASK); } flags[loop] = *dpaa2_seqn((*ops)->sym->m_src); @@ -1796,7 +1796,7 @@ dpaa2_sec_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; } @@ -4020,7 +4020,7 @@ dpaa2_sec_process_atomic_event(struct qbman_swp *swp __rte_unused, dqrr_index = qbman_get_dqrr_idx(dq); *dpaa2_seqn(crypto_op->sym->m_src) = 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_PER_LCORE_DQRR_MBUF(dqrr_index) = crypto_op->sym->m_src; ev->event_ptr = crypto_op; } -- 2.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-17 16:13:19.270444961 +0000 +++ 0069-crypto-dpaa2_sec-fix-bitmask-truncation.patch 2025-02-17 16:13:16.866441592 +0000 @@ -1 +1 @@ -From 013ddc85bff5fdb85eb6006315ebdaa0c12eeece Mon Sep 17 00:00:00 2001 +From 10a08b640b25a46f54aa5901cb6bd52feeb516bc Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 013ddc85bff5fdb85eb6006315ebdaa0c12eeece ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index ec6577f64c..7ad8fd47dd 100644 +index a8c99bc4af..b9a82a92ad 100644 @@ -24 +25 @@ -@@ -1491,8 +1491,8 @@ dpaa2_sec_enqueue_burst(void *qp, struct rte_crypto_op **ops, +@@ -1502,8 +1502,8 @@ dpaa2_sec_enqueue_burst(void *qp, struct rte_crypto_op **ops, @@ -35 +36 @@ -@@ -1772,7 +1772,7 @@ dpaa2_sec_set_enqueue_descriptor(struct dpaa2_queue *dpaa2_q, +@@ -1796,7 +1796,7 @@ dpaa2_sec_set_enqueue_descriptor(struct dpaa2_queue *dpaa2_q, @@ -44 +45 @@ -@@ -4055,7 +4055,7 @@ dpaa2_sec_process_atomic_event(struct qbman_swp *swp __rte_unused, +@@ -4020,7 +4020,7 @@ dpaa2_sec_process_atomic_event(struct qbman_swp *swp __rte_unused,