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 31A5C42C6A; Fri, 9 Jun 2023 08:23:09 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 05AA340EDB; Fri, 9 Jun 2023 08:23:09 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2112.outbound.protection.outlook.com [40.107.223.112]) by mails.dpdk.org (Postfix) with ESMTP id 5FE5740A84; Fri, 9 Jun 2023 08:23:07 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GmnucMDv8HgOdp44MqzflTQVTqQzMr6JrZmrIpiUMclawaS7Tx3Usue7nWmMhYbpS8fM6tuKM/88NazixErdc8GhQ4MtEjGIeCfV1oErZOfIq6oaVDPULZdth33JdBrbaXEQv09kweVqo8U0dfoj2PzDVG0Tl3bsL1wbl3oEOHG4X42898tHsRxlh1/h1MyUo33xhk+a0/lZzTEcQ92HQxNyLavV+vGGAEC9uY3l0gaUX/9tMhJQ2x/9b/cicVm5iPo4rFcyiASeLJuBXHTH/sl6lYWKSWWweiezg7cwP23FwvGfFYnOHfqdhZzOk9/J1yWXbms4+jyK0U4Ql2VvzA== 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=ruutgw8GsgbbwQk5i0UC7ZSFmVz8/AGv+9EOxanGyak=; b=QuN6FA/TGnZgjJ0O6SlspraXd/KlqEdBu9Ko9qcWxh1HeZr1gK7Q5B/7fYZTnxSs7OBaofp0tlS/qv0iq2tvVk84i/LVFuBEJqTIgDuAww00pKsimgAnIy1xqO06mWAHR7J2D7EjAnPd48ijo9hVc0YOUJUqWLAlf0KNdF7ApJBU2Ei8bYVU0LXcAH2qs1TJlJijedsQCFxqLhx6hiLUK9FmCfpjbRBeWre99ybgbN2MwjTrecM01UltqObzZQHPD5wdcwL/RhA1/FaPfvnA7tfNN5GdNGcSBM/I/CjnMW7dbbEY9Q9O8KTOmpvUCyfT4SA26M7jMC4r8XZ15GBcAw== 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=ruutgw8GsgbbwQk5i0UC7ZSFmVz8/AGv+9EOxanGyak=; b=BDONhRCScim1YYDsoYLhNxZkQF5X5QOJ9U89C8ydb1BoWthZgwB+fUY3P1mw0n7bua2zq76GxvTWLWCOIYpDCBqbGfeJedqCSqK17mzvFKkBXPTHPd8wWM3mkeuQQYFkf8mg8ONLJQ9h0VIxQOhl621kHGbroaXEuKmUg1+5Jq0= 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 MW4PR13MB5532.namprd13.prod.outlook.com (2603:10b6:303:183::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6455.33; Fri, 9 Jun 2023 06:23:04 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::d2cb:a650:e1ce:2174]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::d2cb:a650:e1ce:2174%3]) with mapi id 15.20.6455.030; Fri, 9 Jun 2023 06:23:03 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He , stable@dpdk.org Subject: [PATCH] net/nfp: fix TP flow action for UDP Date: Fri, 9 Jun 2023 14:22:19 +0800 Message-Id: <20230609062219.1308140-1-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ClientProxiedBy: SI2PR01CA0010.apcprd01.prod.exchangelabs.com (2603:1096:4:191::12) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|MW4PR13MB5532:EE_ X-MS-Office365-Filtering-Correlation-Id: 9aaeadbf-af82-465a-08e3-08db68b1fb3a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: w2FYjUBvBfoiewQidkJFhwl1ohOd2kOcJztLStiQ+q4plsuJahERv4mQxzKISZtuMc4EKkZN3ZOdnq8pelmudpi+2Yb3JEzzClUCVWPMAsaGxvcxWP8W+ueyQx1pPkyATiD28+h7rAcL9qLu1hIHICyG+h1pGFZJfd6u7AlXDbcYzHcHQLjVgDjwJldRgp2iwSMvB4eQ7kVPBUSLdobDi5SU286S7uX5FS9pzUKsTakvlYk7ETL9EmLPN2Cx3/2I9lRawiDjEecYBXpXY0G7SRAZq72RxqQR0bPZ3VdJwM5ABeefcw92IunEGmvHdK7TjQLoc6/ma+ADlw4RBfCsxUNC/q7PnrSXn6CSRKX4RIj2sWY8M4F9+lOW+3x0ARSYq8apSJbLr8tY5ZZs5yUx8Xm/pd8wHnQldV9taYKbd/S44Z/8kycCmKRD+25xK8DOQeFJT4ymtI9soxecaXYXk3Mr/zTv8Dv4dN8wwkz8ndAsDlJTm/zpsdhB5mEOmdaueRlmnZGaakgOsH1eghc2Uv7gQuAkl9ovnSBuK7K8FdFDGkgkeUopQ8WOcPmofMJym28xMYEit/yWp/ofWdetN66O4Hf39MeinUp/pgJyjr4= 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:(13230028)(4636009)(366004)(396003)(376002)(346002)(136003)(39840400004)(451199021)(66476007)(450100002)(66946007)(6916009)(4326008)(478600001)(316002)(8936002)(2906002)(41300700001)(8676002)(5660300002)(44832011)(66556008)(6666004)(6486002)(52116002)(6512007)(26005)(1076003)(6506007)(2616005)(66574015)(38100700002)(186003)(36756003)(83380400001)(86362001)(38350700002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?M0xWbDJ5bVpJWGR3SVZGc0FmNFJYeDl2Yy9WNk1ibzdmZnMwS0RvSU1nMFZE?= =?utf-8?B?c0pDckNmdVk0SDhwMm5pMlNFRDIrVGNTRndFekMrYXcwNncvcDczUnBTdWxP?= =?utf-8?B?anpFaU84cmpmQ0JPUHNEYmhaRUU2ZFdoeEJIdTlGdjM1V1ZUQzhZUTFzRDZQ?= =?utf-8?B?bi9QMzRkMFdjaiswTEhRR01DaVNSYWp4enpBQWQ2TzhTSVAzMGNTWU9PNmpy?= =?utf-8?B?MjBrY2ZXZDQ2ZkVySDRRYmZUTCt2MncyclBzck40VEkwdGdnM1lhS1dOcXBS?= =?utf-8?B?c1NYMlFOaWpFSWFZRlBaNVMrVmVyZ1lwVStqcVd6cm9WKzBuUkhJSVJ2cXhq?= =?utf-8?B?L01ieWZoWnk1T09WTWVHbWpiSk9ZdXR6TG1uSUM3ZC9nWmdKRkw5ZDRVRXBL?= =?utf-8?B?YjhnTDFUV1RlUDBsTEJRblBUeGNoM2p5VC9nNnN5US8wYjd5T253eThvMlRJ?= =?utf-8?B?V21LeDR3VnY4YmdrYklaY2FRdXkrSnR2Mk0zVEJiOVBRTS9OVmpJVDMwUUU0?= =?utf-8?B?ODhQSXdPOVRScUVNK1lJN2FoSTluVGJyaG9RK2QrV1VEVGZmRHA2ODFkNXEv?= =?utf-8?B?cko5d3lJL3RtV0hCUUw5MDBEZTBZTGMvVHA2L296MFQxVlJJM3l2cUQ0ZzZP?= =?utf-8?B?cCtiMzhUNThQT3R4Tk91NWp6NitMRDFRclNUd0JzZ1dKa1g1NWxoUGJ1Zkhx?= =?utf-8?B?QWlSZkNReDRFcGFmeGJyeU5leWkvVXlyUHZJNDRkQWtXMWNYWHQ0MEc1eUs0?= =?utf-8?B?R2FJdEFiOUFOU1R6d2FzTzFjSitIUm1yWGFRakcwOGEvWXhWNkZreVJaaHpB?= =?utf-8?B?V0d2UzJKWG9NeXlDcFNUMzlrb3FIZ0hJYVVTZUxjR3FURHZGMzQ0QWdDUXg5?= =?utf-8?B?MUJwZzBzLytJb3dVMEdqQzNqMHpzL0paUzFXRWpZaDFhWTFVV2ZXVEt0TGN0?= =?utf-8?B?OVhDeGcyMzJXZHhxeHdjTHpwbGUyWUxQcjlGbi8zNzBoU2syNjE3QS9lL0g2?= =?utf-8?B?bTAwTkxHT2sxODh1d3BVSDBxbCtzN0ErWkZhQUZ0KzZ2NHZqTXRUQVJNeTZV?= =?utf-8?B?T2FNMmRLL3dOK1VieGRLUFBRTDcyNDljaDY4cXFTQnJPWnozZUUyRXFKM0Ux?= =?utf-8?B?WktJYjJsMmhjV3ZveTRUR2FaL2hMTEZNR1M0Z0VqNGg5UjJ5MGhDN01JSC9I?= =?utf-8?B?YnI4cm0ranUwTDVJZk1tRzJxZVBmaEY4M1ozOGxvenR2WWVqTU52bVhUc1lt?= =?utf-8?B?ZVFURzFybnBQUUlic1o2VkdZSlErSzVjbjRoeU5pNEJ2RjgrSHlDdE83MUYw?= =?utf-8?B?bmQvU25penJLRDd2QVQrRG9JN1JscWFhTUZRRzUvZE1WV0xuWWRuV2x0VTVr?= =?utf-8?B?YUNNMEVwRTJYUjhabVF0dUR5dFYxVVp0UVN3RWRKajlWQm45UllwTEFmUnU4?= =?utf-8?B?eVdrMUdidy9NaFFtcHhLc1h6VVlSWHVwNlA0OEt3cnRqWUh6aWhKODlGbXp4?= =?utf-8?B?WUpDSmNiQlVtdFQvU3ovUElFblpEMUVQdXdsKzdZcHk5bGRGbllwNnUwYlZW?= =?utf-8?B?VkQvUm1SL3FPYzF5SWlxWExNcDJaQ2NmcS9pTWxQajAzM1drQ2VHQTVGNG9h?= =?utf-8?B?ay9jeEZSSEJvSElKODJuc2Q4NGlvMkFoNXd2R2JpN3JDdXZ6TVFhMXpUVWRG?= =?utf-8?B?MlJudkl3cDdWMUlGcnBZQWJqcnFEYXdsck1HdjR3S05adUhjeEdXaFRtY1Fm?= =?utf-8?B?L3Bpais5V2dZOUFWVEZFWmFsLzJVNy9KdUVsNVJlc0Z1RHFGZDQ2YWFrOUhx?= =?utf-8?B?MHp3cktrdUpqK0x1YVZKa1llRFhzWFVzZ0lBRENHcXpjOTB2THE2dFo2M0tJ?= =?utf-8?B?YTlEbEJ4YUpvU2p6WnVOTExZUGVWWGRxdVJQQWkwQjRJTm9zMWdZRzlKN1lY?= =?utf-8?B?Qlc2Vit3Z3BxNzBraVM0aERzTjdFdyt5a3RTUDdaYUJUa0RMckdoQ0dBNHAz?= =?utf-8?B?dDhZb2I5VER5Y3l4VGtKOXQwMUJnTkJGK0NqZTNqNVhVR01wODJvQ3U5S0p0?= =?utf-8?B?bjU3VzNDZmRVQ1FYOURHa3puTEw0cXFwSEFvd2ZoT0RpOU9RWXBvaHhLZ2U0?= =?utf-8?B?MCtkb0lPNEJQNGllelZ3ck5ZMVk0R0VadWdtMkloZE1mclRnTVQybzUyUmpu?= =?utf-8?B?a1E9PQ==?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9aaeadbf-af82-465a-08e3-08db68b1fb3a X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jun 2023 06:23:03.8519 (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: e7F3LoURQgNheOAV2H3HNl79+tecZn3MaizkdXksbzBPbXWvaUnlBQnZ7kiNNpjG7A9KysGikryRwp9+nO+auX/NEJE9QTQfPfn9P9DM7so= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR13MB5532 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 former logic can't distinguish the TCP and UDP set action, and only send a TCP type ctrl message to firmware, which cause the set action of UDP can't offload. 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 Reviewed-by: Niklas Söderlund --- drivers/net/nfp/nfp_flow.c | 30 ++++++++++++++++++++++++++---- drivers/net/nfp/nfp_flow.h | 1 + 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c index 41b722f4d8..9f7d86e832 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -1909,6 +1909,19 @@ nfp_flow_inner_item_get(const struct rte_flow_item items[], return false; } +static bool +nfp_flow_tcp_flag_check(const struct rte_flow_item items[]) +{ + const struct rte_flow_item *item; + + for (item = items; item->type != RTE_FLOW_ITEM_TYPE_END; ++item) { + if (item->type == RTE_FLOW_ITEM_TYPE_TCP) + return true; + } + + return false; +} + static int nfp_flow_compile_item_proc(struct nfp_flower_representor *repr, const struct rte_flow_item items[], @@ -2004,6 +2017,9 @@ nfp_flow_compile_items(struct nfp_flower_representor *representor, mbuf_off_mask += sizeof(struct nfp_flower_ext_meta); } + if (nfp_flow_tcp_flag_check(items)) + nfp_flow->tcp_flag = true; + /* Check if this is a tunnel flow and get the inner item*/ is_tun_flow = nfp_flow_inner_item_get(items, &loop_item); if (is_tun_flow) @@ -2175,7 +2191,8 @@ static void nfp_flow_action_set_tp(char *act_data, const struct rte_flow_action *action, bool tp_src_flag, - bool tp_set_flag) + bool tp_set_flag, + bool tcp_flag) { size_t act_size; struct nfp_fl_act_set_tport *set_tp; @@ -2187,7 +2204,10 @@ nfp_flow_action_set_tp(char *act_data, set_tp = (struct nfp_fl_act_set_tport *)act_data; act_size = sizeof(struct nfp_fl_act_set_tport); - set_tp->head.jump_id = NFP_FL_ACTION_OPCODE_SET_TCP; + if (tcp_flag) + set_tp->head.jump_id = NFP_FL_ACTION_OPCODE_SET_TCP; + else + set_tp->head.jump_id = NFP_FL_ACTION_OPCODE_SET_UDP; set_tp->head.len_lw = act_size >> NFP_FL_LW_SIZ; set_tp->reserved = 0; @@ -3442,7 +3462,8 @@ nfp_flow_compile_action(struct nfp_flower_representor *representor, break; case RTE_FLOW_ACTION_TYPE_SET_TP_SRC: PMD_DRV_LOG(DEBUG, "Process RTE_FLOW_ACTION_TYPE_SET_TP_SRC"); - nfp_flow_action_set_tp(position, action, true, tp_set_flag); + nfp_flow_action_set_tp(position, action, true, + tp_set_flag, nfp_flow->tcp_flag); if (!tp_set_flag) { position += sizeof(struct nfp_fl_act_set_tport); tp_set_flag = true; @@ -3450,7 +3471,8 @@ nfp_flow_compile_action(struct nfp_flower_representor *representor, break; case RTE_FLOW_ACTION_TYPE_SET_TP_DST: PMD_DRV_LOG(DEBUG, "Process RTE_FLOW_ACTION_TYPE_SET_TP_DST"); - nfp_flow_action_set_tp(position, action, false, tp_set_flag); + nfp_flow_action_set_tp(position, action, false, + tp_set_flag, nfp_flow->tcp_flag); if (!tp_set_flag) { position += sizeof(struct nfp_fl_act_set_tport); tp_set_flag = true; diff --git a/drivers/net/nfp/nfp_flow.h b/drivers/net/nfp/nfp_flow.h index d352671c2c..414bd4573b 100644 --- a/drivers/net/nfp/nfp_flow.h +++ b/drivers/net/nfp/nfp_flow.h @@ -225,6 +225,7 @@ struct rte_flow { uint32_t mtr_id; uint32_t port_id; bool install_flag; + bool tcp_flag; /**< Used in the SET_TP_* action */ enum nfp_flow_type type; }; -- 2.39.1