From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on0056.outbound.protection.outlook.com [104.47.1.56]) by dpdk.org (Postfix) with ESMTP id 38FDF2986 for ; Tue, 5 Jun 2018 02:12:32 +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=pEph3X6YQLkEpGQImKwFocWViUiGiW7h3bYdVRcYZOg=; b=Xns6IVYQzQa9K+8Vfs5JfKzUn44++2KMqfZpjoh/cZRVoTqYxsw2CdNvfLuUyYS5zHk3EX5yF/SUu9llT+YvImijZlIGy0hJTUlx/WpVUbC/kKjn5OcfxBD4PgdEgUKOfcdmlRlNFaeHUw/snbeBB87VuhfT30InoJXgkoXdOzM= Received: from mellanox.com (209.116.155.178) by AM5PR0501MB2036.eurprd05.prod.outlook.com (2603:10a6:203:1a::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.820.11; Tue, 5 Jun 2018 00:12:29 +0000 From: Yongseok Koh To: yliu@fridaylinux.org Cc: stable@dpdk.org, shahafs@mellanox.com, adrien.mazarguil@6wind.com, nelio.laranjeiro@6wind.com Date: Mon, 4 Jun 2018 17:10:40 -0700 Message-Id: <20180605001129.13184-19-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180605001129.13184-1-yskoh@mellanox.com> References: <20180605001129.13184-1-yskoh@mellanox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Originating-IP: [209.116.155.178] X-ClientProxiedBy: CO1PR15CA0060.namprd15.prod.outlook.com (2603:10b6:101:1f::28) To AM5PR0501MB2036.eurprd05.prod.outlook.com (2603:10a6:203:1a::22) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:AM5PR0501MB2036; X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2036; 3:lJdWYyxqcpZqsLa7rlL2NhraLNz1qkztKHyqZCLamqtuD87JDOoHDUWI1ybPb+U7va6r+pKGzGAT1nMZEX8XNV9mMKXk2zIQQBXzq86778zhlT9MDTKSU4s43hXfzjRnTUyrbh7o1GhQyl71N4PgP3V5wCh0fZz91G6Q0wU7pluPGnYc9Yv6T6h49SGol1pKu7veyUeE1Z4a/K9OaHvluPSsWUdfTPJJmj0v7BJR6uZzKLnx0KEDOjDnhzkiwlXT; 25:Yzcu1wzqdCrXEOg16hcF0Ui0PIP4L5XJHmDj4d3Fxo+J4Xi7N0Mke77YdiMm7HTpfvnAYSTH3gTbKg7mSBfLSFLPKfxS8lgaXhpD/w6pPQSVUgnv58a4kxkJGjSV9mEB/vJ+RK+gbngpO2cqm4IwkofwLz9lG+lTDuA6mJ8PDGQ1uVrLrFOWmIN9b/K2iCeMGFqKItEtpzJEY+lC+fenguxv235jmyxIt/aXl9Modn8H2xyDUTF162NYeQft1IkY6AtrTNqDUzHuGz/upDzdKVKAMJ7yVzuw1WkMG+a96WdKn2GKL6RB8nuCaO6qkSejzZJ1Y85erftT6vnWvSRCng==; 31:5i4ow03Q03VkXLnarxywLg90tglAVU0hRqHQkv8PseFQxww7vFMEWS93l2ZDncEND1Rkz18DLlLOR8PxS1AjoxeYZOoggYDB5Ljbcn6tcaaArePpChEjn1bZVxX2t5ONoSIOH0/51O8XybmjkISNHAI8pa+ObLIn+9RyWFFmANGnk4PyCurnUMXw7PSTEGqR85rWgOwYiX2TAluTmpW9+Nl21jv+xj0M6DJlSfh9DeE= X-MS-TrafficTypeDiagnostic: AM5PR0501MB2036: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=yskoh@mellanox.com; X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2036; 20:/9Ay8nv2GTe6FVHhNTAoiK6gWR5CGc26cVG/E5B38dXztRnAhkV+ywDZjlNf1NCd/AlQ2MOSLu9cSV4jPnYT2Tc0h7YcfCm9s2Vp0Xlss+erxH7myfvXoZDTi0sC1vWvWDeQv1YdJ1XUDKGbs3+PBAGdc4jrSG1L+4U6GXLP7D14EqpXqwh96xY+7kRKogFdDm+9nFWPJZqQVXwXUl8HhiJf9hR8d4DQoGGE8zs4r83dG+Q8fuIHnBnMCe0GlkM86IOmg9hGFhObefl/WKM18+9u8zSL1T++s18SptGV88VggJwMpjPOu3TEL9z8q6VYE+Zs9aBB37bfkTiJzFfIkkj0GHJrXRRPtR/ROAudUj8pZ9IMy+QB3+8sa0j/HGLEKbZz3Tj7RNwehUkptEqCwD29LvYR5t/kDqqcXDoIyPl4CgvYtuoqLOgSfQdA1WD9vFch8sAfwBt1LCbkdPxVTe9DiOx7sGDyoUHJasRVbFv5AVSmHTZG7DxzJNo/Vbwn; 4:ntfCD3N22BNLKrSvRmAHO3k6dAUzdwEfLydQ0wIWbEE72JJ9guthzw7biVkGuSuk/9tUlSY8TV93YLy4wp6UiMYfxGxzsGpVddJH4qkfS+Jmc1p0RfYS1DzUSjvVp2aQxu6CBk06ViuWtlYFWAkaU5x7wOPrZ8GNPKHmqwNDB3dkKdouPD/swK/qKtXVqIVeztaQ5FZHig7Wu8vnjcrz2l3jgE+Lqpt7vS9KYqNitqcOpSYPgA0OQW0rRVTPLSKacZD70w9z7c6hPvB6Y8mo8w== 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)(5005006)(8121501046)(93006095)(93001095)(3231254)(944501410)(52105095)(10201501046)(3002001)(6055026)(149027)(150027)(6041310)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(6072148)(201708071742011)(7699016); SRVR:AM5PR0501MB2036; BCL:0; PCL:0; RULEID:; SRVR:AM5PR0501MB2036; X-Forefront-PRVS: 0694C54398 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39380400002)(366004)(396003)(39860400002)(346002)(376002)(189003)(199004)(478600001)(81156014)(76176011)(7696005)(956004)(2361001)(50226002)(305945005)(2616005)(50466002)(47776003)(486006)(97736004)(5660300001)(6666003)(2351001)(106356001)(8936002)(186003)(81166006)(52116002)(6116002)(476003)(6916009)(23676004)(386003)(446003)(11346002)(59450400001)(66066001)(26005)(3846002)(8676002)(16526019)(1076002)(25786009)(21086003)(86362001)(2870700001)(575784001)(53936002)(4326008)(2906002)(316002)(55016002)(36756003)(105586002)(69596002)(68736007)(7736002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM5PR0501MB2036; H:mellanox.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-Exchange-Diagnostics: =?utf-8?B?MTtBTTVQUjA1MDFNQjIwMzY7MjM6dU1DbmE4R3ExWUduWXlGL3F5Q1h5RS9U?= =?utf-8?B?cUhhQkhTaHhoam5nZ2Q5S09WNDVIcUd4N2k4YWxrVTBodlMxeHdtSUluVk5M?= =?utf-8?B?Z1psRXdyd3NmWXF2eHlHdHpyaENhN0pNSjUrUWgzRnB6MCtlRmJ3MDdPZ041?= =?utf-8?B?Nk9PbXBYNUFsUkxRM1ZqRzVMT3JRNzVtRDNDM0VGYk51QlhndEUyM0w5SjB6?= =?utf-8?B?V0pnd1FUUGVXeUlwQ1IwQlhBQ1IzQTNSU2xTVXY0T3U3WWU1TCtGZmUyVHlT?= =?utf-8?B?NUR0eTNjY0QxN3NPdFpwYTR6Wll0cklMM3IxVC9VbUk5STVuVnRwNXZxdklX?= =?utf-8?B?TVZFTStob2pnMjY1QWZndSt4RzRWa200dHlBVDZUUnc2OGh4Vk8xRTBBcGxl?= =?utf-8?B?bHd4Sk5qZG9GY01BOXZJcHVnZFdrUW8vK1FPSFgva2FVRDBzcGVLYjJOZlhN?= =?utf-8?B?U0xIbitGMS9OeExIMGZzS1pzZmF5czR4QVhQTzBIYTVrNTEvcUt4ZGF1UXpw?= =?utf-8?B?L2hHRkVRcWFiRTFsMFA0R1RYUWx1d3JIdllKWmI3aVRZSGtaRHN2dSs0NUNk?= =?utf-8?B?U3ZJZGMxeDZWMlNmM0JYS1RTMFRtWHR3NUNBSnVEMWYvMlg1VWFlOUFMYmpV?= =?utf-8?B?dWRLZElqVHRhaTZaMFhVc05qaDJNTDRXN3JCWkZXaW5hUXprbWhlM21Mdm0v?= =?utf-8?B?YTBMTHRPTlpqeVBxVENSU3JiRUlWRFhkcnNaRlRhUU81WUFySVFQTEUzSnZE?= =?utf-8?B?clIxSFZ3TmpyS0RuK2FnS0VQUlVaQmxQTDBLK2xBU21zY2hpWEM5MHBISHBo?= =?utf-8?B?cDFwT00vbEMrM1J4eDZOMVd0L1dBaVUxM2sxV3dHODZ5Snp6d2dQNDQrenBP?= =?utf-8?B?KzFXaE11cDNYNzZuOE4yT0orbUJTZmg1U1ZSMkhhb1NldXlsTm9HNyswSXhY?= =?utf-8?B?WHV4T3MzU29mWHdqNUVaNTRvd3BVRk1SUTFKa1FxYVh3WERvMkhhZ0JtRWxY?= =?utf-8?B?cHF5UStYOGF3ak9ER2lJM1Y3NlhyUkE4V01raUdsVlZ2YXJUTExxR3BlMkIx?= =?utf-8?B?T3pSV2FMREY3Z2JDZlVmU2VBSWtZcjMwU0prdE9iOHNLL1FFQ1N2ZnNjcFpI?= =?utf-8?B?bzU3WndHaERid2pLUWhJeHdKQnhSMExLNEtRVTFXTDIzb05jSEU1djhxNDdF?= =?utf-8?B?dU81K3hDa1RwcUpQblpZeUIwc1ZqSTdYRkxDUWNUMFNEQmJuTU9uZ3NPcHph?= =?utf-8?B?TURGN05OcmZjU29JeDhFREJGT05vbjliaFNRa3dZSm5GTjFkRWJxQngzVW84?= =?utf-8?B?RXhJWlNwM3NmTlJEbGJBdDdlZnFCTGt5akNrOSszcjZGeXFGVm00bGlGbnJT?= =?utf-8?B?ZXdGQTIzajV2a3VVcGRBR2lOZEh6a1Q1Vm50bWhKMStkNXZ3OVhoOGkzdnov?= =?utf-8?B?WnJjZFJuUjNxL3FDT2JUdWtNRUlrTjBXRm9LbE1WR29IY0t6T1QvRHJRSHFP?= =?utf-8?B?aXQzN1pia1JKMTUwN0hKSzNOcllUN0Q0cWQwTXRWTFBWY2JzbWRSeXpqQnFp?= =?utf-8?B?c2tweU9QTzYyVkl2Z3ZOUEh0MzVSdVcxeGZ6R0tDcGFONXRoNzZ6ZTllVEFR?= =?utf-8?B?TGxOcjk3U1VOc1J4S1YvMmlaUDFWaUxaTUZOUlRhVHg2b01aQXBlOS84Wnl3?= =?utf-8?B?OTE0R3o0ZFN1LzFHRU1FeC9zRzZHNUFPNUdZQWNDODJ3M3JkT0hvQVBxVFkv?= =?utf-8?B?VnNBNmtqTmRTY1V6REg3NVd3PT0=?= X-Microsoft-Antispam-Message-Info: HHlcV9ABE1GiQeWffzeiGZGnqipmSVU8oge59nH+guIMjRNplYsD664zbqEk1exrQl1KcHvJAeVO03cS8s4nQKISHLE9P69ccpU6tqBWWokmmlVkPV7852h34uNEGWPaQ6yUFVPxCx5n9qusukKWgpxB6oc0MvaI1fFbCu/SJ9x1pUp1c4EQ+UyP9RKv2CiZ X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2036; 6:OpUkp8YyJdlYpJQRWptuDTV/HYoPjj4XddixbhNbENr9KDEO17WH/aKjnZbGRPMmbiJiEH134c98MaqSTgOtj2AcQu/Oz4NWzhg/tRwA0vQDTqZvcGQstqbSEvSq4+SbwZ/IgPGIPP5olIi4CC8ZOgibdSCbqcQunTFYD+BTR1coqW4+v2PaftHiT9ziOLu8gMlvvKGD6ugbZrVYoRWGvsq/EUy3krILqkFDlbAwL9X/2f7IE4pQgG2wn2bCv2+35Dejc5E9XgVJrKJOVYO/Sqik1JA7vCz/G1FfyEXaKzQtyIUr0+L6mY11jYvRjOngq0up2EUVnjqXeo6LcWLpETV0H+jFbEjfZ4vvqKv7GWTLaHnaVdCSwEpBhz6TVnKQp2t5wVOKIqY0iiOGzo8HRcscACbmaKc8Itq6nhldO1w8fj43VC3BtmhW/D6Vc3E1x41M5U2KPGtZE042Ar1zZQ==; 5:44xq9GHGtGa4TMTGnfSX9IsRv5erHoj4J3IWOnYDoLXfPIv3UmxPHCHIv1b2YxnW4eVR3OT9U4zqzkrB+X5qekd5vkPco1PzkDfrDLYG8gshV0VrkBwcRDE3GBlG2C93AZChVzdAFsiepZwYgXZb+OrvRgFxhjfee5whi+oYmLY=; 24:zhWJB+uaiNxCLlfa3PcYYQVhr9lTjmDssEeTIesTllx1eNu2p2fmcy89Bz3Da8CY+G5xsC9OoR7PndN6RYaItmcu2JdVbKJrPtLcinVJNn4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2036; 7:P2owLFWy4h+zu668f9tHqiIThHvWp6Kz9x+lGnlDid0rcbQiEFp6wWueYCHJIMAKbSzQ7CAlr9ER1tSuaaZH5zCVCxu4jEdLABGCaOPgXCtBT1DMqwKGMFb165t832gmXQ81vfEIMqe1Ao9to6bGtaXYutPWgzXPgInYnq/e9D8JEMkBs1GPJhuFz49DXtFMk6shiS5guTJcyrFmjpfLo/Uah1CHutF8z5rfokU4grT5Pg4YbvQRvLKord90QUPy X-MS-Office365-Filtering-Correlation-Id: e664cc11-c2cb-4748-f89c-08d5ca7907b2 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2018 00:12:29.8065 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e664cc11-c2cb-4748-f89c-08d5ca7907b2 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0501MB2036 Subject: [dpdk-stable] [PATCH 18/67] net/mlx5: fix sriov flag X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jun 2018 00:12:32 -0000 From: Nélio Laranjeiro [ backported from upstream commit a61888c8f297eac7e917850e2a4f66601bb715c1 ] priv_get_num_vfs() was used to help the PMD in prefetching the mbuf in datapath when the PMD was behaving in VF mode. This knowledge is no more used. Fixes: 528a9fbec6de ("net/mlx5: support ConnectX-5 devices") Cc: stable@dpdk.org Signed-off-by: Nelio Laranjeiro Acked-by: Adrien Mazarguil --- drivers/net/mlx5/mlx5.c | 18 ++---------------- drivers/net/mlx5/mlx5.h | 2 -- drivers/net/mlx5/mlx5_ethdev.c | 37 ------------------------------------- 3 files changed, 2 insertions(+), 55 deletions(-) diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index 6ad5aa7e3..c3d57c58c 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -653,7 +653,6 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev) int err = 0; struct ibv_context *attr_ctx = NULL; struct ibv_device_attr_ex device_attr; - unsigned int sriov; unsigned int mps; unsigned int cqe_comp; unsigned int tunnel_en = 0; @@ -700,14 +699,6 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev) (pci_dev->addr.devid != pci_addr.devid) || (pci_dev->addr.function != pci_addr.function)) continue; - sriov = ((pci_dev->id.device_id == - PCI_DEVICE_ID_MELLANOX_CONNECTX4VF) || - (pci_dev->id.device_id == - PCI_DEVICE_ID_MELLANOX_CONNECTX4LXVF) || - (pci_dev->id.device_id == - PCI_DEVICE_ID_MELLANOX_CONNECTX5VF) || - (pci_dev->id.device_id == - PCI_DEVICE_ID_MELLANOX_CONNECTX5EXVF)); switch (pci_dev->id.device_id) { case PCI_DEVICE_ID_MELLANOX_CONNECTX4: tunnel_en = 1; @@ -722,10 +713,8 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev) default: break; } - INFO("PCI information matches, using device \"%s\"" - " (SR-IOV: %s)", - list[i]->name, - sriov ? "true" : "false"); + INFO("PCI information matches, using device \"%s\"", + list[i]->name); attr_ctx = ibv_open_device(list[i]); err = errno; break; @@ -783,7 +772,6 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev) struct rte_eth_dev *eth_dev; struct ibv_device_attr_ex device_attr_ex; struct ether_addr mac; - uint16_t num_vfs = 0; struct ibv_device_attr_ex device_attr; struct mlx5_args args = { .cqe_comp = MLX5_ARG_UNSET, @@ -951,8 +939,6 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev) DEBUG("hardware RX end alignment padding is %ssupported", (priv->hw_padding ? "" : "not ")); - priv_get_num_vfs(priv, &num_vfs); - priv->sriov = (num_vfs || sriov); priv->tso = ((priv->tso) && (device_attr_ex.tso_caps.max_tso > 0) && (device_attr_ex.tso_caps.supported_qpts & diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h index 1b01f4603..2fa0aa274 100644 --- a/drivers/net/mlx5/mlx5.h +++ b/drivers/net/mlx5/mlx5.h @@ -125,7 +125,6 @@ struct priv { unsigned int hw_vlan_strip:1; /* VLAN stripping is supported. */ unsigned int hw_fcs_strip:1; /* FCS stripping is supported. */ unsigned int hw_padding:1; /* End alignment padding is supported. */ - unsigned int sriov:1; /* This is a VF or PF with VF devices. */ unsigned int mps:2; /* Multi-packet send mode (0: disabled). */ unsigned int mpw_hdr_dseg:1; /* Enable DSEGs in the title WQEBB. */ unsigned int cqe_comp:1; /* Whether CQE compression is enabled. */ @@ -223,7 +222,6 @@ struct priv *mlx5_get_priv(struct rte_eth_dev *dev); int mlx5_is_secondary(void); int priv_get_ifname(const struct priv *, char (*)[IF_NAMESIZE]); int priv_ifreq(const struct priv *, int req, struct ifreq *); -int priv_get_num_vfs(struct priv *, uint16_t *); int priv_get_mtu(struct priv *, uint16_t *); int priv_set_flags(struct priv *, unsigned int, unsigned int); int mlx5_dev_configure(struct rte_eth_dev *); diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c index 0a36a839c..f9f04ec6d 100644 --- a/drivers/net/mlx5/mlx5_ethdev.c +++ b/drivers/net/mlx5/mlx5_ethdev.c @@ -228,43 +228,6 @@ priv_ifreq(const struct priv *priv, int req, struct ifreq *ifr) } /** - * Return the number of active VFs for the current device. - * - * @param[in] priv - * Pointer to private structure. - * @param[out] num_vfs - * Number of active VFs. - * - * @return - * 0 on success, -1 on failure and errno is set. - */ -int -priv_get_num_vfs(struct priv *priv, uint16_t *num_vfs) -{ - /* The sysfs entry name depends on the operating system. */ - const char **name = (const char *[]){ - "sriov_numvfs", - "mlx5_num_vfs", - NULL, - }; - - do { - int n; - FILE *file; - MKSTR(path, "%s/device/%s", priv->ibdev_path, *name); - - file = fopen(path, "rb"); - if (!file) - continue; - n = fscanf(file, "%" SCNu16, num_vfs); - fclose(file); - if (n == 1) - return 0; - } while (*(++name)); - return -1; -} - -/** * Get device MTU. * * @param priv -- 2.11.0