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 0865D4619F for ; Wed, 5 Feb 2025 17:25:52 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F385F40A84; Wed, 5 Feb 2025 17:25:49 +0100 (CET) Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) by mails.dpdk.org (Postfix) with ESMTP id 9FF5B40A7D for ; Wed, 5 Feb 2025 17:25:47 +0100 (CET) Received: by mail-pj1-f51.google.com with SMTP id 98e67ed59e1d1-2f9d74037a7so2914617a91.2 for ; Wed, 05 Feb 2025 08:25:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1738772747; x=1739377547; 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=w3LGmbm/VIgUuKqHEprS43HMDH8COHR0Pe88EqWZ1M0=; b=ea9hg1SGdP7EeW9iQWDv2FUGyHp/cxDY18ODfY+WxUOLJVIjlqdkreTda8BF4RaFJ9 gMhU0RnOKE47txar5o++fPjzdEFQEhDgwMhrW063uWp4+rv3GFNKuZAEKBx4G0Fxg7sm mq5giynzprqL/c7VX8fZ0gV+TGt8sn8aIvzXAHHDDsCF80v5//FJ229HVQqsaD1W+Y41 5HwRtG2Hjho5J+fZq+fnBWRM8Egq/3/8sO6HTy7mPkcmwFF3gBP7VOzrfgSiQlQEHXGh jzSopR5lB1cYl680kjW3cB1b7RIIkMtZ5tu0dS4JRRIJxo0eRJv0dLnrfGqnraIHK7es pwAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738772747; x=1739377547; 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=w3LGmbm/VIgUuKqHEprS43HMDH8COHR0Pe88EqWZ1M0=; b=ay5lkrsEGclwSKfqHfH/EpAmAJpjNShlFT1Fh3jfA5dFbXQ1XxJOqcUFKExesYWxWO GtlLy8cXVCO5srKmjaZLTP3jWEwcCLuDL3EeDISzbR9nd9FOkuy/8/tlguXkZwH8wmBa 2Y30mFlVKIzx498+O+4HeeU6bIO9fzCo0QmEdaM5FaVh6vWlMxPwO/yzzzLce/Z0buYU A7ipZ8L8nUxfHOcx5VSNMyWbZLw5AodbmS0UK2TDd5yoHpF97YmWLAPiYTEc5S6ySWaF bP1zRE1joCATHIikkcXsrZOKRLrWaSVzISRAllXgXe/IKtgYxTVF6yUXG05tExPGModY aOIQ== X-Forwarded-Encrypted: i=1; AJvYcCXU+1/P+K3iJAOeoMd/6YLi367EjKA+MixCa6PW/xCf4aSvaEuZQjwL34vOalrfye5kGp2ZIXs=@dpdk.org X-Gm-Message-State: AOJu0YwNal9r15NIdKICvQKAvqghUcGDyqMm8DaOrGo9VbQxz8IgtsYP OiaLNgNdQmcDoa0fjNaJEn3SXuht3m2NyQtpkzIWUFlhjOddz2d8d9Ypz5D1Hps= X-Gm-Gg: ASbGnctPO1J1j6KSHyr8d2dTKMSe2rRH2QboDDPdy1aQIlEQIM/F9Oj1d2ThNPTaNi6 7HBS0VyEgr3NIMMvJhNLBH3s/8VfVJgecMy/p7ft5cl4i/yARWxVK1+QXpTBPIH/fpyNfA/H0LT +5/JAomSp9O1aSHvZIUaL6kuz7oulvkeUoyJ/Z/3OiXWeWBQ99fXdHY09UFnb58SS2wIzf5Bfga VEqB/+im2vUZnOJWsziuwC7EYhLehqnKd7kdGMlpHdNKnVOTxHG1csRrHPTTYkBTLFwzD+2SZEI FzLLMl74iye/sdfKwNYvsC415uk40a/G3WbYfMzLEZbST+A9OEmlwqQ92yRIxKE3YGqW X-Google-Smtp-Source: AGHT+IGZhYLrGfACI0WM4NKtj4XhDdU2iW0H8hxXptxnIcjXSF4RPUDC6ik+k6k/aHXkYlulo9chUw== X-Received: by 2002:a17:90b:44:b0:2ee:7411:ca99 with SMTP id 98e67ed59e1d1-2f9e075382dmr4886475a91.1.1738772746823; Wed, 05 Feb 2025 08:25:46 -0800 (PST) Received: from hermes.local (204-195-96-226.wavecable.com. [204.195.96.226]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2f9c314b64fsm2138965a91.1.2025.02.05.08.25.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Feb 2025 08:25:46 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , nipun.gupta@nxp.com, stable@dpdk.org, Hemant Agrawal , Sachin Saxena , Nipun Gupta Subject: [PATCH v3 16/19] net/dpaa2: fix bitmask truncation Date: Wed, 5 Feb 2025 08:23:17 -0800 Message-ID: <20250205162448.161161-17-stephen@networkplumber.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250205162448.161161-1-stephen@networkplumber.org> References: <20241115060738.313190-1-stephen@networkplumber.org> <20250205162448.161161-1-stephen@networkplumber.org> 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 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") Cc: nipun.gupta@nxp.com Cc: stable@dpdk.org 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 bfb5542bbc..cad15d8f75 100644 --- a/drivers/net/dpaa2/dpaa2_rxtx.c +++ b/drivers/net/dpaa2/dpaa2_rxtx.c @@ -933,7 +933,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; } @@ -1317,7 +1317,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; } @@ -1575,7 +1575,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