From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by dpdk.org (Postfix) with ESMTP id D2BC425D9 for ; Tue, 22 Jan 2019 11:14:07 +0100 (CET) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20190122101407euoutp01f935c6b90bd92be3f941d07f4a42ecc2~8JBWckBeo2962329623euoutp01h for ; Tue, 22 Jan 2019 10:14:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20190122101407euoutp01f935c6b90bd92be3f941d07f4a42ecc2~8JBWckBeo2962329623euoutp01h DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1548152047; bh=jutG6h3hrLHcae+geZuTE42SWHgTY4PMH0FHZnVdBqk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JmbLbxiuABYiF0NoPFSHPXm+7MSkQxbziEjErC82opy0m0yMQd5Jpa2pjQrXtHkxZ Z6RwFORBxXG/BqmO7mSBVeTuUdnqgF5rjA+qcV6y5oD4dv6o5HKxZPHhBOnIiG9Igj jrJ5NzScgli3znNTZomaifPNJsGYLg/NeXOxO5D4= Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20190122101406eucas1p12c2cdbfea253ee8a273973a9499f0f63~8JBV7Pv-L3080230802eucas1p1N; Tue, 22 Jan 2019 10:14:06 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id B2.F9.04294.EECE64C5; Tue, 22 Jan 2019 10:14:06 +0000 (GMT) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20190122101405eucas1p250262f33d08bed8919096c6c46f41ed4~8JBVGgvMB1310813108eucas1p2U; Tue, 22 Jan 2019 10:14:05 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20190122101405eusmtrp28cf15801008c0512eb4bf7e8f893cd21~8JBVFI0Iw1676816768eusmtrp2X; Tue, 22 Jan 2019 10:14:05 +0000 (GMT) X-AuditID: cbfec7f4-835ff700000010c6-e7-5c46eceeea18 Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 77.44.04128.DECE64C5; Tue, 22 Jan 2019 10:14:05 +0000 (GMT) Received: from imaximets.rnd.samsung.ru (unknown [106.109.129.180]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20190122101405eusmtip1f2578fdd607a9ca2a86bf1a8ee4cc66f~8JBUckm7q1599515995eusmtip10; Tue, 22 Jan 2019 10:14:04 +0000 (GMT) From: Ilya Maximets To: stable@dpdk.org, Yongseok Koh Cc: Qi Zhang , Wei Zhao , Anatoly Burakov , Ilya Maximets Date: Tue, 22 Jan 2019 13:13:41 +0300 Message-Id: <20190122101341.9556-3-i.maximets@samsung.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190122101341.9556-1-i.maximets@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrLIsWRmVeSWpSXmKPExsWy7djPc7rv3rjFGLR2C1s8ureY2eJK+092 i+kb+tks/nX8YbdY8/UiUGz+PmYHNo9fC5ayeize85LJ49n0w0wefVtWMQawRHHZpKTmZJal FunbJXBlvPstWjBdoOLw4d/MDYwLebsYOTgkBEwkPvVpdTFycQgJrGCU2PpwAnMXIyeQ84VR YtNOMYjEZ0aJJad+s8I0NOyqh6hZzijxuVMKouYHo8SZ9csYQRJsAjoSp1YfAbNFBMwk7s09 wwpSxCwwi1Giuf0VG0hCWCBSYv7mDWDbWARUJeYefMIKYvMKWEl8/XwOrFlCQF5i9YYDYDWc AtYSj3ZsZwIZJCHwmE1iTvtJZoiLXCQuf7CDqBeWeHV8CzuELSPxf+d8Jgi7XuJ+y0tGiN4O Ronph/5BJewltrw+xw4yh1lAU2L9Ln2IsKPElNMN7BDj+SRuvBUECTMDmZO2TYfayivR0SYE Ua0i8fvgcmYIW0ri5rvPUJ0eEvtf10GCp49R4vucqcwTGOVnIexawMi4ilE8tbQ4Nz212Cgv tVyvODG3uDQvXS85P3cTIzARnP53/MsOxl1/kg4xCnAwKvHwJlxwjRFiTSwrrsw9xCjBwawk wut60S1GiDclsbIqtSg/vqg0J7X4EKM0B4uSOG81w4NoIYH0xJLU7NTUgtQimCwTB6dUA2P1 30VvVz0w+p2ZZM54u3fV22dSKxk0wuZ8vd0fpHCY9ekVUdFDDmvn8sTNUl0W7Bqv+WiPx0n3 3R+nVeoI/TLpUlNI+3tQYNlXXZHAFzvfbXJ4pq5vV3JXJNMq0UAy6jfP9PBjJw9zB1oriXvm Kpcf2ndeIP53no+b9+tesTlb5h9aKiTDqa7EUpyRaKjFXFScCADSkYtaAAMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrMLMWRmVeSWpSXmKPExsVy+t/xu7pv37jFGLx+rGLx6N5iZosr7T/Z LaZv6Gez+Nfxh91izdeLQLH5+5gd2Dx+LVjK6rF4z0smj2fTDzN59G1ZxRjAEqVnU5RfWpKq kJFfXGKrFG1oYaRnaGmhZ2RiqWdobB5rZWSqpG9nk5Kak1mWWqRvl6CX8e63aMF0gYrDh38z NzAu5O1i5OCQEDCRaNhV38XIxSEksJRRonnVPNYuRk6guJTEj18XoGxhiT/Xutggir4xShzq fc4EkmAT0JE4tfoII4gtImAhce/JX2aQImaBeYwSn2b/AEsIC4RLfO+6C2azCKhKzD34BGwq r4CVxNfP5xghNshLrN5wgBnE5hSwlni0YzvYAiGgmgkPXzFOYORbwMiwilEktbQ4Nz232Eiv ODG3uDQvXS85P3cTIzBAtx37uWUHY9e74EOMAhyMSjy8CRdcY4RYE8uKK3MPMUpwMCuJ8Lpe dIsR4k1JrKxKLcqPLyrNSS0+xGgKdNREZinR5Hxg9OSVxBuaGppbWBqaG5sbm1koifOeN6iM EhJITyxJzU5NLUgtgulj4uCUamDkK3Ezk7/edr1M1nHd88X2we3/NjdP/d7zMk7z1f2q+jw+ izXzNmyR/hHQ8mYa82md/2HOUZ1nFS5MXe3I8YGVu5HZpHL7B9Z5pu9v1WdmTHxmtPb29cly HVxftJT83v8pCX222/JhM2PzpuOfmiqkMrabnL8j0C4ksmxBoZ2m/kGDM0u2PbiixFKckWio xVxUnAgAVhZfZWYCAAA= X-CMS-MailID: 20190122101405eucas1p250262f33d08bed8919096c6c46f41ed4 X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20190122101405eucas1p250262f33d08bed8919096c6c46f41ed4 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20190122101405eucas1p250262f33d08bed8919096c6c46f41ed4 References: <20190122101341.9556-1-i.maximets@samsung.com> Subject: [dpdk-stable] [PATCH 17.11 2/2] net/ixgbe: stop link setup alarm handler before device start 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, 22 Jan 2019 10:14:07 -0000 [ backported from upstream commit 916193dda6fb400114c0ffc5615e74ca13d50720 ] We should stop alarm handler before resetting the HW to avoid concurrent device reconfiguration. Fixes: 0408f47ba4d6 ("net/ixgbe: fix busy polling while fiber link update") CC: stable@dpdk.org Signed-off-by: Ilya Maximets Tested-by: Anatoly Burakov Acked-by: Qi Zhang --- drivers/net/ixgbe/ixgbe_ethdev.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c index be836beeb..f047db83c 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -2533,6 +2533,9 @@ ixgbe_dev_start(struct rte_eth_dev *dev) return -EINVAL; } + /* Stop the link setup handler before resetting the HW. */ + rte_eal_alarm_cancel(ixgbe_dev_setup_link_alarm_handler, dev); + /* disable uio/vfio intr/eventfd mapping */ rte_intr_disable(intr_handle); @@ -2734,6 +2737,12 @@ ixgbe_dev_start(struct rte_eth_dev *dev) "please call hierarchy_commit() " "before starting the port"); + /* + * Update link status right before return, because it may + * start link configuration process in a separate thread. + */ + ixgbe_dev_link_update(dev, 0); + return 0; error: @@ -5042,6 +5051,9 @@ ixgbevf_dev_start(struct rte_eth_dev *dev) PMD_INIT_FUNC_TRACE(); + /* Stop the link setup handler before resetting the HW. */ + rte_eal_alarm_cancel(ixgbe_dev_setup_link_alarm_handler, dev); + err = hw->mac.ops.reset_hw(hw); if (err) { PMD_INIT_LOG(ERR, "Unable to reset vf hardware (%d)", err); @@ -5114,6 +5126,12 @@ ixgbevf_dev_start(struct rte_eth_dev *dev) /* Re-enable interrupt for VF */ ixgbevf_intr_enable(hw); + /* + * Update link status right before return, because it may + * start link configuration process in a separate thread. + */ + ixgbevf_dev_link_update(dev, 0); + return 0; } -- 2.17.1