From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0069.outbound.protection.outlook.com [104.47.2.69]) by dpdk.org (Postfix) with ESMTP id 10DCBAAC6 for ; Tue, 5 Jun 2018 02:36:06 +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=kI1KEdQnnpRaoAKj7scictBcGCeODrH2fYWGe/sg7Fe4P3qP9/4dzCSkPORGPrcRv15ympbYkvEeY7E+Gyyhhlq6IuxbDPHF/InFCvaBaACFHOQGOlvbayM815fe8o44lf+YpINB3fhS9Aq7oAPdoevuLITYovIq1FY2ZYjQX10= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=yskoh@mellanox.com; Received: from mellanox.com (209.116.155.178) by VI1PR0501MB2048.eurprd05.prod.outlook.com (2603:10a6:800:36::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.820.12; Tue, 5 Jun 2018 00:36:03 +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:35:17 -0700 Message-Id: <20180605003518.14227-9-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180605003518.14227-1-yskoh@mellanox.com> References: <20180605002732.13866-1-yskoh@mellanox.com> <20180605003518.14227-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: BYAPR07CA0036.namprd07.prod.outlook.com (2603:10b6:a02:bc::49) To VI1PR0501MB2048.eurprd05.prod.outlook.com (2603:10a6:800:36::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:VI1PR0501MB2048; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0501MB2048; 3:/5E2CF2W+QUkhptihurmhaGjxz8iuuEiLVaiHuRqWORC6yEMc3mkRL33H9QUI4q7CsNsvfWq++CDznHBR5FwyXK3XbxbfDFtKVFuNfC9VjQFISwM/jWPVW3qx62ompHggg1yARzlRpY82mE4OK1FEBrQ35bwcB33MfQg6oONgS850XSmqwW8CIK1NW8iN1/esxpsQ0ytVmB148Lg7yTvXE1b34YEBO41GInogq1HVNXvRtHQ/mnTVrYHPXltGmbd; 25:nLnoyrXY58amRLPcCrgOL2yRfuVIlBpjRrDcrIVLzywyUW0rOURiWxomWuoiBHg544KnyxzeOTl/YRQ5WXI/L93ZHxbkgeb2BEq3K/t0Gz+L345L4Q4W5y5brKWiUilKJczc9jGTiv+6lFzSlR7KFipIZZIVWkSeRCQsW3IO3xk2RKaGx1LdZXxG+jPJTEX2wQ4xzPiMFBnv5dqt5bRACeB6cjigU2tn+N+GiFNNp8GNjtMYQ1hkENPPvfQEbWm6Ve12d5YzNMSjvrKNO3bC9Z3jbBDJ4Q9Lh6744u3X/BkpWKQYh2rZRxLgvNqLxi+TZGc8QIDH0MsX5Yu+p04rYA==; 31:YLDpJEMUog3X4fC2jjAyGq+Kfr48KBopPwlmi+c69nJL9EGeSkv23KsCfvSzcVPdF63QoIRNbfkwzdgy0T22cBQlkgmDttqjQSZq1N3Mdo+PazjQibOZ7FFdWFaBU6oxuZwCBPDKgK4Vv9bQYJgfHqn9zPri0OyEwT7Cn6GOHiPMyh83kq8dg3+jY4FUb5C56gA1OMPaqactsRClErYEv2p2NTs014+jlTmJgf2KhuU= X-MS-TrafficTypeDiagnostic: VI1PR0501MB2048: X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; VI1PR0501MB2048; 20:geB0IYKYQavHmAQwepVL4fL10v/mQnlFjhBmvWX/AsXinB9KJVGS6Eye71bfifjlWBUmoO1EhG/ArU97hlz7Wb8zZvVKvhpnuBVRqM0nTP4wnIbwakLJM2EOoD/txqu1+dJg960Gx2wdFQnRhHXt0ER45r8iiecR9roLlORU9OuLd465m21WGOrczkvNm/Ac/Mcobc6kcPEviU0L9ydxYA2UitJ6dvMii4jfFIdSAuwAfGoUgksZdY78xFIOLg0zS4eV53K+XxGsQoha2W1w3h33xGaTExOSI50jlZuuhFEYuD3XbLHe4k7mqwWHDiOcJNgbah1CaZTY9+mtB1cRLgBQiPkOxvQ2UM4um24rvhMMdQcldVFau6pDnlfcinmKPMXzZDXcQP/65zRz/3FJkIlSVPKGvMvTCpVr2hVa7AC9ZLtYYZxR3h3P8CskCEkzejHqvLLo5cu4Swafc2I3o7hgeNR+KKgs6KvXfbZCQiIzFV6G1VNOQAL52bKwa09E; 4:B1KAvmnNu/JJL5P7h3gf9L3S//tDVvQ4KfTjcOWc0jmetbxcjd1TIwLkPkRCX/8yZmnnqDZQN5IcZc0VGcESOCuwPzNuLgK7kTGoe5uMzJBKlIxK+Qt0jNUz9eJ+SBcT1lz2UuN33AE+xxkngjzhew1Yipadx/jmnm4dFDkeK0BkwNup+chhHIChRJ0hXlOyDQ1LDm6/GQYq+hR/r/58hq41frr3uSGptmErBbgTSKpaTLuGImSCFO+TjDa6TJe2wUS1Z+/Cv4cjSuGbjc6adA== 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)(93006095)(93001095)(3002001)(3231254)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123558120)(20161123564045)(6072148)(201708071742011)(7699016); SRVR:VI1PR0501MB2048; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0501MB2048; X-Forefront-PRVS: 0694C54398 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(346002)(396003)(376002)(39860400002)(39380400002)(199004)(189003)(3846002)(6666003)(2351001)(1076002)(6116002)(316002)(386003)(59450400001)(26005)(52116002)(186003)(2361001)(23676004)(16526019)(68736007)(7696005)(76176011)(446003)(55016002)(305945005)(956004)(11346002)(476003)(2616005)(486006)(50466002)(21086003)(69596002)(47776003)(53936002)(81156014)(81166006)(8676002)(86362001)(575784001)(106356001)(8936002)(25786009)(50226002)(7736002)(478600001)(4326008)(5660300001)(36756003)(6916009)(97736004)(66066001)(2906002)(2870700001)(105586002); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR0501MB2048; H:mellanox.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-Exchange-Diagnostics: =?utf-8?B?MTtWSTFQUjA1MDFNQjIwNDg7MjM6VVQyeDFwc1B2SFZJSVhCUmtjWUM5aGhH?= =?utf-8?B?bFVXekI1TEhtRlJFL1lkSEE2dWtsUzNNTTZBUCtXOXBGZ0VQaGZpUFdkeits?= =?utf-8?B?WFZ0ZU9rUXE0M2xBdVRkbVBRUUlKSnlxdmNyV2crWEdOdFdpYzFMeWw5RGx2?= =?utf-8?B?SFNTeVV6QUVjRXBPNG1JMWtHaDFBK1ppN3ZNQ09lak5QcFplRDdQbkh5V3FH?= =?utf-8?B?TFc1T3VFOGJXc1R2UHdTUW5SV0RqU2kvVU8vSVJWSUV4ajluYkpHY2UxWXc3?= =?utf-8?B?WGRmeUZmL0R2Sk5adFY0bWpqRC9IOFB5THV3dTlhQnFPdmdmTzBRREF3aWNm?= =?utf-8?B?Q3RLYUtUV3hxMnVSd25NUDI5aUpGTzRBcVpjbndPL1Rzd0ROM3Fyd2VGN0Ew?= =?utf-8?B?THgrTUlQRlVveVhydmJJNGxqR0d2Vi9YZmd5SjgzbWliTGEzdHBoWG52V1Ay?= =?utf-8?B?cHIwU0hiRFFUVlgzR3paQVFkZUsvdHB6cm1ndzBRUWpqU0thV2U2SXpTL1ZT?= =?utf-8?B?R2N1WWN0UnRGNElUT3liSXFDckVQbmNCekZrdzREd01XQVplVUt5MUhhQ2ph?= =?utf-8?B?NW9FcE1pMGRQR1pkZXBseHl0aGRvOUU4dmxPTlNvZEtmTlZjZlZCUkRCSGpI?= =?utf-8?B?RzVYOWowWmF3RGNrWFRHekhaOVU2VlNTM215T3R6d0xOWFNWdTJER1pkV3NI?= =?utf-8?B?TEU2V0ExR1V4TWh0dUwzSjZJYnl0VTFqcG5ZbmxWd0hZZENsQmQxTi9KcmlB?= =?utf-8?B?M3lwbWE3MVF2UlJ2SSt1b1Iybk82VkhZY200Wk1HVlR6SEZBZDlwUkN6MjIz?= =?utf-8?B?VmhYVlgzWUhxbHR1L3AwN2F4c01oWVBNZ0JXSCs3UVRtblBnSlBFemFLeVVW?= =?utf-8?B?M2xvKzRsMXFrVnJGVld4c050OVFLOHl4a2NvOGptUmpuNGFUMmFrTkxsck85?= =?utf-8?B?bGdUdWE1bTY3RjhqaEhOY2dWT2tzV1FOVzJTaWVsRENic2JFVCtBRU9XSWU1?= =?utf-8?B?eStSR0ZuQ2hCVmFRSFBpMXJBL3Nvb001SFJacXNzWXcxa2lrNGV0Rm05WXEv?= =?utf-8?B?N3JLam9aRmE5RXJ5Z2lCVzh3U1Q0eW1obW1ndTBDcW1TSnJwdzMvanByTENt?= =?utf-8?B?MUhNVzVad2xEa0krclIwWnlIN3N5MGh0elZiK0d1bnhiU0xRbjBnTkZwMXRq?= =?utf-8?B?MnQ5a2NBczBqamc1ckVhWFBPUG40Y3RwdU9VbUR1RGYvTmRLNkowMmtKSXhu?= =?utf-8?B?OUlpVlAvRHVQTCtFVHNwL1Yxb2NuU1AzNWdtZE83NVpvekl6ZWFTbWl2cmtz?= =?utf-8?B?Q1dlRWxLNW9VYVZueC9XQ3oyR2s5TWxlaVhNQmhxV2pxQTVHQ241ZURqSXFN?= =?utf-8?B?N2llM0xsYzQ2aTg5TW9VRjRmSFdoVjBZcjhLeW9LREdvdkE3MjFOMVJKWHhN?= =?utf-8?B?YTFHNWJXdGxleTBTZ2ZQSHJjV21CL1U2ZmdoT2lGVGlQSUg4L1JLQ0pCbU1o?= =?utf-8?B?cGN3TVgzVmtwTDY0aWhqSXhINlFsSDAzTk1za2tJSHFpYU5SL3FGTzJRSWwz?= =?utf-8?B?QXlodytYY3Z0VkE1dkYxMVdvU0VOcWxIY0hJZHFqeGtoM092TVNxbm5Zd1Ri?= =?utf-8?B?UFFmREFUalA0bUoxa1dRNWxpVGZXSDlKbTJFa2Y5VDQrUlhRK3VxRHFUUHVj?= =?utf-8?B?UVNqL3ZaZkJ6cmZqaEhiaFVDZWwzS1U0TmhBTjh6K1N2QXdaQmNBZ1RBQVFn?= =?utf-8?B?ZmhoTzVsQ3lNYStwaHZHWXh3PT0=?= X-Microsoft-Antispam-Message-Info: Vnv3Unj26O/qepd5si6xN1WUAgQVszOW3o5rDXomVwHyu+GckiNJwmblhdXpt1KXyNORTXsJdxEFqfqQjtAAj3Uv8QVw89BhWaF5625l3N/wE072xFJgYqWay/+hebkvt/WfctWMF5mOzbntO7PlcUbxdP2zR/L8MvrXg0eb9ihLyXlKaoqdKR9+IqgSJwYR X-Microsoft-Exchange-Diagnostics: 1; VI1PR0501MB2048; 6:/N6cTQmREZkguBNU2f15P4zXX7v0oKvU0MzyFo057vZtKxsNDlyzZvCnh3BG7jWqFIgss3yK6slz6ocXofCVuuEn+t5xiQNKV1iFy06ty0WjMZM7dl7lhAaXeB/apUoqVSkgF6uLp7LcILYt/gOktOrq1qHbadysI2j4YgqRjNbTYDPC6XjSiZkUdC9pCW49VItr7scWEkGdF/PPuY60nRCq67ShBMn/cPTsudytXJ5WtLfjLmWOcY/LuqIsRg4ErBtXjaFGxIvFpQ2abhtS4CGs92mdY+KMflj5t3DPDbiHxk8PbSJB+jPj3iz4/tw/0lrfSgq0484VqtotS0G2pZMHFIBGJAEXwo6lPx8Bh02LEglANhpCkDoX+jTtY2zTDg9KCCIy35+2raMpjx0SHueKWf0e6DCL0h990dqL0Dzfu9Z6D4zPfHj5JKKeklobASo+CGK7cLR0vGOaImM0gA==; 5:eMIyFzYM+26jfnC4p+CJp+H+b/LB6OTCF4OPC7BFWi5IxlPOXLjtfRmI6tDA/ESbl/pPOZY3IYW4xxRH3bFFmeiWvf1wJzU7o9p4mtrSIFetCzOhA2MdK7wnZ0ApyKRi2LXisHp4tfFhKr7fcN5x1hxO6JvPred81gtSkqi0Nck=; 24:HZ4vcphaypxL0tVWn0Utbpo0eo+FNcIkeaH0RXN+P1vh+ryi83pGBcbY/8oxzYH0k0WQB5HWV3KTjmCpo9ZfgFPGZ56b9A7lHBBUn4DXi6A= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR0501MB2048; 7:lzUWeiVP1NUL+pAZWaI8GAEgQbrKdNmFybDhmBRslzpivJ0nasQ1m93PASBMwQajJxdQZMTfrj4fzbyJm++UxYmGZfganogzEkWnlmll9Mi8uLzQZR4fYCd3mStluqhz1sRXj7ams5DcmCT229GG4d0rB29Y48EDVznYSFxhn+beFa0G3WNGPjBslsxttRBLaXw5gh52KV4foUxM2Yx93BOwnvRxAKAFH/tY8EagWE5iG/a2i5mjHa4xqgc4WM0w X-MS-Office365-Filtering-Correlation-Id: 45279e81-ed85-4cfe-eb9d-08d5ca7c524a X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2018 00:36:03.5063 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 45279e81-ed85-4cfe-eb9d-08d5ca7c524a X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0501MB2048 Subject: [dpdk-stable] [PATCH v2 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:36:06 -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