From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20072.outbound.protection.outlook.com [40.107.2.72]) by dpdk.org (Postfix) with ESMTP id 59FBD1B1BB for ; Thu, 11 Oct 2018 07:52:01 +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=bqOmUoSBuMhTv4QBIfhEy4wJfb6TIrpHE9Yl+XZ5GPc=; b=ZOIQmlq/V2KdiKuUlaE9+B3BRmLNoV89KOg1yuwXp8YCd7bqDNDiN41yHO8m03OUJQi41F8VWLTJ9TKa25vh8pYUXCS6Xe+L5XJkTCKfBsBOmretY4CgPaxNTw5sljW9pEdZA1aP1qyGggp7adhvEqSTu5+pHBeG//cAv26WsqY= Received: from DB3PR0502MB3980.eurprd05.prod.outlook.com (52.134.72.27) by DB3PR0502MB4090.eurprd05.prod.outlook.com (52.134.72.159) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1228.23; Thu, 11 Oct 2018 05:51:59 +0000 Received: from DB3PR0502MB3980.eurprd05.prod.outlook.com ([fe80::1cb0:661b:ecab:6045]) by DB3PR0502MB3980.eurprd05.prod.outlook.com ([fe80::1cb0:661b:ecab:6045%2]) with mapi id 15.20.1207.029; Thu, 11 Oct 2018 05:51:59 +0000 From: Yongseok Koh To: Jack Min CC: Shahaf Shuler , "dev@dpdk.org" Thread-Topic: [PATCH v2 3/3] net/mlx5: rewrite MAC address by E-Switch Thread-Index: AQHUYJrLf3xzTgzNe0+MsrW6aNNviqUZi82A Date: Thu, 11 Oct 2018 05:51:58 +0000 Message-ID: <20181011055150.GD27741@mtidpdk.mti.labs.mlnx> References: <20180925150340.25378-1-jackmin@mellanox.com> <20181010131108.24167-1-jackmin@mellanox.com> <20181010131108.24167-4-jackmin@mellanox.com> In-Reply-To: <20181010131108.24167-4-jackmin@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: BN6PR11CA0007.namprd11.prod.outlook.com (2603:10b6:405:2::17) To DB3PR0502MB3980.eurprd05.prod.outlook.com (2603:10a6:8:10::27) authentication-results: spf=none (sender IP is ) smtp.mailfrom=yskoh@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [209.116.155.178] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DB3PR0502MB4090; 6:LdQ42EXudCFbeS68c85LUELi0uaC2bMg95Z92MNkQBJ/rxZQRTEGhwtbxiSsxOqDaPGRUZ1SXPR6LFv8WF8t4V1mumCrdjK/+nK1YgZErQtIpdVp5qc78N8Ch6T6TcvyjznLTjsjXt+ongJE1mdUSaNSSGOq7NIy0O4W7fsGQ8k0H7dmIxPfk9IQfflq9obANCAookxnpTpQP2wMTdxhNuGCZgGSUu3dX88cmCy1aJbjn+MnlvFrY2839ELk+h1RJuPv0brlECYECDrO+JzxUBNAq1iv5/vJXb6RtF917pDO5/FB9WZ7Jua3VueaL8vFappS+BlLWGwP9xBQL0s1wVlllyGLD4zsKXjL8nLrlHUw/hVsiOGCgaE0rICcFNN6e8cbw16H07dM2SsUzfnnSjJzKriUSZuq8gwj7AM0Xdh0D4HxboJwMERCz1KE/7o9ea0E2p4cVhzvM4xDPxQsYQ==; 5:VCMWoTontGJwbTt9wPud/rfbqfdkFYMWlStlU6Ew2bE4ClyTJiLTnhSlIdEKqM5O9EE6mHZxZqJcXeJcVp+VMRg6qTj+kxz1GXd+c/mYfi1cJxUjf7ySS7mwhqNSu/vTXdIUJLjaGbfTQOOZbIdIPKgHgzSo7c9bDIChRgBYMPo=; 7:IrelHzlm8tFyp/jx35MMQB4uIc8ematw4TtGvaK/tVaMJY+I+7hpMn99GR58YTGD80kIeJNeUInNTgjZ7K5+3+f3mCvew0AQ4Y8megTt8BVyAlkR7KJgPxy0zVqZzfYGn5gaC6Rv+teBGQZImJNxSr8L56gvvwNvJl63aSCH6H0CoQ9I4yPcy0KAAnuh/J8xPmIPdqV3ucVXOX2EIkH7plLbK6MQKm2hfX8jsZhhM0GojMLsMnqoiZzKw/9cHWsk x-ms-office365-filtering-correlation-id: e98a3c9c-475e-414c-de60-08d62f3da86e 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:DB3PR0502MB4090; x-ms-traffictypediagnostic: DB3PR0502MB4090: 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)(10201501046)(93006095)(93001095)(6055026)(149066)(150057)(6041310)(20161123564045)(20161123562045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(201708071742011)(7699051); SRVR:DB3PR0502MB4090; BCL:0; PCL:0; RULEID:; SRVR:DB3PR0502MB4090; x-forefront-prvs: 08220FA8D6 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(39860400002)(366004)(136003)(396003)(346002)(376002)(189003)(199004)(68736007)(97736004)(2900100001)(6246003)(14454004)(186003)(26005)(102836004)(53936002)(9686003)(6512007)(5660300001)(86362001)(5250100002)(105586002)(476003)(486006)(25786009)(106356001)(2906002)(446003)(11346002)(6486002)(6636002)(4326008)(6436002)(6862004)(229853002)(54906003)(1076002)(256004)(99286004)(52116002)(305945005)(7736002)(14444005)(3846002)(6116002)(316002)(81166006)(81156014)(8676002)(8936002)(66066001)(71190400001)(6506007)(386003)(33656002)(478600001)(71200400001)(76176011)(33896004); DIR:OUT; SFP:1101; SCL:1; SRVR:DB3PR0502MB4090; H:DB3PR0502MB3980.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: rBVRZsxeugKN4dRA8nQIrLcA4dbPFd9ohqK6dlb4BIDbQwTdDNKs58m5L67lY30VbcadlFq9mWUg8zTGJ7bupnPN43J+5uPRbtIbDfo3c61PXWC1ynCnBfU6b8HwxThYqLscXy4CZ6Ow5pFqRHgxTVNeuVWfyMBVT+0NJ9pQ0KBJ83leQzIfBAZTksKe2WFr4ng9d4VjoJWKKn7UucJgj6xVQTA/5w067oEwTnXpp+oz6R7mwOmHQZex6FI2lqONYbgWSS7146OLCyRPdMdVcU1cNcqldfPdRKKQul+lFu+FSp2XarLjaO6AJwxPa/bXv5ythviIW6818J7wgkaLk9ufGuM/hwHPUvCyr0uWd6o= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="us-ascii" Content-ID: <7A0F083130F6DE469D4C4E07CC0EAC96@eurprd05.prod.outlook.com> Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: e98a3c9c-475e-414c-de60-08d62f3da86e X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Oct 2018 05:51:59.0076 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR0502MB4090 Subject: Re: [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: Thu, 11 Oct 2018 05:52:01 -0000 On Wed, Oct 10, 2018 at 06:11:45AM -0700, Jack Min wrote: > Offload following modify MAC address actions to E-Switch > via TC-Flower driver >=20 > - RTE_FLOW_ACTION_TYPE_SET_MAC_SRC > - RTE_FLOW_ACTION_TYPE_SET_MAC_DST >=20 > The corresponding rte_flow_item_eth must be present in > rte_flow pattern >=20 > Only support modify outer layer MAC address >=20 > The example testpmd command is: >=20 > 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 >=20 > Signed-off-by: Xiaoyu Min > --- Acked-by: Yongseok Koh But you'll also need to rebase it on your other patchsets. Thanks > drivers/net/mlx5/mlx5_flow.h | 2 + > drivers/net/mlx5/mlx5_flow_tcf.c | 71 +++++++++++++++++++++++++++++++- > 2 files changed, 72 insertions(+), 1 deletion(-) >=20 > 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_flo= w_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_flo= w_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= _action 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 = mlx5_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 >=20