From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 08897A034F for ; Tue, 1 Mar 2022 11:45:06 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 00659426EA; Tue, 1 Mar 2022 11:45:06 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 21AD1407FF for ; Tue, 1 Mar 2022 11:45:04 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646131503; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sGpj+8ZuFULy12bfX85jkVrdwmTgHdrvH6fiW4DcJ2c=; b=LQn3/Fdc8ff3w/pDXnBwVNOcQNreQlqExD0rsyFLVpWKOjknqdHECniFjGcvKuXaUCheiF BYxT+R6JkOYhntJN/caNBTRVZSCTyv8N9bBsDmYmPpYuig0wMmxOmbY3hGmpTWYYlxmrAL p34kSM5TYvNcgiBSY8ZyfFsF+HNMzPI= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-169-dNc-a0TbNOaQqMDa4KymyA-1; Tue, 01 Mar 2022 05:45:00 -0500 X-MC-Unique: dNc-a0TbNOaQqMDa4KymyA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3F732814600; Tue, 1 Mar 2022 10:44:59 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.142]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4FF386FB02; Tue, 1 Mar 2022 10:44:58 +0000 (UTC) From: Kevin Traynor To: Gowrishankar Muthukrishnan Cc: Jerin Jacob , dpdk stable Subject: patch 'common/cnxk fix unintended sign extension' has been queued to stable release 21.11.1 Date: Tue, 1 Mar 2022 10:42:09 +0000 Message-Id: <20220301104300.334382-53-ktraynor@redhat.com> In-Reply-To: <20220301104300.334382-1-ktraynor@redhat.com> References: <20220301104300.334382-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/06/22. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/2f61027cda110f1fe3a1006171768cf1b37cf752 Thanks. Kevin --- >From 2f61027cda110f1fe3a1006171768cf1b37cf752 Mon Sep 17 00:00:00 2001 From: Gowrishankar Muthukrishnan Date: Sat, 12 Feb 2022 18:08:19 +0530 Subject: [PATCH] common/cnxk fix unintended sign extension [ upstream commit 2447b0b6695d4cecb8606d4c069564f35c31b1d4 ] This patch fixes unintended sign extensions reported in coverity scan. Coverity issue: 373258 Fixes: 8ca851cdc598 ("common/cnxk: support dual VLAN insert and strip actions") Signed-off-by: Gowrishankar Muthukrishnan Acked-by: Jerin Jacob --- drivers/common/cnxk/roc_npc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/common/cnxk/roc_npc.c b/drivers/common/cnxk/roc_npc.c index 8386e0e956..5ee7ff5e41 100644 --- a/drivers/common/cnxk/roc_npc.c +++ b/drivers/common/cnxk/roc_npc.c @@ -970,5 +970,5 @@ npc_vtag_insert_action_configure(struct mbox *mbox, struct roc_npc_flow *flow, vtag_cfg->vtag_size = NIX_VTAGSIZE_T4; vtag_cfg->tx.vtag0 = - ((vlan_info[0].vlan_ethtype << 16) | + (((uint32_t)vlan_info[0].vlan_ethtype << 16) | (vlan_info[0].vlan_pcp << 13) | vlan_info[0].vlan_id); @@ -977,5 +977,5 @@ npc_vtag_insert_action_configure(struct mbox *mbox, struct roc_npc_flow *flow, if (flow->vtag_insert_count == 2) { vtag_cfg->tx.vtag1 = - ((vlan_info[1].vlan_ethtype << 16) | + (((uint32_t)vlan_info[1].vlan_ethtype << 16) | (vlan_info[1].vlan_pcp << 13) | vlan_info[1].vlan_id); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-01 10:41:02.836453043 +0000 +++ 0053-common-cnxk-fix-unintended-sign-extension.patch 2022-03-01 10:41:01.338244105 +0000 @@ -1 +1 @@ -From 2447b0b6695d4cecb8606d4c069564f35c31b1d4 Mon Sep 17 00:00:00 2001 +From 2f61027cda110f1fe3a1006171768cf1b37cf752 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 2447b0b6695d4cecb8606d4c069564f35c31b1d4 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index df3016f538..245eb8b74f 100644 +index 8386e0e956..5ee7ff5e41 100644