From patchwork Mon Nov 27 12:53:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Pundir X-Patchwork-Id: 119697 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp238991qgn; Mon, 27 Nov 2017 05:06:55 -0800 (PST) X-Google-Smtp-Source: AGs4zMZHHZkwRIuKEMCwR874O9ghjz7pi0m1+0l+p5k6N+xidrdjvTOemNOqH33BqzttA9zLVYD4 X-Received: by 10.101.69.76 with SMTP id x12mr37162838pgr.284.1511788014929; Mon, 27 Nov 2017 05:06:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511788014; cv=none; d=google.com; s=arc-20160816; b=Y6M+iFrW3QtoXny0sHWSlMVUzj7L6LOMOHIIkrodBa39rdohAcdy3SDgj+oydsNQSD Zug+MxR3D0OqWR3W39rYzlg1bKkGDmRByYTtCxF7AeAmChu2fbkSylZd23Y61lOk/nlN eYx4H/NQ18uqaFkdrDeshnSu4NlJ1gcgIZpEo+2lskClRVQufgJlk1I87ixkJlyTJsYT kjU92aJ2dcdzl1YOAYnmEFjPkveKzttC0OBT1CHH6VtYNHFMDNxNe1C4vc30x4b+857o To/LUUUlGbsHO6k5jV5z8gthZaSxIB+anD2a3pa8RwbDsqldTMrUQZZtRD9UDvWbJcbU J0aA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=MKc1n8ZS+kEAshlU2knT7lz+dDP0vIpPr5FMb2GkavI=; b=ebOiKwkfp2AgsZ1pMZ98L5szSoMTs9fJ49ghDecATLNxWUdYm+g4PMMKGkzeRQ2DMO 1fxPCpaOAkGBPk2ipdcTuiiIu9W6J0VdiRTZhw6cauT6KeVkMlkC0NX/5hCrvd6Y5yem p7VbkFfJWCrvi/NLCpwFcnGgRIZE9K6619zomSlLIvZtbyYzH3so9rAUoXXh3oFvk5Vm p2UB4Zlo99DFq/MPvRyTw4vxQU8ORUcy9pvsKcCVj1FZDGcPB2utHWK/B5fhMl/rOrcE Il0j/ZoFMHqEVawkkb97ZfAZzV/TsnZEt6Og50sdWU0CKi2PPY8Z2nGNG5Po1sKs4Zm8 7JQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dgor6Sl5; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 5si362610plx.33.2017.11.27.05.06.54; Mon, 27 Nov 2017 05:06:54 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dgor6Sl5; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752412AbdK0MyC (ORCPT + 9 others); Mon, 27 Nov 2017 07:54:02 -0500 Received: from mail-pf0-f194.google.com ([209.85.192.194]:44997 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752291AbdK0Mxw (ORCPT ); Mon, 27 Nov 2017 07:53:52 -0500 Received: by mail-pf0-f194.google.com with SMTP id r14so10813734pfl.11 for ; Mon, 27 Nov 2017 04:53:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=MKc1n8ZS+kEAshlU2knT7lz+dDP0vIpPr5FMb2GkavI=; b=dgor6Sl5+n7GdJnmOvSGPuWSx/NyzXMl3qFv2EUmPdmIzO0ZbGu0D5Rgj8tm/SdSib cqMqAc9SRWMNtjdfoRLvpDPO/5ZurTvILwRUpB8rQfp0N0BcmmM6CIv5EkSmwaeh0m+G /DGe/RWX/53d+PS7t6FGW0s8+a940BBPA0Fvk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=MKc1n8ZS+kEAshlU2knT7lz+dDP0vIpPr5FMb2GkavI=; b=kApo65HNWAsCSxZFbtwfe8lePr/0G4dTUrlhwYAkHOQTqVMPVGrvOHrHeOOoMjeE4U pyVTMAcIoScO/M+JXID4vf0AY4FeBgOjyhSa+rnwWi/+uEfHXwq22rtpzBEDuNpwo+b9 nZYYug/NTAjno1Glljo8W9ArDG4rYsEoFRIyMtJ+8EVPFY2J8rMTN009m+yy81zI16y7 eFys649cJJSr8kJcfQou+1Bg4MgJIFwGFC6lRgC7AjuKuKqSABX/nAj2a92W8DLliASX n2S9ETsDoVOyUJPxkXVNFWYEN/SMUXj2xFvacvrAMuEeOcpCZyzMUsuc2G+Jq+P/VlL5 adtg== X-Gm-Message-State: AJaThX5ObdHeAgQERapg5Zfdm1ZHDIBDf+U42Lf1aouQeXMYWk43seL2 BOY6E/ABkUeL0ZO14M/W8nYQyQ== X-Received: by 10.98.71.144 with SMTP id p16mr36266641pfi.15.1511787231564; Mon, 27 Nov 2017 04:53:51 -0800 (PST) Received: from localhost.localdomain ([106.51.17.194]) by smtp.gmail.com with ESMTPSA id i187sm51792658pfc.96.2017.11.27.04.53.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 27 Nov 2017 04:53:50 -0800 (PST) From: Amit Pundir To: Greg KH Cc: Benjamin Poirier , Sasha Neftin , Stable , Jeff Kirsher Subject: [PATCH for-4.14.y 3/5] e1000e: Separate signaling for link check/link up Date: Mon, 27 Nov 2017 18:23:35 +0530 Message-Id: <1511787217-10987-4-git-send-email-amit.pundir@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1511787217-10987-1-git-send-email-amit.pundir@linaro.org> References: <1511787217-10987-1-git-send-email-amit.pundir@linaro.org> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Benjamin Poirier commit 19110cfbb34d4af0cdfe14cd243f3b09dc95b013 upstream. Lennart reported the following race condition: \ e1000_watchdog_task \ e1000e_has_link \ hw->mac.ops.check_for_link() === e1000e_check_for_copper_link /* link is up */ mac->get_link_status = false; /* interrupt */ \ e1000_msix_other hw->mac.get_link_status = true; link_active = !hw->mac.get_link_status /* link_active is false, wrongly */ This problem arises because the single flag get_link_status is used to signal two different states: link status needs checking and link status is down. Avoid the problem by using the return value of .check_for_link to signal the link status to e1000e_has_link(). Reported-by: Lennart Sorensen Signed-off-by: Benjamin Poirier Tested-by: Aaron Brown Signed-off-by: Jeff Kirsher Signed-off-by: Amit Pundir --- drivers/net/ethernet/intel/e1000e/mac.c | 11 ++++++++--- drivers/net/ethernet/intel/e1000e/netdev.c | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) -- 2.7.4 diff --git a/drivers/net/ethernet/intel/e1000e/mac.c b/drivers/net/ethernet/intel/e1000e/mac.c index b322011ec282..f457c5703d0c 100644 --- a/drivers/net/ethernet/intel/e1000e/mac.c +++ b/drivers/net/ethernet/intel/e1000e/mac.c @@ -410,6 +410,9 @@ void e1000e_clear_hw_cntrs_base(struct e1000_hw *hw) * Checks to see of the link status of the hardware has changed. If a * change in link status has been detected, then we read the PHY registers * to get the current speed/duplex if link exists. + * + * Returns a negative error code (-E1000_ERR_*) or 0 (link down) or 1 (link + * up). **/ s32 e1000e_check_for_copper_link(struct e1000_hw *hw) { @@ -423,7 +426,7 @@ s32 e1000e_check_for_copper_link(struct e1000_hw *hw) * Change or Rx Sequence Error interrupt. */ if (!mac->get_link_status) - return 0; + return 1; /* First we want to see if the MII Status Register reports * link. If so, then we want to get the current speed/duplex @@ -461,10 +464,12 @@ s32 e1000e_check_for_copper_link(struct e1000_hw *hw) * different link partner. */ ret_val = e1000e_config_fc_after_link_up(hw); - if (ret_val) + if (ret_val) { e_dbg("Error configuring flow control\n"); + return ret_val; + } - return ret_val; + return 1; } /** diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index 764a6bd958ac..83071fe99323 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c @@ -5081,7 +5081,7 @@ static bool e1000e_has_link(struct e1000_adapter *adapter) case e1000_media_type_copper: if (hw->mac.get_link_status) { ret_val = hw->mac.ops.check_for_link(hw); - link_active = !hw->mac.get_link_status; + link_active = ret_val > 0; } else { link_active = true; }