From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 23191C25B7E for ; Wed, 29 May 2024 15:36:57 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 822CC10FB76; Wed, 29 May 2024 15:36:56 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="ISrn7Nhk"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.21]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9C94410EDE3 for ; Wed, 29 May 2024 15:36:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1716997013; x=1748533013; h=from:to:cc:subject:in-reply-to:references:date: message-id:mime-version; bh=0ed1rELFvtSE5jw6jvoO1vEqzUp2NjFvPpoS0Skz8U0=; b=ISrn7NhkMbpHOvqrErygvGl5oay9kUPj430qcjJuftsiZQQ38gKXqf4o ZrqDhAsjPHFvMRm9vj6wnGdU462OFfY/hknghb1ahTIbFxUJjkAuJDgG5 2W0hnjJVP+YyWK+5isiK32ljAyV0FXek6yeFrOfifUwvPaSP9GYAMfh1b pzjV9pkcxoFAApb/JRtKfph2ZahxQqxZ0MW9bMli8AkCs0egtTkWrwXdC oR6GqqK15SKykWgngcPvTdo2/PJJdTUOgjT3PXqZ5FZot/Cgv0gy3uPbl 0fu52eZmT9r/NTttNZ264a+5cj1Klk3UfAuKpLQnGMp/dpA5Jn+MrBlDX Q==; X-CSE-ConnectionGUID: CElb/ATySDqFxYl0/yqTkg== X-CSE-MsgGUID: wCX7tCOlR+GN/2FOS7KPRQ== X-IronPort-AV: E=McAfee;i="6600,9927,11087"; a="13361094" X-IronPort-AV: E=Sophos;i="6.08,198,1712646000"; d="scan'208";a="13361094" Received: from fmviesa010.fm.intel.com ([10.60.135.150]) by orvoesa113.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 May 2024 08:36:53 -0700 X-CSE-ConnectionGUID: xvmXtFWpRJifl/b7O8l5+g== X-CSE-MsgGUID: IgPXAzYURqePd3DWkQhi+Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,198,1712646000"; d="scan'208";a="35562661" Received: from ncintean-mobl1.ger.corp.intel.com (HELO localhost) ([10.245.246.86]) by fmviesa010-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 May 2024 08:36:51 -0700 From: Jani Nikula To: Imre Deak , intel-gfx@lists.freedesktop.org Cc: Jani Saarinen Subject: Re: [core-for-CI PATCH] PCI: Make PCI cfg_access_lock lockdep key a singleton In-Reply-To: <20240529114901.344655-1-imre.deak@intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20240529114901.344655-1-imre.deak@intel.com> Date: Wed, 29 May 2024 18:37:02 +0300 Message-ID: <87o78oiq8x.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Wed, 29 May 2024, Imre Deak wrote: > From: Dan Williams > > The new lockdep annotation for cfg_access_lock naively registered a new > key per device. This is overkill and leads to warnings on hash > collisions at dynamic registration time: > > WARNING: CPU: 0 PID: 1 at kernel/locking/lockdep.c:1226 lockdep_register_key+0xb0/0x240 > RIP: 0010:lockdep_register_key+0xb0/0x240 > [..] > Call Trace: > > ? __warn+0x8c/0x190 > ? lockdep_register_key+0xb0/0x240 > ? report_bug+0x1f8/0x200 > ? handle_bug+0x3c/0x70 > ? exc_invalid_op+0x18/0x70 > ? asm_exc_invalid_op+0x1a/0x20 > ? lockdep_register_key+0xb0/0x240 > pci_device_add+0x14b/0x560 > ? pci_setup_device+0x42e/0x6a0 > pci_scan_single_device+0xa7/0xd0 > p2sb_scan_and_cache_devfn+0xc/0x90 > p2sb_fs_init+0x15f/0x170 > > Switch to a shared static key for all instances. > > Fixes: 7e89efc6e9e4 ("PCI: Lock upstream bridge for pci_reset_function()") > Reported-by: Jani Saarinen > Closes: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14834/bat-apl-1/boot0.txt > Cc: Dave Jiang > Cc: Bjorn Helgaas > Signed-off-by: Dan Williams Dropped extra Cc's. Acked-by: Jani Nikula for merging to topic/core-for-CI. Please create the issue at gitlab, label it core-for-CI, and add References: to it here. > --- > drivers/pci/probe.c | 7 ++++--- > include/linux/pci.h | 1 - > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c > index 8e696e547565c..15168881ec941 100644 > --- a/drivers/pci/probe.c > +++ b/drivers/pci/probe.c > @@ -2533,6 +2533,8 @@ static void pci_set_msi_domain(struct pci_dev *dev) > dev_set_msi_domain(&dev->dev, d); > } > > +static struct lock_class_key cfg_access_key; > + > void pci_device_add(struct pci_dev *dev, struct pci_bus *bus) > { > int ret; > @@ -2546,9 +2548,8 @@ void pci_device_add(struct pci_dev *dev, struct pci_bus *bus) > dev->dev.dma_mask = &dev->dma_mask; > dev->dev.dma_parms = &dev->dma_parms; > dev->dev.coherent_dma_mask = 0xffffffffull; > - lockdep_register_key(&dev->cfg_access_key); > - lockdep_init_map(&dev->cfg_access_lock, dev_name(&dev->dev), > - &dev->cfg_access_key, 0); > + lockdep_init_map(&dev->cfg_access_lock, "&dev->cfg_access_lock", > + &cfg_access_key, 0); > > dma_set_max_seg_size(&dev->dev, 65536); > dma_set_seg_boundary(&dev->dev, 0xffffffff); > diff --git a/include/linux/pci.h b/include/linux/pci.h > index fb004fd4e8890..5bece7fd11f88 100644 > --- a/include/linux/pci.h > +++ b/include/linux/pci.h > @@ -413,7 +413,6 @@ struct pci_dev { > struct resource driver_exclusive_resource; /* driver exclusive resource ranges */ > > bool match_driver; /* Skip attaching driver */ > - struct lock_class_key cfg_access_key; > struct lockdep_map cfg_access_lock; > > unsigned int transparent:1; /* Subtractive decode bridge */ -- Jani Nikula, Intel