From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00085.outbound.protection.outlook.com [40.107.0.85]) by dpdk.org (Postfix) with ESMTP id 628FB1B9A3 for ; Thu, 18 Apr 2019 14:16:12 +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=ej7Ca11uU3vsWrrdX2o8Yx4WtBjBEVZHmJoeFprg/9M=; b=FpFYyu4zptV0Sy63P9ZtzshrEtSbs8TX1s7rZjo9UR6XgfbgHKR1KyCqLRS+s/U2EaJt1Vuj4cLqejhfV1/DckmdaazItalqGJ+BICI9ruCvAPt5hOftjtApJ74OnLpozmOV6OMQGukLJHykOsvOyXFZPSMObflly+YfK5ig4lI= Received: from AM0PR0502MB3971.eurprd05.prod.outlook.com (52.133.40.151) by AM0PR0502MB3748.eurprd05.prod.outlook.com (52.133.47.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1813.11; Thu, 18 Apr 2019 12:16:10 +0000 Received: from AM0PR0502MB3971.eurprd05.prod.outlook.com ([fe80::7da6:9e13:922a:9d88]) by AM0PR0502MB3971.eurprd05.prod.outlook.com ([fe80::7da6:9e13:922a:9d88%5]) with mapi id 15.20.1813.013; Thu, 18 Apr 2019 12:16:10 +0000 From: Yongseok Koh To: Ori Kam CC: Shahaf Shuler , Matan Azrad , Slava Ovsiienko , Moti Haimovsky , "dev@dpdk.org" Thread-Topic: [PATCH v2 4/9] net/mlx5: add validation for Direct Rule E-Switch Thread-Index: AQHU9doF7VpBHusz4USFxQjX7020/qZB1UYA Date: Thu, 18 Apr 2019 12:16:10 +0000 Message-ID: <20190418121602.GJ31179@mtidpdk.mti.labs.mlnx> References: <1555276357-4892-1-git-send-email-orika@mellanox.com> <1555586930-109097-1-git-send-email-orika@mellanox.com> <1555586930-109097-5-git-send-email-orika@mellanox.com> In-Reply-To: <1555586930-109097-5-git-send-email-orika@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: BYAPR11CA0072.namprd11.prod.outlook.com (2603:10b6:a03:80::49) To AM0PR0502MB3971.eurprd05.prod.outlook.com (2603:10a6:208:11::23) 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-ms-office365-filtering-correlation-id: 7c542149-c4d0-4b61-8055-08d6c3f7a46f x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600141)(711020)(4605104)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7193020); SRVR:AM0PR0502MB3748; x-ms-traffictypediagnostic: AM0PR0502MB3748: x-microsoft-antispam-prvs: x-forefront-prvs: 0011612A55 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(376002)(396003)(39860400002)(346002)(366004)(136003)(199004)(189003)(97736004)(71190400001)(76176011)(229853002)(6436002)(14454004)(3846002)(7736002)(6116002)(2906002)(316002)(71200400001)(9686003)(5660300002)(6512007)(6636002)(6486002)(52116002)(53936002)(6246003)(86362001)(305945005)(99286004)(68736007)(256004)(14444005)(66066001)(8936002)(6506007)(33656002)(478600001)(4326008)(102836004)(11346002)(446003)(8676002)(26005)(386003)(6862004)(476003)(54906003)(1076003)(486006)(186003)(81166006)(25786009)(81156014)(30864003); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR0502MB3748; H:AM0PR0502MB3971.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-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: 0bgK/ZXhM6cvASZ6DwO0jeN3iAETWrXt0onKku0lp2kXBHSe9bZxsvp5BUED7t2uCYth0wzFYZZLlD10hxZnZ7ylufUuzBLfMQVAA7dY0BHnxUcYY/bpoWrbTQOWRZuMwWL9uxXcxt5CL6HoN2zRdHkMr6ILu7E6vuhS/tB3H8l8apoumg7kCm/Iz4UTPCOlxxezgxnG/RUzY5VEf9pAGPUvIVIbbwe4fGyllD5odhV/89HN/9jCysMvKwsqJ2VPbPbmthwLYgWZKHBX37eZL/ljyRj/aSKJphFjp05IAlsd5oO0DPBiBBTtE0KqZ2eOy4jl3S4wjjP0rqY6B1iV/PVW52wVXeAZOul3EIs4EhfaVLsrN3zQRE57VdzOcD4fLLN2JIZeRIg0TPoqE9sX8T6WhqHj8pYlNM9hUUPiMwQ= Content-Type: text/plain; charset="us-ascii" Content-ID: Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7c542149-c4d0-4b61-8055-08d6c3f7a46f X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Apr 2019 12:16:10.5304 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR0502MB3748 Subject: Re: [dpdk-dev] [PATCH v2 4/9] net/mlx5: add validation for Direct Rule 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, 18 Apr 2019 12:16:12 -0000 On Thu, Apr 18, 2019 at 11:28:45AM +0000, Ori Kam wrote: > Add validation logic for E-Switch using Direct Rules. >=20 > Signed-off-by: Ori Kam > --- Acked-by: Yongseok Koh > v2: > * Address ML comments. > --- > drivers/net/mlx5/mlx5.h | 2 + > drivers/net/mlx5/mlx5_ethdev.c | 41 +++++++ > drivers/net/mlx5/mlx5_flow.h | 5 + > drivers/net/mlx5/mlx5_flow_dv.c | 243 ++++++++++++++++++++++++++++++++++= ++++-- > 4 files changed, 280 insertions(+), 11 deletions(-) >=20 > diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h > index b9946f6..dd22bb6 100644 > --- a/drivers/net/mlx5/mlx5.h > +++ b/drivers/net/mlx5/mlx5.h > @@ -412,6 +412,8 @@ int mlx5_ibv_device_to_pci_addr(const struct ibv_devi= ce *device, > unsigned int mlx5_dev_to_port_id(const struct rte_device *dev, > uint16_t *port_list, > unsigned int port_list_n); > +int mlx5_port_to_eswitch_info(uint16_t port, uint16_t *es_domain_id, > + uint16_t *es_port_id); > int mlx5_sysfs_switch_info(unsigned int ifindex, > struct mlx5_switch_info *info); > bool mlx5_translate_port_name(const char *port_name_in, > diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethde= v.c > index 3992918..695440a 100644 > --- a/drivers/net/mlx5/mlx5_ethdev.c > +++ b/drivers/net/mlx5/mlx5_ethdev.c > @@ -1376,6 +1376,47 @@ int mlx5_fw_version_get(struct rte_eth_dev *dev, c= har *fw_ver, size_t fw_size) > } > =20 > /** > + * Get the E-Switch domain id this port belongs to. > + * > + * @param[in] port > + * Device port id. > + * @param[out] es_domain_id > + * E-Switch domain id. > + * @param[out] es_port_id > + * The port id of the port in the E-Switch. > + * > + * @return > + * 0 on success, a negative errno value otherwise and rte_errno is set= . > + */ > +int > +mlx5_port_to_eswitch_info(uint16_t port, > + uint16_t *es_domain_id, uint16_t *es_port_id) > +{ > + struct rte_eth_dev *dev; > + struct mlx5_priv *priv; > + > + if (port >=3D RTE_MAX_ETHPORTS) { > + rte_errno =3D EINVAL; > + return -rte_errno; > + } > + if (!rte_eth_dev_is_valid_port(port)) { > + rte_errno =3D ENODEV; > + return -rte_errno; > + } > + dev =3D &rte_eth_devices[port]; > + priv =3D dev->data->dev_private; > + if (!(priv->representor || priv->master)) { > + rte_errno =3D EINVAL; > + return -rte_errno; > + } > + if (es_domain_id) > + *es_domain_id =3D priv->domain_id; > + if (es_port_id) > + *es_port_id =3D priv->vport_id; > + return 0; > +} > + > +/** > * Get switch information associated with network interface. > * > * @param ifindex > diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h > index 9f47fd4..85954c2 100644 > --- a/drivers/net/mlx5/mlx5_flow.h > +++ b/drivers/net/mlx5/mlx5_flow.h > @@ -48,6 +48,7 @@ > =20 > /* General pattern items bits. */ > #define MLX5_FLOW_ITEM_METADATA (1u << 16) > +#define MLX5_FLOW_ITEM_PORT_ID (1u << 17) > =20 > /* Outer Masks. */ > #define MLX5_FLOW_LAYER_OUTER_L3 \ > @@ -118,6 +119,10 @@ > (MLX5_FLOW_ACTION_DROP | MLX5_FLOW_ACTION_QUEUE | \ > MLX5_FLOW_ACTION_RSS | MLX5_FLOW_ACTION_JUMP) > =20 > +#define MLX5_FLOW_FATE_ESWITCH_ACTIONS \ > + (MLX5_FLOW_ACTION_DROP | MLX5_FLOW_ACTION_PORT_ID | \ > + MLX5_FLOW_ACTION_JUMP) > + > #define MLX5_FLOW_ENCAP_ACTIONS (MLX5_FLOW_ACTION_VXLAN_ENCAP | \ > MLX5_FLOW_ACTION_NVGRE_ENCAP | \ > MLX5_FLOW_ACTION_RAW_ENCAP) > diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow= _dv.c > index 1e25e0b..b819359 100644 > --- a/drivers/net/mlx5/mlx5_flow_dv.c > +++ b/drivers/net/mlx5/mlx5_flow_dv.c > @@ -613,6 +613,89 @@ struct field_modify_info modify_tcp[] =3D { > } > =20 > /** > + * Validate vport item. > + * > + * @param[in] dev > + * Pointer to the rte_eth_dev structure. > + * @param[in] item > + * Item specification. > + * @param[in] attr > + * Attributes of flow that includes this item. > + * @param[in] item_flags > + * Bit-fields that holds the items detected until now. > + * @param[out] error > + * Pointer to error structure. > + * > + * @return > + * 0 on success, a negative errno value otherwise and rte_errno is set= . > + */ > +static int > +flow_dv_validate_item_port_id(struct rte_eth_dev *dev, > + const struct rte_flow_item *item, > + const struct rte_flow_attr *attr, > + uint64_t item_flags, > + struct rte_flow_error *error) > +{ > + const struct rte_flow_item_port_id *spec =3D item->spec; > + const struct rte_flow_item_port_id *mask =3D item->mask; > + const struct rte_flow_item_port_id switch_mask =3D { > + .id =3D 0xffffffff, > + }; > + uint16_t esw_domain_id; > + uint16_t item_port_esw_domain_id; > + int ret; > + > + if (!attr->transfer) > + return rte_flow_error_set(error, EINVAL, > + RTE_FLOW_ERROR_TYPE_ITEM, > + NULL, > + "match on port id is valid only" > + " when transfer flag is enabled"); > + if (item_flags & MLX5_FLOW_ITEM_PORT_ID) > + return rte_flow_error_set(error, ENOTSUP, > + RTE_FLOW_ERROR_TYPE_ITEM, item, > + "multiple source ports are not" > + " supported"); > + if (!mask) > + mask =3D &switch_mask; > + if (mask->id !=3D 0xffffffff) > + return rte_flow_error_set(error, ENOTSUP, > + RTE_FLOW_ERROR_TYPE_ITEM_MASK, > + mask, > + "no support for partial mask on" > + " \"id\" field"); > + ret =3D mlx5_flow_item_acceptable > + (item, (const uint8_t *)mask, > + (const uint8_t *)&rte_flow_item_port_id_mask, > + sizeof(struct rte_flow_item_port_id), > + error); > + if (ret) > + return ret; > + if (!spec) > + return 0; > + ret =3D mlx5_port_to_eswitch_info(spec->id, &item_port_esw_domain_id, > + NULL); > + if (ret) > + return rte_flow_error_set(error, -ret, > + RTE_FLOW_ERROR_TYPE_ITEM_SPEC, spec, > + "failed to obtain E-Switch info for" > + " port"); > + ret =3D mlx5_port_to_eswitch_info(dev->data->port_id, > + &esw_domain_id, NULL); > + if (ret < 0) > + return rte_flow_error_set(error, -ret, > + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, > + NULL, > + "failed to obtain E-Switch info"); > + if (item_port_esw_domain_id !=3D esw_domain_id) > + return rte_flow_error_set(error, -ret, > + RTE_FLOW_ERROR_TYPE_ITEM_SPEC, spec, > + "cannot match on a port from a" > + " different E-Switch"); > + return 0; > +} > + > +/** > * Validate count action. > * > * @param[in] dev > @@ -676,7 +759,7 @@ struct field_modify_info modify_tcp[] =3D { > RTE_FLOW_ERROR_TYPE_ACTION, NULL, > "can only have a single encap or" > " decap action in a flow"); > - if (attr->ingress) > + if (!attr->transfer && attr->ingress) > return rte_flow_error_set(error, ENOTSUP, > RTE_FLOW_ERROR_TYPE_ATTR_INGRESS, > NULL, > @@ -761,7 +844,8 @@ struct field_modify_info modify_tcp[] =3D { > "can only have a single encap" > " action in a flow"); > /* encap without preceding decap is not supported for ingress */ > - if (attr->ingress && !(action_flags & MLX5_FLOW_ACTION_RAW_DECAP)) > + if (!attr->transfer && attr->ingress && > + !(action_flags & MLX5_FLOW_ACTION_RAW_DECAP)) > return rte_flow_error_set(error, ENOTSUP, > RTE_FLOW_ERROR_TYPE_ATTR_INGRESS, > NULL, > @@ -1561,6 +1645,77 @@ struct field_modify_info modify_tcp[] =3D { > return 0; > } > =20 > +/* > + * Validate the port_id action. > + * > + * @param[in] dev > + * Pointer to rte_eth_dev structure. > + * @param[in] action_flags > + * Bit-fields that holds the actions detected until now. > + * @param[in] action > + * Port_id RTE action structure. > + * @param[in] attr > + * Attributes of flow that includes this action. > + * @param[out] error > + * Pointer to error structure. > + * > + * @return > + * 0 on success, a negative errno value otherwise and rte_errno is set= . > + */ > +static int > +flow_dv_validate_action_port_id(struct rte_eth_dev *dev, > + uint64_t action_flags, > + const struct rte_flow_action *action, > + const struct rte_flow_attr *attr, > + struct rte_flow_error *error) > +{ > + const struct rte_flow_action_port_id *port_id; > + uint16_t port; > + uint16_t esw_domain_id; > + uint16_t act_port_domain_id; > + int ret; > + > + if (!attr->transfer) > + return rte_flow_error_set(error, ENOTSUP, > + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, > + NULL, > + "port id action is valid in transfer" > + " mode only"); > + if (!action || !action->conf) > + return rte_flow_error_set(error, ENOTSUP, > + RTE_FLOW_ERROR_TYPE_ACTION_CONF, > + NULL, > + "port id action parameters must be" > + " specified"); > + if (action_flags & (MLX5_FLOW_FATE_ACTIONS | > + MLX5_FLOW_FATE_ESWITCH_ACTIONS)) > + return rte_flow_error_set(error, EINVAL, > + RTE_FLOW_ERROR_TYPE_ACTION, NULL, > + "can have only one fate actions in" > + " a flow"); > + ret =3D mlx5_port_to_eswitch_info(dev->data->port_id, > + &esw_domain_id, NULL); > + if (ret < 0) > + return rte_flow_error_set(error, -ret, > + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, > + NULL, > + "failed to obtain E-Switch info"); > + port_id =3D action->conf; > + port =3D port_id->original ? dev->data->port_id : port_id->id; > + ret =3D mlx5_port_to_eswitch_info(port, &act_port_domain_id, NULL); > + if (ret) > + return rte_flow_error_set > + (error, -ret, > + RTE_FLOW_ERROR_TYPE_ACTION_CONF, port_id, > + "failed to obtain E-Switch port id for port"); > + if (act_port_domain_id !=3D esw_domain_id) > + return rte_flow_error_set > + (error, -ret, > + RTE_FLOW_ERROR_TYPE_ACTION, NULL, > + "port does not belong to" > + " E-Switch being configured"); > + return 0; > +} > =20 > /** > * Find existing modify-header resource or create and register a new one= . > @@ -1759,11 +1914,29 @@ struct field_modify_info modify_tcp[] =3D { > RTE_FLOW_ERROR_TYPE_ATTR_PRIORITY, > NULL, > "priority out of range"); > - if (attributes->transfer) > - return rte_flow_error_set(error, ENOTSUP, > - RTE_FLOW_ERROR_TYPE_ATTR_TRANSFER, > - NULL, > - "transfer is not supported"); > + if (attributes->transfer) { > + if (!priv->config.dv_esw_en) > + return rte_flow_error_set > + (error, ENOTSUP, > + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, > + "E-Switch dr is not supported"); > + if (!(priv->representor || priv->master)) > + return rte_flow_error_set > + (error, EINVAL, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, > + NULL, "E-Switch configurationd can only be" > + " done by a master or a representor device"); > + if (attributes->egress) > + return rte_flow_error_set > + (error, ENOTSUP, > + RTE_FLOW_ERROR_TYPE_ATTR_EGRESS, attributes, > + "egress is not supported"); > + if (attributes->group >=3D MLX5_MAX_TABLES_FDB) > + return rte_flow_error_set > + (error, EINVAL, > + RTE_FLOW_ERROR_TYPE_ATTR_TRANSFER, > + NULL, "group must be smaller than " > + RTE_STR(MLX5_MAX_FDB_TABLES)); > + } > if (!(attributes->egress ^ attributes->ingress)) > return rte_flow_error_set(error, ENOTSUP, > RTE_FLOW_ERROR_TYPE_ATTR, NULL, > @@ -1812,6 +1985,13 @@ struct field_modify_info modify_tcp[] =3D { > switch (items->type) { > case RTE_FLOW_ITEM_TYPE_VOID: > break; > + case RTE_FLOW_ITEM_TYPE_PORT_ID: > + ret =3D flow_dv_validate_item_port_id > + (dev, items, attr, item_flags, error); > + if (ret < 0) > + return ret; > + last_item |=3D MLX5_FLOW_ITEM_PORT_ID; > + break; > case RTE_FLOW_ITEM_TYPE_ETH: > ret =3D mlx5_flow_validate_item_eth(items, item_flags, > error); > @@ -1943,6 +2123,17 @@ struct field_modify_info modify_tcp[] =3D { > switch (actions->type) { > case RTE_FLOW_ACTION_TYPE_VOID: > break; > + case RTE_FLOW_ACTION_TYPE_PORT_ID: > + ret =3D flow_dv_validate_action_port_id(dev, > + action_flags, > + actions, > + attr, > + error); > + if (ret) > + return ret; > + action_flags |=3D MLX5_FLOW_ACTION_PORT_ID; > + ++actions_n; > + break; > case RTE_FLOW_ACTION_TYPE_FLAG: > ret =3D mlx5_flow_validate_action_flag(action_flags, > attr, error); > @@ -2133,10 +2324,40 @@ struct field_modify_info modify_tcp[] =3D { > "action not supported"); > } > } > - if (!(action_flags & MLX5_FLOW_FATE_ACTIONS) && attr->ingress) > - return rte_flow_error_set(error, EINVAL, > - RTE_FLOW_ERROR_TYPE_ACTION, actions, > - "no fate action is found"); > + /* Eswitch has few restrictions on using items and actions */ > + if (attr->transfer) { > + if (action_flags & MLX5_FLOW_ACTION_FLAG) > + return rte_flow_error_set(error, ENOTSUP, > + RTE_FLOW_ERROR_TYPE_ACTION, > + NULL, > + "unsupported action FLAG"); > + if (action_flags & MLX5_FLOW_ACTION_MARK) > + return rte_flow_error_set(error, ENOTSUP, > + RTE_FLOW_ERROR_TYPE_ACTION, > + NULL, > + "unsupported action MARK"); > + if (action_flags & MLX5_FLOW_ACTION_QUEUE) > + return rte_flow_error_set(error, ENOTSUP, > + RTE_FLOW_ERROR_TYPE_ACTION, > + NULL, > + "unsupported action QUEUE"); > + if (action_flags & MLX5_FLOW_ACTION_RSS) > + return rte_flow_error_set(error, ENOTSUP, > + RTE_FLOW_ERROR_TYPE_ACTION, > + NULL, > + "unsupported action RSS"); > + if (!(action_flags & MLX5_FLOW_FATE_ESWITCH_ACTIONS)) > + return rte_flow_error_set(error, EINVAL, > + RTE_FLOW_ERROR_TYPE_ACTION, > + actions, > + "no fate action is found"); > + } else { > + if (!(action_flags & MLX5_FLOW_FATE_ACTIONS) && attr->ingress) > + return rte_flow_error_set(error, EINVAL, > + RTE_FLOW_ERROR_TYPE_ACTION, > + actions, > + "no fate action is found"); > + } > return 0; > } > =20 > --=20 > 1.8.3.1 >=20 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id D990EA00E6 for ; Thu, 18 Apr 2019 14:16:14 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A1A381B9B4; Thu, 18 Apr 2019 14:16:13 +0200 (CEST) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00085.outbound.protection.outlook.com [40.107.0.85]) by dpdk.org (Postfix) with ESMTP id 628FB1B9A3 for ; Thu, 18 Apr 2019 14:16:12 +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=ej7Ca11uU3vsWrrdX2o8Yx4WtBjBEVZHmJoeFprg/9M=; b=FpFYyu4zptV0Sy63P9ZtzshrEtSbs8TX1s7rZjo9UR6XgfbgHKR1KyCqLRS+s/U2EaJt1Vuj4cLqejhfV1/DckmdaazItalqGJ+BICI9ruCvAPt5hOftjtApJ74OnLpozmOV6OMQGukLJHykOsvOyXFZPSMObflly+YfK5ig4lI= Received: from AM0PR0502MB3971.eurprd05.prod.outlook.com (52.133.40.151) by AM0PR0502MB3748.eurprd05.prod.outlook.com (52.133.47.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1813.11; Thu, 18 Apr 2019 12:16:10 +0000 Received: from AM0PR0502MB3971.eurprd05.prod.outlook.com ([fe80::7da6:9e13:922a:9d88]) by AM0PR0502MB3971.eurprd05.prod.outlook.com ([fe80::7da6:9e13:922a:9d88%5]) with mapi id 15.20.1813.013; Thu, 18 Apr 2019 12:16:10 +0000 From: Yongseok Koh To: Ori Kam CC: Shahaf Shuler , Matan Azrad , Slava Ovsiienko , Moti Haimovsky , "dev@dpdk.org" Thread-Topic: [PATCH v2 4/9] net/mlx5: add validation for Direct Rule E-Switch Thread-Index: AQHU9doF7VpBHusz4USFxQjX7020/qZB1UYA Date: Thu, 18 Apr 2019 12:16:10 +0000 Message-ID: <20190418121602.GJ31179@mtidpdk.mti.labs.mlnx> References: <1555276357-4892-1-git-send-email-orika@mellanox.com> <1555586930-109097-1-git-send-email-orika@mellanox.com> <1555586930-109097-5-git-send-email-orika@mellanox.com> In-Reply-To: <1555586930-109097-5-git-send-email-orika@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: BYAPR11CA0072.namprd11.prod.outlook.com (2603:10b6:a03:80::49) To AM0PR0502MB3971.eurprd05.prod.outlook.com (2603:10a6:208:11::23) 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-ms-office365-filtering-correlation-id: 7c542149-c4d0-4b61-8055-08d6c3f7a46f x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600141)(711020)(4605104)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7193020); SRVR:AM0PR0502MB3748; x-ms-traffictypediagnostic: AM0PR0502MB3748: x-microsoft-antispam-prvs: x-forefront-prvs: 0011612A55 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(376002)(396003)(39860400002)(346002)(366004)(136003)(199004)(189003)(97736004)(71190400001)(76176011)(229853002)(6436002)(14454004)(3846002)(7736002)(6116002)(2906002)(316002)(71200400001)(9686003)(5660300002)(6512007)(6636002)(6486002)(52116002)(53936002)(6246003)(86362001)(305945005)(99286004)(68736007)(256004)(14444005)(66066001)(8936002)(6506007)(33656002)(478600001)(4326008)(102836004)(11346002)(446003)(8676002)(26005)(386003)(6862004)(476003)(54906003)(1076003)(486006)(186003)(81166006)(25786009)(81156014)(30864003); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR0502MB3748; H:AM0PR0502MB3971.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-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: 0bgK/ZXhM6cvASZ6DwO0jeN3iAETWrXt0onKku0lp2kXBHSe9bZxsvp5BUED7t2uCYth0wzFYZZLlD10hxZnZ7ylufUuzBLfMQVAA7dY0BHnxUcYY/bpoWrbTQOWRZuMwWL9uxXcxt5CL6HoN2zRdHkMr6ILu7E6vuhS/tB3H8l8apoumg7kCm/Iz4UTPCOlxxezgxnG/RUzY5VEf9pAGPUvIVIbbwe4fGyllD5odhV/89HN/9jCysMvKwsqJ2VPbPbmthwLYgWZKHBX37eZL/ljyRj/aSKJphFjp05IAlsd5oO0DPBiBBTtE0KqZ2eOy4jl3S4wjjP0rqY6B1iV/PVW52wVXeAZOul3EIs4EhfaVLsrN3zQRE57VdzOcD4fLLN2JIZeRIg0TPoqE9sX8T6WhqHj8pYlNM9hUUPiMwQ= Content-Type: text/plain; charset="UTF-8" Content-ID: Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7c542149-c4d0-4b61-8055-08d6c3f7a46f X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Apr 2019 12:16:10.5304 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR0502MB3748 Subject: Re: [dpdk-dev] [PATCH v2 4/9] net/mlx5: add validation for Direct Rule 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Message-ID: <20190418121610.qT-PEhXCrSIhK4yETBHnXxi-ahq0GniGgtusHVPs1eY@z> On Thu, Apr 18, 2019 at 11:28:45AM +0000, Ori Kam wrote: > Add validation logic for E-Switch using Direct Rules. >=20 > Signed-off-by: Ori Kam > --- Acked-by: Yongseok Koh > v2: > * Address ML comments. > --- > drivers/net/mlx5/mlx5.h | 2 + > drivers/net/mlx5/mlx5_ethdev.c | 41 +++++++ > drivers/net/mlx5/mlx5_flow.h | 5 + > drivers/net/mlx5/mlx5_flow_dv.c | 243 ++++++++++++++++++++++++++++++++++= ++++-- > 4 files changed, 280 insertions(+), 11 deletions(-) >=20 > diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h > index b9946f6..dd22bb6 100644 > --- a/drivers/net/mlx5/mlx5.h > +++ b/drivers/net/mlx5/mlx5.h > @@ -412,6 +412,8 @@ int mlx5_ibv_device_to_pci_addr(const struct ibv_devi= ce *device, > unsigned int mlx5_dev_to_port_id(const struct rte_device *dev, > uint16_t *port_list, > unsigned int port_list_n); > +int mlx5_port_to_eswitch_info(uint16_t port, uint16_t *es_domain_id, > + uint16_t *es_port_id); > int mlx5_sysfs_switch_info(unsigned int ifindex, > struct mlx5_switch_info *info); > bool mlx5_translate_port_name(const char *port_name_in, > diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethde= v.c > index 3992918..695440a 100644 > --- a/drivers/net/mlx5/mlx5_ethdev.c > +++ b/drivers/net/mlx5/mlx5_ethdev.c > @@ -1376,6 +1376,47 @@ int mlx5_fw_version_get(struct rte_eth_dev *dev, c= har *fw_ver, size_t fw_size) > } > =20 > /** > + * Get the E-Switch domain id this port belongs to. > + * > + * @param[in] port > + * Device port id. > + * @param[out] es_domain_id > + * E-Switch domain id. > + * @param[out] es_port_id > + * The port id of the port in the E-Switch. > + * > + * @return > + * 0 on success, a negative errno value otherwise and rte_errno is set= . > + */ > +int > +mlx5_port_to_eswitch_info(uint16_t port, > + uint16_t *es_domain_id, uint16_t *es_port_id) > +{ > + struct rte_eth_dev *dev; > + struct mlx5_priv *priv; > + > + if (port >=3D RTE_MAX_ETHPORTS) { > + rte_errno =3D EINVAL; > + return -rte_errno; > + } > + if (!rte_eth_dev_is_valid_port(port)) { > + rte_errno =3D ENODEV; > + return -rte_errno; > + } > + dev =3D &rte_eth_devices[port]; > + priv =3D dev->data->dev_private; > + if (!(priv->representor || priv->master)) { > + rte_errno =3D EINVAL; > + return -rte_errno; > + } > + if (es_domain_id) > + *es_domain_id =3D priv->domain_id; > + if (es_port_id) > + *es_port_id =3D priv->vport_id; > + return 0; > +} > + > +/** > * Get switch information associated with network interface. > * > * @param ifindex > diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h > index 9f47fd4..85954c2 100644 > --- a/drivers/net/mlx5/mlx5_flow.h > +++ b/drivers/net/mlx5/mlx5_flow.h > @@ -48,6 +48,7 @@ > =20 > /* General pattern items bits. */ > #define MLX5_FLOW_ITEM_METADATA (1u << 16) > +#define MLX5_FLOW_ITEM_PORT_ID (1u << 17) > =20 > /* Outer Masks. */ > #define MLX5_FLOW_LAYER_OUTER_L3 \ > @@ -118,6 +119,10 @@ > (MLX5_FLOW_ACTION_DROP | MLX5_FLOW_ACTION_QUEUE | \ > MLX5_FLOW_ACTION_RSS | MLX5_FLOW_ACTION_JUMP) > =20 > +#define MLX5_FLOW_FATE_ESWITCH_ACTIONS \ > + (MLX5_FLOW_ACTION_DROP | MLX5_FLOW_ACTION_PORT_ID | \ > + MLX5_FLOW_ACTION_JUMP) > + > #define MLX5_FLOW_ENCAP_ACTIONS (MLX5_FLOW_ACTION_VXLAN_ENCAP | \ > MLX5_FLOW_ACTION_NVGRE_ENCAP | \ > MLX5_FLOW_ACTION_RAW_ENCAP) > diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow= _dv.c > index 1e25e0b..b819359 100644 > --- a/drivers/net/mlx5/mlx5_flow_dv.c > +++ b/drivers/net/mlx5/mlx5_flow_dv.c > @@ -613,6 +613,89 @@ struct field_modify_info modify_tcp[] =3D { > } > =20 > /** > + * Validate vport item. > + * > + * @param[in] dev > + * Pointer to the rte_eth_dev structure. > + * @param[in] item > + * Item specification. > + * @param[in] attr > + * Attributes of flow that includes this item. > + * @param[in] item_flags > + * Bit-fields that holds the items detected until now. > + * @param[out] error > + * Pointer to error structure. > + * > + * @return > + * 0 on success, a negative errno value otherwise and rte_errno is set= . > + */ > +static int > +flow_dv_validate_item_port_id(struct rte_eth_dev *dev, > + const struct rte_flow_item *item, > + const struct rte_flow_attr *attr, > + uint64_t item_flags, > + struct rte_flow_error *error) > +{ > + const struct rte_flow_item_port_id *spec =3D item->spec; > + const struct rte_flow_item_port_id *mask =3D item->mask; > + const struct rte_flow_item_port_id switch_mask =3D { > + .id =3D 0xffffffff, > + }; > + uint16_t esw_domain_id; > + uint16_t item_port_esw_domain_id; > + int ret; > + > + if (!attr->transfer) > + return rte_flow_error_set(error, EINVAL, > + RTE_FLOW_ERROR_TYPE_ITEM, > + NULL, > + "match on port id is valid only" > + " when transfer flag is enabled"); > + if (item_flags & MLX5_FLOW_ITEM_PORT_ID) > + return rte_flow_error_set(error, ENOTSUP, > + RTE_FLOW_ERROR_TYPE_ITEM, item, > + "multiple source ports are not" > + " supported"); > + if (!mask) > + mask =3D &switch_mask; > + if (mask->id !=3D 0xffffffff) > + return rte_flow_error_set(error, ENOTSUP, > + RTE_FLOW_ERROR_TYPE_ITEM_MASK, > + mask, > + "no support for partial mask on" > + " \"id\" field"); > + ret =3D mlx5_flow_item_acceptable > + (item, (const uint8_t *)mask, > + (const uint8_t *)&rte_flow_item_port_id_mask, > + sizeof(struct rte_flow_item_port_id), > + error); > + if (ret) > + return ret; > + if (!spec) > + return 0; > + ret =3D mlx5_port_to_eswitch_info(spec->id, &item_port_esw_domain_id, > + NULL); > + if (ret) > + return rte_flow_error_set(error, -ret, > + RTE_FLOW_ERROR_TYPE_ITEM_SPEC, spec, > + "failed to obtain E-Switch info for" > + " port"); > + ret =3D mlx5_port_to_eswitch_info(dev->data->port_id, > + &esw_domain_id, NULL); > + if (ret < 0) > + return rte_flow_error_set(error, -ret, > + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, > + NULL, > + "failed to obtain E-Switch info"); > + if (item_port_esw_domain_id !=3D esw_domain_id) > + return rte_flow_error_set(error, -ret, > + RTE_FLOW_ERROR_TYPE_ITEM_SPEC, spec, > + "cannot match on a port from a" > + " different E-Switch"); > + return 0; > +} > + > +/** > * Validate count action. > * > * @param[in] dev > @@ -676,7 +759,7 @@ struct field_modify_info modify_tcp[] =3D { > RTE_FLOW_ERROR_TYPE_ACTION, NULL, > "can only have a single encap or" > " decap action in a flow"); > - if (attr->ingress) > + if (!attr->transfer && attr->ingress) > return rte_flow_error_set(error, ENOTSUP, > RTE_FLOW_ERROR_TYPE_ATTR_INGRESS, > NULL, > @@ -761,7 +844,8 @@ struct field_modify_info modify_tcp[] =3D { > "can only have a single encap" > " action in a flow"); > /* encap without preceding decap is not supported for ingress */ > - if (attr->ingress && !(action_flags & MLX5_FLOW_ACTION_RAW_DECAP)) > + if (!attr->transfer && attr->ingress && > + !(action_flags & MLX5_FLOW_ACTION_RAW_DECAP)) > return rte_flow_error_set(error, ENOTSUP, > RTE_FLOW_ERROR_TYPE_ATTR_INGRESS, > NULL, > @@ -1561,6 +1645,77 @@ struct field_modify_info modify_tcp[] =3D { > return 0; > } > =20 > +/* > + * Validate the port_id action. > + * > + * @param[in] dev > + * Pointer to rte_eth_dev structure. > + * @param[in] action_flags > + * Bit-fields that holds the actions detected until now. > + * @param[in] action > + * Port_id RTE action structure. > + * @param[in] attr > + * Attributes of flow that includes this action. > + * @param[out] error > + * Pointer to error structure. > + * > + * @return > + * 0 on success, a negative errno value otherwise and rte_errno is set= . > + */ > +static int > +flow_dv_validate_action_port_id(struct rte_eth_dev *dev, > + uint64_t action_flags, > + const struct rte_flow_action *action, > + const struct rte_flow_attr *attr, > + struct rte_flow_error *error) > +{ > + const struct rte_flow_action_port_id *port_id; > + uint16_t port; > + uint16_t esw_domain_id; > + uint16_t act_port_domain_id; > + int ret; > + > + if (!attr->transfer) > + return rte_flow_error_set(error, ENOTSUP, > + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, > + NULL, > + "port id action is valid in transfer" > + " mode only"); > + if (!action || !action->conf) > + return rte_flow_error_set(error, ENOTSUP, > + RTE_FLOW_ERROR_TYPE_ACTION_CONF, > + NULL, > + "port id action parameters must be" > + " specified"); > + if (action_flags & (MLX5_FLOW_FATE_ACTIONS | > + MLX5_FLOW_FATE_ESWITCH_ACTIONS)) > + return rte_flow_error_set(error, EINVAL, > + RTE_FLOW_ERROR_TYPE_ACTION, NULL, > + "can have only one fate actions in" > + " a flow"); > + ret =3D mlx5_port_to_eswitch_info(dev->data->port_id, > + &esw_domain_id, NULL); > + if (ret < 0) > + return rte_flow_error_set(error, -ret, > + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, > + NULL, > + "failed to obtain E-Switch info"); > + port_id =3D action->conf; > + port =3D port_id->original ? dev->data->port_id : port_id->id; > + ret =3D mlx5_port_to_eswitch_info(port, &act_port_domain_id, NULL); > + if (ret) > + return rte_flow_error_set > + (error, -ret, > + RTE_FLOW_ERROR_TYPE_ACTION_CONF, port_id, > + "failed to obtain E-Switch port id for port"); > + if (act_port_domain_id !=3D esw_domain_id) > + return rte_flow_error_set > + (error, -ret, > + RTE_FLOW_ERROR_TYPE_ACTION, NULL, > + "port does not belong to" > + " E-Switch being configured"); > + return 0; > +} > =20 > /** > * Find existing modify-header resource or create and register a new one= . > @@ -1759,11 +1914,29 @@ struct field_modify_info modify_tcp[] =3D { > RTE_FLOW_ERROR_TYPE_ATTR_PRIORITY, > NULL, > "priority out of range"); > - if (attributes->transfer) > - return rte_flow_error_set(error, ENOTSUP, > - RTE_FLOW_ERROR_TYPE_ATTR_TRANSFER, > - NULL, > - "transfer is not supported"); > + if (attributes->transfer) { > + if (!priv->config.dv_esw_en) > + return rte_flow_error_set > + (error, ENOTSUP, > + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, > + "E-Switch dr is not supported"); > + if (!(priv->representor || priv->master)) > + return rte_flow_error_set > + (error, EINVAL, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, > + NULL, "E-Switch configurationd can only be" > + " done by a master or a representor device"); > + if (attributes->egress) > + return rte_flow_error_set > + (error, ENOTSUP, > + RTE_FLOW_ERROR_TYPE_ATTR_EGRESS, attributes, > + "egress is not supported"); > + if (attributes->group >=3D MLX5_MAX_TABLES_FDB) > + return rte_flow_error_set > + (error, EINVAL, > + RTE_FLOW_ERROR_TYPE_ATTR_TRANSFER, > + NULL, "group must be smaller than " > + RTE_STR(MLX5_MAX_FDB_TABLES)); > + } > if (!(attributes->egress ^ attributes->ingress)) > return rte_flow_error_set(error, ENOTSUP, > RTE_FLOW_ERROR_TYPE_ATTR, NULL, > @@ -1812,6 +1985,13 @@ struct field_modify_info modify_tcp[] =3D { > switch (items->type) { > case RTE_FLOW_ITEM_TYPE_VOID: > break; > + case RTE_FLOW_ITEM_TYPE_PORT_ID: > + ret =3D flow_dv_validate_item_port_id > + (dev, items, attr, item_flags, error); > + if (ret < 0) > + return ret; > + last_item |=3D MLX5_FLOW_ITEM_PORT_ID; > + break; > case RTE_FLOW_ITEM_TYPE_ETH: > ret =3D mlx5_flow_validate_item_eth(items, item_flags, > error); > @@ -1943,6 +2123,17 @@ struct field_modify_info modify_tcp[] =3D { > switch (actions->type) { > case RTE_FLOW_ACTION_TYPE_VOID: > break; > + case RTE_FLOW_ACTION_TYPE_PORT_ID: > + ret =3D flow_dv_validate_action_port_id(dev, > + action_flags, > + actions, > + attr, > + error); > + if (ret) > + return ret; > + action_flags |=3D MLX5_FLOW_ACTION_PORT_ID; > + ++actions_n; > + break; > case RTE_FLOW_ACTION_TYPE_FLAG: > ret =3D mlx5_flow_validate_action_flag(action_flags, > attr, error); > @@ -2133,10 +2324,40 @@ struct field_modify_info modify_tcp[] =3D { > "action not supported"); > } > } > - if (!(action_flags & MLX5_FLOW_FATE_ACTIONS) && attr->ingress) > - return rte_flow_error_set(error, EINVAL, > - RTE_FLOW_ERROR_TYPE_ACTION, actions, > - "no fate action is found"); > + /* Eswitch has few restrictions on using items and actions */ > + if (attr->transfer) { > + if (action_flags & MLX5_FLOW_ACTION_FLAG) > + return rte_flow_error_set(error, ENOTSUP, > + RTE_FLOW_ERROR_TYPE_ACTION, > + NULL, > + "unsupported action FLAG"); > + if (action_flags & MLX5_FLOW_ACTION_MARK) > + return rte_flow_error_set(error, ENOTSUP, > + RTE_FLOW_ERROR_TYPE_ACTION, > + NULL, > + "unsupported action MARK"); > + if (action_flags & MLX5_FLOW_ACTION_QUEUE) > + return rte_flow_error_set(error, ENOTSUP, > + RTE_FLOW_ERROR_TYPE_ACTION, > + NULL, > + "unsupported action QUEUE"); > + if (action_flags & MLX5_FLOW_ACTION_RSS) > + return rte_flow_error_set(error, ENOTSUP, > + RTE_FLOW_ERROR_TYPE_ACTION, > + NULL, > + "unsupported action RSS"); > + if (!(action_flags & MLX5_FLOW_FATE_ESWITCH_ACTIONS)) > + return rte_flow_error_set(error, EINVAL, > + RTE_FLOW_ERROR_TYPE_ACTION, > + actions, > + "no fate action is found"); > + } else { > + if (!(action_flags & MLX5_FLOW_FATE_ACTIONS) && attr->ingress) > + return rte_flow_error_set(error, EINVAL, > + RTE_FLOW_ERROR_TYPE_ACTION, > + actions, > + "no fate action is found"); > + } > return 0; > } > =20 > --=20 > 1.8.3.1 >=20