Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/96032/?format=api
{ "id": 96032, "url": "http://patches.dpdk.org/api/patches/96032/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20210719025410.15483-9-xuemingl@nvidia.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20210719025410.15483-9-xuemingl@nvidia.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20210719025410.15483-9-xuemingl@nvidia.com", "date": "2021-07-19T02:54:03", "name": "[v3,08/15] net/mlx5: support SubFunction", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "7e27a56897fe63c9388c5fa79e13d53227641923", "submitter": { "id": 1904, "url": "http://patches.dpdk.org/api/people/1904/?format=api", "name": "Xueming Li", "email": "xuemingl@nvidia.com" }, "delegate": { "id": 1, "url": "http://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20210719025410.15483-9-xuemingl@nvidia.com/mbox/", "series": [ { "id": 17884, "url": "http://patches.dpdk.org/api/series/17884/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=17884", "date": "2021-07-19T02:53:55", "name": "net/mlx5: support Sub-Function", "version": 3, "mbox": "http://patches.dpdk.org/series/17884/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/96032/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/96032/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id EEAA6A0C45;\n\tMon, 19 Jul 2021 04:55:49 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id CB16B411B8;\n\tMon, 19 Jul 2021 04:55:33 +0200 (CEST)", "from NAM12-DM6-obe.outbound.protection.outlook.com\n (mail-dm6nam12on2062.outbound.protection.outlook.com [40.107.243.62])\n by mails.dpdk.org (Postfix) with ESMTP id B8E9841194\n for <dev@dpdk.org>; Mon, 19 Jul 2021 04:55:31 +0200 (CEST)", "from MW4PR04CA0115.namprd04.prod.outlook.com (2603:10b6:303:83::30)\n by BL1PR12MB5240.namprd12.prod.outlook.com (2603:10b6:208:319::21)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4331.24; Mon, 19 Jul\n 2021 02:55:30 +0000", "from CO1NAM11FT005.eop-nam11.prod.protection.outlook.com\n (2603:10b6:303:83:cafe::7e) by MW4PR04CA0115.outlook.office365.com\n (2603:10b6:303:83::30) with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4331.21 via Frontend\n Transport; Mon, 19 Jul 2021 02:55:29 +0000", "from mail.nvidia.com (216.228.112.34) by\n CO1NAM11FT005.mail.protection.outlook.com (10.13.174.147) with Microsoft SMTP\n Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id\n 15.20.4331.21 via Frontend Transport; Mon, 19 Jul 2021 02:55:29 +0000", "from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com\n (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 19 Jul\n 2021 02:55:26 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=P7IahEIR5Iuw1zXG1vQxjDTJxSVcPIKmux7DuaqgaPv0Srzv9rii6z3JWoTQM9M5PqJ4tEHj9+kxxrvcCLzf92bNl4M+Gf/ulL2Lb+RncyBpLmk68nrZklz17pEVn4gAkmCKo3mcWDcyAHb9WLdejea2OzXhanAAFlJMlJvFDDUTF1N98vjmNQX/oMmkw1xBdCwHun0IgsRsL00yiYkCBEE4vl7s3fvC5N4Rf8CeXkT6FuLgY0OeuGVLkls4dQGfKbfose3vdVTutDW/H24AyrQx+szNnls5yxkiUHyBBPmrV5tsXP675bo/qxVmG7v4inwszJcp9UHo6qcVlKjdPA==", "ARC-Message-Signature": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;\n s=arcselector9901;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=GdSBma1SpYcFeoFo00HYKTQHmIas2aanWyM3u2MfLvU=;\n b=A9yqaf7vtkUZtyOwtc5LfwEEXpT0fq41X6dO9NfSWsIAxOLnLPEdbFklXecDHyg0q+/3LS18mSOTbLXWJE+1NedslPp4K/LgedAI6sNoJb+Rf9FkNwTvsLEx5pU7Q3JiVjI2WVeLUrwPQmNgg5jHw4aWbCguoOJFEOepFwmPmbNK+QpzI/mIsULIfx71JCEcDRTEp0jEvtTZFAncX+iZ4rdkJNRyC8oDCVHyCt6WTQWZILtwcQ2O5S1uJnr49o5TZICz9/uhCiS7LKudooSEPpIfRGl7M1hwRcBl4qf3/Z4mjAVs2HnE/oKQny3zwe34GcMtv4xzeaerat5BJsr3og==", "ARC-Authentication-Results": "i=1; mx.microsoft.com 1; spf=pass (sender ip is\n 216.228.112.34) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com;\n dmarc=pass (p=quarantine sp=none pct=100) action=none header.from=nvidia.com;\n dkim=none (message not signed); arc=none", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com;\n s=selector2;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=GdSBma1SpYcFeoFo00HYKTQHmIas2aanWyM3u2MfLvU=;\n b=t9iG546YJjtIaK3VId6Yawl4LR9Dbnq9ywcbrtHJJIem4sefbJrKzWVOmIoTNsUgPN8a9F+I+UQ6lNhrfDFvsowhRwGP6aPBrMkUsPo9vMUbB3zTmck50UnlwUf9vVRrmIy5lx8pFpCCAbM1emiZqDVsOe244MdUHRMgC2WHeSsOR7HVsH0k7hzxi4u5HxjGQQ2p3Bu2J4bK/2E6NhzNGO5Iw4B94QK+ICgxUYF5pHtLowgZXo6nQgfXi1errKyDth4ru4L8N8J9iPoAr4a2tUfjckbEIg3whUmly0uHHj7ZylfZiemm5e+hXnXe+giM1RKoNFGCXApwtmvbiTVmvQ==", "X-MS-Exchange-Authentication-Results": "spf=pass (sender IP is 216.228.112.34)\n smtp.mailfrom=nvidia.com; intel.com; dkim=none (message not signed)\n header.d=none;intel.com; dmarc=pass action=none header.from=nvidia.com;", "Received-SPF": "Pass (protection.outlook.com: domain of nvidia.com designates\n 216.228.112.34 as permitted sender) receiver=protection.outlook.com;\n client-ip=216.228.112.34; helo=mail.nvidia.com;", "From": "Xueming Li <xuemingl@nvidia.com>", "To": "Viacheslav Ovsiienko <viacheslavo@nvidia.com>", "CC": "<dev@dpdk.org>, <xuemingl@nvidia.com>, Matan Azrad <matan@nvidia.com>,\n Shahaf Shuler <shahafs@nvidia.com>, Anatoly Burakov\n <anatoly.burakov@intel.com>", "Date": "Mon, 19 Jul 2021 10:54:03 +0800", "Message-ID": "<20210719025410.15483-9-xuemingl@nvidia.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20210713131437.30170-2-xuemingl@nvidia.com>", "References": "<20210713131437.30170-2-xuemingl@nvidia.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-Originating-IP": "[172.20.187.5]", "X-ClientProxiedBy": "HQMAIL105.nvidia.com (172.20.187.12) To\n HQMAIL107.nvidia.com (172.20.187.13)", "X-EOPAttributedMessage": "0", "X-MS-PublicTrafficType": "Email", "X-MS-Office365-Filtering-Correlation-Id": "9349b629-884e-4d39-7e1e-08d94a60ab25", "X-MS-TrafficTypeDiagnostic": "BL1PR12MB5240:", "X-Microsoft-Antispam-PRVS": "\n <BL1PR12MB524044CB1BA2FAC8A1071211A1E19@BL1PR12MB5240.namprd12.prod.outlook.com>", "X-MS-Oob-TLC-OOBClassifiers": "OLM:199;", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n h+3PDT08tB5msU8vwuk1WaYGyETjjnZ3Pp2lI5rYJTOHBg0tNMqsaxRvbFDj6nCWj4ZO2qjBOkCz2zebNW/cwb5prVtlxQxia4HZ84XsdkJxfXSGYF23zOtvR7bSPTuhP6HDDbbprJqypXCdcDksu4nRv25Gi01cdr/23RzK8iFfFoe+bxVmVGNw/5S+lyWMic1Bcu2NqaWMQFjEE6vDc2+4Ogb/aiWJJGLz6hmat2i3nYLOQxL5ikLGPjRT5h+GP2BTsyVRb84ctJG1P6b9+b9G2LX3ZdsO7xQMsMXfGMJukKvOuEFYEbJmuphLYani+RyELl01kO1YVW0A7w+NogCbuuiaJH0WbXd/fNJuPaGK8lectHtUiw+e7hIg8+8mTt9HUv1Op3jqfsVTIZHCUYoGSBMGCdwY31FAsSQdn5rKAYW7raS1gRTVlVVfI1dO4m11KfbjDYU5dcxvrf2N9mnM3Lqn5a3mXvNKAckrEjzA8EwXgpK5IMV7tado34RsPG1jN8Wq1U20AY7o/6C4LmZTkydThd1rhYQtDCwg7YU0OfWiDCjGvy6F82FLEJV3qr54w0MWP+XI89FoZOCjZ+FFm+USGbrJ6UuxN1vWI5c+twx4CfDabeKQzbSotNfN+nPm0CakyxJPxlhBybJcaux51MFtysjCVyjDGTbcITuJtX0e6Rcy3CzNy0Tf95KrMLAmr4ZVEfV/iPFWSVDuQA==", "X-Forefront-Antispam-Report": "CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1;\n SRV:;\n IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE;\n SFS:(4636009)(346002)(396003)(136003)(39860400002)(376002)(36840700001)(46966006)(37006003)(426003)(336012)(5660300002)(2616005)(70586007)(70206006)(36906005)(7696005)(186003)(83380400001)(316002)(16526019)(54906003)(19627235002)(1076003)(26005)(82310400003)(47076005)(8936002)(6286002)(36756003)(86362001)(356005)(8676002)(4326008)(7636003)(30864003)(55016002)(82740400003)(6862004)(478600001)(6636002)(2906002)(6666004)(36860700001);\n DIR:OUT; SFP:1101;", "X-OriginatorOrg": "Nvidia.com", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "19 Jul 2021 02:55:29.7273 (UTC)", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 9349b629-884e-4d39-7e1e-08d94a60ab25", "X-MS-Exchange-CrossTenant-Id": "43083d15-7273-40c1-b7db-39efd9ccc17a", "X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp": "\n TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34];\n Helo=[mail.nvidia.com]", "X-MS-Exchange-CrossTenant-AuthSource": "\n CO1NAM11FT005.eop-nam11.prod.protection.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Anonymous", "X-MS-Exchange-CrossTenant-FromEntityHeader": "HybridOnPrem", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "BL1PR12MB5240", "Subject": "[dpdk-dev] [PATCH v3 08/15] net/mlx5: support SubFunction", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "This patch introduces SF support. Similar to VF, SF on auxiliary bus is\na portion of hardware PF, no representor or bonding parameters for SF.\n\nDevargs to support SF:\n-a auxiliary:mlx5_core.sf.8,dv_flow_en=1\n\nNew global syntax to support SF:\n-a bus=auxiliary,name=mlx5_core.sf.8/class=eth/driver=mlx5,dv_flow_en=1\n\nSigned-off-by: Xueming Li <xuemingl@nvidia.com>\n---\n doc/guides/nics/mlx5.rst | 54 +++++----\n drivers/net/mlx5/linux/mlx5_ethdev_os.c | 12 +-\n drivers/net/mlx5/linux/mlx5_os.c | 145 +++++++++++++++++-------\n drivers/net/mlx5/linux/mlx5_os.h | 2 +\n drivers/net/mlx5/mlx5.c | 23 +++-\n drivers/net/mlx5/mlx5.h | 2 +\n drivers/net/mlx5/mlx5_mac.c | 2 +-\n drivers/net/mlx5/mlx5_rxmode.c | 8 +-\n drivers/net/mlx5/mlx5_trigger.c | 2 +-\n drivers/net/mlx5/windows/mlx5_os.c | 12 +-\n 10 files changed, 188 insertions(+), 74 deletions(-)", "diff": "diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst\nindex f5b727c1ee..a2ecddef13 100644\n--- a/doc/guides/nics/mlx5.rst\n+++ b/doc/guides/nics/mlx5.rst\n@@ -112,6 +112,11 @@ Features\n - Flow integrity offload API.\n - Connection tracking.\n - Sub-Function representors.\n+- Sub-Function.\n+\n+Limitations\n+-----------\n+\n \n Limitations\n -----------\n@@ -1478,40 +1483,51 @@ the DPDK application.\n \n echo switchdev > /sys/class/net/<net device>/compat/devlink/mode\n \n-Sub-Function representor\n-------------------------\n+Sub-Function support\n+--------------------\n \n Sub-Function is a portion of the PCI device, a SF netdev has its own\n-dedicated queues(txq, rxq). A SF netdev supports E-Switch representation\n-offload similar to existing PF and VF representors. A SF shares PCI\n-level resources with other SFs and/or with its parent PCI function.\n+dedicated queues(txq, rxq). A SF shares PCI level resources with other SFs\n+and/or with its parent PCI function.\n+\n+0. Requirement::\n+\n+ OFED version >= 5.4-0.3.3.0\n \n 1. Configure SF feature::\n \n- mlxconfig -d <mst device> set PF_BAR2_SIZE=<0/1/2/3> PF_BAR2_ENABLE=1\n+ # Run mlxconfig on both PFs on host and ECPFs on BlueField.\n+ mlxconfig -d <mst device> set PER_PF_NUM_SF=1 PF_TOTAL_SF=252 PF_SF_BAR_SIZE=12\n \n- Value of PF_BAR2_SIZE:\n+2. Enable switchdev mode::\n \n- 0: 8 SFs\n- 1: 16 SFs\n- 2: 32 SFs\n- 3: 64 SFs\n+ mlxdevm dev eswitch set pci/<DBDF> mode switchdev\n \n-2. Reset the FW::\n+3. Add SF port::\n \n- mlxfwreset -d <mst device> reset\n+ mlxdevm port add pci/<DBDF> flavour pcisf pfnum 0 sfnum <sfnum>\n \n-3. Enable switchdev mode::\n+ Get SFID from output: pci/<DBDF>/<SFID>\n \n- echo switchdev > /sys/class/net/<net device>/compat/devlink/mode\n+4. Modify MAC address::\n+\n+ mlxdevm port function set pci/<DBDF>/<SFID> hw_addr <MAC>\n+\n+5. Activate SF port::\n+\n+ mlxdevm port function set pci/<DBDF>/<ID> state active\n+\n+6. Devargs to probe SF device::\n \n-4. Create SF::\n+ auxiliary:mlx5_core.sf.<num>,dv_flow_en=1\n \n- mlnx-sf -d <PCI_BDF> -a create\n+Sub-Function representor support\n+--------------------------------\n \n-5. Probe SF representor::\n+A SF netdev supports E-Switch representation offload similar to existing PF\n+and VF representors. Use <sfnum> to probe SF representor.\n \n- testpmd> port attach <PCI_BDF>,representor=sf0,dv_flow_en=1\n+ testpmd> port attach <PCI_BDF>,representor=sf<sfnum>,dv_flow_en=1\n \n Performance tuning\n ------------------\ndiff --git a/drivers/net/mlx5/linux/mlx5_ethdev_os.c b/drivers/net/mlx5/linux/mlx5_ethdev_os.c\nindex b05b9fc950..f34133e2c6 100644\n--- a/drivers/net/mlx5/linux/mlx5_ethdev_os.c\n+++ b/drivers/net/mlx5/linux/mlx5_ethdev_os.c\n@@ -128,6 +128,17 @@ struct ethtool_link_settings {\n #define ETHTOOL_LINK_MODE_200000baseCR4_Full_BIT 2 /* 66 - 64 */\n #endif\n \n+/* Get interface index from SubFunction device name. */\n+int\n+mlx5_auxiliary_get_ifindex(const char *sf_name)\n+{\n+\tchar if_name[IF_NAMESIZE] = { 0 };\n+\n+\tif (mlx5_auxiliary_get_child_name(sf_name, \"/net\",\n+\t\t\t\t\t if_name, sizeof(if_name)) != 0)\n+\t\treturn -rte_errno;\n+\treturn if_nametoindex(if_name);\n+}\n \n /**\n * Get interface name from private structure.\n@@ -1619,4 +1630,3 @@ mlx5_get_mac(struct rte_eth_dev *dev, uint8_t (*mac)[RTE_ETHER_ADDR_LEN])\n \tmemcpy(mac, request.ifr_hwaddr.sa_data, RTE_ETHER_ADDR_LEN);\n \treturn 0;\n }\n-\ndiff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c\nindex 1b7ee419d1..f041f9054f 100644\n--- a/drivers/net/mlx5/linux/mlx5_os.c\n+++ b/drivers/net/mlx5/linux/mlx5_os.c\n@@ -20,6 +20,7 @@\n #include <ethdev_pci.h>\n #include <rte_pci.h>\n #include <rte_bus_pci.h>\n+#include <rte_bus_auxiliary.h>\n #include <rte_common.h>\n #include <rte_kvargs.h>\n #include <rte_rwlock.h>\n@@ -2061,6 +2062,27 @@ mlx5_device_bond_pci_match(const struct ibv_device *ibv_dev,\n \treturn pf;\n }\n \n+static void\n+mlx5_os_config_default(struct mlx5_dev_config *config)\n+{\n+\tmemset(config, 0, sizeof(*config));\n+\tconfig->mps = MLX5_ARG_UNSET;\n+\tconfig->dbnc = MLX5_ARG_UNSET;\n+\tconfig->rx_vec_en = 1;\n+\tconfig->txq_inline_max = MLX5_ARG_UNSET;\n+\tconfig->txq_inline_min = MLX5_ARG_UNSET;\n+\tconfig->txq_inline_mpw = MLX5_ARG_UNSET;\n+\tconfig->txqs_inline = MLX5_ARG_UNSET;\n+\tconfig->vf_nl_en = 1;\n+\tconfig->mr_ext_memseg_en = 1;\n+\tconfig->mprq.max_memcpy_len = MLX5_MPRQ_MEMCPY_DEFAULT_LEN;\n+\tconfig->mprq.min_rxqs_num = MLX5_MPRQ_MIN_RXQS;\n+\tconfig->dv_esw_en = 1;\n+\tconfig->dv_flow_en = 1;\n+\tconfig->decap_en = 1;\n+\tconfig->log_hp_size = MLX5_ARG_UNSET;\n+}\n+\n /**\n * Register a PCI device within bonding.\n *\n@@ -2485,23 +2507,8 @@ mlx5_os_pci_probe_pf(struct rte_pci_device *pci_dev,\n \t\tuint32_t restore;\n \n \t\t/* Default configuration. */\n-\t\tmemset(&dev_config, 0, sizeof(struct mlx5_dev_config));\n+\t\tmlx5_os_config_default(&dev_config);\n \t\tdev_config.vf = dev_config_vf;\n-\t\tdev_config.mps = MLX5_ARG_UNSET;\n-\t\tdev_config.dbnc = MLX5_ARG_UNSET;\n-\t\tdev_config.rx_vec_en = 1;\n-\t\tdev_config.txq_inline_max = MLX5_ARG_UNSET;\n-\t\tdev_config.txq_inline_min = MLX5_ARG_UNSET;\n-\t\tdev_config.txq_inline_mpw = MLX5_ARG_UNSET;\n-\t\tdev_config.txqs_inline = MLX5_ARG_UNSET;\n-\t\tdev_config.vf_nl_en = 1;\n-\t\tdev_config.mr_ext_memseg_en = 1;\n-\t\tdev_config.mprq.max_memcpy_len = MLX5_MPRQ_MEMCPY_DEFAULT_LEN;\n-\t\tdev_config.mprq.min_rxqs_num = MLX5_MPRQ_MIN_RXQS;\n-\t\tdev_config.dv_esw_en = 1;\n-\t\tdev_config.dv_flow_en = 1;\n-\t\tdev_config.decap_en = 1;\n-\t\tdev_config.log_hp_size = MLX5_ARG_UNSET;\n \t\tdev_config.allow_duplicate_pattern = 1;\n \t\tlist[i].numa_node = pci_dev->device.numa_node;\n \t\tlist[i].eth_dev = mlx5_dev_spawn(&pci_dev->device,\n@@ -2560,6 +2567,35 @@ mlx5_os_pci_probe_pf(struct rte_pci_device *pci_dev,\n \treturn ret;\n }\n \n+static int\n+mlx5_os_parse_eth_devargs(struct rte_device *dev,\n+\t\t\t struct rte_eth_devargs *eth_da)\n+{\n+\tint ret = 0;\n+\n+\tif (dev->devargs == NULL)\n+\t\treturn 0;\n+\tmemset(eth_da, 0, sizeof(*eth_da));\n+\t/* Parse representor information first from class argument. */\n+\tif (dev->devargs->cls_str)\n+\t\tret = rte_eth_devargs_parse(dev->devargs->cls_str, eth_da);\n+\tif (ret != 0) {\n+\t\tDRV_LOG(ERR, \"failed to parse device arguments: %s\",\n+\t\t\tdev->devargs->cls_str);\n+\t\treturn -rte_errno;\n+\t}\n+\tif (eth_da->type == RTE_ETH_REPRESENTOR_NONE) {\n+\t\t/* Parse legacy device argument */\n+\t\tret = rte_eth_devargs_parse(dev->devargs->args, eth_da);\n+\t\tif (ret) {\n+\t\t\tDRV_LOG(ERR, \"failed to parse device arguments: %s\",\n+\t\t\t\tdev->devargs->args);\n+\t\t\treturn -rte_errno;\n+\t\t}\n+\t}\n+\treturn 0;\n+}\n+\n /**\n * Callback to register a PCI device.\n *\n@@ -2574,31 +2610,13 @@ mlx5_os_pci_probe_pf(struct rte_pci_device *pci_dev,\n static int\n mlx5_os_pci_probe(struct rte_pci_device *pci_dev)\n {\n-\tstruct rte_eth_devargs eth_da = { .type = RTE_ETH_REPRESENTOR_NONE };\n+\tstruct rte_eth_devargs eth_da = { .nb_ports = 0 };\n \tint ret = 0;\n \tuint16_t p;\n \n-\tif (pci_dev->device.devargs) {\n-\t\t/* Parse representor information from device argument. */\n-\t\tif (pci_dev->device.devargs->cls_str)\n-\t\t\tret = rte_eth_devargs_parse\n-\t\t\t\t(pci_dev->device.devargs->cls_str, ð_da);\n-\t\tif (ret) {\n-\t\t\tDRV_LOG(ERR, \"failed to parse device arguments: %s\",\n-\t\t\t\tpci_dev->device.devargs->cls_str);\n-\t\t\treturn -rte_errno;\n-\t\t}\n-\t\tif (eth_da.type == RTE_ETH_REPRESENTOR_NONE) {\n-\t\t\t/* Support legacy device argument */\n-\t\t\tret = rte_eth_devargs_parse\n-\t\t\t\t(pci_dev->device.devargs->args, ð_da);\n-\t\t\tif (ret) {\n-\t\t\t\tDRV_LOG(ERR, \"failed to parse device arguments: %s\",\n-\t\t\t\t\tpci_dev->device.devargs->args);\n-\t\t\t\treturn -rte_errno;\n-\t\t\t}\n-\t\t}\n-\t}\n+\tret = mlx5_os_parse_eth_devargs(&pci_dev->device, ð_da);\n+\tif (ret != 0)\n+\t\treturn ret;\n \n \tif (eth_da.nb_ports > 0) {\n \t\t/* Iterate all port if devargs pf is range: \"pf[0-1]vf[...]\". */\n@@ -2611,10 +2629,56 @@ mlx5_os_pci_probe(struct rte_pci_device *pci_dev)\n \treturn ret;\n }\n \n+/* Probe a single SF device on auxiliary bus, no representor support. */\n+static int\n+mlx5_os_auxiliary_probe(struct rte_device *dev)\n+{\n+\tstruct rte_eth_devargs eth_da = { .nb_ports = 0 };\n+\tstruct mlx5_dev_config config;\n+\tstruct mlx5_dev_spawn_data spawn = { .pf_bond = -1 };\n+\tstruct rte_auxiliary_device *adev = RTE_DEV_TO_AUXILIARY(dev);\n+\tstruct rte_eth_dev *eth_dev;\n+\tint ret = 0;\n+\n+\t/* Parse ethdev devargs. */\n+\tret = mlx5_os_parse_eth_devargs(dev, ð_da);\n+\tif (ret != 0)\n+\t\treturn ret;\n+\t/* Set default config data. */\n+\tmlx5_os_config_default(&config);\n+\tconfig.sf = 1;\n+\t/* Init spawn data. */\n+\tspawn.max_port = 1;\n+\tspawn.phys_port = 1;\n+\tspawn.phys_dev = mlx5_os_get_ibv_dev(dev);\n+\tif (spawn.phys_dev == NULL)\n+\t\treturn -rte_errno;\n+\tret = mlx5_auxiliary_get_ifindex(dev->name);\n+\tif (ret < 0) {\n+\t\tDRV_LOG(ERR, \"failed to get ethdev ifindex: %s\", dev->name);\n+\t\treturn ret;\n+\t}\n+\tspawn.ifindex = ret;\n+\tspawn.numa_node = dev->numa_node;\n+\t/* Spawn device. */\n+\teth_dev = mlx5_dev_spawn(dev, &spawn, &config, ð_da);\n+\tif (eth_dev == NULL)\n+\t\treturn -rte_errno;\n+\t/* Post create. */\n+\teth_dev->intr_handle = &adev->intr_handle;\n+\tif (rte_eal_process_type() == RTE_PROC_PRIMARY) {\n+\t\teth_dev->data->dev_flags |= RTE_ETH_DEV_INTR_LSC;\n+\t\teth_dev->data->dev_flags |= RTE_ETH_DEV_INTR_RMV;\n+\t\teth_dev->data->numa_node = dev->numa_node;\n+\t}\n+\trte_eth_dev_probing_finish(eth_dev);\n+\treturn 0;\n+}\n+\n /**\n * Net class driver callback to probe a device.\n *\n- * This function probe PCI bus device(s).\n+ * This function probe PCI bus device(s) or a single SF on auxiliary bus.\n *\n * @param[in] dev\n * Pointer to the generic device.\n@@ -2637,7 +2701,8 @@ mlx5_os_net_probe(struct rte_device *dev)\n \t}\n \tif (mlx5_dev_is_pci(dev))\n \t\treturn mlx5_os_pci_probe(RTE_DEV_TO_PCI(dev));\n-\treturn 0;\n+\telse\n+\t\treturn mlx5_os_auxiliary_probe(dev);\n }\n \n static int\ndiff --git a/drivers/net/mlx5/linux/mlx5_os.h b/drivers/net/mlx5/linux/mlx5_os.h\nindex af7cbeb418..2991d37df2 100644\n--- a/drivers/net/mlx5/linux/mlx5_os.h\n+++ b/drivers/net/mlx5/linux/mlx5_os.h\n@@ -19,4 +19,6 @@ enum {\n \n #define MLX5_NAMESIZE IF_NAMESIZE\n \n+int mlx5_auxiliary_get_ifindex(const char *sf_name);\n+\n #endif /* RTE_PMD_MLX5_OS_H_ */\ndiff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c\nindex 96e8d189ba..818e37fd48 100644\n--- a/drivers/net/mlx5/mlx5.c\n+++ b/drivers/net/mlx5/mlx5.c\n@@ -399,6 +399,24 @@ mlx5_is_hpf(struct rte_eth_dev *dev)\n \t MLX5_REPRESENTOR_REPR(-1) == repr;\n }\n \n+/**\n+ * Decide whether representor ID is a SF port representor.\n+ *\n+ * @param dev\n+ * Pointer to Ethernet device structure.\n+ *\n+ * @return\n+ * Non-zero if HPF, otherwise 0.\n+ */\n+bool\n+mlx5_is_sf_repr(struct rte_eth_dev *dev)\n+{\n+\tstruct mlx5_priv *priv = dev->data->dev_private;\n+\tint type = MLX5_REPRESENTOR_TYPE(priv->representor_id);\n+\n+\treturn priv->representor != 0 && type == RTE_ETH_REPRESENTOR_SF;\n+}\n+\n /**\n * Initialize the ASO aging management structure.\n *\n@@ -2335,7 +2353,10 @@ mlx5_eth_find_next(uint16_t port_id, struct rte_device *odev)\n \t\t (dev->device == odev ||\n \t\t (dev->device->driver &&\n \t\t dev->device->driver->name &&\n-\t\t !strcmp(dev->device->driver->name, MLX5_PCI_DRIVER_NAME))))\n+\t\t ((strcmp(dev->device->driver->name,\n+\t\t\t MLX5_PCI_DRIVER_NAME) == 0) ||\n+\t\t (strcmp(dev->device->driver->name,\n+\t\t\t MLX5_AUXILIARY_DRIVER_NAME) == 0)))))\n \t\t\tbreak;\n \t\tport_id++;\n \t}\ndiff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h\nindex d88b1433fb..c3736e3d56 100644\n--- a/drivers/net/mlx5/mlx5.h\n+++ b/drivers/net/mlx5/mlx5.h\n@@ -243,6 +243,7 @@ struct mlx5_dev_config {\n \tunsigned int hw_fcs_strip:1; /* FCS stripping is supported. */\n \tunsigned int hw_padding:1; /* End alignment padding is supported. */\n \tunsigned int vf:1; /* This is a VF. */\n+\tunsigned int sf:1; /* This is a SF. */\n \tunsigned int tunnel_en:1;\n \t/* Whether tunnel stateless offloads are supported. */\n \tunsigned int mpls_en:1; /* MPLS over GRE/UDP is enabled. */\n@@ -1466,6 +1467,7 @@ int mlx5_udp_tunnel_port_add(struct rte_eth_dev *dev,\n uint16_t mlx5_eth_find_next(uint16_t port_id, struct rte_device *odev);\n int mlx5_dev_close(struct rte_eth_dev *dev);\n bool mlx5_is_hpf(struct rte_eth_dev *dev);\n+bool mlx5_is_sf_repr(struct rte_eth_dev *dev);\n void mlx5_age_event_prepare(struct mlx5_dev_ctx_shared *sh);\n \n /* Macro to iterate over all valid ports for mlx5 driver. */\ndiff --git a/drivers/net/mlx5/mlx5_mac.c b/drivers/net/mlx5/mlx5_mac.c\nindex 19981d26d8..a791fedc91 100644\n--- a/drivers/net/mlx5/mlx5_mac.c\n+++ b/drivers/net/mlx5/mlx5_mac.c\n@@ -159,7 +159,7 @@ mlx5_mac_addr_set(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr)\n \t * Configuring the VF instead of its representor,\n \t * need to skip the special case of HPF on Bluefield.\n \t */\n-\tif (priv->representor && !mlx5_is_hpf(dev)) {\n+\tif (priv->representor && !mlx5_is_hpf(dev) && !mlx5_is_sf_repr(dev)) {\n \t\tDRV_LOG(DEBUG, \"VF represented by port %u setting primary MAC address\",\n \t\t\tdev->data->port_id);\n \t\tif (priv->pf_bond >= 0) {\ndiff --git a/drivers/net/mlx5/mlx5_rxmode.c b/drivers/net/mlx5/mlx5_rxmode.c\nindex 25fb47c9ed..7f19b235c2 100644\n--- a/drivers/net/mlx5/mlx5_rxmode.c\n+++ b/drivers/net/mlx5/mlx5_rxmode.c\n@@ -36,7 +36,7 @@ mlx5_promiscuous_enable(struct rte_eth_dev *dev)\n \t\t\tdev->data->port_id);\n \t\treturn 0;\n \t}\n-\tif (priv->config.vf) {\n+\tif (priv->config.vf || priv->config.sf) {\n \t\tret = mlx5_os_set_promisc(dev, 1);\n \t\tif (ret)\n \t\t\treturn ret;\n@@ -69,7 +69,7 @@ mlx5_promiscuous_disable(struct rte_eth_dev *dev)\n \tint ret;\n \n \tdev->data->promiscuous = 0;\n-\tif (priv->config.vf) {\n+\tif (priv->config.vf || priv->config.sf) {\n \t\tret = mlx5_os_set_promisc(dev, 0);\n \t\tif (ret)\n \t\t\treturn ret;\n@@ -109,7 +109,7 @@ mlx5_allmulticast_enable(struct rte_eth_dev *dev)\n \t\t\tdev->data->port_id);\n \t\treturn 0;\n \t}\n-\tif (priv->config.vf) {\n+\tif (priv->config.vf || priv->config.sf) {\n \t\tret = mlx5_os_set_allmulti(dev, 1);\n \t\tif (ret)\n \t\t\tgoto error;\n@@ -142,7 +142,7 @@ mlx5_allmulticast_disable(struct rte_eth_dev *dev)\n \tint ret;\n \n \tdev->data->all_multicast = 0;\n-\tif (priv->config.vf) {\n+\tif (priv->config.vf || priv->config.sf) {\n \t\tret = mlx5_os_set_allmulti(dev, 0);\n \t\tif (ret)\n \t\t\tgoto error;\ndiff --git a/drivers/net/mlx5/mlx5_trigger.c b/drivers/net/mlx5/mlx5_trigger.c\nindex 6d2351f5a8..a9d5d58fd9 100644\n--- a/drivers/net/mlx5/mlx5_trigger.c\n+++ b/drivers/net/mlx5/mlx5_trigger.c\n@@ -1259,7 +1259,7 @@ mlx5_traffic_enable(struct rte_eth_dev *dev)\n \t\t}\n \t\tmlx5_txq_release(dev, i);\n \t}\n-\tif (priv->config.dv_esw_en && !priv->config.vf) {\n+\tif (priv->config.dv_esw_en && !priv->config.vf && !priv->config.sf) {\n \t\tif (mlx5_flow_create_esw_table_zero_flow(dev))\n \t\t\tpriv->fdb_def_rule = 1;\n \t\telse\ndiff --git a/drivers/net/mlx5/windows/mlx5_os.c b/drivers/net/mlx5/windows/mlx5_os.c\nindex bf20adaa30..ee09acc96b 100644\n--- a/drivers/net/mlx5/windows/mlx5_os.c\n+++ b/drivers/net/mlx5/windows/mlx5_os.c\n@@ -922,20 +922,18 @@ mlx5_match_devx_devices_to_addr(struct devx_device_bdf *devx_bdf,\n /**\n * DPDK callback to register a PCI device.\n *\n- * This function spawns Ethernet devices out of a given PCI device.\n+ * This function spawns Ethernet devices out of a given device.\n *\n- * @param[in] pci_drv\n- * PCI driver structure (mlx5_driver).\n- * @param[in] pci_dev\n- * PCI device information.\n+ * @param[in] dev\n+ * Pointer to the generic device.\n *\n * @return\n * 0 on success, a negative errno value otherwise and rte_errno is set.\n */\n int\n-mlx5_os_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,\n-\t\t struct rte_pci_device *pci_dev)\n+mlx5_os_net_probe(struct rte_device *dev)\n {\n+\tstruct rte_pci_device *pci_dev = RTE_DEV_TO_PCI(dev);\n \tstruct devx_device_bdf *devx_bdf_devs, *orig_devx_bdf_devs;\n \t/*\n \t * Number of found IB Devices matching with requested PCI BDF.\n", "prefixes": [ "v3", "08/15" ] }