From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on0082.outbound.protection.outlook.com [104.47.0.82]) by dpdk.org (Postfix) with ESMTP id 3C3531B5DE for ; Wed, 10 Oct 2018 15:06:02 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=nHcLhq+FSXa5nheJIFtw1L8PeVvwCd41CNGmv1DOkps=; b=mZyrSQoLBXg2UBpTjFxba/DmUDP0JHuzLqpJIP6d0WH/D9FZWlEYOJTMEv2kiQNVVBuBiRgny+jz5DdG6ySiXEwRXynPZBdTyWkDQ8c9PaT9rpq+EFmMXtrACqcQo3VkoFRw2S6sEeTXgPHl1nFD2f68knZvnVVV0cEnvvCjTEA= Received: from DB6PR0501MB2023.eurprd05.prod.outlook.com (10.168.9.17) by DB6PR0501MB2327.eurprd05.prod.outlook.com (10.168.56.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1207.23; Wed, 10 Oct 2018 13:06:00 +0000 Received: from DB6PR0501MB2023.eurprd05.prod.outlook.com ([fe80::b1fb:bad3:b5b1:f913]) by DB6PR0501MB2023.eurprd05.prod.outlook.com ([fe80::b1fb:bad3:b5b1:f913%3]) with mapi id 15.20.1228.020; Wed, 10 Oct 2018 13:06:00 +0000 From: Jack Min To: Shahaf Shuler , Yongseok Koh CC: "dev@dpdk.org" Thread-Topic: [PATCH v3 3/3] net/mlx5: rewrite TTL by E-Switch Thread-Index: AQHUYJn811IzDKSYJUywmgmIa+d59A== Date: Wed, 10 Oct 2018 13:06:00 +0000 Message-ID: <20181010130524.23590-4-jackmin@mellanox.com> References: <20180925143719.23339-1-jackmin@mellanox.com> <20181010130524.23590-1-jackmin@mellanox.com> In-Reply-To: <20181010130524.23590-1-jackmin@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: SG2PR01CA0102.apcprd01.prod.exchangelabs.com (2603:1096:3:15::28) To DB6PR0501MB2023.eurprd05.prod.outlook.com (2603:10a6:4:6::17) authentication-results: spf=none (sender IP is ) smtp.mailfrom=jackmin@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [118.201.220.138] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DB6PR0501MB2327; 6:u2RE/AgWt3Ptxu+sikoi198UwFZajZv3Yf2akp8WeTqQM0uZHeQyMuBuFcwi4f79SfQGqBE05zUCCZ8VLSv3UVmC+7FEPwCwyZkHQ2lPOpceR+8SgGeGKQeQ7Jm6zjphvOmfqqFp0hs9AVOHwKivjzPwgd9YzqhDanO/wUabZRMmraNhIwF+Ja7HrWXmRMhSlaH1SDbNXb4nVi/DdnTpFEUvrSS6MEN/ZJvuIqdlc8v09Hvpo5UD4t8J0hxJaD6+6L62uj3fm3sRbrN35BDhUCyGHAG2f02ITct7dGHTOF3UBxQoRfSnVG2GKQKzB2hmkMZ52Y6uqZeB0l076+Ply5hdAI8iCJpl0yCDKFkJH/RcLZCex4LWWyn+9Gaj77nkNkUoYt4FNuIcOa0G3b4yL2H1enwB0cIhGzaJLvPGU8CtMdFqPjvD3/EbHNhbGArmtz6AeWHflL62sl6rr27iEQ==; 5:DunvxaIy6PwkKFFWvuzMapnKf4VEiMS+k0JwGlZW31Ss/bCDHoL4L74HAiFpjN8F7WjUu3SMLkMOochO2a2HXXR4d4dSV06Wlj/tcNHJR36G9ik7VFrat/SsU/Uy8StwIy7VWdcRM16RQV5XPSwKPkvgOP+Vs+Hg9UUs3uy7qEU=; 7:ou04XTh2N4nEsUgUX/wXdOsMAfAPLEr73eEKgZidYKCG0h7NLEtRrSa4CuDMEds0Wt0VqeeE2Vz6pABfacvA8xvplfIFfQFCRo1c1r0kK2GPmPDZ/D4H87SWoSK8s+Ia1K1CUqMWGt1g4TzCRw7fLsfyoj76LwKf0+2+3/WnhpBGPOB00dH7bOdO5oqDygWeGzNa34s9v8KMQkBukIjdfMm71QsZJq/g64ZXpN/9CvscL95IR1qheB7Gs/Z/qVUU x-ms-office365-filtering-correlation-id: 41cf6731-0fb8-4429-2162-08d62eb11d98 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:DB6PR0501MB2327; x-ms-traffictypediagnostic: DB6PR0501MB2327: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:; x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3002001)(3231355)(944501410)(52105095)(93006095)(93001095)(10201501046)(6055026)(149066)(150057)(6041310)(20161123560045)(20161123562045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(201708071742011)(7699051); SRVR:DB6PR0501MB2327; BCL:0; PCL:0; RULEID:; SRVR:DB6PR0501MB2327; x-forefront-prvs: 08213D42D3 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(39860400002)(396003)(366004)(376002)(346002)(136003)(189003)(199004)(97736004)(6486002)(186003)(7736002)(26005)(305945005)(5250100002)(66066001)(71200400001)(68736007)(71190400001)(53936002)(8936002)(102836004)(25786009)(14444005)(2900100001)(256004)(6436002)(6512007)(36756003)(76176011)(81166006)(446003)(86362001)(316002)(105586002)(1076002)(2906002)(8676002)(3846002)(110136005)(11346002)(85306007)(386003)(476003)(2616005)(99286004)(478600001)(106356001)(4326008)(5660300001)(6636002)(6116002)(486006)(14454004)(81156014)(6506007)(52116002); DIR:OUT; SFP:1101; SCL:1; SRVR:DB6PR0501MB2327; H:DB6PR0501MB2023.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: ZIfE2QaiKnYfTrFd6Oq4w/5my1aOF8hUZvhK9l7QkfQwvUOjGtIvpoL9zY7s2OPlBuhJXs0GOvGhn3OEEKuu/zq9R8sBPB2/iQNNMadbCDSZZ2PF1eJUXEU5Q8DMzHtysqbD9UejSbcNZqQZeXhA3iwohgi2eiwXn6PZXmT7nI5EvHmAqEf3QmMY3f+8L37WpaVIlONyPlRTkTCSM5+KB2hSpGwrmAZHb4fxnuYI1Q7lYt14Ee3mfZxyYzPHvP79n92HJCfQfnn8deg7mNGBURQH4aZWymBlQzKMcBcYYjqP3aiyfxEDvhC708/obYQkTi2qPcVuZmVvJWnXxtRHeNjbCN9p5gPo64eINqc59Nw= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 41cf6731-0fb8-4429-2162-08d62eb11d98 X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Oct 2018 13:06:00.7758 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0501MB2327 Subject: [dpdk-dev] [PATCH v3 3/3] net/mlx5: rewrite TTL by E-Switch X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Oct 2018 13:06:02 -0000 Offload following modify TTL actions to E-Switch via TC-Flower driver - RTE_FLOW_ACTION_TYPE_SET_TTL - RTE_FLOW_ACTION_TYPE_DEC_TTL The corresponding IP protocol rte_flow_item_ipv[4|6] must be present in rte_flow pattern otherwith PMD return error The example testpmd commands are: flow create 0 transfer ingress pattern eth / ipv4 / udp dst is 7000 / end actions dec_ttl / port_id id 1 / end flow create 0 transfer ingress pattern eth / ipv4 / udp dst is 7001 / end actions set_ttl ttl_value 10 / port_id id 1 / end Signed-off-by: Xiaoyu Min --- drivers/net/mlx5/mlx5_flow.h | 2 + drivers/net/mlx5/mlx5_flow_tcf.c | 84 +++++++++++++++++++++++++++++++- 2 files changed, 84 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h index cbb8c56c8..0ad8c12ea 100644 --- a/drivers/net/mlx5/mlx5_flow.h +++ b/drivers/net/mlx5/mlx5_flow.h @@ -84,6 +84,8 @@ #define MLX5_FLOW_ACTION_SET_IPV6_DST (1u << 14) #define MLX5_FLOW_ACTION_SET_TP_SRC (1u << 15) #define MLX5_FLOW_ACTION_SET_TP_DST (1u << 16) +#define MLX5_FLOW_ACTION_SET_TTL (1u << 17) +#define MLX5_FLOW_ACTION_DEC_TTL (1u << 18) =20 #define MLX5_FLOW_FATE_ACTIONS \ (MLX5_FLOW_ACTION_DROP | MLX5_FLOW_ACTION_QUEUE | MLX5_FLOW_ACTION_RSS) diff --git a/drivers/net/mlx5/mlx5_flow_tcf.c b/drivers/net/mlx5/mlx5_flow_= tcf.c index 65e8a4b3f..af8a68529 100644 --- a/drivers/net/mlx5/mlx5_flow_tcf.c +++ b/drivers/net/mlx5/mlx5_flow_tcf.c @@ -217,6 +217,10 @@ struct tc_pedit_sel { #define TP_PORT_LEN 2 /* Transport Port (UDP/TCP) Length */ #endif =20 +#ifndef TTL_LEN +#define TTL_LEN 1 +#endif + /** Empty masks for known item types. */ static const union { struct rte_flow_item_port_id port_id; @@ -299,13 +303,16 @@ struct flow_tcf_ptoi { MLX5_FLOW_ACTION_SET_IPV6_SRC | \ MLX5_FLOW_ACTION_SET_IPV6_DST | \ MLX5_FLOW_ACTION_SET_TP_SRC | \ - MLX5_FLOW_ACTION_SET_TP_DST) + MLX5_FLOW_ACTION_SET_TP_DST | \ + MLX5_FLOW_ACTION_SET_TTL | \ + MLX5_FLOW_ACTION_DEC_TTL) =20 #define MLX5_TCF_CONFIG_ACTIONS (MLX5_FLOW_ACTION_PORT_ID | \ MLX5_FLOW_ACTION_OF_PUSH_VLAN | \ MLX5_FLOW_ACTION_OF_SET_VLAN_VID | \ MLX5_FLOW_ACTION_OF_SET_VLAN_PCP | \ - MLX5_TCF_PEDIT_ACTIONS) + (MLX5_TCF_PEDIT_ACTIONS & \ + ~MLX5_FLOW_ACTION_DEC_TTL)) =20 #define MAX_PEDIT_KEYS (128) #define SZ_PEDIT_KEY_VAL (4) @@ -338,6 +345,46 @@ flow_tcf_calc_pedit_keys(const uint64_t size) return keys; } =20 +/** + * Set pedit key of decrease/set ttl + * + * @param[in] actions + * pointer to action specification + * @param[in,out] p_parser + * pointer to pedit_parser + * @param[in] item_flags + * flags of all items presented + */ +static void +flow_tcf_pedit_key_set_dec_ttl(const struct rte_flow_action *actions, + struct pedit_parser *p_parser, + uint64_t item_flags) +{ + int idx =3D p_parser->sel.nkeys; + + p_parser->keys[idx].mask =3D 0xFFFFFF00; + if (item_flags & MLX5_FLOW_LAYER_OUTER_L3_IPV4) { + p_parser->keys_ex[idx].htype =3D TCA_PEDIT_KEY_EX_HDR_TYPE_IP4; + p_parser->keys[idx].off =3D + offsetof(struct ipv4_hdr, time_to_live); + } + if (item_flags & MLX5_FLOW_LAYER_OUTER_L3_IPV6) { + p_parser->keys_ex[idx].htype =3D TCA_PEDIT_KEY_EX_HDR_TYPE_IP6; + p_parser->keys[idx].off =3D + offsetof(struct ipv6_hdr, hop_limits); + } + if (actions->type =3D=3D RTE_FLOW_ACTION_TYPE_DEC_TTL) { + p_parser->keys_ex[idx].cmd =3D TCA_PEDIT_KEY_EX_CMD_ADD; + p_parser->keys[idx].val =3D 0x000000FF; + } else { + p_parser->keys_ex[idx].cmd =3D TCA_PEDIT_KEY_EX_CMD_SET; + p_parser->keys[idx].val =3D + (__u32)((const struct rte_flow_action_set_ttl *) + actions->conf)->ttl_value; + } + p_parser->sel.nkeys =3D (++idx); +} + /** * Set pedit key of transport (TCP/UDP) port value * @@ -477,6 +524,11 @@ flow_tcf_create_pedit_mnl_msg(struct nlmsghdr *nl, flow_tcf_pedit_key_set_tp_port(*actions, &p_parser, item_flags); break; + case RTE_FLOW_ACTION_TYPE_SET_TTL: + case RTE_FLOW_ACTION_TYPE_DEC_TTL: + flow_tcf_pedit_key_set_dec_ttl(*actions, + &p_parser, item_flags); + break; default: goto pedit_mnl_msg_done; } @@ -557,6 +609,14 @@ flow_tcf_get_pedit_actions_size(const struct rte_flow_= action **actions, keys +=3D flow_tcf_calc_pedit_keys(TP_PORT_LEN); flags |=3D MLX5_FLOW_ACTION_SET_TP_DST; break; + case RTE_FLOW_ACTION_TYPE_SET_TTL: + keys +=3D flow_tcf_calc_pedit_keys(TTL_LEN); + flags |=3D MLX5_FLOW_ACTION_SET_TTL; + break; + case RTE_FLOW_ACTION_TYPE_DEC_TTL: + keys +=3D flow_tcf_calc_pedit_keys(TTL_LEN); + flags |=3D MLX5_FLOW_ACTION_DEC_TTL; + break; default: goto get_pedit_action_size_done; } @@ -1075,6 +1135,12 @@ flow_tcf_validate(struct rte_eth_dev *dev, case RTE_FLOW_ACTION_TYPE_SET_TP_DST: current_action_flag =3D MLX5_FLOW_ACTION_SET_TP_DST; break; + case RTE_FLOW_ACTION_TYPE_SET_TTL: + current_action_flag =3D MLX5_FLOW_ACTION_SET_TTL; + break; + case RTE_FLOW_ACTION_TYPE_DEC_TTL: + current_action_flag =3D MLX5_FLOW_ACTION_DEC_TTL; + break; default: return rte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ACTION, @@ -1169,6 +1235,16 @@ flow_tcf_validate(struct rte_eth_dev *dev, return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, actions, "no fate action is found"); + if (action_flags & + (MLX5_FLOW_ACTION_SET_TTL | MLX5_FLOW_ACTION_DEC_TTL)) { + if (!(item_flags & + (MLX5_FLOW_LAYER_OUTER_L3_IPV4 | + MLX5_FLOW_LAYER_OUTER_L3_IPV6))) + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ACTION, + actions, + "no IP found in pattern"); + } return 0; } =20 @@ -1318,6 +1394,8 @@ flow_tcf_get_actions_and_size(const struct rte_flow_a= ction actions[], case RTE_FLOW_ACTION_TYPE_SET_IPV6_DST: case RTE_FLOW_ACTION_TYPE_SET_TP_SRC: case RTE_FLOW_ACTION_TYPE_SET_TP_DST: + case RTE_FLOW_ACTION_TYPE_SET_TTL: + case RTE_FLOW_ACTION_TYPE_DEC_TTL: size +=3D flow_tcf_get_pedit_actions_size(&actions, &flags); break; @@ -1862,6 +1940,8 @@ flow_tcf_translate(struct rte_eth_dev *dev, struct ml= x5_flow *dev_flow, case RTE_FLOW_ACTION_TYPE_SET_IPV6_DST: case RTE_FLOW_ACTION_TYPE_SET_TP_SRC: case RTE_FLOW_ACTION_TYPE_SET_TP_DST: + case RTE_FLOW_ACTION_TYPE_SET_TTL: + case RTE_FLOW_ACTION_TYPE_DEC_TTL: na_act_index =3D mnl_attr_nest_start(nlh, na_act_index_cur++); flow_tcf_create_pedit_mnl_msg(nlh, --=20 2.17.1