From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
	by inbox.dpdk.org (Postfix) with ESMTP id 3C9B441CF8;
	Tue, 21 Feb 2023 07:50:23 +0100 (CET)
Received: from mails.dpdk.org (localhost [127.0.0.1])
	by mails.dpdk.org (Postfix) with ESMTP id 228BB43197;
	Tue, 21 Feb 2023 07:50:01 +0100 (CET)
Received: from NAM12-DM6-obe.outbound.protection.outlook.com
 (mail-dm6nam12on2126.outbound.protection.outlook.com [40.107.243.126])
 by mails.dpdk.org (Postfix) with ESMTP id E218C4318E;
 Tue, 21 Feb 2023 07:49:58 +0100 (CET)
ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;
 b=CkaF8gEegEmoIOsq5cfcjX0FnR/Dtuxk3aHIR3ol390MATVLIk0cNYAD9MuIjbeBkD5uY2a2ng+MzuF33EK+voCeM18x+kVIHgEoAj7rR0QKk+DdEOc5kiZOYovUljGFIezm6YTbqm5SpMZEwBjdImMrFjb55/WMCU2EfrPAWG6sG6DPrFznKWDIPKplKLFahfMWwinHrU5Dz0rBz/u3iie3SrZ9sMqFJbL9spYjvlJN3j1TSUwRFJbHxYt38b0Y4kuhnY83KPT2sLrDfyQ/TVMeAJ4fbkHOKw1eQNZSiddwA8IdTwB90El6doB/OP3z6S+gKtpnklTK9VhL56RjfA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; 
 s=arcselector9901;
 h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1;
 bh=HxvSBGEYnlBGcngeFvJiaPII8z867fOMaKU4VCg6edg=;
 b=YhNPdBBikO2KIbwYvZbRyHYlf+EzLMjXKs5259WnCb3PHC0GdJrgRzZYBfoN+ZWrqa9AVum1fuNVo43K40xvrDApu6/Lkt3YfWUOlJXvf+frzXP27ayHpmHMWr9F54WzLCE3oMWhs90jU5V5ID8cX94f2ISgsUDZjrBA12CT0TxQICd6+y1dXgJjCJBO6B0KmqOjCqK8jFEGX14vwVofPOtn/1ZnpzS9fcD/7MGJSslZEz38a0V+IzcuxSkWOyEt7FEzQWNkIDchCLpFxmLluMuHHv/Eb8WUywNVfpb36Kog+jb+lV2niJtI8nDLN/SvmDo4DZ6sUF2XZdCwgU6g+A==
ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass
 smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com;
 dkim=pass header.d=corigine.com; arc=none
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com;
 h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;
 bh=HxvSBGEYnlBGcngeFvJiaPII8z867fOMaKU4VCg6edg=;
 b=idvCxdzV1O703MOD79oXQGf9J0D4+oCc/+nYbUyLGWo4lOSL8eOVsOEQKMPV3uoe1TuJMTrqfh+tGj7NgoY0lN7OF1aZ6uIsXVMojAsgrzE8MY8eKbtM7EDsPv86uqg32kG6sLCd52UX46mLsgRs+mdvbuKu4DiO/mUenIVuu3g=
Authentication-Results: dkim=none (message not signed)
 header.d=none;dmarc=none action=none header.from=corigine.com;
Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5)
 by PH7PR13MB5455.namprd13.prod.outlook.com (2603:10b6:510:139::9)
 with Microsoft SMTP Server (version=TLS1_2,
 cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6111.15; Tue, 21 Feb
 2023 06:49:57 +0000
Received: from SJ0PR13MB5545.namprd13.prod.outlook.com
 ([fe80::7ea4:e421:5dd5:9f4d]) by SJ0PR13MB5545.namprd13.prod.outlook.com
 ([fe80::7ea4:e421:5dd5:9f4d%7]) with mapi id 15.20.6111.021; Tue, 21 Feb 2023
 06:49:57 +0000
From: Chaoyong He <chaoyong.he@corigine.com>
To: dev@dpdk.org
Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com,
 Chaoyong He <chaoyong.he@corigine.com>, stable@dpdk.org
Subject: [PATCH 4/6] net/nfp: fix the set TP flow action
Date: Tue, 21 Feb 2023 14:49:28 +0800
Message-Id: <20230221064930.3399-5-chaoyong.he@corigine.com>
X-Mailer: git-send-email 2.29.3
In-Reply-To: <20230221064930.3399-1-chaoyong.he@corigine.com>
References: <20230221064930.3399-1-chaoyong.he@corigine.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-ClientProxiedBy: SI2PR02CA0049.apcprd02.prod.outlook.com
 (2603:1096:4:196::7) To SJ0PR13MB5545.namprd13.prod.outlook.com
 (2603:10b6:a03:424::5)
MIME-Version: 1.0
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|PH7PR13MB5455:EE_
X-MS-Office365-Filtering-Correlation-Id: 7df5e6b8-f7fb-45e2-9378-08db13d7d836
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: Ru0aLEZxhWuLO7uhZ2XczVvuPHQ6schlnr/l3srt/6EzuHjhby0j6UKKdxI8lRx3mVm03GXGiypMOchFW5n19PKjO4Sffrc/GfS22oKkiUJovb2X4l2U1PsU+tFZ9pVOezwV4BOx9xY4aX7J0uNa2B/286R4XykV9Ch/tiHh8K1STegCaT+mWF0tBMdiTgcFYeE5IMQ/1ViAR0+e/LSg2gr0CJxNu7N7U/iA+Kx83Plb6VXgdJDe4Q7D073u6Q7PmHn5APoUPO7ZsrCbDB+hFLY/lFeMQddj2BR7xK8f7p8hJKr1WafQPmMOtbl02QEjjmrm7CwnfQOS/slrcMdUKmzQKRR94B+JZDMuKdkZLEEi5PdxPEfGuJ/4njinuRvDMv3pqWPC7JH/RBjnX5cpxXFenHxxNM/+Tpl6YzZ8CXj45H/ZjFijzz5hEAtzf9XqriZLO+FWJOcoGzeQDwZuDFzUcEEPsSLDIGuGFA1h0hVuEe+TChED3XhT0EWMdDCbkCmJ1G+N5VO8GLENG/uxbY5ZFROdem/zL5O6979zZsbTN0Nkos9agezNcS+XsaOUc7+P+7r+XdA09Wq08zVvi4crwpUpF+lR4pDmc/xfxLCIhQSXOqjm0KyHVn0UGZtkQRKMhdEI4713naz2VC1CjwIlLgoNzOUrm7AD49Gi5BXqzavxkqjfpcPmWKiK66N7PWxgiAugqBCB45AF+EbmGA==
X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:;
 IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE;
 SFS:(13230025)(4636009)(366004)(39840400004)(376002)(136003)(396003)(346002)(451199018)(6512007)(41300700001)(450100002)(2616005)(66556008)(66946007)(316002)(8676002)(4326008)(5660300002)(8936002)(6666004)(6916009)(66476007)(26005)(478600001)(52116002)(6486002)(6506007)(186003)(83380400001)(36756003)(1076003)(86362001)(44832011)(2906002)(38100700002)(38350700002);
 DIR:OUT; SFP:1102; 
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?T3pzalJGVEFud0VlZXJvMnJvMThUM1RkVGRDWkRtUHFvRzRtRjJuSDkxbEZh?=
 =?utf-8?B?ZmpnNEtuaDRGdXRxSExuajZUVU8xN1AxUlNBeUV6czQyM0ZaTW11V1hXcHdo?=
 =?utf-8?B?YTNEdFZxazQyZ21VSlI5RXJCbGgyQlFnemlJdmd5TEpVeDA0TjNrTHEweUVV?=
 =?utf-8?B?UTRNeGlkaWNYRVp0bDMxUmpINWVhaWc4amRreWxseW9kRlRPWjNZRU5McEt1?=
 =?utf-8?B?T0NpSzBoelJaeGdiY2xxdmticEJPeXI1OG1tTDdVd2tkYm5hUGxjbGhOdExS?=
 =?utf-8?B?ajJYOXdCT3RoSGRTbDkrRUJqWUNIN2lvMnZhMFZrRDJBdmZaYlJscVZ4T016?=
 =?utf-8?B?cmdJS2NiT0l4YjVIdG9oY2FtMzhqQmtUNkJUV1ZibExGaGRuN0hMUldUSnhW?=
 =?utf-8?B?cVFhL0Q3NlNmWm9lYVk5L0dTanQrTTNtMll1MkFkOXkrWndPS0xGaWlZZVVz?=
 =?utf-8?B?VmtYVmV5WEpIL2lkdC82Uk81MzJmeCtxV0JDeVZQVGM4OG1uQWo3eC9pdFVt?=
 =?utf-8?B?Q2M0dWtDbDE3Wi9weGI2b2FlM29EL29CbjNNZVVLeDBHdjRvZTlYTWxXcmR4?=
 =?utf-8?B?aXJkNXIwK0tad1hUeHpnQXF3a2hGbUZKcUE5UG9ab1NTQ1ZWNmVFNFFXbXJw?=
 =?utf-8?B?SUhpTEtURGFzaDMxa2p2N3JBNzhDaXZCQjhpM2dudjVCSHNWK3BMeENJZ0lV?=
 =?utf-8?B?V3ZsNVAxdlpWcGlhclhsN0RuSEdHWUhnN0VIaStoOEhlUk5FRmJrdG1EdUdD?=
 =?utf-8?B?QWZab2p0TWx3UU9aNzA3Qm93a1YwUzUxWDFrN2xsUk83OCtUUTJwZmd1SFFw?=
 =?utf-8?B?MmFyVUg3cTZMN3hoYTZHSzlnZDlGWklBWXNxeDRPaWlzLzZGU3paSUY1T01M?=
 =?utf-8?B?Nkw2cENaTHp1cGRBTzZsNnUzUkxwVnJjMUZVQUpsQkwvbmhOYmNhV3Y2bjA0?=
 =?utf-8?B?VnlQaFgzOGxxUExXTnJBOUpTUzAwYSs0M1FqZllpd3dqTUpnWmJIdklQdGsz?=
 =?utf-8?B?M3pubnNpVHk5MEc2eFVmcHhQbk5takRNTXVrUFRIUWhyV1NvMlJ3WVY0OXZJ?=
 =?utf-8?B?dzNZOEJxNk1WU2xldHFsclA1cWswekR6ekZ2Q1dOQ29WQjk3QkZmMjkwWlZx?=
 =?utf-8?B?NFQ5QmwyL3FHTzlMZ2MxbG5wM3dTclhWemZKelZlUlBqNmdoZ1VRRHArRXhh?=
 =?utf-8?B?RXlHTmpUQURTMDlLWFdhRDFqbjlsYkpacUNGcDZLZjVmSnBNNVNrdXQ5U3Zz?=
 =?utf-8?B?cjJtcHk4cUNnd0RxYUF5NGY3aloreGpBSFZwRTh3QmRSY1djM3k0MFJabUNU?=
 =?utf-8?B?ZkpNR2J2NVMzblhHMHdZN1ZjVFREVnpuRG9CcnRmelNoR29rQnU5cWdzdGlp?=
 =?utf-8?B?SGxyRnBkOXhiUzZkRWF2MWJibTRGWXExRTdYMFllNDlQaUxrWWJscVdidEZn?=
 =?utf-8?B?cFhvbFozM0RSU3UwajNWY1A5NlZKTGxKOEgxUmpKYzJDNFVDUlh2MWdtdFpR?=
 =?utf-8?B?OGVnK2RzRGlUeFlRQXV3OXlUdlo3NmlFWG9rYUwzV1lmYkFPL3R1RTBRU1dP?=
 =?utf-8?B?OXo2bkZWb0NpV2h4bldWUjU0VUo2NTRWS3dYWDF6WlRwNmJVMWdnSXlQWHF3?=
 =?utf-8?B?QWFubkJIZVJBdUYxaWs3aE4rbFVtc0lRZFFKenRVbHZLdTNXUHdJUUMrZENl?=
 =?utf-8?B?TVRVbFk4cElhc0dMb0NWVlhqMTFIRDZqS2NwZnB3emRGbWFvbTFHY2huNitT?=
 =?utf-8?B?NTdJbVZpbDZRNzBKZW5oYmVuejRiUE1aQkR3Z3cvU1cxL3NxRUxXWFdobWVL?=
 =?utf-8?B?NWlZTGJnUUh2eVlWQzNHaW1BTXpLc1VMKzZHdi9EZTRZMkxzYjYwVUNFZGQw?=
 =?utf-8?B?R2JjM0h1K1ZQOGVsVHl6MjN0ZFRoQmxvcnd6Z1ptT205L25vVndYVmY3cW9W?=
 =?utf-8?B?MlZBT0J0ZS84S05MWERGcWhuN1pFVnlnQzU4NlFnQ2dPOEh1VS9LQlVGem9J?=
 =?utf-8?B?RDV4K3FHWk1TRmZTK1FDWjk4c25NM1JSMXJjUXM3OVhmRDYxRW5mZlNvMmJz?=
 =?utf-8?B?T3htRjZ6d3FJaDhDWXVLZVFSWTFjekJTNDdnQTltVW9GRWxDMXFzQ0E4Mjgv?=
 =?utf-8?B?VElmS1RERUoxYUpCT0JQclVLMXo1b216ei91bHZPN0FWL1VmUVhPa1hqa09t?=
 =?utf-8?B?Y1E9PQ==?=
X-OriginatorOrg: corigine.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 7df5e6b8-f7fb-45e2-9378-08db13d7d836
X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Feb 2023 06:49:57.3158 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: Z+PvOZyI7OAuE0400Qyki7ZmFfI/lx2EQk+Ll5NnvCEgRlAZtHq4ldpGqfYxzdg53jqMFzFEeqKko6dyFC24fb7vhWkFl6tDroEjCu3Plms=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR13MB5455
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
 <mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
 <mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org

The former logic of set TP source/destination flow action don't
consider the mask filed of control message passed to the firmware.
This caused the firmware skip the set action logic, and the offloaded
packets don't have the right TP as expected.

Fixes: fc185097bbe6 ("net/nfp: support TP source flow action")
Fixes: 87986df09d75 ("net/nfp: support TP destination flow action")
Cc: stable@dpdk.org

Signed-off-by: Chaoyong He <chaoyong.he@corigine.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@corigine.com>
---
 drivers/net/nfp/nfp_flow.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c
index a4561b08e8..f22e89e1ea 100644
--- a/drivers/net/nfp/nfp_flow.c
+++ b/drivers/net/nfp/nfp_flow.c
@@ -2190,10 +2190,13 @@ nfp_flow_action_set_tp(char *act_data,
 	set_tp->reserved     = 0;
 
 	set_tp_conf = (const struct rte_flow_action_set_tp *)action->conf;
-	if (tp_src_flag)
+	if (tp_src_flag) {
 		set_tp->src_port = set_tp_conf->port;
-	else
+		set_tp->src_port_mask = RTE_BE16(0xffff);
+	} else {
 		set_tp->dst_port = set_tp_conf->port;
+		set_tp->dst_port_mask = RTE_BE16(0xffff);
+	}
 }
 
 static int
-- 
2.29.3