From patchwork Thu Jan 25 16:04:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shahaf Shuler X-Patchwork-Id: 34479 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7ED6B1B00C; Thu, 25 Jan 2018 17:04:50 +0100 (CET) Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on0054.outbound.protection.outlook.com [104.47.1.54]) by dpdk.org (Postfix) with ESMTP id 85EA5199B5 for ; Thu, 25 Jan 2018 17:04:49 +0100 (CET) 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; bh=nGBnSauhWS8G4EALmTHur4ZF6GmZbMqkji80ZyDpWtc=; b=nBluqerpTTdiPvRO91xs2FEDbQpUEy2d5T/3HuqOYzDJ5pNM+Pj9L2vSnHQOHTC06O506HCEQTJSrS0ug0uJTBN86GUsojkoWG5ACTWhiy2eQpUZWz5XSL0qfppZJUtNAUvaBd1qVcX2QWMuWV6eNj2T8rEFGTuPARTI7Hrhq8U= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=shahafs@mellanox.com; Received: from mellanox.com (141.226.120.58) by VI1PR05MB3150.eurprd05.prod.outlook.com (2603:10a6:802:1b::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.428.17; Thu, 25 Jan 2018 16:04:46 +0000 From: Shahaf Shuler To: nelio.laranjeiro@6wind.com, adrien.mazarguil@6wind.com, yskoh@mellanox.com Cc: dev@dpdk.org Date: Thu, 25 Jan 2018 18:04:28 +0200 Message-Id: <20180125160428.146069-1-shahafs@mellanox.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180123170106.9047-1-shahafs@mellanox.com> References: <20180123170106.9047-1-shahafs@mellanox.com> MIME-Version: 1.0 X-Originating-IP: [141.226.120.58] X-ClientProxiedBy: AM5PR0701CA0012.eurprd07.prod.outlook.com (2603:10a6:203:51::22) To VI1PR05MB3150.eurprd05.prod.outlook.com (2603:10a6:802:1b::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 27cf9c53-ed02-4172-c7dd-08d5640d5b50 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:VI1PR05MB3150; X-Microsoft-Exchange-Diagnostics: 1; VI1PR05MB3150; 3:tD/lf7QRxt4wDp2fAeQLDj2PHFnpmS6sTes+NGhUsQNuLsezIB5qutRjQGcTa5jkTTtutH+vFJ0i5qVOFEBk26EO5e/U8YNVG76V0no1zOQ+goangzo4gie2yEzJl1aXRxBU/g2POhu/7BVJtBtP9z9/lN6HLOJ+2AnlAlzSbQflmQsoVOD42a0xRY5Nq8BZO4UeBW1pDsX6rkteVE84DqC329S1mIFp6PiqKdDTtvQkgdpirEwEw8gtwCjfZIUU; 25:OriYrdVqpLtTkbKNbV1/SgYPv6BeCHz4udYG54Bk0yp1PGWTZoEkqMcvw5d+ydFTxspqNENppDS8tcNX8ssLRzwNZksl2H4h5tPzB8v3CRYb/O2CeixWxphHCyNHnMmb4PmCVh6kuApKepV6tKux2da1kl7BSNJwUBzDr/9/c88odBsSreuxtysDpAr+/gk+KJWXaNk1Cgi5pZYtm/FZ6HCsDdwxbU1tz/sKVijYrpY4ne0YP9KUye/YzMvKpgq9n/PhUE8ibAl2+2y8ZHAnGAovgfoRJV96WPNczxwHnBCkVLKaPl/KhBUVH6QhD1ty8MeJXHq9ZYgtPGSQTzZpIQ==; 31:fTmpD94fECQpUZ9VKNWN4wlGCa08Z2Lvik5amgoJzhJIEntAEvxLJDOfCTKiXcTijlAiAxASJVFxLfFoHygHBanlusZoaXlKmd2mf33TgvioI9AicswAs8dBzOOuymvuTA+prJ6c2KCXstFQrO4zhCKtQy1xrfQBDNNq6LTqX2C4Zh4BVS7w1PPARBD51nQzM4gMoYmBo+ZeNXXbH9JAAh7Oir984tPsQj2FjTlDj6g= X-MS-TrafficTypeDiagnostic: VI1PR05MB3150: X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; VI1PR05MB3150; 20:97WssB7VWd1ilgBx0bQM/38Pn0hwCBCQ32nQ6iNwIsi6TBYdKV+cwQvemniPl77x0Jsra9iHya+3B7IJ4+tCPL4dQqtur26bCcRRm0keXFk1AM+DEcMlTW7BQ5qE77FlwG0pK0I3jWoo9ZNejuhH7xSWmVRQaLiGxqTERU2xgZSEPMNoSDNPXU+mCvWplW3mDbRqQt21i0tv+NF9+Dxc13g6oAAxne1JB5+uR7CkrrGO6quQ624tcoAr4jg16pwgI71ADowRxgws6vGbuv4i+Io3T9tU3DoIP1Fnkx44G8JO1YraqY0DNmPqJcPs0uvBxzzgxltdKfLvulOqsxKu//4EiuZSxcOFaGiM3VNiIWq3C5JcoluGOsfLOAjFYXVfoNtWMrdbxQK+YzeNT2w7ZpUYVPZUya8n1JjUPpStduP+Yv1DK8MCbdEF6HErNa7URQ/IGxb0eeoQVGdFtCQ5ZE1J938wUPznKyKut7qdMnvuoTxSihanK+pDQogAxx83; 4:2Fey9dWG5EbWl/yWr6njc9IpYeJfB38Mmd/0pUxE1gT+hbTpaD5xeUmSd/pDxMy1NZw3/P6G+ZfdYaA00tqDQpJ2uaY8zD0QZ3GpeAOMEXYbrETn03JHIoo44oVYAwhIP9+3qefvgeOnDomavitfyulawDLuZ2E8+4Xrm9CtASfjz/2cg2xMWgSOXNO050qR3/53oDn8z+O3K2tu4ICKO4Akr3CvJUJfjTBXXOhUYgSMhYIMmlqJeQqx0LhqVrfUfykT/OQImGr+Ye+IFhez5g== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040501)(2401047)(5005006)(8121501046)(3231023)(2400081)(944501161)(93006095)(93001095)(10201501046)(3002001)(6055026)(6041288)(20161123560045)(20161123564045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(6072148)(201708071742011); SRVR:VI1PR05MB3150; BCL:0; PCL:0; RULEID:; SRVR:VI1PR05MB3150; X-Forefront-PRVS: 0563F2E8B7 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39860400002)(366004)(396003)(376002)(39380400002)(346002)(199004)(189003)(1076002)(6666003)(48376002)(68736007)(25786009)(6116002)(69596002)(4326008)(53936002)(97736004)(47776003)(6636002)(50466002)(55016002)(59450400001)(76176011)(3846002)(81166006)(186003)(2950100002)(8676002)(2906002)(81156014)(8936002)(50226002)(386003)(16526018)(36756003)(7696005)(21086003)(26005)(51416003)(52116002)(316002)(5660300001)(16586007)(305945005)(66066001)(478600001)(105586002)(7736002)(86362001)(106356001); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR05MB3150; H:mellanox.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR05MB3150; 23:sW30F2rbJFV8TZ/xolwFe0PRoHyIkmhBTEgiRSHcZ?= XaBajDZF+PFT5kglButuLLfwuN7qIYGhkL+BMtJ693p/07tpH0Qv+ioq1QTTcHBP4/KBmD/cgznpJH2cwupTzwWFBlk5M1BjIjPXjUSxo4FOwXeG97Sn3oGf1dWkJn0jcPHxbecRzI0tdcX/OyO+/FubtSMhikYhKDFNhLW+OJIy8vwsPQOQ9xZFDDjGa0jnAVthgBf7oFC1PSmhl2hjj98NQH1f0otVu2998P92Wunc5hmKmYJ2LDrVddFs1WCJUftE2ColJa0HTsEnUja8Z1IiOtE2W2X+ltPgPtNxdRYrUdJ3BFAPYB2XuC+J2J4CHYdKE1WnnL2EBlMShDocLYImPg61jQelWnhbsKTu54JQt6AZtPIbwZHbACuvWZtZLTlDlBIEWRMuqDxwFBynnt1jJ+UNsABbsrKDiPZXt8FedJgSi6yNZrKD19L2iJLUd3VzoIRjes1P0WKl4sNA8w/V+Xwmu+kMP8tStV4ov5rbSjP0DuNR5WN0XQxyHE80DHt+Micly5MtN9yeB8iPXihv3IAyOL4/MDBfzCrzjrwApmpGPz9Fp+z2utigaQbN0qdGxy+QwQzfPDEotsp6qIAi5lOLmyg9CEDfVxXMfnt/vTBnuipJhdI+gTbpfsZtaLlZw+BNTKynAxFKaYwRpQWwTgAx5J1HouyGgTUf3/L/6rZ/iHwhcKaXNpYR9tqFIj2HC3cK7v6ZNH/8fvF06uYXKi5uMkuo5zc58VB3WPuK61ewSLS8LhX3eOo3IRqiK1U13ZUSvYXMWXCTkGm+cdIqYmkB+fQVfhCXyYNx9y7Wz2nZsz+r7NQhYNSk7YvrUAGxo70i05O3Gv6x0Ap5nfFCgimY9t5MaKxxc9uvGwm9ypPU9NJHE2d9s6yLFayxb4zMfzxFuD4Kkl/G4+NxyyFGRj2LaB4xq8W347DocseIB8FPgIfbHeHBZoSORJhhVV12lNHAtug+vEcEfAOnWP8VhdeH52dFkyVTcHRAjHeyncT53r/q7eGqGiSbydL2nUqINu0vlp53+5lcGb+fGDc9WQVwZlWgEaDA/ls14zkEGdpZucU9Uz6pU6ZGgYCEgpCcRaSqK/BtWxNH9yWYpUOV7Cu0U+hAR9IlxjbQG17Lg== X-Microsoft-Exchange-Diagnostics: 1; VI1PR05MB3150; 6:IdIJF6Gxcd/kjd9wXv8GUoULRqdxA3nBeH35xOmLRPdYCiEhk0Cy2nigQrHshAtzDo8lPHx77Dm212tyE/7bk81M0acPTNk/mOt4p70ox2OQ5vN5vIjeLcWjhlwtfpSB+bEY70ALP+Y8z7QkgIkilltTb8QwSIywqZVtF29yS00xBLWIGxSmaqihRacl3QrZjAKun4pmBEd2q+g3db4rEpbwAXOVahSgSNQ2UMO8tbnw1/JMEXU+RNvad/VtwCPu90/lv90HyhQJfacvn3kfxpahqqpKUHlhTyiE3fO1kA79xQkM1EKkne3aBtCRl0MFZBWTeCGFctFGwjj8jUUf2zZtn7ya/OoLSvpK7f9ibQ4=; 5:aZhHVZgFwmMlcqUhNB4MUIGxuAw8clnrE0ueALwJ9yztDrBf64cHVTSeURJFwiH2Cw6DitBUjOB1OddTv7uhg5XHFD2E7b+ssCzqWYTQ9qmSrUy7c/vWPzln9J7/7Ytw9fXZsdKWuJFczXhkVrn7EbcrdL8jBSwkcRxr0Sd7oXc=; 24:lC43n+s/xZ99GTSHA6P/olKT0wt4xzo8Ei44rmUouM2vHvb2gLm2e1exHQSs4UepVmK6K3PLLei+uV7vfOMmNrfGEYfgOs6+Rjkcu50FoLQ=; 7:Nu/h6JQxEwYfiB+IGPaDsszeNYEzhlLboWN67+j4mfHAIVxppPY9BpdWa+AUAWy+Os0PuSUI9p0Kb3xNK2buYIlQYAKbG4q1RRleHnCxdni8CMwqDs5Px3hPgOJqQNGSFyE2w1iV79BlB70RYNSzjM5HVUOj7scvpdgfCofQ0CxVjXbQnlMt9QHOrJDrb9ZrqaNVyEio4OmBJh0x8fldLXwSq7Jx5gkRJIT3gah1uhlkF8RkAqirLeyPftH8AMpI SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2018 16:04:46.6697 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 27cf9c53-ed02-4172-c7dd-08d5640d5b50 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR05MB3150 Subject: [dpdk-dev] [PATCH v2] net/mlx5: fix link state on device start 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" Following commit c7bf62255edf ("net/mlx5: fix handling link status event") the link state must be up in order for the burst function to be set on the device ops. As the link may take time to move between down and up state it is possible the rte_eth_dev_start call will return with wrong burst function (either null or the empty burst function). Fixing it by forcing the link to be up before returning from device start. In case the link is still not up after 5 seconds fail the function. In addition initialize the burst function on device probe to prevent crashes before the link is up. Fixes: c7bf62255edf ("net/mlx5: fix handling link status event") Cc: yskoh@mellanox.com Signed-off-by: Shahaf Shuler Acked-by: Nelio Laranjeiro --- drivers/net/mlx5/mlx5.c | 5 +++++ drivers/net/mlx5/mlx5.h | 1 + drivers/net/mlx5/mlx5_defs.h | 3 +++ drivers/net/mlx5/mlx5_ethdev.c | 27 +++++++++++++++++++++++++++ drivers/net/mlx5/mlx5_trigger.c | 8 +++++++- 5 files changed, 43 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index bc4b6bad0..62fa52434 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -862,6 +862,11 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev) eth_dev->device = &pci_dev->device; rte_eth_copy_pci_info(eth_dev, pci_dev); eth_dev->device->driver = &mlx5_driver.driver; + /* + * Initialize burst functions to prevent crashes before link-up. + */ + eth_dev->rx_pkt_burst = removed_rx_burst; + eth_dev->tx_pkt_burst = removed_tx_burst; priv->dev = eth_dev; eth_dev->dev_ops = &mlx5_dev_ops; /* Register MAC address. */ diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h index a7ec607c3..30b737f76 100644 --- a/drivers/net/mlx5/mlx5.h +++ b/drivers/net/mlx5/mlx5.h @@ -246,6 +246,7 @@ int mlx5_dev_configure(struct rte_eth_dev *); void mlx5_dev_infos_get(struct rte_eth_dev *, struct rte_eth_dev_info *); const uint32_t *mlx5_dev_supported_ptypes_get(struct rte_eth_dev *dev); int priv_link_update(struct priv *, int); +int priv_force_link_status_change(struct priv *, int); int mlx5_link_update(struct rte_eth_dev *, int); int mlx5_dev_set_mtu(struct rte_eth_dev *, uint16_t); int mlx5_dev_get_flow_ctrl(struct rte_eth_dev *, struct rte_eth_fc_conf *); diff --git a/drivers/net/mlx5/mlx5_defs.h b/drivers/net/mlx5/mlx5_defs.h index a71db281d..57f295c58 100644 --- a/drivers/net/mlx5/mlx5_defs.h +++ b/drivers/net/mlx5/mlx5_defs.h @@ -110,4 +110,7 @@ /* Supported RSS */ #define MLX5_RSS_HF_MASK (~(ETH_RSS_IP | ETH_RSS_UDP | ETH_RSS_TCP)) +/* Maximum number of attempts to query link status before giving up. */ +#define MLX5_MAX_LINK_QUERY_ATTEMPTS 5 + #endif /* RTE_PMD_MLX5_DEFS_H_ */ diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c index 6624888c9..5694136c9 100644 --- a/drivers/net/mlx5/mlx5_ethdev.c +++ b/drivers/net/mlx5/mlx5_ethdev.c @@ -966,6 +966,33 @@ priv_link_update(struct priv *priv, int wait_to_complete) } /** + * Querying the link status till it changes to the desired state. + * Number of query attempts is bounded by MLX5_MAX_LINK_QUERY_ATTEMPTS. + * + * @param priv + * Pointer to private structure. + * @param status + * Link desired status. + * + * @return + * 0 on success, negative errno value on failure. + */ +int +priv_force_link_status_change(struct priv *priv, int status) +{ + int try = 0; + + while (try < MLX5_MAX_LINK_QUERY_ATTEMPTS) { + priv_link_update(priv, 0); + if (priv->dev->data->dev_link.link_status == status) + return 0; + try++; + sleep(1); + } + return -EAGAIN; +} + +/** * DPDK callback to retrieve physical link information. * * @param dev diff --git a/drivers/net/mlx5/mlx5_trigger.c b/drivers/net/mlx5/mlx5_trigger.c index 827db2e7e..c5429e182 100644 --- a/drivers/net/mlx5/mlx5_trigger.c +++ b/drivers/net/mlx5/mlx5_trigger.c @@ -166,7 +166,13 @@ mlx5_dev_start(struct rte_eth_dev *dev) priv_xstats_init(priv); /* Update link status and Tx/Rx callbacks for the first time. */ memset(&dev->data->dev_link, 0, sizeof(struct rte_eth_link)); - priv_link_update(priv, 1); + INFO("Forcing port %u link to be up", dev->data->port_id); + err = priv_force_link_status_change(priv, ETH_LINK_UP); + if (err) { + DEBUG("Failed to set port %u link to be up", + dev->data->port_id); + goto error; + } priv_dev_interrupt_handler_install(priv, dev); priv_unlock(priv); return 0;