From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933869AbcLGXyi (ORCPT ); Wed, 7 Dec 2016 18:54:38 -0500 Received: from mga11.intel.com ([192.55.52.93]:52923 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932434AbcLGXyg (ORCPT ); Wed, 7 Dec 2016 18:54:36 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,316,1477983600"; d="scan'208";a="1069336339" Date: Wed, 7 Dec 2016 19:04:33 -0500 From: Keith Busch To: Bjorn Helgaas Cc: Ashok Raj , linux-pci@vger.kernel.org, Bjorn Helgaas , linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: Re: [PATCH 3/3] pciehp: Fix race condition handling surprise link-down Message-ID: <20161208000433.GD25959@localhost.localdomain> References: <1479544367-7195-1-git-send-email-ashok.raj@intel.com> <1479544367-7195-4-git-send-email-ashok.raj@intel.com> <20161207234054.GL22129@bhelgaas-glaptop.roam.corp.google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20161207234054.GL22129@bhelgaas-glaptop.roam.corp.google.com> User-Agent: Mutt/1.7.0 (2016-08-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Dec 07, 2016 at 05:40:54PM -0600, Bjorn Helgaas wrote: > On Sat, Nov 19, 2016 at 12:32:47AM -0800, Ashok Raj wrote: > > --- a/drivers/pci/hotplug/pciehp_ctrl.c > > +++ b/drivers/pci/hotplug/pciehp_ctrl.c > > @@ -182,6 +182,7 @@ static void pciehp_power_thread(struct work_struct *work) > > switch (info->req) { > > case DISABLE_REQ: > > mutex_lock(&p_slot->hotplug_lock); > > + p_slot->state = POWEROFF_STATE; > > It sounds right that p_slot->state should be protected. > > It looks like handle_button_press_event() and > pciehp_sysfs_enable_slot() hold p_slot->lock while updating > p_slot->state. > > You're setting "state = POWEROFF_STATE" while holding > p_slot->hotplug_lock (not p_slot->lock). Four lines down, we set > "state = STATIC_STATE", but this time we're holding p_slot->lock. > > What is the difference between the p_slot->lock and > p_slot->hotplug_lock? Do we need both? How do we know which one to > use? > > I'm very confused. This is _very_ confusing. :) The p_slot->hotplug_lock serializes a power off and a power on event. We only want to set the state when one of those events gets to execute rather than when the event is queued. Changing the state when the event is queued can trigger a never ending up-down sequence. It currently looks safe to nest the p_slot->lock under the p_slot->hotplug_lock if that is you recommendation. Alternatively we could fix this if we used an ordered work queue for the slot's work, but that is a significantly more complex change.