From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on0058.outbound.protection.outlook.com [104.47.0.58]) by dpdk.org (Postfix) with ESMTP id F38F41B5F9 for ; Wed, 10 Oct 2018 15:11:46 +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=Q4AQ/KpGaM+bW5o8vBGRgRaDOnvC2XccK+UyUyAO1PM=; b=wYS84W/tkKAko3nvtnIX87cQ+g0APwwP3yX9hN7ORm6DO8AivHyZPKj28OvgBkYccmGXt4oA6uQDyxu5gv3HWRMjO0pA+QXYu8bnjI3k+TSon+buL/ZItxuBuzhUiViIZrMyOkdM98wSYvoLtwB/aFBBXRYjDQcGesooFJbWAMs= Received: from DB6PR0501MB2023.eurprd05.prod.outlook.com (10.168.9.17) by DB6PR0501MB2632.eurprd05.prod.outlook.com (10.172.225.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1228.23; Wed, 10 Oct 2018 13:11:45 +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:11:45 +0000 From: Jack Min To: Shahaf Shuler , Yongseok Koh CC: "dev@dpdk.org" Thread-Topic: [PATCH v2 3/3] net/mlx5: rewrite MAC address by E-Switch Thread-Index: AQHUYJrLu7WwdR73z0yLmlrr3npCtg== Date: Wed, 10 Oct 2018 13:11:45 +0000 Message-ID: <20181010131108.24167-4-jackmin@mellanox.com> References: <20180925150340.25378-1-jackmin@mellanox.com> <20181010131108.24167-1-jackmin@mellanox.com> In-Reply-To: <20181010131108.24167-1-jackmin@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: HK2PR02CA0156.apcprd02.prod.outlook.com (2603:1096:201:1f::16) 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; DB6PR0501MB2632; 6:asCq4xpV5edPCuYdRnPwXpWHhN8FLxuWlHlxAs29Ii/knl3++dWdf84TfePTD6YYUAFIS79PGorKoptlcUvcExNou1P4YHKc1lgiITe4R26UoUZZPB8mEcAdXuH9U//eNfX6YeL0ygoWTJ0L0IVgxqbVacX8N4My1dcsDUvCThoI0WvShatx7z1IP0YyVJ6YRVwFCHB8u6+trjsS5EnNy2B6HurcQ955BCsGI/nO00vK+bYAYO66GxoOS2hoc1EMIY7C820QAhGkryX+gAD7HT9bZSgauRM412RDJVBcgsl3c5NIyIjmGkzmM4QxJAGJrWeg9rES0AgjnzG0BZC5FVIafTj0pqtt1nY0wb/iv/4gETXCK3J+c4EgL7eWKuwcm35qDmHt/s/KN/2eap6EVtW0seJzmDh8K70wurGIFZ4fZZRP6Qu37o0l4gu8qnDjCQPdgJa9oYeaui+pNCVyaw==; 5:rEPfYj3zsKYHEIf/qf4FUMkQ0ZduUASCVCVIulI1StGwlmGMl3wDVPjjzXJ27AFiVTZXOy1PWd+SmMSTNFiDZ+Asa5agUsaAke/Cij7DvpcWmjyjC5mznvyX9zULNo53+byzijv9Rhzm+YPW0yC+s46+CnRZ4vXTz4ZwcwBXrZ4=; 7:bEECeWgcqm/UjHHir5zVLr7AkPEbyMaofFBJkX+pIGZfJHPLzASekCz3jG7VZNtzsbL2Peqe9PM7h8G8hu+UQkC45F1vhjd9aZcr3aG3pZ0VBoUbxuVvwkJkw58jlymmh7UE/GVYWmzFx9fCSw9Xt9etcdi8o6l+t/tcgOjePI8MOvln63yb3obDfJGaJgPY2xSL5G0PDO4y6SzMMINPQpPfb5mOYRPlKIe3LCDzIi05VMCSjE5sNfU65e/iU7Dx x-ms-office365-filtering-correlation-id: 28a1c56c-172a-48f9-92e5-08d62eb1edaf 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:DB6PR0501MB2632; x-ms-traffictypediagnostic: DB6PR0501MB2632: 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)(10201501046)(3231355)(944501410)(52105095)(3002001)(93006095)(93001095)(6055026)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(20161123562045)(20161123560045)(201708071742011)(7699051); SRVR:DB6PR0501MB2632; BCL:0; PCL:0; RULEID:; SRVR:DB6PR0501MB2632; x-forefront-prvs: 08213D42D3 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(39860400002)(366004)(396003)(346002)(376002)(136003)(199004)(189003)(14454004)(446003)(106356001)(105586002)(3846002)(6116002)(1076002)(110136005)(85306007)(86362001)(52116002)(186003)(14444005)(256004)(76176011)(99286004)(81166006)(81156014)(486006)(386003)(11346002)(102836004)(26005)(8676002)(8936002)(2616005)(6506007)(476003)(68736007)(7736002)(66066001)(53936002)(2906002)(305945005)(5660300001)(6436002)(6486002)(316002)(71200400001)(71190400001)(6636002)(36756003)(25786009)(97736004)(2900100001)(5250100002)(4326008)(6512007)(478600001); DIR:OUT; SFP:1101; SCL:1; SRVR:DB6PR0501MB2632; H:DB6PR0501MB2023.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: h7mwGdWFk934oBRpxHhCf5qwfiu/IGq7ctxbnrfnXPAdk6hKWinEUFfEgSjn4k4VG9SMnlhlmskFRW8juiWJN2Mprq1tyS5Mb05B/yqHY6bObzTa3qRNqkJjoP5oISU+pD4eoDeuhlTgG/bAkJqXRJP9KLisNVh83SmVt4CwQ2UVuM7aq8BfiqhVQwsCsPVvf17+nlVptc8WkeyblDKNuNQpzly6gd9YEemXRi4N5kPTuSIRDmaU3+Qxz+dRHFPNwRBFoP8kBBLwjuFh3x/qkw3O0Hd0sgtFsv1JYFWMzEpFwUyG62rh++KxWlHt5wwIp+VrPwjKnL2ygc/RhlgjLmaMj26WEPOWsQCaSZV7K4o= 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: 28a1c56c-172a-48f9-92e5-08d62eb1edaf X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Oct 2018 13:11:45.7549 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0501MB2632 Subject: [dpdk-dev] [PATCH v2 3/3] net/mlx5: rewrite MAC address 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:11:47 -0000 Offload following modify MAC address actions to E-Switch via TC-Flower driver - RTE_FLOW_ACTION_TYPE_SET_MAC_SRC - RTE_FLOW_ACTION_TYPE_SET_MAC_DST The corresponding rte_flow_item_eth must be present in rte_flow pattern Only support modify outer layer MAC address The example testpmd command is: flow create 0 transfer ingress pattern eth / ipv4 / udp dst is 7000 / end actions set_mac_dst mac_addr dd:00:aa:11:bb:33 / set_mac_src mac_addr bb:00:cc:11:aa:22 / port_id id 1 / end Signed-off-by: Xiaoyu Min --- drivers/net/mlx5/mlx5_flow.h | 2 + drivers/net/mlx5/mlx5_flow_tcf.c | 71 +++++++++++++++++++++++++++++++- 2 files changed, 72 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h index 0ad8c12ea..22e648b36 100644 --- a/drivers/net/mlx5/mlx5_flow.h +++ b/drivers/net/mlx5/mlx5_flow.h @@ -86,6 +86,8 @@ #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) +#define MLX5_FLOW_ACTION_SET_MAC_SRC (1u << 19) +#define MLX5_FLOW_ACTION_SET_MAC_DST (1u << 20) =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 af8a68529..c10fdd3fb 100644 --- a/drivers/net/mlx5/mlx5_flow_tcf.c +++ b/drivers/net/mlx5/mlx5_flow_tcf.c @@ -305,7 +305,9 @@ struct flow_tcf_ptoi { MLX5_FLOW_ACTION_SET_TP_SRC | \ MLX5_FLOW_ACTION_SET_TP_DST | \ MLX5_FLOW_ACTION_SET_TTL | \ - MLX5_FLOW_ACTION_DEC_TTL) + MLX5_FLOW_ACTION_DEC_TTL | \ + MLX5_FLOW_ACTION_SET_MAC_SRC | \ + MLX5_FLOW_ACTION_SET_MAC_DST) =20 #define MLX5_TCF_CONFIG_ACTIONS (MLX5_FLOW_ACTION_PORT_ID | \ MLX5_FLOW_ACTION_OF_PUSH_VLAN | \ @@ -345,6 +347,42 @@ flow_tcf_calc_pedit_keys(const uint64_t size) return keys; } =20 +/** + * Set pedit key of MAC address + * + * @param[in] actions + * pointer to action specification + * @param[in,out] p_parser + * pointer to pedit_parser + */ +static void +flow_tcf_pedit_key_set_mac(const struct rte_flow_action *actions, + struct pedit_parser *p_parser) +{ + int idx =3D p_parser->sel.nkeys; + uint32_t off =3D actions->type =3D=3D RTE_FLOW_ACTION_TYPE_SET_MAC_SRC ? + offsetof(struct ether_hdr, s_addr) : + offsetof(struct ether_hdr, d_addr); + const struct rte_flow_action_set_mac *conf =3D + (const struct rte_flow_action_set_mac *)actions->conf; + + p_parser->keys[idx].off =3D off; + p_parser->keys[idx].mask =3D ~UINT32_MAX; + p_parser->keys_ex[idx].htype =3D TCA_PEDIT_KEY_EX_HDR_TYPE_ETH; + p_parser->keys_ex[idx].cmd =3D TCA_PEDIT_KEY_EX_CMD_SET; + memcpy(&p_parser->keys[idx].val, + conf->mac_addr, SZ_PEDIT_KEY_VAL); + idx++; + p_parser->keys[idx].off =3D off + SZ_PEDIT_KEY_VAL; + p_parser->keys[idx].mask =3D 0xFFFF0000; + p_parser->keys_ex[idx].htype =3D TCA_PEDIT_KEY_EX_HDR_TYPE_ETH; + p_parser->keys_ex[idx].cmd =3D TCA_PEDIT_KEY_EX_CMD_SET; + memcpy(&p_parser->keys[idx].val, + conf->mac_addr + SZ_PEDIT_KEY_VAL, + ETHER_ADDR_LEN - SZ_PEDIT_KEY_VAL); + p_parser->sel.nkeys =3D (++idx); +} + /** * Set pedit key of decrease/set ttl * @@ -529,6 +567,10 @@ flow_tcf_create_pedit_mnl_msg(struct nlmsghdr *nl, flow_tcf_pedit_key_set_dec_ttl(*actions, &p_parser, item_flags); break; + case RTE_FLOW_ACTION_TYPE_SET_MAC_SRC: + case RTE_FLOW_ACTION_TYPE_SET_MAC_DST: + flow_tcf_pedit_key_set_mac(*actions, &p_parser); + break; default: goto pedit_mnl_msg_done; } @@ -617,6 +659,14 @@ flow_tcf_get_pedit_actions_size(const struct rte_flow_= action **actions, keys +=3D flow_tcf_calc_pedit_keys(TTL_LEN); flags |=3D MLX5_FLOW_ACTION_DEC_TTL; break; + case RTE_FLOW_ACTION_TYPE_SET_MAC_SRC: + keys +=3D flow_tcf_calc_pedit_keys(ETHER_ADDR_LEN); + flags |=3D MLX5_FLOW_ACTION_SET_MAC_SRC; + break; + case RTE_FLOW_ACTION_TYPE_SET_MAC_DST: + keys +=3D flow_tcf_calc_pedit_keys(ETHER_ADDR_LEN); + flags |=3D MLX5_FLOW_ACTION_SET_MAC_DST; + break; default: goto get_pedit_action_size_done; } @@ -1141,6 +1191,12 @@ flow_tcf_validate(struct rte_eth_dev *dev, case RTE_FLOW_ACTION_TYPE_DEC_TTL: current_action_flag =3D MLX5_FLOW_ACTION_DEC_TTL; break; + case RTE_FLOW_ACTION_TYPE_SET_MAC_SRC: + current_action_flag =3D MLX5_FLOW_ACTION_SET_MAC_SRC; + break; + case RTE_FLOW_ACTION_TYPE_SET_MAC_DST: + current_action_flag =3D MLX5_FLOW_ACTION_SET_MAC_DST; + break; default: return rte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ACTION, @@ -1245,6 +1301,15 @@ flow_tcf_validate(struct rte_eth_dev *dev, actions, "no IP found in pattern"); } + if (action_flags & + (MLX5_FLOW_ACTION_SET_MAC_SRC | MLX5_FLOW_ACTION_SET_MAC_DST)) { + if (!(item_flags & MLX5_FLOW_LAYER_OUTER_L2)) + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_ACTION, + actions, + "no ethernet found in" + " pattern"); + } return 0; } =20 @@ -1396,6 +1461,8 @@ flow_tcf_get_actions_and_size(const struct rte_flow_a= ction actions[], case RTE_FLOW_ACTION_TYPE_SET_TP_DST: case RTE_FLOW_ACTION_TYPE_SET_TTL: case RTE_FLOW_ACTION_TYPE_DEC_TTL: + case RTE_FLOW_ACTION_TYPE_SET_MAC_SRC: + case RTE_FLOW_ACTION_TYPE_SET_MAC_DST: size +=3D flow_tcf_get_pedit_actions_size(&actions, &flags); break; @@ -1942,6 +2009,8 @@ flow_tcf_translate(struct rte_eth_dev *dev, struct ml= x5_flow *dev_flow, case RTE_FLOW_ACTION_TYPE_SET_TP_DST: case RTE_FLOW_ACTION_TYPE_SET_TTL: case RTE_FLOW_ACTION_TYPE_DEC_TTL: + case RTE_FLOW_ACTION_TYPE_SET_MAC_SRC: + case RTE_FLOW_ACTION_TYPE_SET_MAC_DST: na_act_index =3D mnl_attr_nest_start(nlh, na_act_index_cur++); flow_tcf_create_pedit_mnl_msg(nlh, --=20 2.17.1