From patchwork Wed Feb 5 16:23:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 150974 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 8B95C4619F; Wed, 5 Feb 2025 17:25:13 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5D1B34064C; Wed, 5 Feb 2025 17:25:06 +0100 (CET) Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by mails.dpdk.org (Postfix) with ESMTP id 23488402EE for ; Wed, 5 Feb 2025 17:25:03 +0100 (CET) Received: by mail-pj1-f49.google.com with SMTP id 98e67ed59e1d1-2f9b9c0088fso1848735a91.0 for ; Wed, 05 Feb 2025 08:25:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1738772702; x=1739377502; 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=S+P0iRQIN7Ddu4uuVC6PGL7SifUHeSC7BEdThlMrW64=; b=CEwrfbRSnjQpSSkNQOxhihDKOykJVH1Cbwk7sALikvNMVQq7S2Y/84pcH4lonxewaX fUXe0ZxSGhl0XKDQxRx4/baUmsqnMJQ7eOVoV6tQtSYB0wrgBM3bAqwNFwyt1DDlxC03 H63ZKndwTWLixaXIjSt9YZ46KtW2Bpev6NM7EIwZkTfhexAS7qxeZK/gfieNsyZHaVeZ jgkEo9Jp2MM4xuxwY8kMeHRnLyhKhC16WupMWVcs+r6cy9DmVHTJJPVzBhLAQHHpejjM 8ozCcMgZVccUq/6FPexG0l/ECOtCPYygZkKRVb0246OpyE2nlWnZB6x/GlAgwvTk5tXe cUQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738772702; x=1739377502; 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=S+P0iRQIN7Ddu4uuVC6PGL7SifUHeSC7BEdThlMrW64=; b=qZWfXpTtH5juuTITErNbf3S8Lc76zKYmg32G88HCqp3xjN1DLJPtrx4iA+gnPIG5iP gGdvgK0K6qeuWj/rXPAW+lCo7313Hq0oWOSHEDQbXsMKMH5kCuBNQHd1ScpuB9WE5fXH olIBBY6Um8ahjiCVDk8+bJBZnrDcx1ng2uPiub+zXZw2EbN6odvhfrrm3tm3q8h2Rsof EOPUREj49zyn8lhzTeYwCCa89bR38+24LSOMh0IDAwFd+XKYN1karHkC5WL0rX7B++vR 8IUT5NuwxJ8d8EpHJms5/LTsOoxqqonn8L1IZjFea1eyW7IJZ81p3F7tSraK9l7be61k ts/w== X-Gm-Message-State: AOJu0YydVl9LvG3dk61/Pp2/Uuo0UDYxALZM+1lRy2ok21nLRBgqyh1n pCy1MthoLzs5/jxNLdrSPanQ7seVhAwP56ReeAc8DiLnONHo+SpHy35l4/UdcIKAbU0gu/Lx3Y8 x X-Gm-Gg: ASbGncvyPKuB+W8oXi15JaV22K6Jj4o8/9TyoY6AZjEY8Sohs6SFQlHMjfCT5Sbss3n 7A2Fgl7hIBtMz9OFXC6uEZBWLaqfahoTcAQt0bGX9oHlRuabcZCABX51MCgzDGzWnXLddjixbvB VITesgu5dtzkUSQRaeRp0FT3y2S554xYD6Ivu3IuR7rqzxq6uYa8sQyOzEglQv9m+rUoEvGmfm8 0lUA2Ix10zvDesVi2eJ4kpXh4kJUWqh/Sl+7JaRn0KPwjVDKFBRfzpzizvwrAc3Q4oripJOV3vC Cf5QHC7Ybb6iwSz53g0BmGWrhtwuQn4x6Zrj8NdAlKglzHd0JeQbiw00M//NMqGyfm2c X-Google-Smtp-Source: AGHT+IEggT8cR9kBSwBuhMLWZjuoQrgy60OVFwM6XVQ7J070FQciws9io/lWuFnkWrBsWACLy4hIQw== X-Received: by 2002:a17:90a:d44d:b0:2ee:edae:775 with SMTP id 98e67ed59e1d1-2f9fddaab98mr129158a91.3.1738772700802; Wed, 05 Feb 2025 08:25:00 -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.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Feb 2025 08:25:00 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Anoob Joseph , Nithin Dabilpuram , Kiran Kumar K , Sunil Kumar Kori , Satha Rao , Harman Kalra Subject: [PATCH v3 01/19] common/cnxk: remove duplicate condition Date: Wed, 5 Feb 2025 08:23:02 -0800 Message-ID: <20250205162448.161161-2-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 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org The same condition is checked twice in an if statement. Harmless, but redundant. Link: https://pvs-studio.com/en/blog/posts/cpp/1183/ Signed-off-by: Stephen Hemminger Acked-by: Anoob Joseph --- drivers/common/cnxk/cnxk_security.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/drivers/common/cnxk/cnxk_security.c b/drivers/common/cnxk/cnxk_security.c index c2871ad2bd..9446c14ac8 100644 --- a/drivers/common/cnxk/cnxk_security.c +++ b/drivers/common/cnxk/cnxk_security.c @@ -174,9 +174,11 @@ ot_ipsec_sa_common_param_fill(union roc_ot_ipsec_sa_word2 *w2, uint8_t *cipher_k } /* Set AES key length */ - if (w2->s.enc_type == ROC_IE_SA_ENC_AES_CBC || w2->s.enc_type == ROC_IE_SA_ENC_AES_CCM || - w2->s.enc_type == ROC_IE_SA_ENC_AES_CTR || w2->s.enc_type == ROC_IE_SA_ENC_AES_GCM || - w2->s.enc_type == ROC_IE_SA_ENC_AES_CCM || w2->s.auth_type == ROC_IE_SA_AUTH_AES_GMAC) { + if (w2->s.enc_type == ROC_IE_SA_ENC_AES_CBC || + w2->s.enc_type == ROC_IE_SA_ENC_AES_CTR || + w2->s.enc_type == ROC_IE_SA_ENC_AES_GCM || + w2->s.enc_type == ROC_IE_SA_ENC_AES_CCM || + w2->s.auth_type == ROC_IE_SA_AUTH_AES_GMAC) { switch (length) { case ROC_CPT_AES128_KEY_LEN: w2->s.aes_key_len = ROC_IE_SA_AES_KEY_LEN_128; @@ -879,9 +881,11 @@ on_ipsec_sa_ctl_set(struct rte_security_ipsec_xform *ipsec, } /* Set AES key length */ - if (ctl->enc_type == ROC_IE_SA_ENC_AES_CBC || ctl->enc_type == ROC_IE_SA_ENC_AES_CCM || - ctl->enc_type == ROC_IE_SA_ENC_AES_CTR || ctl->enc_type == ROC_IE_SA_ENC_AES_GCM || - ctl->enc_type == ROC_IE_SA_ENC_AES_CCM || ctl->auth_type == ROC_IE_SA_AUTH_AES_GMAC) { + if (ctl->enc_type == ROC_IE_SA_ENC_AES_CBC || + ctl->enc_type == ROC_IE_SA_ENC_AES_CTR || + ctl->enc_type == ROC_IE_SA_ENC_AES_GCM || + ctl->enc_type == ROC_IE_SA_ENC_AES_CCM || + ctl->auth_type == ROC_IE_SA_AUTH_AES_GMAC) { switch (aes_key_len) { case 16: ctl->aes_key_len = ROC_IE_SA_AES_KEY_LEN_128; From patchwork Wed Feb 5 16:23:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 150973 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id DAC7B4619F; Wed, 5 Feb 2025 17:25:06 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5B5584060B; Wed, 5 Feb 2025 17:25:05 +0100 (CET) Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by mails.dpdk.org (Postfix) with ESMTP id 67332402E1 for ; Wed, 5 Feb 2025 17:25:02 +0100 (CET) Received: by mail-pj1-f50.google.com with SMTP id 98e67ed59e1d1-2f9cb23d22cso2915767a91.1 for ; Wed, 05 Feb 2025 08:25:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1738772701; x=1739377501; 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=W95WOP/8RCXxUi+KRMAjzCq/I0S+IPBFDVd0PU8v19E=; b=YVjF5+rM45W3wKNxQRbQiK+Dj5SJHRSFFRdt/iuC94o2VEykt3B+GXm/FZmX6f7zql p9X8cbmcwW20kc1/CSOJZ2XaF7HogBAuTEziEaZ6NzzEKllMfIkUhcU+i85buTPhCkKp YWo5eJZsnxsat+3eYfmS/E6Vr+tgqx3eBeePm1cm3tWJ5QYoB/nG+FQ89Ok0GL3c675Q CnBHJ02EOxneInmLJBUCA0J0ObTmm60NTy7CWsFtodfhHH2a6AZ4n1h5dI9t9qTTeymU xVhR+zGwd51i60uUiz7rvp4MhK8YAoDGXulByQMoyMIJ6LpzSnamsJmwQfX1hvfWlZPn fzAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738772701; x=1739377501; 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=W95WOP/8RCXxUi+KRMAjzCq/I0S+IPBFDVd0PU8v19E=; b=eDu8Yc+X2hmF85/NO10t3e+jcDLQf4qN2iGkLcffFzFcWhtAj5nEbFL4shIZRIR+iU 7yRVYkLhERGVAUztXBgizQ2+alQw9v5w5jZy6DFntwWAx452EoBPo0xVIAS6MBnhmE3X 2Mc620vKnXZwkKWNjaTyak4FJFO4zWcIb0MqS5p4H7Xg62U5bqQ6/cKQoZPOz0F1jKEt mAQTwXfchaZf8x6+9VgsEqzJItx/SGiiwO2qT5FGwQ+143C63L31eywHJG3LbE2KaJ4D K6qDRxxe4FlyqV5OTYSRNOjfFfrKNc0FrjY+0mlCd88qy5Undd2wmTvzkk6mC5FQ0BHZ EQuQ== X-Gm-Message-State: AOJu0Yy4abBACI33hKPOZl4kUfWXM6LfiuFvJoQYCuGPsW7QBxXVbDQy jwdN5mRQ56VTx7rfaj1ywctf2w301QIKT15uvymJbr5RYmZlSwe7FoVRsE0g28DEuHvS2hhSWBk 4 X-Gm-Gg: ASbGncs8WjB0GMGXXpVCB3I9XVDsCdO2DgNx9UHhzjuGPv2KN2EpgIFk92z24BGvv6o lXTNQPaYKxjDuW7kCsKLEUEaYUIfngdxPTxUnFjN6toiMpfszvR7kB4/yB7OIu8OXZ8O/zRhLv7 mEL6hjYfHQbi6oyjIE2VoorugnQp9ByMnMbriffFlgHDCksRJCEQfDT8ORx4ipIts11kNwGasfI cOvgNpI2A5S9FaLDkHBxhlPYc/VssN81QOqfbEBeJtQI9hnzKuGBZR9wLcknBIfq3p09q0A9+FM pbC5hGIElWQM8trPINfgCHK8VYR+M0T4FddnI26IjsJ+1KAHSn2utg1Ouf3G05RPo98H X-Google-Smtp-Source: AGHT+IFaxEFfdxoB+NhJWY6Xjw8ISMTtUGfHpgU9GFwGkwmORKfGmIuhKqeQzS066wOADy8uUGvHIQ== X-Received: by 2002:a17:90b:1d87:b0:2ee:ed1c:e451 with SMTP id 98e67ed59e1d1-2f9e077b9fbmr5796134a91.15.1738772701637; Wed, 05 Feb 2025 08:25:01 -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.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Feb 2025 08:25:01 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Praveen Shetty Subject: [PATCH v3 02/19] net/cpfl: avoid calling log (printf) with null Date: Wed, 5 Feb 2025 08:23:03 -0800 Message-ID: <20250205162448.161161-3-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 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org The log message would always refer to str variable which is NULL here. Looks like author intended to print original parameter. Link: https://pvs-studio.com/en/blog/posts/cpp/1183/ Signed-off-by: Stephen Hemminger --- drivers/net/intel/cpfl/cpfl_ethdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/intel/cpfl/cpfl_ethdev.c b/drivers/net/intel/cpfl/cpfl_ethdev.c index 6f6707a0bd..1817221652 100644 --- a/drivers/net/intel/cpfl/cpfl_ethdev.c +++ b/drivers/net/intel/cpfl/cpfl_ethdev.c @@ -1580,7 +1580,7 @@ parse_repr(const char *key __rte_unused, const char *value, void *args) RTE_DIM(eth_da->representor_ports)); done: if (str == NULL) { - PMD_DRV_LOG(ERR, "wrong representor format: %s", str); + PMD_DRV_LOG(ERR, "wrong representor format: %s", value); return -1; } From patchwork Wed Feb 5 16:23:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 150975 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id BCF7E4619F; Wed, 5 Feb 2025 17:25:20 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 416324064A; Wed, 5 Feb 2025 17:25:08 +0100 (CET) Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) by mails.dpdk.org (Postfix) with ESMTP id 4EC3440608 for ; Wed, 5 Feb 2025 17:25:03 +0100 (CET) Received: by mail-pj1-f46.google.com with SMTP id 98e67ed59e1d1-2f9f5caa37cso722359a91.0 for ; Wed, 05 Feb 2025 08:25:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1738772702; x=1739377502; 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=tQR7HMFBLn+vHlNygZ1YrWong0eA4S4pgzdM13oH2Qg=; b=xYBgxcnjoL7yg5Hw8R0Lx2T6qI6eqpdOnuDdK+06QFgs7mV1RI9tw6gE46zYEB88dL CgJoLeIZJhGPgI4I01I+C55dOJC3H93UsqDsIMA5SOvzTCy8eTaOJlE145N3GFWqD3lQ QZUtD3OsAFNz2oPJlaqwb1gNYa9woJK9wdqc9iDNCZPoq7JRSlVEouWhmtCravikO0JC fquGU/2ftvNsNRs0jtjH17lbUshHOPLzIeHq5Y0uj8HZxIsmadPP0WTuuWwE0nlGx6Yt vYjIvo76xnenRqzE0qLXN8matMvyYJasavMI2deg734nfxIMhNqcvK4sA0+Smt7yczRj DzWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738772702; x=1739377502; 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=tQR7HMFBLn+vHlNygZ1YrWong0eA4S4pgzdM13oH2Qg=; b=cNPmGTRXPoLV3Dra3H7rNoBmWNjqipHT3UCwy3SxnzJcHmsGCOkPvWtll9AJKLkU6m qlQ5KxOaXCQr7IYWG1vL2pde0jvQG5DqBVLpQ/qmwv5qFRSJn/fJjOsJ9yOK4SrhcBLo V22fDcky25aqOQsjex8Qn2XFkUhaNTdfjidJsXSS/KROIPolF11u0Wu+3ywbgIrZF0bm YVZDguaEqI0A11RZWKAH3GJkHZCc42iV7kWDsGTJwsl7NYlix6OksP/PEW5HYFD9un0v ju4ri6D5Y4PzxWSKZhi58w9C3Po5szQ6O94HFjXe39KG8JOhqztqI01spvAjt7A3Z+fw OA+g== X-Gm-Message-State: AOJu0YyFTK4ooAuhMfjflQq1pCQb8+sOMBe4OxSwNsfStn1kwk1+tMtY +NyPAKilYy0KRXyeNEnn/RxfghIygtgrB9cmsLHkqxWpjfc7IjHQgvF5LCcXxSWt3PF9NoufpOt 9 X-Gm-Gg: ASbGnctfelQde7IG3cDYAhjwzYgyqN/ukvCbTUB0vIynGw/TKTtmpzh0QlNkdb++InN ci4wc03nRlDvXdO6+9pscTY9g7ygPx0ahFAPVkJp+dfqOlri1bz14sBvWycvBE/RkqOA6DIOzmb jRIzHEJeJygg+SY5eseoMO3HISuXNtk2xeDGdYurp9M1KnYfxFRNvBkNn0NAc5OUQ7pK+G48k4u Zy8LXPy/I3DXiACZpaNhF7xmXBySnUXnw569TW6d4W3xszKsq9MZrycK71+ArOmpulLdAlKaMu9 43I4p9Zin6UL0BZWXrKU9R2nBS6uMnIcuPCobbi8PzOj1R7+2UjMYdxkzcZeGk3wBS2z X-Google-Smtp-Source: AGHT+IEkXVgCaAp3Fud+979m5DDQ4vmW3r6bMjIc5fgQ/PI46BDwvpgM5tiqI+svOmZbtIGDg1L2oA== X-Received: by 2002:a17:90b:1d88:b0:2ee:823e:39c4 with SMTP id 98e67ed59e1d1-2f9fddd6945mr125358a91.7.1738772702491; Wed, 05 Feb 2025 08:25:02 -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.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Feb 2025 08:25:02 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , tduszynski@marvell.com, stable@dpdk.org, Jakub Palider Subject: [PATCH v3 03/19] raw/cnxk_gpio: fix file descriptor leak Date: Wed, 5 Feb 2025 08:23:04 -0800 Message-ID: <20250205162448.161161-4-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 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org The function would leak file if fscanf failed. There is a working version in other file, clone that. Link: https://pvs-studio.com/en/blog/posts/cpp/1183/ Fixes: 0e6557b448fa ("raw/cnxk_gpio: add self test") Cc: tduszynski@marvell.com Cc: stable@dpdk.org Signed-off-by: Stephen Hemminger --- drivers/raw/cnxk_gpio/cnxk_gpio_selftest.c | 24 ++++++++++++++-------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/drivers/raw/cnxk_gpio/cnxk_gpio_selftest.c b/drivers/raw/cnxk_gpio/cnxk_gpio_selftest.c index 2f3973a7b5..a0d9942f20 100644 --- a/drivers/raw/cnxk_gpio/cnxk_gpio_selftest.c +++ b/drivers/raw/cnxk_gpio/cnxk_gpio_selftest.c @@ -34,24 +34,30 @@ cnxk_gpio_attr_exists(const char *attr) static int cnxk_gpio_read_attr(char *attr, char *val) { + int ret, ret2; FILE *fp; - int ret; fp = fopen(attr, "r"); if (!fp) return -errno; ret = fscanf(fp, "%s", val); - if (ret < 0) - return -errno; - if (ret != 1) - return -EIO; + if (ret < 0) { + ret = -errno; + goto out; + } + if (ret != 1) { + ret = -EIO; + goto out; + } - ret = fclose(fp); - if (ret) - return -errno; + ret = 0; +out: + ret2 = fclose(fp); + if (!ret) + ret = ret2; - return 0; + return ret; } #define CNXK_GPIO_ERR_STR(err, str, ...) do { \ From patchwork Wed Feb 5 16:23:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 150976 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id B15FA4619F; Wed, 5 Feb 2025 17:25:26 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 51EB14065B; Wed, 5 Feb 2025 17:25:09 +0100 (CET) Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) by mails.dpdk.org (Postfix) with ESMTP id 1778F4042E for ; Wed, 5 Feb 2025 17:25:04 +0100 (CET) Received: by mail-pj1-f54.google.com with SMTP id 98e67ed59e1d1-2f9e415fa42so1379214a91.1 for ; Wed, 05 Feb 2025 08:25:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1738772703; x=1739377503; 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=dyYQOw5yHwgfvcv4qIn/z4VM8/qbMnQvnHGhTrbkKlg=; b=ZIrrUGOqEaGCe0XY93AcLchgW+e8ECS8m6AFsiW8JKaqxEALuaJy5R/9YKaFjSl+9J 2XmPjFhP4sHIWitmybsbCP8maqiQ4Ibr0PDuZuYkwCpBacLWgTqMsJPwnwFaOziC131V E3gDDddhCdlyBixPCOledlxIv8YKeFqXwpTsl1nWSuZiOzEW8ZqGMl3v2xdmucaAS5n4 R+cGpD0+Dz4nojjTt+Z9gHORyH966bDqNyWJWQBAzqmRQTnlunfw+cjMlCWdlplsWwpn 3R7aEMI1fii9JN4rxk/uYrV/cDshj9VLo0E9SM2pGAdXJaAX9Q/EAAhfDbnIAdIhcVF5 wRSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738772703; x=1739377503; 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=dyYQOw5yHwgfvcv4qIn/z4VM8/qbMnQvnHGhTrbkKlg=; b=g6lIGyl4X2d8yUqnj7YH5wY9nEZgg8WQPupmKlpbI5c+W9pDT5wfE1H7q9iUQvoNsi 2J5MpfCJtRXX3wsOzEm6amqsKLQ27BbKt5GJoBo8hd1nQRVX/548hggz7WgRjt03aQWx SkzHa0eJHBycDleUwkZxuBN1gXTxXIIs5j/B/SHz7zvd1gmdjDTqH8U06zy0MHwgTjdL FSU2Cy4Eim/6Hvi1Q1MnIAh+EY/+XIUAJZikaFKJ0+LSxOWyuq38ha3gmi4VCtEbI2w6 o56HqsvqD+BiwPeKDv1o+Q2huynFIOT1DoeoP/YmuHByYw1a5M4dGmmlUB1as5FzDOKi p9Ig== X-Gm-Message-State: AOJu0Yxdub7b4m8B3cB9x2i1lGR/8FaWIuZkXGoYotKmi13t7HIi5rOQ Mf9Kzsj8wJlLQaLkJAuNvUmbqBZVHu9W+B1bxfEGtsJOExWUMjulIkq3td+rrD7/cPnfNID/mos 7 X-Gm-Gg: ASbGncvqB0YhTjWUpMI9HgUABL61dFinf5T4LFoXC/xOG4X7ASxJpvh5/Jzd+0hOP4S ygGlcABluCXeba/F5dIHuqav81GdZ8g8+VGXkzwiuVL6v/pqKFnue+Y9QT4f+edeBkw1rjaRjN3 XWm2bp536cPJJtuuc/TF+MBuDsZfT1OfFx1gDQv3hYG766MPLWDgl6w91bhIZB8hfX5hP+SmoV6 2HS36YriNvZb9/RqGE9B/cHTYFmpfkMyEk+ePPUgVfYTyOUyRIcE6tL34rvt3oK39NxCgO69c7N w3VF/eUtiBYQrviKciMKMMVA3RVVcUI1ipqXLOaAVziU3nSs4GCByRuZJ8oJyKYp3niU X-Google-Smtp-Source: AGHT+IGp4YxuaiKwVhSfXB0KRyKkfSWhVXZoXtDKqlJuOxJUEwlwIIRuIGtuLhaU93/T9f8cAXcgWg== X-Received: by 2002:a17:90b:4cc2:b0:2f5:63a:44f9 with SMTP id 98e67ed59e1d1-2f9e0811e4bmr4253699a91.23.1738772703288; Wed, 05 Feb 2025 08:25:03 -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.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Feb 2025 08:25:02 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Christian Koue Muf , Serhii Iliushyk Subject: [PATCH v3 04/19] net/ntnic: remove dead code Date: Wed, 5 Feb 2025 08:23:05 -0800 Message-ID: <20250205162448.161161-5-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 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org The loop to update speed would not work because num_port_speeds was always zero so it did nothing. And the array of pls_mbps was only used inside the loop but never set. Link: https://pvs-studio.com/en/blog/posts/cpp/1183/ Signed-off-by: Stephen Hemminger --- drivers/net/ntnic/ntnic_ethdev.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/drivers/net/ntnic/ntnic_ethdev.c b/drivers/net/ntnic/ntnic_ethdev.c index 2a2643a106..467fea4bf2 100644 --- a/drivers/net/ntnic/ntnic_ethdev.c +++ b/drivers/net/ntnic/ntnic_ethdev.c @@ -2037,8 +2037,6 @@ nthw_pci_dev_init(struct rte_pci_device *pci_dev) uint32_t exception_path = 0; struct flow_queue_id_s queue_ids[MAX_QUEUES]; int n_phy_ports; - struct port_link_speed pls_mbps[NUM_ADAPTER_PORTS_MAX] = { 0 }; - int num_port_speeds = 0; enum flow_eth_dev_profile profile = FLOW_ETH_DEV_PROFILE_INLINE; NT_LOG_DBGX(DBG, NTNIC, "Dev %s PF #%i Init : %02x:%02x:%i", pci_dev->name, @@ -2178,12 +2176,6 @@ nthw_pci_dev_init(struct rte_pci_device *pci_dev) p_nt_drv->b_shutdown = false; p_nt_drv->adapter_info.pb_shutdown = &p_nt_drv->b_shutdown; - for (int i = 0; i < num_port_speeds; ++i) { - struct adapter_info_s *p_adapter_info = &p_nt_drv->adapter_info; - nt_link_speed_t link_speed = convert_link_speed(pls_mbps[i].link_speed); - port_ops->set_link_speed(p_adapter_info, i, link_speed); - } - /* store context */ store_pdrv(p_drv); From patchwork Wed Feb 5 16:23:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 150978 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 47A004619F; Wed, 5 Feb 2025 17:25:43 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C64304067A; Wed, 5 Feb 2025 17:25:11 +0100 (CET) Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) by mails.dpdk.org (Postfix) with ESMTP id 9FDA14060F for ; Wed, 5 Feb 2025 17:25:06 +0100 (CET) Received: by mail-pj1-f52.google.com with SMTP id 98e67ed59e1d1-2f9da2a7004so2106317a91.0 for ; Wed, 05 Feb 2025 08:25:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1738772706; x=1739377506; 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=TfXiE2LtADCfDkW4/FzronF6b6+6e4EqLUV8etfbTU4=; b=rPfDFc0epn5+oJJ8n6qIRDCDVjVd0mj+LG+zrFrRBEPJrDsY61c73gsbQZnLbSOpvi 8zo2SBZzHtNM1ieoI/zA0fZe08Vc+uHuwlIcQekqIZvSeHDcfe74Hs1/7RGgiKY72I/g /OIURGTmNu1/SwVJYKuBzXt0Uu2azZgD2GrppEYPhmoUCf1s2SwrXjaa1qWSwqps2YeY 9LJvYQ1s3io7Okm0LSOQAJznxQAiyb/aupxfY1Mn6SCj+WDqj8heNc8RM4imocBhS4Fu wxjK1hVIBeKTENk+i8BmAQ6yhY/eTIatq/XonwCREncAicHQoq6j8YCpETzCdAehG4dy EVbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738772706; x=1739377506; 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=TfXiE2LtADCfDkW4/FzronF6b6+6e4EqLUV8etfbTU4=; b=bpF9ZxYNx4GG42wLzDfttIE69qDBr3y79VP3biSpCbMl7LkKFOpueifdnF1V2ouQaf z5HitjXjam7vitXzyNFwfEVxXlfP2u9S3TOJ/9iQYXfTNf4UQfreYk8blSmBpJPNhBX7 CGkDpqITL3PJDIZI/qoCA9nYpF9NQAydsnn8TmfKcIHoIfhds6hfL0wNKX+yOpfw63cb lBlV5uQn/gkW+Izqb+ziArpIWgEnPYIujYn6wT8q9F8279e0Qx1ATqEki1fkQEhAV2bL rKPR2M6JssfqfaPjKLGUW5kIiOIzPIMtL9eoMZ8FooZqSewZO/aT6/DV/7Ms9VGdnhtn EGBw== X-Gm-Message-State: AOJu0Yyb/H0+9tGBt/67E/c0oXb/n951Hz7o2XFauSeT9NFDcFiffeYw Kgyxfe41HjqlLrf/4jSRexbicZAc5WJC+/KMTc5SZDgx+oEc6q7//0HIqwuBbj+3FOAb9zodpwk S X-Gm-Gg: ASbGnculSw/8HVooNsPiVuM3O56qfKFcxiPaLke+qZpjWfWf5FpdY9EbDlOGAIZdao0 7oEFHliSZJWNtKU08HD33+aN6m7R8yBSPp0/qU+5H8hks/Kn1Z+PRVASfxQisKlYrMY71io/fep furGnCb46uLztue65xip0HmOp0XnT1OXDnyu0XIoo7X7zqRY0h9DuTklyAlckH5+AfbyypURF90 49e2LhaMYKnJMmCo2taT60VCcLo4LE+9wWPppKjUXm6I+3eFLz8IHP3AvrhTC9R0aQ0poN5m3qE psSkfSfwvBdYVu9rog/riG5fUb8QJLaipdrdEUWBBV7ysKCMuDkpCcZ9IRKJ5D03V12V X-Google-Smtp-Source: AGHT+IHGNHV/+8i9af6XKFJ6C4foocqANPp8cwlRy7kWjNyYVKQpfPgEhlwCGt6QUyw81+H8HH73ow== X-Received: by 2002:a17:90a:d604:b0:2ee:bbe0:98c6 with SMTP id 98e67ed59e1d1-2f9e07627a6mr5377243a91.8.1738772704207; Wed, 05 Feb 2025 08:25:04 -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.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Feb 2025 08:25:03 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Bruce Richardson , Ian Stokes , Bernard Iremonger , Rory Sexton Subject: [PATCH v3 05/19] net/i40e: remove duplicate code Date: Wed, 5 Feb 2025 08:23:06 -0800 Message-ID: <20250205162448.161161-6-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 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org There are two branches in the cascading if/else that have same condition and code; remove one. Update the code to follow DPDK style where all statements in if should have brackets if any leg requires them. Link: https://pvs-studio.com/en/blog/posts/cpp/1183/ Fixes: 2ab5c84605f0 ("net/i40e: fix ESP flow creation") Signed-off-by: Stephen Hemminger Acked-by: Bruce Richardson --- drivers/net/intel/i40e/i40e_fdir.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/net/intel/i40e/i40e_fdir.c b/drivers/net/intel/i40e/i40e_fdir.c index 349627a2ed..94e3ab44e3 100644 --- a/drivers/net/intel/i40e/i40e_fdir.c +++ b/drivers/net/intel/i40e/i40e_fdir.c @@ -599,18 +599,16 @@ i40e_flow_fdir_fill_eth_ip_head(struct i40e_pf *pf, } else if (cus_pctype->index == I40E_CUSTOMIZED_ESP_IPV4_UDP) { len = fill_ip4_head(fdir_input, raw_pkt, IPPROTO_UDP, len, ether_type); - } else if (cus_pctype->index == I40E_CUSTOMIZED_ESP_IPV4_UDP) { - len = fill_ip4_head(fdir_input, raw_pkt, IPPROTO_UDP, - len, ether_type); - } else if (cus_pctype->index == I40E_CUSTOMIZED_ESP_IPV6) + } else if (cus_pctype->index == I40E_CUSTOMIZED_ESP_IPV6) { len = fill_ip6_head(fdir_input, raw_pkt, IPPROTO_ESP, len, ether_type); - else if (cus_pctype->index == I40E_CUSTOMIZED_ESP_IPV6_UDP) + } else if (cus_pctype->index == I40E_CUSTOMIZED_ESP_IPV6_UDP) { len = fill_ip6_head(fdir_input, raw_pkt, IPPROTO_UDP, len, ether_type); - else if (cus_pctype->index == I40E_CUSTOMIZED_IPV6_L2TPV3) + } else if (cus_pctype->index == I40E_CUSTOMIZED_IPV6_L2TPV3) { len = fill_ip6_head(fdir_input, raw_pkt, IPPROTO_L2TP, len, ether_type); + } } else { PMD_DRV_LOG(ERR, "unknown pctype %u.", fdir_input->pctype); return -1; From patchwork Wed Feb 5 16:23:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 150977 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 7D9CA4619F; Wed, 5 Feb 2025 17:25:35 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B94404066F; Wed, 5 Feb 2025 17:25:10 +0100 (CET) Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by mails.dpdk.org (Postfix) with ESMTP id 1122240649 for ; Wed, 5 Feb 2025 17:25:06 +0100 (CET) Received: by mail-pj1-f41.google.com with SMTP id 98e67ed59e1d1-2f9c97af32eso2835001a91.2 for ; Wed, 05 Feb 2025 08:25:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1738772705; x=1739377505; 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=2P5RCKeZRHk7jkRn4otybzGL+FUsq+KHiovxUWGDHec=; b=ZMx4qoUtJM54K+Z9ucmdqfC4FNBiOVt8grmdQP6zhPkjGEjavNJgaokUxT89gIsRw7 1qm+XyFXbCrvy8sbm8akNcKypPFbgPfP+CQVxvekCmScxWWDRhlEvykjNIXBDB3qLI1R Mhqi6BFMzy0tGMQ7+m/GoITJJzyU6aboPoxday3Ud472ty52YmzaWByVwhl7+jqe2fgE mY6GbdNAL+FAnuPkuFk5s6G9abd+kOmdpc5r48NYWMBSl+v6vp7J+kyA7DZJ9trUGS/C PvZuyNlxxDfpDImwPKp0K5OvtbCc+NzBcZ5fjQMv775ObLet+aN25cWUBfSGy+zq73yG hA2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738772705; x=1739377505; 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=2P5RCKeZRHk7jkRn4otybzGL+FUsq+KHiovxUWGDHec=; b=KyErsZDpzq33iGXgtCKFHRcDcbR7gOAgzXliztHKRlxOYOrxOJYzODkBbk3+9jerIn KJHoeTGyWBGL4g6ROc86pOC9vgj5acKLkco0aiY1Jw3IK8UiraD7zk8xEwLG9vX/j/uR n/86vIXqY1/UbvRkwlsAJSvHmjREmC1WL+6B52KPOUCSbvuF9O6MUwoIyXXF19iDZnGi 9ZQuPUP3flrPOBMst5EShTlWsTmGRkKX4BwkTelnOW4cTY1opfI9mkzyoQiNdl8d/KHz 2yOqqQkAsOKExcTfKt87YPvSJlkpiFXNx7yMM/9PdnH98EpBjStqeqsglMH9iqC2HqiV 0i/w== X-Gm-Message-State: AOJu0Yz9yFWqiL0jDx8aXLy9pcCM67DdP6Enjunw6qPre9NtoMfPCJBF /zJ79m7C9kXfUErDu049G26gj/b6BoURnWYnT4V9tbjNK+a06rRXEdO8Ze/ji7unVZyIejhIn0x + X-Gm-Gg: ASbGnctOaSyEL3brVvJb3Q50xO1axioyorQA9m/9GcWhg3Isn3kaVNrJillIqblzzCa fMCXzGUV7MQGSKzRLuMp1ACYZ9yGJ+yIgug14rhXtn2kvgCEQbV5UB9uisJUOV/ZeaQuj+B3Yqa hvBGDdDtYGF3nVG0bx5JqtVVxzjPY1cjRxiyYWtg3Edu0smWuW6d/3BfkNy+yR5VoSfFkgiu6Lj OjWVYzVwwhhIRfY/JIDGUz1eE9omCJ0s2SDAv6Nrv2x4jwWW9Xddi37sZ+GogVsbO8dUPzgpOCi er07PiS7o76QGH9eNM4j8lHLRnK2ISZqXOgHXoOS5nGUvvxAyDCBkkBnOpDzPjWXRyPa X-Google-Smtp-Source: AGHT+IHUBfVgojk05hKsnLKT9TKXICYPb7zP76ukH1Y+FZ7XjR4JKxKyM4/5QSBAw7mFsFMfCttTQw== X-Received: by 2002:a17:90b:2ec8:b0:2ee:dd79:e046 with SMTP id 98e67ed59e1d1-2f9e076c07bmr5047954a91.13.1738772705095; Wed, 05 Feb 2025 08:25:05 -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.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Feb 2025 08:25:04 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , xuemingl@nvidia.com, stable@dpdk.org, Tyler Retzlaff , Gaetan Rivet Subject: [PATCH v3 06/19] eal: fix out of bounds access in devargs Date: Wed, 5 Feb 2025 08:23:07 -0800 Message-ID: <20250205162448.161161-7-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 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org The code for parsing layers in devargs could reference past the end of layers[] array on stack. Link: https://pvs-studio.com/en/blog/posts/cpp/1183/ Fixes: 9a1a9e4a2ddd ("devargs: support path value with global device syntax") Cc: xuemingl@nvidia.com Cc: stable@dpdk.org Signed-off-by: Stephen Hemminger --- lib/eal/common/eal_common_devargs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/eal/common/eal_common_devargs.c b/lib/eal/common/eal_common_devargs.c index a64805b268..dd857fc839 100644 --- a/lib/eal/common/eal_common_devargs.c +++ b/lib/eal/common/eal_common_devargs.c @@ -88,7 +88,7 @@ rte_devargs_layers_parse(struct rte_devargs *devargs, s = devargs->data; while (s != NULL) { - if (nblayer > RTE_DIM(layers)) { + if (nblayer >= RTE_DIM(layers)) { ret = -E2BIG; goto get_out; } From patchwork Wed Feb 5 16:23:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 150979 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id A5DF54619F; Wed, 5 Feb 2025 17:25:50 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CB30340659; Wed, 5 Feb 2025 17:25:12 +0100 (CET) Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by mails.dpdk.org (Postfix) with ESMTP id 086B640656 for ; Wed, 5 Feb 2025 17:25:06 +0100 (CET) Received: by mail-pj1-f42.google.com with SMTP id 98e67ed59e1d1-2f9d5f6df4cso2357297a91.1 for ; Wed, 05 Feb 2025 08:25:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1738772706; x=1739377506; 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=4+SIaV/lHu2jExzmnNWYeH0+4AAstRGe4I7fI5Kd3LU=; b=oSjjyXRxEoWeIs1hrGfvDmUMBYh5pL5S89OK0HvA/5eEwZIIZo5s8Y2zTvVPPIhe9k aN9g40AaPEzujrMjsaXitM1frZnTiF5kmWVthxmRcBHmoFQqXNuM56dR6KfBdiUjoTjR CIWEXKfdDQlkep7mIAAgV2Qav+uzK8kptlz+6LW0QB90tISrwVLPUvLp374Bh/XkP/HX iCMJsv7nmGKu70xBdyjKTpcVIoBjAlRmNETJZ7d+S/g0B3aRDkLrbxnE+bV6mS+ppmcZ 3Tva/02DEX0juaGeaTlsld79zz5eZhebqURnc+RgBtvr2z8PoQMeMnaYoxGbkbYQESzX nACw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738772706; x=1739377506; 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=4+SIaV/lHu2jExzmnNWYeH0+4AAstRGe4I7fI5Kd3LU=; b=ikdKcBsvbzsgmhHW4TBGImeIRiNRTbVDkDqp2JXD4R8qexcuZVYNkZ1rM621gfeRkE LIKWqiki+zHi1moH/cYkg62+7NE63lgPXwMIlTVSS2gx7KEyBdKDFgFsT8t9CMuwyYND l7fR3tvL5rj/CtS9KvUjv3bstheA+NkLmKgptqWxJ3YmaidSIaoJWkL/v7t0/FaMOH/C Kxl2L6PfTawTXetBIyz/+LR4SPlTiAginoryAunCE8Jpa0Jx6zsxrJizBaMHxrqJdpDH mZOcxrjAzv2reZcSOY2M1HKcUBBjdLj9RDjoMkjuOmyN/H8FrbShp7GpxIX8gN4r1IeA O97g== X-Gm-Message-State: AOJu0YzKMg6MvV4t78SJz/+fpDwkWSnuhb7tbCoWXQ5x7b7SWy4Ur4p0 Ja6vJjHWWQRsbxTO1lbgKb/0gxamVBzvE2K9J+0Hc9QJSu9dZfX7xC2GjjXyKCMZfG1MiTR0oa1 R X-Gm-Gg: ASbGncvl73UL0Sm7ujk7rGt4+cNIJMEOB4in1FnE5ABXnqwfDOotn8t1lPiBNLktvUA 6Xvgqulh+n3WYtp2O+nW4Kd3cBVFd5ML/uBphGh21RV85MSPWG9dsc9t2Wq+zr1HzWmUfw1idD8 227EnzJFONg7Wh1/SigaZ+zl4JeuMzIRfZTemvOAwQOCB/jmOCV23mqBBs6US6KjUvjTI1kueDb hrrN6RQUNyveleciw4e/L/FA0+4k43CuQuHyViyjEM4EqdYR4Cy1V2K5GezQZ0ZjuyppMCGmO66 zvdw/1C4ztCEBEg0Dzr5F20jrQs3FbV2HublbKZCIlA5u0MNaSplsRHoqEgxYJoapeeT X-Google-Smtp-Source: AGHT+IEocN13XgBIFv9BcSLAp03r01MbPmxt7LzpW3QF2FtMENuJjyA8hx1qH87r7E+eAbUfVwCJEA== X-Received: by 2002:a17:90a:d604:b0:2ee:ad18:b30d with SMTP id 98e67ed59e1d1-2f9e074c788mr4833776a91.6.1738772706100; Wed, 05 Feb 2025 08:25:06 -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.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Feb 2025 08:25:05 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , rmody@marvell.com, stable@dpdk.org, Devendra Singh Rawat , Alok Prasad , Igor Russkikh Subject: [PATCH v3 07/19] net/qede: fix missing debug string Date: Wed, 5 Feb 2025 08:23:08 -0800 Message-ID: <20250205162448.161161-8-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 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org The array of debug status strings did not match possible enum values. Add the missing element and a static assert to make sure the table has all possible values. For more complete description see. Link: https://pvs-studio.com/en/blog/posts/cpp/1176/ Fixes: ec55c118792b ("net/qede: add infrastructure for debug data collection") Cc: rmody@marvell.com Cc: stable@dpdk.org Signed-off-by: Stephen Hemminger --- drivers/net/qede/qede_debug.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/qede/qede_debug.c b/drivers/net/qede/qede_debug.c index 18f2d988fb..1d3147b724 100644 --- a/drivers/net/qede/qede_debug.c +++ b/drivers/net/qede/qede_debug.c @@ -4,6 +4,7 @@ * www.marvell.com */ +#include #include #include "base/bcm_osal.h" #include "base/ecore.h" @@ -82,6 +83,7 @@ static const char * const s_mem_group_names[] = { "TM_MEM", "TASK_CFC_MEM", }; +static_assert(RTE_DIM(s_mem_group_names) == MEM_GROUPS_NUM, "memory group string mismatch"); /* Idle check conditions */ @@ -5614,6 +5616,8 @@ static const char * const s_status_str[] = { /* DBG_STATUS_INVALID_FILTER_TRIGGER_DWORDS */ "The filter/trigger constraint dword offsets are not enabled for recording", + /* DBG_STATUS_NO_MATCHING_FRAMING_MODE */ + "No matching frame mode", /* DBG_STATUS_VFC_READ_ERROR */ "Error reading from VFC", @@ -5759,6 +5763,7 @@ static const char * const s_status_str[] = { /* DBG_STATUS_MISSING_TRIGGER_STATE_STORM */ "When triggering on Storm data, the Storm to trigger on must be specified" }; +static_assert(RTE_DIM(s_status_str) == MAX_DBG_STATUS, "status string table mismatch"); /* Idle check severity names array */ static const char * const s_idle_chk_severity_str[] = { From patchwork Wed Feb 5 16:23:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 150980 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id BAC7C4619F; Wed, 5 Feb 2025 17:25:58 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DA6F34066C; Wed, 5 Feb 2025 17:25:13 +0100 (CET) Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) by mails.dpdk.org (Postfix) with ESMTP id CE9EA4060F for ; Wed, 5 Feb 2025 17:25:07 +0100 (CET) Received: by mail-pj1-f45.google.com with SMTP id 98e67ed59e1d1-2f833af7a09so9457506a91.2 for ; Wed, 05 Feb 2025 08:25:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1738772707; x=1739377507; 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=fnT/3pOH6Z4FzBwUSMIczea55Qnff60OXjfwMyNHJNg=; b=Lj9nLe4XZMNsVVpL9ygD6syePFp/pB4XSgBULHbB3hLdHS06Mu5fi4jZT5A8127/aH FFA2bgaQAt1OgMGqfy+sIzqGkOI6VtQ6WfzfZtA/eFg/dkpBZZrNDQsc/g+GkyDIdEd1 RNEhuvEn/Qhdi67qj9flmWACMprCEhaPFqNhelIC3TF/V4mrcTdALL3QqC+Z+3TFweCS T0wBZfrzXgq0N6OyfN0NxgUmYRtm0YX5fzeVlIVFvJ8vDxcVTFZ1zUKywdI8nhP8v4xa fl5DelW/6QvcQ3r5JR2/5MleuNiMj0KpIIvDLPkZpWMwp/n7s2E4P6EkfmxYxcZhOsoZ Xxvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738772707; x=1739377507; 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=fnT/3pOH6Z4FzBwUSMIczea55Qnff60OXjfwMyNHJNg=; b=nJhZRZDIBORTwVwVUZPIuKTBj+OTPY5Djk1xtasCndIgdzoOwKr7kEILcH4oejzLpm HcSkY5ozoi94yEZNS+/VvFI9JMh6a/P1Yzwd4dtdFTzXNPEYVamS+qmUOQVs+52Xk7gS Hw4Z8CiDm+PzUw9AUPd3hMDXIIt9E6fhDMPmEQmwOk3tPs5DHwhgEpMt9ARuPyup6Frq Bq1dHsg5lvKddRBOP/ZhHrRkMzxXH40SlEnNw1zsSmKnZ6Hy1vtn5t3kMgEmxmyIsaxf /+AcqmSspfSg7vy0sfynswbFCqK/ZJALp1xjAC9ruhT8uJchhaGM/VTCwIefFYFIEZxw o34A== X-Gm-Message-State: AOJu0YwWklW8UHdXqEfN8HDvA76j3+j5wkjNYipzLg7CXXzyPkr2J3jL XqtuDQ9mlfXYNofAsoiR0NcpMPMzFu1XCqu3VJ6RwWlRuoXF5zHcagwqqG/RnicJkXlhkrrCBGS 4 X-Gm-Gg: ASbGncuwJqSQmTZtX2MCQxW111/22lHwGuKRAh32iJmkKjNpHxeVbdCtrJK14cdCCYJ Y++YpGyVh8NMnLws05DlT3T5Lc/Uu+xpmwNQ/CldBWzE4/7tmX+/oiVppaajhO3q0DNUuLUWLtd 3dIOQ7iHyMmvBh6uVDoM9xMRr7nW6V4RXceMCfe7L4S0eO5f2riNz1KF1oRXrNnjWgDOXZA42OX VcawkLIkhOMrd63jPXE5BcR82TMwNzVuqqZfLjhrxemSQKDtUTOn5TPV9gKFYHMXy+UjpVJ7clw EhZue4t4NgYnDL0QwRW//mxJm2q6Jv2oRtqCk+CwPPZTkisvVQkLbhVYGKG+ITZIcY+7 X-Google-Smtp-Source: AGHT+IEtZGHobkFh85Pvb++64mf1Ek9QGUTIl7Pbk9E9IZWqJzfvRDQGuUEKvJldV8O2W2sFGxvD9w== X-Received: by 2002:a17:90b:1fc7:b0:2ee:693e:ed7c with SMTP id 98e67ed59e1d1-2f9e0868531mr6197656a91.33.1738772706969; Wed, 05 Feb 2025 08:25:06 -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.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Feb 2025 08:25:06 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Kirill Rybalchenko Subject: [PATCH v3 08/19] examples/ptpclient: replace rte_memcpy with assignment Date: Wed, 5 Feb 2025 08:23:09 -0800 Message-ID: <20250205162448.161161-9-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 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Don't use rte_memcpy() when not necessary. Structure assignment is as fast and type safe. Signed-off-by: Stephen Hemminger --- examples/ptpclient/ptpclient.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/examples/ptpclient/ptpclient.c b/examples/ptpclient/ptpclient.c index def8de29ff..27d06dd91d 100644 --- a/examples/ptpclient/ptpclient.c +++ b/examples/ptpclient/ptpclient.c @@ -363,9 +363,7 @@ parse_sync(struct ptpv2_time_receiver_ordinary *ptp_data, uint16_t rx_tstamp_idx ptp_data->seqID_SYNC = rte_be_to_cpu_16(ptp_hdr->seq_id); if (ptp_data->ptpset == 0) { - rte_memcpy(&ptp_data->transmitter_clock_id, - &ptp_hdr->source_port_id.clock_id, - sizeof(struct clock_id)); + ptp_data->transmitter_clock_id = ptp_hdr->source_port_id.clock_id; ptp_data->ptpset = 1; } @@ -470,9 +468,7 @@ parse_fup(struct ptpv2_time_receiver_ordinary *ptp_data) client_clkid->id[6] = eth_hdr->src_addr.addr_bytes[4]; client_clkid->id[7] = eth_hdr->src_addr.addr_bytes[5]; - rte_memcpy(&ptp_data->client_clock_id, - client_clkid, - sizeof(struct clock_id)); + ptp_data->client_clock_id = *client_clkid; /* Enable flag for hardware timestamping. */ created_pkt->ol_flags |= RTE_MBUF_F_TX_IEEE1588_TMST; From patchwork Wed Feb 5 16:23:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 150981 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 937724619F; Wed, 5 Feb 2025 17:26:08 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 45C2240A6D; Wed, 5 Feb 2025 17:25:15 +0100 (CET) Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by mails.dpdk.org (Postfix) with ESMTP id DCFDF4065B for ; Wed, 5 Feb 2025 17:25:08 +0100 (CET) Received: by mail-pj1-f41.google.com with SMTP id 98e67ed59e1d1-2f9d5f6df4cso2357389a91.1 for ; Wed, 05 Feb 2025 08:25:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1738772708; x=1739377508; 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=zB6hIMtxNUEA8p6kUttERH7GJP97SxLZf0I+dhffzHM=; b=aexkUW/yDg/OEtvAzCvWsr7kTH8cHTARmXnUMOvNOQJauYVKEU771NmjX4w0PbhxiT +xi6N/Xf8DvYTVyo4wsDsCpYaoW8qQ1y6HNwJjxH7q+5ie/89dbxn89BxpnSRTB0UFmr rAaqows5yAMiQTiywGoeuO8xXzsY0cE6S/xwyqcojRiirzHhCubkzMlAd0zNguyJ7o30 zG6zH/dNeNB193nVCqvSrqWjr1CJqe6Z4wlP3bSqkAPQ1qUeSe6TQg6m6JOYZPlYsnSS ZODNXeclXzxmaQhS37IF94/inQNplXD1t+OjhbdvkI/BM6w+UK/cJ4GlQ8oNgTUQo9uX Mq2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738772708; x=1739377508; 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=zB6hIMtxNUEA8p6kUttERH7GJP97SxLZf0I+dhffzHM=; b=Jrt7l7kV9nXQ+AzhIW4ghXdB2E7d/UIkMvHnqYtu9WBLsBOHUkWcvBmxUbYF9aUh5S W6BLZgmeaddc1djEFSXxNDMW4BXKFD2YYSHg2oP01p4SS99zKX8fX8PMg5wi1q0C5FZy H6mr7kM53wo3fzcaaSkblxwCL2M3AxjGBTHu0hth/QH5VqMvLRfMF+79P1WdD06xVLdG l1Rxl/B30EWyUNszHVtY0jbUcd50yWjV+0+fS5Ru609pUJ5/Ia3JyjZaE49OWQzWC9N0 jNGeHI/5Zaus+QD5TH4SLDJNeH1s1OTqYS8zbEdAbctK8InNMuLwaU+7/xDT51fwgc8o s6VQ== X-Gm-Message-State: AOJu0YwTtf73QH9udmY7Ijdu2BUprB7+fff77M+rHNcF2ZyCRweCaqzW nwFq0GwbUS0hozBjyAFD6EuigxjfN6lJ/deGoP0ldNIv/F1jxWl4WLcznirjvGkw4js3Kt8Gtbo l X-Gm-Gg: ASbGncu0pwvEB5n68Np3zU5dqVClBY6Yqze8vdxGI8Zy3ppOoAnvjx7wGQDXYkeWCoC NTgXUVQEBA3W1dlCzetahhE2kZ+3VFH8ciavmjBUhS8amS1vbKyLy3P7GXizsoCBVdW/pUQervz XKL1D/b/nfG1QqbCYwXaLxWpszNPgZVU2/NswsYSHHU/xNAKf6EmaqrVPGqYXqwBXTOgPuEqov7 WgQYw/JhOc1ByzSPRsyn1BuIA/GgLtBqOxtSP9gnK4ICM+xIBh0pPH9a8hWxudga/LaGmv3YP7I SkgZQVvPgGZ+R5rbTlWmc2HmDkAIeHLIfntveWSFoU6BN/wPNLmH7y3oyuLWJPHufTHT X-Google-Smtp-Source: AGHT+IHOZIYwSOGWklF9gT/z6zxUTnxmaqPiYXrpkJ6BBKzS6sna/JPi3Mm+bBVXVphJ5NDZlhK9fg== X-Received: by 2002:a17:90b:4fcc:b0:2ee:8031:cdbc with SMTP id 98e67ed59e1d1-2f9e080004dmr4303528a91.23.1738772708002; Wed, 05 Feb 2025 08:25:08 -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.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Feb 2025 08:25:07 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , danielx.t.mrzyglod@intel.com, stable@dpdk.org, Kirill Rybalchenko , Pablo de Lara , John McNamara Subject: [PATCH v3 09/19] examples/ptpclient: fix self memcmp Date: Wed, 5 Feb 2025 08:23:10 -0800 Message-ID: <20250205162448.161161-10-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 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Calling memcmp on same structure will always be true. Replace with same conditional used elsewhere. Link: https://pvs-studio.com/en/blog/posts/cpp/1183/ Fixes: ab129e9065a5 ("examples/ptpclient: add minimal PTP client") Cc: danielx.t.mrzyglod@intel.com Cc: stable@dpdk.org Signed-off-by: Stephen Hemminger --- examples/ptpclient/ptpclient.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/ptpclient/ptpclient.c b/examples/ptpclient/ptpclient.c index 27d06dd91d..c344e7db1e 100644 --- a/examples/ptpclient/ptpclient.c +++ b/examples/ptpclient/ptpclient.c @@ -367,7 +367,7 @@ parse_sync(struct ptpv2_time_receiver_ordinary *ptp_data, uint16_t rx_tstamp_idx ptp_data->ptpset = 1; } - if (memcmp(&ptp_hdr->source_port_id.clock_id, + if (memcmp(&ptp_data->transmitter_clock_id, &ptp_hdr->source_port_id.clock_id, sizeof(struct clock_id)) == 0) { From patchwork Wed Feb 5 16:23:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 150982 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id EDA7F4619F; Wed, 5 Feb 2025 17:26:14 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4B13540A72; Wed, 5 Feb 2025 17:25:16 +0100 (CET) Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by mails.dpdk.org (Postfix) with ESMTP id AA0E040667 for ; Wed, 5 Feb 2025 17:25:10 +0100 (CET) Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-21f01fe1ce8so31206875ad.2 for ; Wed, 05 Feb 2025 08:25:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1738772710; x=1739377510; 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=xyzifiWA3+VxTUYxCZpCy2nFQoPfapOrdzV288THeqw=; b=Zt6fOe0dE70I9+3xWErzzGgv4STRYdSOo4bKF1zDotU7k6vF2yy6Z7IE5K1UTZQef0 b4j27OSV86uW9dQrSNlRKpxtvfjTOwZt3K9pikFxYxQAVK9w6PiU9aCoEzd1xVe/5Oxx x3faoKvVv++GTDUQEuvImO1BB1bIb3O30AVgYNUCZYZogMxhLUMBeoKLkRixsa/UTSrY TN/vPBK09jYMmHFadVnsX5wvBPrADcX5b0JsH2rqNdY+90BVbxBAiZf9jAiZdC9kYWTG M/eyWQ2vZCpfN2y51spn3smls/l/Uj9IgL4gkU6TEcLmGr8NQQXfmFfohKeAWCKIqa9V imxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738772710; x=1739377510; 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=xyzifiWA3+VxTUYxCZpCy2nFQoPfapOrdzV288THeqw=; b=P6xRvOVwsNpNdQ2i6tF6rx2vi6QgMioeaQsKO2oHCculGgzf8uRtQptVYGtg6HZJA2 Hb5RW1d4mjcTH+u2rZrSxsaTzejX4bFlcN4lm/jyKAMpaoDkhEuXfjudGo5GXFY3FAwi 7QECAMEZDEHoMh1zYHnaw7/C9oFHqSzRbqLX8WaLY9woCSgcAJcRnWBcCL/CyRl+SKfz uViUcQt/UEmdAiblg7NwCwyzB4SDUX9xrVx5w/uV1GIyuMMku5TjKji48OyP1KMskC3P IZAUVCg0c5LpHXrhC4pP9BwRrmr67bHjE92hqBrNEPOvtVu+mmObLqT1JieGcr6d/wes 069A== X-Gm-Message-State: AOJu0YxyYYpZSjXZnfYlO9H3kkrGPMRJtwtJYVdVWamGqy/aIyljGiXA BOnLmREXRY0UCa+WenCFbj2fkIf3WMEjBoN7RssCUjFGQ1ERNGqh/HCnih4MPrLkM4K4+VPKfwO 8 X-Gm-Gg: ASbGncv79jskZ9f9jvRjvyYsFqnaeK/RETvgG7cr9x8FDq399s4lyDcZKVwrFW3XJ+u PGNIvftI2iY/1EVHjVFW5hJfOPrUCmLsSLoGZy0TKuLHgBrPEjAolTrzJnghGsjVVTFwb90hkx3 snouOT5QHDiFBVGJhlaxlWFRIn7hox60Rj6ovxcQsqnK36qRgj13uArdB8UD7CnhiOxlcveuSHp PRLfSn4F/ump6TyWnh7lOKV2WRAyan75FGfldcN0Cg62kJwlP16bzmYtEagpFlCE+JvA9LRl9DY xQ03/1MdoAbNib10aN0u590VkZwsfKjNwz9rAXAtnYjtM10X9tnW3nR6M9f3UrJCcMWu X-Google-Smtp-Source: AGHT+IG44BrI+C01uRov8A7dmQEsfqkDF2YQ3w0rqW9HwiNgrlvWOSzDeX2Vela2qQF5gBy1JDdtBA== X-Received: by 2002:a17:903:2291:b0:21f:13a6:d424 with SMTP id d9443c01a7336-21f17e6d3b7mr55843155ad.30.1738772708856; Wed, 05 Feb 2025 08:25:08 -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.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Feb 2025 08:25:08 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Vamsi Attunuru , Anatoly Burakov Subject: [PATCH v3 10/19] net/octeon_ep: remove duplicate code Date: Wed, 5 Feb 2025 08:23:11 -0800 Message-ID: <20250205162448.161161-11-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 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Both sides of the if in uninit are using same code. Link: https://pvs-studio.com/en/blog/posts/cpp/1183/ Signed-off-by: Stephen Hemminger --- drivers/net/octeon_ep/otx_ep_ethdev.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/net/octeon_ep/otx_ep_ethdev.c b/drivers/net/octeon_ep/otx_ep_ethdev.c index b4f8baf3b3..8b14734b0c 100644 --- a/drivers/net/octeon_ep/otx_ep_ethdev.c +++ b/drivers/net/octeon_ep/otx_ep_ethdev.c @@ -721,14 +721,9 @@ static const struct eth_dev_ops otx_ep_eth_dev_ops = { static int otx_ep_eth_dev_uninit(struct rte_eth_dev *eth_dev) { - if (rte_eal_process_type() != RTE_PROC_PRIMARY) { - eth_dev->dev_ops = NULL; - eth_dev->rx_pkt_burst = NULL; - eth_dev->tx_pkt_burst = NULL; - return 0; - } + if (rte_eal_process_type() == RTE_PROC_PRIMARY) + otx_ep_mbox_uninit(eth_dev); - otx_ep_mbox_uninit(eth_dev); eth_dev->dev_ops = NULL; eth_dev->rx_pkt_burst = NULL; eth_dev->tx_pkt_burst = NULL; From patchwork Wed Feb 5 16:23:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 150983 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6C39C4619F; Wed, 5 Feb 2025 17:26:22 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 680D240A7F; Wed, 5 Feb 2025 17:25:17 +0100 (CET) Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by mails.dpdk.org (Postfix) with ESMTP id AF93C40669 for ; Wed, 5 Feb 2025 17:25:10 +0100 (CET) Received: by mail-pj1-f53.google.com with SMTP id 98e67ed59e1d1-2f9c69aefdbso3564037a91.2 for ; Wed, 05 Feb 2025 08:25:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1738772710; x=1739377510; 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=j0dvoHm/iI5DjcPcNDwGHDc3HdVJCtsbFCJCmrvlmTQ=; b=d2zDa5iCwk2vONN18PQ80Rnmlijglf6TgO0CBsHdKLZXfumXzSYQ8BsHLnJLGn8Y7U 1lFIknViBQFGaejspQUbpAZHnpf/Bt8mYEPdl0h1zyD7+aLAscC5Nv3MwsxIfcRaVs17 JuNYVk/n8COljVmiyyjIeYCFWgt2SFP4MQf5I0iVkgjjWae2MZonFMRfyHJ2wItZzAE4 5dQ3q58icXfWNknay9QcGedAZuKNm9ekXJtzWa4d6Vrdqblh1SrZNrKMCdbvfjO4f7qy abPpvtcijGws3kyVa0e+52QJzw+vrBQBPczZbO/++YDivd0wDd6arYQmfrol7IaPZs7F MFwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738772710; x=1739377510; 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=j0dvoHm/iI5DjcPcNDwGHDc3HdVJCtsbFCJCmrvlmTQ=; b=qd++MOwrhLMGZhrQv8K6J8jqhHMMF+SHyae+WMcVcuu+EdyW0SvzKwFspfW1BRLeg0 tBtMAiOmdbuZvs3GvhItgvUciiFfhpilXH/yNOf/hEAZAJ1aDbgNJojQoTJwu50u+tzq 9MOh5hT9VR9TgBJyWaKLwgcAlUhYfksN4U2Pi4W8ct1HnY4RU+BxO2j+XEOc0JacfFOL QbNKWtm5mWZC+D3Scrjy6BVmJWRRBZ9FDYU6GOxfjQglhv4OfEtrJUCsEoBTYdyTAUSN /6lvDr8s5L1ECPbA/nZIJ7lS0OkADLvvX9Yxit8oMJWRi+IXucjI/OuZb80xAn9T1N46 VxFg== X-Gm-Message-State: AOJu0YyKQ5AKKfyECxlgHoOyO5ccw41wzXZnQaFcOyyD3xgJo8awifbm XnbhkJ5NGjNW6mS+RuM9gWNbNU4YqdUgkSj7xwCB7MfD26ZptH5oF1xnS5iJyxA7R+VDRksSs6v N X-Gm-Gg: ASbGncu1Npg6AviFUbByVQmJfqdR4wJUXFsMoSfMNbv3nAQLuNyl27xVQbW2/5YZRj3 9I4EQB6JYu+mzgEip3bEOu2cKQDCq8iYIj+hI+29uCtpE/QmTfk+v4zp1pVxihYJ24dPagxd0eB V7X4iQtkkfsAPvmqmFxVUsMOc29AZG+nKauE8shMpW1qeqDERKOO/F7M5dNpqaA++tzBzNSuJAE 6guABhzBmhCJ6DMgwRMqHrpvSyBPgE+DhOK2ZfHhUBAVYajGRXsqNXMKy3JtZLnueNw4su4F6yy zD6lUpT3RTRCVb9sCQVg41xXey+k0nmME9q75co1SHIkQNDxPOuBA6avXoROaFVRMNSg X-Google-Smtp-Source: AGHT+IEEZ7zQhDg5xJmGxZwFSJuyGEZkPujNmKDPtxp1ZLWG0EvQFKzBdIVPeptZI91MQmKc4hCowg== X-Received: by 2002:a17:90a:d410:b0:2f2:8bdd:cd8b with SMTP id 98e67ed59e1d1-2f9e084a275mr5303820a91.29.1738772709757; Wed, 05 Feb 2025 08:25:09 -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.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Feb 2025 08:25:09 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , cloud.wangxiaoyun@huawei.com, stable@dpdk.org, Ziyang Xuan Subject: [PATCH v3 11/19] net/hinic: fix flow type bitmask overflow Date: Wed, 5 Feb 2025 08:23:12 -0800 Message-ID: <20250205162448.161161-12-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 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org The type mask is 64 bit value, doing a shift of literal 1 (32 bit) will result in int type (32 bit) and cause truncation. Link: https://pvs-studio.com/en/blog/posts/cpp/1183/ Fixes: f4ca3fd54c4d ("net/hinic: create and destroy flow director filter") Cc: cloud.wangxiaoyun@huawei.com Cc: stable@dpdk.org Signed-off-by: Stephen Hemminger --- drivers/net/hinic/hinic_pmd_flow.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/net/hinic/hinic_pmd_flow.c b/drivers/net/hinic/hinic_pmd_flow.c index 8fdd5a35be..6b1ca6ff88 100644 --- a/drivers/net/hinic/hinic_pmd_flow.c +++ b/drivers/net/hinic/hinic_pmd_flow.c @@ -1979,8 +1979,8 @@ static int hinic_lookup_new_filter(struct hinic_5tuple_filter *filter, return -EINVAL; } - if (!(filter_info->type_mask & (1 << type_id))) { - filter_info->type_mask |= 1 << type_id; + if (!(filter_info->type_mask & (UINT64_C(1) << type_id))) { + filter_info->type_mask |= UINT64_C(1) << type_id; filter->index = type_id; filter_info->pkt_filters[type_id].enable = true; filter_info->pkt_filters[type_id].pkt_proto = @@ -2138,7 +2138,7 @@ static void hinic_remove_5tuple_filter(struct rte_eth_dev *dev, filter_info->pkt_type = 0; filter_info->qid = 0; filter_info->pkt_filters[filter->index].qid = 0; - filter_info->type_mask &= ~(1 << (filter->index)); + filter_info->type_mask &= ~(UINT64_C(1) << filter->index); TAILQ_REMOVE(&filter_info->fivetuple_list, filter, entries); rte_free(filter); @@ -2268,8 +2268,8 @@ hinic_ethertype_filter_insert(struct hinic_filter_info *filter_info, if (id < 0) return -EINVAL; - if (!(filter_info->type_mask & (1 << id))) { - filter_info->type_mask |= 1 << id; + if (!(filter_info->type_mask & (UINT64_C(1) << id))) { + filter_info->type_mask |= UINT64_C(1) << id; filter_info->pkt_filters[id].pkt_proto = ethertype_filter->pkt_proto; filter_info->pkt_filters[id].enable = ethertype_filter->enable; @@ -2289,7 +2289,7 @@ hinic_ethertype_filter_remove(struct hinic_filter_info *filter_info, return; filter_info->pkt_type = 0; - filter_info->type_mask &= ~(1 << idx); + filter_info->type_mask &= ~(UINT64_C(1) << idx); filter_info->pkt_filters[idx].pkt_proto = (uint16_t)0; filter_info->pkt_filters[idx].enable = FALSE; filter_info->pkt_filters[idx].qid = 0; @@ -2355,7 +2355,7 @@ hinic_add_del_ethertype_filter(struct rte_eth_dev *dev, if (i < 0) return -EINVAL; - if ((filter_info->type_mask & (1 << i))) { + if ((filter_info->type_mask & (UINT64_C(1) << i))) { filter_info->pkt_filters[i].enable = FALSE; (void)hinic_set_fdir_filter(nic_dev->hwdev, filter_info->pkt_type, From patchwork Wed Feb 5 16:23:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 150984 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id C430F4619F; Wed, 5 Feb 2025 17:26:28 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A1F8240A87; Wed, 5 Feb 2025 17:25:18 +0100 (CET) Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by mails.dpdk.org (Postfix) with ESMTP id 8DC7D4066C for ; Wed, 5 Feb 2025 17:25:11 +0100 (CET) Received: by mail-pj1-f41.google.com with SMTP id 98e67ed59e1d1-2f9d5e0e365so2580968a91.2 for ; Wed, 05 Feb 2025 08:25:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1738772711; x=1739377511; 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=5yzqN0rb+p6zknth1raMaRc1zwdToLdLcpFjEjE+Oog=; b=zPqeWO4myrR5t+Wv8hF/9WcKG0qa35SHpK4El+WXD4zjQe4ABvUZT+tsuWtYPgXhBx eqiBWegzVws4lHxBqtCwlltiQU3D3rUtEPuml9AFl96hVXQLxs+q8oosp53QLuR0MSw+ c/Ke8VeCJYd/anDDSxAsBNaK71r4Tg5ioyZsVug/ylMHVbhiay3oFVY01EtiTx36hMTJ b69DnjGsrjx5M+lZDHlTTJi/NMjkYgGfSQ9+hoDz/XNTKuN/HeNu1oy+AhkLa7IPOpP2 LHH8i3S0OP/YwGXgY7vp+DVwcPE3eHBnjT4KEPTiJNB7TL21C9IShk3RWnCk3if2tyIC UsxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738772711; x=1739377511; 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=5yzqN0rb+p6zknth1raMaRc1zwdToLdLcpFjEjE+Oog=; b=WElFMsL1FGdQIOYOLaMvMBeZ06da0Ms++CXt4Gc8hIkUkLlvXfJOzkWKTbj4xwYzXY ibc0Zk7IKTL0pr+vcSuDQu7rSBJSYksIabjbnHto2jkZV7i6NBIMnsTgutpLgbHmmg5s z4fGtFgfFr6KIXRWJg0OQklcFEy3zd30jLGRjm7rwkcAyzZBicZ4g7rXPwwAUZD28Eh6 ZvCtwV7Kq+WVDrpXKfGCKHXHiJCBol9at1c/pZ8NPJCGWGEe3aCozp/aCiKWhE0VFa6U R315m2YH7PoXRAAxEoUYKnRBe2La/qQFumhotLj5GEwp0i0tdpMPLoA+8ZtFZSMDuX65 iGZg== X-Gm-Message-State: AOJu0YxB7fpLLUbEVX1PX2YwSxoOSob18WRSnJ2oQkKMOpFLKQJdiip/ pc9JCS7/FNd+sdsoPzvgxXUtJJC+BpHMkqVgzbVD5r6vw58xGVdA+P0uo6p+fpat3QppSsoswXB v X-Gm-Gg: ASbGncu0J6GNmd3V+PmYMECCDYzDcErWis5qIWONbyyb6aeRGLTulNZcPt8AXJp+Zno w14xnyAsR7EWgg9tQSlaA2QTiBhvb/XA7sl94hHFwwM9emBrCL+5k7y/b4/YJ28/3agnk+tk4N9 Ue37cGqYlL0mnNLcGnNw9i2NYWWyOaOQsE4Sff79LmMc82hdMk87U9PQRMVyDyZDb2xPEdI3c27 LUP7OmwuoG2RQjlZY0l9hsDX5h82V/KLln1LgUamLwvQQifRLt35l5zBwPwkGp/v5EMLq4mJ5wK Hhl7iNtZJemnI2OQFX/NsY5FlT3ZrUi+MBJp0w5iE2Cp9R/T/WM5N8oov72rKDI5zoXG X-Google-Smtp-Source: AGHT+IGtRIywwPWEgt4swryeJWvD6xYGrM2Pa20biMSOj8NOM0UQCLKmnYY5M1SIoeu7Q+BM+abU0g== X-Received: by 2002:a17:90b:28c4:b0:2ee:c5ea:bd91 with SMTP id 98e67ed59e1d1-2f9e0834932mr5378711a91.29.1738772710746; Wed, 05 Feb 2025 08:25:10 -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.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Feb 2025 08:25:10 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , ashish.jain@nxp.com, stable@dpdk.org, Hemant Agrawal , Gagandeep Singh , Akhil Goyal Subject: [PATCH v3 12/19] crypto/dpaa2_sec: fix bitmask truncation Date: Wed, 5 Feb 2025 08:23:13 -0800 Message-ID: <20250205162448.161161-13-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 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-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: a77db24643b7 ("crypto/dpaa2_sec: support atomic queues") Cc: ashish.jain@nxp.com Cc: stable@dpdk.org 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 ec6577f64c..7ad8fd47dd 100644 --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c @@ -1491,8 +1491,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); @@ -1772,7 +1772,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; } @@ -4055,7 +4055,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; } From patchwork Wed Feb 5 16:23:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 150985 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 88E1E4619F; Wed, 5 Feb 2025 17:26:34 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BFC9640B8F; Wed, 5 Feb 2025 17:25:19 +0100 (CET) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by mails.dpdk.org (Postfix) with ESMTP id 8D22A4067E for ; Wed, 5 Feb 2025 17:25:12 +0100 (CET) Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-21f237fb0eeso11028645ad.2 for ; Wed, 05 Feb 2025 08:25:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1738772712; x=1739377512; 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=iNkdoLj4B8mPp3n7IkOHdHg+h9cQ/8I0Zq91BGC8mVk=; b=WZzxBJKEhW22VglDKINziLlJiq1bYDc7QXjQtaYRdZeahC94tZxiqpObANR0FfUSBa As7YUZ4Gk2SZerZBy99KRNNwt8CXCLj8GedkEIVy2dbErCZp4eMcDJ0jf8AaGZYmuDee SVZm1/sCx8hpJos26TDh9J887EkSB2kI4sd2OHZ4PfrrlNjb+xCuFwiqkIBDIzgHkplK gX9vh4AG70vYC8zb91V1AJpZ0BPkCxqbtz9K3ZobkaDNV+iFRasCK34+qpGAGCjkSNRE RoqtFsQXZhVZgnMsseVRwwrbyeFvbF4KhNy5WbtBO4DCNoEAsoqqomdf9otD0X4UiF8i 2n4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738772712; x=1739377512; 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=iNkdoLj4B8mPp3n7IkOHdHg+h9cQ/8I0Zq91BGC8mVk=; b=aFC2yFG3+uYxdhaQfbGbQ7iBXrG7xm9Wgsfe8AYRmd5HD6jKXgu747UpKTbNT/OWIt aM8KVxW/DY0N9g720ENlL2+9kSqoLb3hpltov6KXlY3RWHi5dWlR+1HVQIHOWtZKUFH+ aSmiN6+PQGx9qcBCnN0LnWAokcyZJnLtYlq8DLGADV0VyRAGzgzSMg/djNLfLgaFZo+i yeb23PvK2YLbYBdGBtAQ09vPuwA+IDREGvNbwVLp5JsqRoaAdpQhBPdgmgt7rjayQoSt cWihzqktebnaStoidX8A9RUo3kFqcl99729EEEIvHVra5hQNo18mKB4EAE8GqWSI8tkU 7J2g== X-Gm-Message-State: AOJu0YxcQH0c6mX7D5DH5xkP5GtLBEnyVSayFiDoeG9Ecyq2eV9iTIl2 KrAk+4yor9FFQ37CeNSCKUs1GovhpUyv8uUcspcJ7h+IVE1P4ty+Kt+YxLf6BgHn8bmxWTFxS+0 e X-Gm-Gg: ASbGnctZ7/z7YuhBJT57K9Ph4ug93n7/3YJ8tFi0MyQJtAwBe7vquAhLtt3p4qbxknD eMoJeVFtnZpLy+nLKPQVNhU+6IBKuyxvpW50/SnjwShEaRqxxvYXOVtKiEktdft7Od5PtBOKmNk GldDUZyrU0uWEWB212ysTDRs+cIGPmt8wz8WSGJRWrxuP+jLtuAPcpY90/l0EEk+1mIEeoIjlHR Ki8fKdpC6nmpqyWBnMVd7TVpd09trj9Yh67jjxbqzZkqzZU0eNVMUroTX8dkLAdLhvSsFWEmb/t pUDKUWpr4MbLhFYcstrOsNXixZnn06xD1zCufzRbur1Uwl0GgU4XIpZnfGVqhPWFraoL X-Google-Smtp-Source: AGHT+IGDYpsen3a8910zqbxv0PaNbEoQoY/htRWCIkJFoV0dwWdfO5rvqGZOqI6umi33f9yVRg/K+g== X-Received: by 2002:a17:902:d4d1:b0:216:3297:92a4 with SMTP id d9443c01a7336-21f17ed4b41mr62716275ad.46.1738772711735; Wed, 05 Feb 2025 08:25:11 -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.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Feb 2025 08:25:11 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , akhil.goyal@nxp.com, stable@dpdk.org, Hemant Agrawal , Gagandeep Singh , Akhil Goyal Subject: [PATCH v3 13/19] crypto/dpaa_sec: fix bitmask truncation Date: Wed, 5 Feb 2025 08:23:14 -0800 Message-ID: <20250205162448.161161-14-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 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-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: fe3688ba7950 ("crypto/dpaa_sec: support event crypto adapter") Cc: akhil.goyal@nxp.com Cc: stable@dpdk.org Signed-off-by: Stephen Hemminger Acked-by: Hemant Agrawal --- drivers/crypto/dpaa_sec/dpaa_sec.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c index 3fa88ca968..e117cd77a6 100644 --- a/drivers/crypto/dpaa_sec/dpaa_sec.c +++ b/drivers/crypto/dpaa_sec/dpaa_sec.c @@ -1907,13 +1907,12 @@ dpaa_sec_enqueue_burst(void *qp, struct rte_crypto_op **ops, op = *(ops++); if (*dpaa_seqn(op->sym->m_src) != 0) { index = *dpaa_seqn(op->sym->m_src) - 1; - if (DPAA_PER_LCORE_DQRR_HELD & (1 << index)) { + if (DPAA_PER_LCORE_DQRR_HELD & (UINT64_C(1) << index)) { /* QM_EQCR_DCA_IDXMASK = 0x0f */ flags[loop] = ((index & 0x0f) << 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); } } @@ -3500,7 +3499,7 @@ dpaa_sec_process_atomic_event(void *event, /* Save active dqrr entries */ index = ((uintptr_t)dqrr >> 6) & (16/*QM_DQRR_SIZE*/ - 1); 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) = ctx->op->sym->m_src; ev->impl_opaque = index + 1; *dpaa_seqn(ctx->op->sym->m_src) = (uint32_t)index + 1; From patchwork Wed Feb 5 16:23:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 150986 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 777BE4619F; Wed, 5 Feb 2025 17:26:44 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9DBB740654; Wed, 5 Feb 2025 17:25:43 +0100 (CET) Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) by mails.dpdk.org (Postfix) with ESMTP id 213BF40654 for ; Wed, 5 Feb 2025 17:25:42 +0100 (CET) Received: by mail-pj1-f46.google.com with SMTP id 98e67ed59e1d1-2ee9a780de4so9474945a91.3 for ; Wed, 05 Feb 2025 08:25:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1738772741; x=1739377541; 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=/iJlTuZvQnCWDqPlQkdXuE25ei11Xp5OSkh+ZynGR4E=; b=ZgrWj1RNYU1FlR2YSOesF9ePUYaxAsphF20zmKIisZi2bj1LHbIUh1WUH4vdLMtyaf F+okwznjszMzCKqcYLPqGypX2Z8KnSAB41kSb1CoWcv+43ppyzNKaM9p6w1ZdnFPxw7A HNesdl+pHc5uasp3ubUKg0UV5eN6N2eUxW+rSoLezSZZnPdIVAnseZC7Vrwg8lYywFnq pDgBBsGklFrMwnRKCNu7qciWBAKl/IFmuBjlrKFwdO+tH3IB8Wr/YpT1B0I9JF6R+sIJ 2Qb5SIMvYUB7uUdSE7utOUBRy5E39joll+T9Pw+hNE7EXkeUv8Wu662fkrS2rF4ci2yk 0+jA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738772741; x=1739377541; 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=/iJlTuZvQnCWDqPlQkdXuE25ei11Xp5OSkh+ZynGR4E=; b=r8nHpzI53nAR26iwaWO0naJ3DZywv918mwCoy7INI/gmJivLtVrVLMA35hQvu1rePd KMIREg9t3EpIkr+hwRnqUueYrEiuTvIzFXD486oxO6hePoTn9c+3RQPJdzXpKX9ESTQ7 G8S4QOYctHdEbVNtQa4B+gF88t8eKVMBewpE3aT/z/3KX/9OuNyTbP5lPhfp3hWwRmF2 GOy7PkjL7O7jTGcN4wGCfVKhaNyChsH0Z1WHx4rxG89Lv4/Oi0DiqsSAyBrwwZ44gBB3 pGiXHbrYa1ZkbhmFUe0+1GBXd7KJXyCQSwJuUFiZA2jq+FlYd7g9FqoKrgr5SdsqBtJu TxJg== X-Gm-Message-State: AOJu0Yx727MemDI05gZ0e4U92ezP+auJcpyConw5SOR+hoXUGbYgnvdn pQSwUFiVOQ8iPmB8BHb3QSiDWpWA75NJHjJcXg6a2wzrQHD7zZ5tsHkGt7rUdjn3k1CN5erPsBw x X-Gm-Gg: ASbGncvkABbeLOY38gGkMPy2S+k0LtYEbO4UPS9pBDxLBuGHqWRuN7hSfzjJwJ5tLvC oaYODVtV/WZsyYLPOiugrUDbplr9FzQ+jdSSMk42/mJ/wNVTS4cQIE50elTv81LYBNRGASgLIRy xw5cAxRhkPJBGkNfqYRRq5nMYM6hmX2fP4c7wwogfd7OuKoMi6DHG+cfLl/j0k/GWM3CKKVMfkl huD4vJHXbbY7TytpwiblukOdzLji/QPLRAFTU66qk+2A8hff/rZH1XrUkKmL+ifHSLAUt0Byb+Z m5/EvkAkqQ66+F88Eehm56tP3gVK6zFUkkG6eKQhUL8Uv7OiFs5egd2B/O41zUj0yCzo X-Google-Smtp-Source: AGHT+IEwwOU+nZK6rWdxwL/acmyEb48lb4FkIWn3I5i41J9I26v5hA3G2j6FWwX9Y3c62RU3yVG8Yw== X-Received: by 2002:a17:90b:5289:b0:2ee:b875:6d30 with SMTP id 98e67ed59e1d1-2f9e0762b70mr5729264a91.9.1738772741333; Wed, 05 Feb 2025 08:25:41 -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.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Feb 2025 08:25:41 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , sunil.kori@nxp.com, stable@dpdk.org, Hemant Agrawal , Sachin Saxena Subject: [PATCH v3 14/19] event/dpaa: fix bitmask truncation Date: Wed, 5 Feb 2025 08:23:15 -0800 Message-ID: <20250205162448.161161-15-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 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org More bitmask truncation from mask computation. Fixes: 0ee17f79ebd0 ("event/dpaa: add enqueue/dequeue") Cc: sunil.kori@nxp.com Cc: stable@dpdk.org 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 853cc1ecf9..400e0ecd1c 100644 --- a/drivers/event/dpaa/dpaa_eventdev.c +++ b/drivers/event/dpaa/dpaa_eventdev.c @@ -102,7 +102,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: @@ -199,11 +199,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++; @@ -263,11 +263,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++; From patchwork Wed Feb 5 16:23:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 150987 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6188E4619F; Wed, 5 Feb 2025 17:26:53 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CA8F440A7D; Wed, 5 Feb 2025 17:25:48 +0100 (CET) Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by mails.dpdk.org (Postfix) with ESMTP id C034140A67 for ; Wed, 5 Feb 2025 17:25:46 +0100 (CET) Received: by mail-pj1-f42.google.com with SMTP id 98e67ed59e1d1-2f9d5f6df4cso2358571a91.1 for ; Wed, 05 Feb 2025 08:25:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1738772746; x=1739377546; 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=gDhw28+EUF/HlEE2pqYuojbCu6BgdSQ5N3cpWGYIXsM=; b=23P19y7zEw8HbV6PUJ3T3xvFNtHgCu+DgYvKexFve8csvpe/hNAco6IVI67Zdle++0 aLbLvJ6n80biltALANCtexMDS1bkV4d+XajLRTkGQhcOxWkLxt8NfhnnXf3+UHBoMfW1 +1+NkxZRXAFylcp5e5xk11vscTc5z8sI76w3D+MDG0u0nZJIIT1n/S3Gz5MSMrlrgnbI IW52nyG3JsQ3bZrbk8B1JWBuqQSZwXJiho5gYc0tsXoUMwdZay0KQB40CaKT/CTIbXnc qs28Gax7E7N7uChWdGefA8nPKSv2StaUIwVw3RMwp4ur0J1nKvtZyJhvJ8XqCZAZntg+ +YGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738772746; x=1739377546; 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=gDhw28+EUF/HlEE2pqYuojbCu6BgdSQ5N3cpWGYIXsM=; b=Iivh9i85mS9tsGukDioAJ6T0A0BKuoxfs2b7SsI0Cga/b0GItMKQtsI1Sasgkns6MY 4k5tDwkb1UbpKbLV7QdGyMzXif1fMOquJnKRkAHj4nb1dSUlooA4pSkeBHKymYcnMVSx LyLysJeHqclmzf9Ekhdy/i/fgrALf/V5Fg2dtzoKVVS6fy0ZUEPvyUmFFGFUzcoMS8fs 6DWQrzRjb8e1ApMdFHHqU7sdtvR/IEQj+XGVl50DcgurXILW5/MdAARnOZemPUEESkqX dvae5g+bEIxHxuiwE15qIgDUJWpYIOlQj8t7yYeRrklw04vTG9uKGwHhtu0gIQO1e/dj yvxw== X-Gm-Message-State: AOJu0YxjV6OheQbd/A980OuJf6U4UjPz6PwhdJu2dyCkme831RdZqu5r SQ/EMt6LCm7tVjlpApytipvMC6zQrKkeKZi6lNL4rV2hjPRcKzlYWnEXTkL/LQMFIPx4DBtbySW R X-Gm-Gg: ASbGncs27tpqh2SQ3Xlnxf0/bO3xWlTYjYM5NHmLiLO3TM/oxhyBALDhFr7+AjSTZRO y8+ImmbTVXcXXyptI9r3rUBS3Lg4Dbk5jZS/fxku0XjPpPJ3C81+oaOo0zlnleCY0Y32DgFDo18 igCRx1YmBPQw6VmCt+ESVlwxT26mC8gq7gx1eauIMifTn1Cl1O0dzF19IhN6NNUcKTG0awTs09C Ml+SqhdGh4XeBOV/TQfMS5fwzOx0heYnrLrv2WzmazMIXlYlRI3S+cFRbgxELVkgRjz+9Wnc2WF ECcsctWn4mOBdctB1VkbWSopLJI6ILXv93x5GTbFLfmE99dOx3vIyB+NzzH/0y6FkL8I X-Google-Smtp-Source: AGHT+IEd8jhjg8wFxDyRKd5aL2NRrQnVJtHT83KEm8SH0piHsHC039NnEn1jv5Jtdfofq/PD2hw+qQ== X-Received: by 2002:a17:90b:28c4:b0:2ea:61de:38f7 with SMTP id 98e67ed59e1d1-2f9e082dff0mr5324144a91.29.1738772745924; Wed, 05 Feb 2025 08:25:45 -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.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Feb 2025 08:25:45 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , sunil.kori@nxp.com, stable@dpdk.org, Hemant Agrawal , Sachin Saxena , Nipun Gupta Subject: [PATCH v3 15/19] net/dpaa: fix bitmask truncation Date: Wed, 5 Feb 2025 08:23:16 -0800 Message-ID: <20250205162448.161161-16-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 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-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: 5e7455931442 ("net/dpaa: support Rx queue configurations with eventdev") Cc: sunil.kori@nxp.com Cc: stable@dpdk.org 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 247e7b92ba..05bd73becf 100644 --- a/drivers/net/dpaa/dpaa_rxtx.c +++ b/drivers/net/dpaa/dpaa_rxtx.c @@ -842,7 +842,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; @@ -1338,13 +1338,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); } } From patchwork Wed Feb 5 16:23:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 150988 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id CEDF04619F; Wed, 5 Feb 2025 17:27:04 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 266DC40B9F; Wed, 5 Feb 2025 17:25:50 +0100 (CET) Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by mails.dpdk.org (Postfix) with ESMTP id A040F40A80 for ; Wed, 5 Feb 2025 17:25:47 +0100 (CET) Received: by mail-pj1-f49.google.com with SMTP id 98e67ed59e1d1-2f9cd8ecbceso3345148a91.0 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=kVX2LgrrAXLrl/yVi3NGLRNyG6QPC7u5ND0CquNN/kCjXeTTP2mHf3oBZPamoKH77+ 5UujgKalszD1MfJ0LBmfDtldrD9FTCfHdKLPldrQY3g5aBYSrdmMatebNJhfxlK4lPVb pBJEGXYyTovoNLo+qAPZMWITDQkID+zaIV1c0SojqTv+RlAyHWvPm0sg0EYTgwOUcPTr hyOR3TKp9RbZNPEkiJWg1IMb0Jpz7MdtINZBAwhOKQnNlHolUH3GhQR2tdae+DCc22td G3OVtGWNm56GqHJp/YnSJZX64THruuaIWb4yeZJCZRHhJ55tTiu1CZQ88WduDJQk2oJn G3Jw== X-Gm-Message-State: AOJu0Yy3CmnP8izf6natsTYi4WgzULAUFjH773aFkq8zGYkfpUmbLauk S0Pvl4oB9yfq8jAHvaXa7l7ih1/Jw7SGx3PLbD+7T4fu6VOT/r7YaUq75pPVfjf5Qwf/HWBXPvn m X-Gm-Gg: ASbGncvptfNgF0G7tTOW6hhj1mUB9mra9ErWzBanpw8ag2hbvh+e/nnpGcJRODm7Av0 AktAziEdK9f7gOe8P6Ld2mAup0LHmyIP5yGrGcyRB5eM+16MchZX7MhUbFFp0bOsLFaZa+JN8LD wNeXw3vOSQPtv4DjqBX7G8Gqa9fimpx4TYMAtnfiWszqrKkOCDFx+0kPThNXdUKNiJ9wVfdmMYi tmTQrh01jfJ6tbhQxZSw00RiEfxbg1XpxiIZ6es73FodOmMtu1k4nc++lY0koEAMxxiNsHj9y7j ahIounv8aNNWHLamCIm+YUJRSe7lTf97DM/NpUPvdkPMkuOTOY7GFhUTfJxkneZUrhOw 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 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-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; } From patchwork Wed Feb 5 16:23:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 150989 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 324834619F; Wed, 5 Feb 2025 17:27:12 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 62A2B40BA5; Wed, 5 Feb 2025 17:25:51 +0100 (CET) Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by mails.dpdk.org (Postfix) with ESMTP id 990D440657 for ; Wed, 5 Feb 2025 17:25:48 +0100 (CET) Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-2f9bd7c480eso4125804a91.1 for ; Wed, 05 Feb 2025 08:25:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1738772748; x=1739377548; 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=5WEmMwDvQTZJAP5rJn4dTAdKUMhak8r26KimFBXN/Uc=; b=Q2gKA6lJ45Y+0fRGJnEASGyTScXe6OjGV43yLqSTDSaSRY4wK3Cv4c1fuarN35S/Eh l3A0dkEAqYwFx10UrYudOHQvhunYWZh9hCKWt2inAqtKeaig+EiFjyA5hMnAwKXjkiId hVZ0ZGxZmltrxzWKkiMUj3BgEFEtBypvHXYFmd5HofzUcd37HOErmuRJGxXssBih7keM OnAaZ6e6TRLefUgwKTxz8fx+K/3x0/s5lncjLc9I+Swa2SHOjhraggT4gJoY89W4RR3I OXYni1+kUwl+tAZk24PLdqMzCgm6gTPDXoSneRmnhuKWG0pi1O3TuFyRqxpYuz/BS0dR jEBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738772748; x=1739377548; 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=5WEmMwDvQTZJAP5rJn4dTAdKUMhak8r26KimFBXN/Uc=; b=CJ5Utz5nePmXAYVYnRhBroj0d0HgR7yXfdVo2zVGp2njBfSkr+nu7uTXr3gJ74f70Q zlFvLZfha6FDA9ePV9OMk6i6WwrnoDuHpuZ+UDNbX9ZmWC2B7CmQtMYjWeQyDoX/8uEC mpEb99d7a6a4F6WRfxhownrvfwCQ2E0t8xS6neJ9ZE3TUA+s5QJvEANBsB9NlQQrR1iF bA2STUMrjQig0YJ9CrUNZgccVGPmLWcPXoY4kPtNLs8Bd3xxF26BFTMWEBN2xwiANc2V KOF8RPviLAb4RvmaMOrWfAIQ4D281sMesimBxnEqJXXcPzalCJBqp8aPQjuyB7R07UVH ZlhQ== X-Gm-Message-State: AOJu0YxEDxWnryC0Uouy6yInvkUKsIbK9LSgFptiHAbSUAEZDXt4M0P/ DPQD10LDb1+I5GCzkLc0fdCtDyDekG1b3HEFPq52Jnt/7/bp9vmKQzGGgBR0KYLjs2FUD06mA7L p X-Gm-Gg: ASbGncuWh2bd75v1U1zh9jPHWTxocFDFN8LsNzPiYTbhmoBDxRZB/+ZO3pgAigLVT4x yzLvOFk15JBThMEutdEN7iFhj8iA9aXQg6CqDJb8z77l6V37Rp+g8gR275O9CCm9HXZgHeBG8Lh Zm6aNMgXwEt8CZ7G+SkZJV3EQu9XTmi3QAJBH8frELVr8FjrjAAa/c3HKswQIq2+TWf+pRDTG4m FIfKUO+lE92R3qj5e8YkAejImg0myz9CiR5W3YdJpFhR/D6RD9RQFNidIraag/uT8XwpxTtrcxJ Lf9ZqdOh5Nc40Gn/KfPPjDunR833AhL5ETMl0ALd3TJ9GXTbl6EDCSaAD/0/GrJVYSLi X-Google-Smtp-Source: AGHT+IGICEXF1eAs42nuOqiiu7LOKSySGbrVaRZA4UeVzjlmk29fVK9QszHKFP6v3WUBD1+h+Ew55Q== X-Received: by 2002:a17:90b:48cc:b0:2ee:aef4:2c5d with SMTP id 98e67ed59e1d1-2f9e0810794mr4657992a91.26.1738772747765; Wed, 05 Feb 2025 08:25:47 -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.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Feb 2025 08:25:47 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , rasesh.mody@cavium.com, stable@dpdk.org, Devendra Singh Rawat , Alok Prasad Subject: [PATCH v3 17/19] net/qede: don't use same loop variable twice Date: Wed, 5 Feb 2025 08:23:18 -0800 Message-ID: <20250205162448.161161-18-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 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Using variable in outer loop, and inner loop is obvious bug. This bug is in base code, so likely on other platforms as well. Link: https://pvs-studio.com/en/blog/posts/cpp/1183/ Fixes: 81dba2b2ff61 ("net/qede/base: add LLDP support") Cc: rasesh.mody@cavium.com Cc: stable@dpdk.org Signed-off-by: Stephen Hemminger --- drivers/net/qede/base/ecore_dcbx.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/qede/base/ecore_dcbx.c b/drivers/net/qede/base/ecore_dcbx.c index 31234f18cf..72bbedd65a 100644 --- a/drivers/net/qede/base/ecore_dcbx.c +++ b/drivers/net/qede/base/ecore_dcbx.c @@ -1363,7 +1363,7 @@ ecore_lldp_mib_update_event(struct ecore_hwfn *p_hwfn, struct ecore_ptt *p_ptt) struct ecore_dcbx_mib_meta_data data; enum _ecore_status_t rc = ECORE_SUCCESS; struct lldp_received_tlvs_s tlvs; - int i; + int i, j; for (i = 0; i < LLDP_MAX_LLDP_AGENTS; i++) { OSAL_MEM_ZERO(&data, sizeof(data)); @@ -1381,9 +1381,9 @@ ecore_lldp_mib_update_event(struct ecore_hwfn *p_hwfn, struct ecore_ptt *p_ptt) if (!tlvs.length) continue; - for (i = 0; i < MAX_TLV_BUFFER; i++) - tlvs.tlvs_buffer[i] = - OSAL_CPU_TO_BE32(tlvs.tlvs_buffer[i]); + for (j = 0; j < MAX_TLV_BUFFER; j++) + tlvs.tlvs_buffer[j] = + OSAL_CPU_TO_BE32(tlvs.tlvs_buffer[j]); OSAL_LLDP_RX_TLVS(p_hwfn, tlvs.tlvs_buffer, tlvs.length); } From patchwork Wed Feb 5 16:23:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 150990 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 8CD994619F; Wed, 5 Feb 2025 17:27:18 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8017240A84; Wed, 5 Feb 2025 17:25:52 +0100 (CET) Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by mails.dpdk.org (Postfix) with ESMTP id 7ACB440A80 for ; Wed, 5 Feb 2025 17:25:49 +0100 (CET) Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-21644aca3a0so10867545ad.3 for ; Wed, 05 Feb 2025 08:25:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1738772749; x=1739377549; 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=pQRYIizkrRLYVmn/OQ7uW2ePgUly/NZ+Cx3EFIrhBxc=; b=P6Y4RzRa08kremGRQBGfoK7Xz3gaGpmVFT4HGQVoX33Ay0SDYYgHogKiPdOrqrrcC4 YEZvFNKAkyb7XUFctITTYbADUIXGlZpsFuESD9fb6k8obHyhATrNNrxwnDTRdYXjeFlA JOO8UAZho9OpBRV5n223q9xrgMKZkEFmTRYId2O7rAsf5YU82h5mGnGjGZfcH4c+r2X/ MkH2EykZ5Z3ibXkPvllyEEw0gGkNJTx0JL12JyqfvZv35ZYvlMSEUlUVftvueWR+vgKS PiTpkFV88LsiJOvhkXZDqmGXEMJqFPTW/eDzOPmu4TuoxIWCTbtkxDZpXKVzOBUNufjE Ek8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738772749; x=1739377549; 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=pQRYIizkrRLYVmn/OQ7uW2ePgUly/NZ+Cx3EFIrhBxc=; b=BVJ5xvLnmpUuBGMErRJ6zPQVlQqpCcVDYVxwltkqxijprY5JSatNf8kE3bNDUKmQta Os96dQqcvuvsbPDxhWRyTYvplcjg/JVwfd/h0QdqKABjYO9eczp7F1KfdcAvLsBSwI7n ZR60Gx2pF8oP/PuwMdcK11SLMcqO3Zr9EFVDBOJXDzWpyz8Ji/9HVnvxV/GkKSC0Dzgy nxSkr4KIJZ1UYyagcBYQVN1TDM85+orBusN5n/ARKo+3uv/s8x8k0jTBwB11xDmqoamG yEB8D7H5MMncd8XACkZy257Kdc6w0mfT2njLzkUgE6j3tsXkVxQbz6h1C0zziKhCELkL RW0Q== X-Gm-Message-State: AOJu0Yzg9DodVMjiOa+4xU89HmOGWoG21BqjeRbLtL7LxJSikIszineM +bRlSkNXf25jAGpTRd+dIu12H7jEblhPMsdFGvheaKIBCHJLptxyoeA34jZkh5hipCbCcFfc09f g X-Gm-Gg: ASbGncs4pLxVlb7tfNE60x2KcyQmrimMAkNuaTr6NTt7KsqswPhVJo3dsqXOFpsMSJI nmRWLfT0aaH4JN1XaAQ0nmqHXHPV4PR6q5PLNmmukVN7pArIbYvJNJ4loWJICHKusib3ovmOw/8 6xeMRO0HOqVbjEHsXJni0q+b8IT3G9bXNITLZ4PdCERQsPFeptZmxBaFDPDxw6I/fI9uu8DBCCc MFUr+M6IGFH+wvP/kacipeaxtHFM+3sXD/A0EbWnUIpAJqMd6Ico8ZtUhs12iRxFFhmF62c8MW4 bYvxood5GpXCTFRnsAazkMVb07AQZFf0YafvZ/0sgm34RBwU185OWpPa7o2oLMYOX+4p X-Google-Smtp-Source: AGHT+IHCp9NM+QtO/lmIIIXf2MsCj2fkSPxlowXeVqTX/m8RACuZ5K/gD7Lew7ZUufQ5sQkWYIh7TQ== X-Received: by 2002:a17:902:e892:b0:215:4f3b:cb20 with SMTP id d9443c01a7336-21f17e2725dmr60438405ad.23.1738772748729; Wed, 05 Feb 2025 08:25:48 -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.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Feb 2025 08:25:48 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , stable@dpdk.org, Anatoly Burakov , David Hunt , Sivaprasad Tummala Subject: [PATCH v3 18/19] examples/l3fwd: fix operator precedence bugs Date: Wed, 5 Feb 2025 08:23:19 -0800 Message-ID: <20250205162448.161161-19-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 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org The expression: if ((socketid = rte_lcore_to_socket_id(lcore) != 0) && gets evaluated as sockeid = (rte_lcore_to_socket_id(lcore) != 0) which is not what was intended. This is goes all the way back to first release. Link: https://pvs-studio.com/en/blog/posts/cpp/1183/ Fixes: af75078fece3 ("first public release") Cc: stable@dpdk.org Signed-off-by: Stephen Hemminger --- examples/l3fwd-power/main.c | 4 ++-- examples/l3fwd/main.c | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c index d279e664b3..e27b8531b5 100644 --- a/examples/l3fwd-power/main.c +++ b/examples/l3fwd-power/main.c @@ -1412,8 +1412,8 @@ check_lcore_params(void) "mask\n", lcore); return -1; } - if ((socketid = rte_lcore_to_socket_id(lcore) != 0) && - (numa_on == 0)) { + socketid = rte_lcore_to_socket_id(lcore); + if (socketid != 0 && numa_on == 0) { printf("warning: lcore %u is on socket %d with numa " "off\n", lcore, socketid); } diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c index 994b7dd8e5..ae3b4f6439 100644 --- a/examples/l3fwd/main.c +++ b/examples/l3fwd/main.c @@ -311,8 +311,9 @@ check_lcore_params(void) printf("error: lcore %u is not enabled in lcore mask\n", lcore); return -1; } - if ((socketid = rte_lcore_to_socket_id(lcore) != 0) && - (numa_on == 0)) { + + socketid = rte_lcore_to_socket_id(lcore); + if (socketid != 0 && numa_on == 0) { printf("warning: lcore %u is on socket %d with numa off\n", lcore, socketid); } From patchwork Wed Feb 5 16:23:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 150991 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 91B974619F; Wed, 5 Feb 2025 17:27:25 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0A1D940DDB; Wed, 5 Feb 2025 17:25:54 +0100 (CET) Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by mails.dpdk.org (Postfix) with ESMTP id ADD3140BA2 for ; Wed, 5 Feb 2025 17:25:50 +0100 (CET) Received: by mail-pj1-f41.google.com with SMTP id 98e67ed59e1d1-2f9ef7a3c3cso933074a91.1 for ; Wed, 05 Feb 2025 08:25:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1738772750; x=1739377550; 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=m59IG++74hiOwfX6DwsbQqLgqP9dXqv2ZyoMq8Pyi64=; b=fTKLqN/CpIot8uAgiZAcVvgYnBRBeXnmAKEqSXwW8lZi3h4+r6jfnP+zjm7RIR3B8l SY8jV23AMeYpSqyBeW90oNWB3G32Mu8S5nC3UBwSIXwpovnbcCbwD5EXO0orJ/rqMQSj sGVUuBa5SX38Md/jSughgrfX9UepXurNVLkKj3BaVnV7TPzl1HUBn3CHQwQtQqhwBlxy YYSVcrNL2laaHwrO4qJ90zPaELuLQC5JiQTUoLKKPPji3r5yDbtWArOWgTcYtRhqw9oi FfFuPY9ti0WnMveXrRTvMtrdncFbQSmGdPkFP7vr4OJWHKiezstkpx5yt8lZU8agg5R4 RbgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738772750; x=1739377550; 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=m59IG++74hiOwfX6DwsbQqLgqP9dXqv2ZyoMq8Pyi64=; b=Kn/T9L/u/m/CGr91M+xU8THs5Y11iq3eGkjVnVgPgnBW5+FMIEMlsotLYJYj4UHqRi Ckqbf0ynieaz7CvesR1LEabBhWpw7h6xhysHyHr1/m4WlL6yE0M+0afTJOFwZ44mCUtl sQc6Va5iY9FkTFYZ976//8WAsqUG6TXiswls7/0R2Y0MG8prHkHoqmn/Kc3NLhPUEz/y 6xGfk+TGC+pnclLcv2l1hLDGJHgpUmw0kvsxf0grp/qmNdTQML3ZG0qPdXULkvaFwYzE FGMsJbR55Inp/FDqXJeJEgb02zJUb8WCanhz5RffS9ab4MjQSVrf6Oq/80lkmjkM6j0E nJoA== X-Gm-Message-State: AOJu0YxVnDP2S/rrNZCPwdbQE8oVQ6GxDNUTh0qtjgoQs6Y9O6y8OQPi X1xiuiYTT8LLn8BNVkocyZypO1OtCEzw0IjRXgD/q1ZXoOOqiTtZ2cJN90e1abVKXGLc6hV0J74 5 X-Gm-Gg: ASbGncuIFaQr08NbdC1acQPQuD5MnmmvTH4agkGHDEoTDPfCtSTIFUuIRPqoocaLxXO VTir+AJDPpDALzDYQnHSBCyy3I4IH6dpFbd1pk/y5w4i137mEnRMioosNNkP/DFYW0Aw4VbNArC DTSWi8aLf13AD2WIlxXUrGv2u8sKtbAddHcm2/djpStJlCPSW8SEh/1qzS6L3PO+B2jhwUUpyDf qYYajQy4D18BdSajrjhYz655YxkK9M96OVJna8hcD9589sgif4GB7sfd21kFchuZ07uGbSUHmb9 4dLY28egwFbddFUoW/oyHO+P5W6PnQ36tNaNstZyi3T50reTHzwwnLTiUAuJScpeK7d9 X-Google-Smtp-Source: AGHT+IGJyV52MvRTWCTuYXTBJXKFEs/iQBMfI12zR9NJaG543CuivuCPH0qPfPd/iHn9OSD0W41rsg== X-Received: by 2002:a17:90b:4b10:b0:2f9:d0cd:3403 with SMTP id 98e67ed59e1d1-2f9fdf62111mr60457a91.16.1738772749896; Wed, 05 Feb 2025 08:25:49 -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.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Feb 2025 08:25:49 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , tduszynski@marvell.com, stable@dpdk.org, Nithin Dabilpuram , Kiran Kumar K , Sunil Kumar Kori , Satha Rao , Harman Kalra , Jerin Jacob , Jakub Palider Subject: [PATCH v3 19/19] common/cnxk: fix null ptr check Date: Wed, 5 Feb 2025 08:23:20 -0800 Message-ID: <20250205162448.161161-20-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 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org The pointer mode is used then checked which is a bug reported by PVS studio. Fixes: bd2fd34ab86f ("common/cnxk: sync eth mode change command with firmware") Cc: tduszynski@marvell.com Cc: stable@dpdk.org Signed-off-by: Stephen Hemminger --- drivers/common/cnxk/roc_bphy_cgx.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/common/cnxk/roc_bphy_cgx.c b/drivers/common/cnxk/roc_bphy_cgx.c index 882cf65474..db70bafd9b 100644 --- a/drivers/common/cnxk/roc_bphy_cgx.c +++ b/drivers/common/cnxk/roc_bphy_cgx.c @@ -366,20 +366,20 @@ roc_bphy_cgx_set_link_mode(struct roc_bphy_cgx *roc_cgx, unsigned int lmac, { uint64_t scr1, scr0; + if (!mode) + return -EINVAL; + + if (!roc_cgx) + return -EINVAL; + if (roc_model_is_cn9k() && (mode->use_portm_idx || mode->portm_idx || mode->mode_group_idx)) { return -ENOTSUP; } - if (!roc_cgx) - return -EINVAL; - if (!roc_bphy_cgx_lmac_exists(roc_cgx, lmac)) return -ENODEV; - if (!mode) - return -EINVAL; - scr1 = FIELD_PREP(SCR1_ETH_CMD_ID, ETH_CMD_MODE_CHANGE) | FIELD_PREP(SCR1_ETH_MODE_CHANGE_ARGS_SPEED, mode->speed) | FIELD_PREP(SCR1_ETH_MODE_CHANGE_ARGS_DUPLEX, mode->full_duplex) |