From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ie0-f173.google.com ([209.85.223.173]:41317 "EHLO mail-ie0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751441Ab3KRUj3 (ORCPT ); Mon, 18 Nov 2013 15:39:29 -0500 Received: by mail-ie0-f173.google.com with SMTP id x13so9348616ief.4 for ; Mon, 18 Nov 2013 12:39:28 -0800 (PST) Date: Mon, 18 Nov 2013 13:39:25 -0700 From: Bjorn Helgaas To: Yinghai Lu Cc: Tejun Heo , Hugh Dickins , Steven Rostedt , Li Zefan , Markus Blank-Burian , Michal Hocko , Johannes Weiner , David Rientjes , Ying Han , Greg Thelen , Michel Lespinasse , cgroups@vger.kernel.org, "Srivatsa S. Bhat" , Lai Jiangshan , "linux-kernel@vger.kernel.org" , "Rafael J. Wysocki" , Alexander Duyck , "linux-pci@vger.kernel.org" Subject: Re: Possible regression with cgroups in 3.11 Message-ID: <20131118203925.GA26682@google.com> References: <5270BFE7.4000602@huawei.com> <20131031130647.0ff6f2c7@gandalf.local.home> <20131113032804.GB19394@mtj.dyndns.org> <20131113073806.GA23244@mtj.dyndns.org> <20131116002820.GA31073@google.com> <20131116045356.GA5618@mtj.dyndns.org> <20131118181440.GA2996@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: Sender: linux-pci-owner@vger.kernel.org List-ID: On Mon, Nov 18, 2013 at 11:29:32AM -0800, Yinghai Lu wrote: > On Mon, Nov 18, 2013 at 10:14 AM, Bjorn Helgaas wrote: > >> A bit of comment here would be nice but yeah I think this should work. > >> Can you please also queue the revert of c2fda509667b ("workqueue: > >> allow work_on_cpu() to be called recursively") after this patch? > >> Please feel free to add my acked-by. > > > > OK, below are the two patches (Alex's fix + the revert) I propose to > > merge. Unless there are objections, I'll ask Linus to pull these > > before v3.13-rc1. > > > > > > > > commit 84f23f99b507c2c9247f47d3db0f71a3fd65e3a3 > > Author: Alexander Duyck > > Date: Mon Nov 18 10:59:59 2013 -0700 > > > > PCI: Avoid unnecessary CPU switch when calling driver .probe() method > > > > If we are already on a CPU local to the device, call the driver .probe() > > method directly without using work_on_cpu(). > > > > This is a workaround for a lockdep warning in the following scenario: > > > > pci_call_probe > > work_on_cpu(cpu, local_pci_probe, ...) > > driver .probe > > pci_enable_sriov > > ... > > pci_bus_add_device > > ... > > pci_call_probe > > work_on_cpu(cpu, local_pci_probe, ...) > > > > It would be better to fix PCI so we don't call VF driver .probe() methods > > from inside a PF driver .probe() method, but that's a bigger project. > > > > [bhelgaas: disable preemption, open bugzilla, rework comments & changelog] > > Link: https://bugzilla.kernel.org/show_bug.cgi?id=65071 > > Link: http://lkml.kernel.org/r/CAE9FiQXYQEAZ=0sG6+2OdffBqfLS9MpoN1xviRR9aDbxPxcKxQ@mail.gmail.com > > Link: http://lkml.kernel.org/r/20130624195942.40795.27292.stgit@ahduyck-cp1.jf.intel.com > > Signed-off-by: Alexander Duyck > > Signed-off-by: Bjorn Helgaas > > Acked-by: Tejun Heo > > Tested-by: Yinghai Lu > Acked-by: Yinghai Lu Thanks, I added these and pushed my for-linus branch for -next to pick up before I ask Linus to pull them. Bjorn