From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
To: Bjorn Helgaas <bhelgaas@google.com>
Cc: kernel@pengutronix.de,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
linux-pci@vger.kernel.org,
"Michael Ellerman" <mpe@ellerman.id.au>,
"Benjamin Herrenschmidt" <benh@kernel.crashing.org>,
"Paul Mackerras" <paulus@samba.org>,
"Russell Currey" <ruscur@russell.cc>,
"Oliver O'Halloran" <oohall@gmail.com>,
"Peter Zijlstra" <peterz@infradead.org>,
"Ingo Molnar" <mingo@redhat.com>,
"Arnaldo Carvalho de Melo" <acme@kernel.org>,
"Mark Rutland" <mark.rutland@arm.com>,
"Alexander Shishkin" <alexander.shishkin@linux.intel.com>,
"Jiri Olsa" <jolsa@redhat.com>,
"Namhyung Kim" <namhyung@kernel.org>,
"Thomas Gleixner" <tglx@linutronix.de>,
"Borislav Petkov" <bp@alien8.de>,
x86@kernel.org, "H. Peter Anvin" <hpa@zytor.com>,
"Rafał Miłecki" <zajec5@gmail.com>,
"Zhou Wang" <wangzhou1@hisilicon.com>,
"Herbert Xu" <herbert@gondor.apana.org.au>,
"David S. Miller" <davem@davemloft.net>,
"Giovanni Cabiddu" <giovanni.cabiddu@intel.com>,
"Sathya Prakash" <sathya.prakash@broadcom.com>,
"Sreekanth Reddy" <sreekanth.reddy@broadcom.com>,
"Suganath Prabu Subramani"
<suganath-prabu.subramani@broadcom.com>,
"Frederic Barrat" <fbarrat@linux.ibm.com>,
"Andrew Donnellan" <ajd@linux.ibm.com>,
"Arnd Bergmann" <arnd@arndb.de>,
"Yisen Zhuang" <yisen.zhuang@huawei.com>,
"Salil Mehta" <salil.mehta@huawei.com>,
"Jakub Kicinski" <kuba@kernel.org>,
"Vadym Kochan" <vkochan@marvell.com>,
"Taras Chornyi" <tchornyi@marvell.com>,
"Jiri Pirko" <jiri@nvidia.com>,
"Ido Schimmel" <idosch@nvidia.com>,
"Simon Horman" <simon.horman@corigine.com>,
"Konrad Rzeszutek Wilk" <konrad.wilk@oracle.com>,
"Boris Ostrovsky" <boris.ostrovsky@oracle.com>,
"Juergen Gross" <jgross@suse.com>,
"Stefano Stabellini" <sstabellini@kernel.org>,
"Michael Buesch" <m@bues.ch>,
"Mathias Nyman" <mathias.nyman@intel.com>,
"Fiona Trahe" <fiona.trahe@intel.com>,
"Andy Shevchenko" <andriy.shevchenko@intel.com>,
"Wojciech Ziemba" <wojciech.ziemba@intel.com>,
"Alexander Duyck" <alexanderduyck@fb.com>,
linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org,
linux-perf-users@vger.kernel.org, linux-wireless@vger.kernel.org,
linux-crypto@vger.kernel.org, qat-linux@intel.com,
MPT-FusionLinux.pdl@broadcom.com, linux-scsi@vger.kernel.org,
netdev@vger.kernel.org, oss-drivers@corigine.com,
xen-devel@lists.xenproject.org, linux-usb@vger.kernel.org
Subject: [PATCH v2 0/6] PCI: Drop duplicated tracking of a pci_dev's bound driver
Date: Tue, 3 Aug 2021 12:01:44 +0200 [thread overview]
Message-ID: <20210803100150.1543597-1-u.kleine-koenig@pengutronix.de> (raw)
Hello,
changes since v1 (https://lore.kernel.org/linux-pci/20210729203740.1377045-1-u.kleine-koenig@pengutronix.de):
- New patch to simplify drivers/pci/xen-pcifront.c, spotted and
suggested by Boris Ostrovsky
- Fix a possible NULL pointer dereference I introduced in xen-pcifront.c
- A few whitespace improvements
- Add a commit log to patch #6 (formerly #5)
I also expanded the audience for patches #4 and #6 to allow affected
people to actually see the changes to their drivers.
Interdiff can be found below.
The idea is still the same: After a few cleanups (#1 - #3) a new macro
is introduced abstracting access to struct pci_dev->driver. All users
are then converted to use this and in the last patch the macro is
changed to make use of struct pci_dev::dev->driver to get rid of the
duplicated tracking.
Best regards
Uwe
Uwe Kleine-König (6):
PCI: Simplify pci_device_remove()
PCI: Drop useless check from pci_device_probe()
xen/pci: Drop some checks that are always true
PCI: Provide wrapper to access a pci_dev's bound driver
PCI: Adapt all code locations to not use struct pci_dev::driver
directly
PCI: Drop duplicated tracking of a pci_dev's bound driver
arch/powerpc/include/asm/ppc-pci.h | 3 +-
arch/powerpc/kernel/eeh_driver.c | 12 ++--
arch/x86/events/intel/uncore.c | 2 +-
arch/x86/kernel/probe_roms.c | 2 +-
drivers/bcma/host_pci.c | 6 +-
drivers/crypto/hisilicon/qm.c | 2 +-
drivers/crypto/qat/qat_common/adf_aer.c | 2 +-
drivers/message/fusion/mptbase.c | 4 +-
drivers/misc/cxl/guest.c | 21 +++----
drivers/misc/cxl/pci.c | 25 ++++----
.../ethernet/hisilicon/hns3/hns3_ethtool.c | 2 +-
.../ethernet/marvell/prestera/prestera_pci.c | 2 +-
drivers/net/ethernet/mellanox/mlxsw/pci.c | 2 +-
.../ethernet/netronome/nfp/nfp_net_ethtool.c | 2 +-
drivers/pci/iov.c | 23 ++++---
drivers/pci/pci-driver.c | 48 +++++++--------
drivers/pci/pci.c | 10 ++--
drivers/pci/pcie/err.c | 35 ++++++-----
drivers/pci/xen-pcifront.c | 60 ++++++++-----------
drivers/ssb/pcihost_wrapper.c | 7 ++-
drivers/usb/host/xhci-pci.c | 3 +-
include/linux/pci.h | 2 +-
22 files changed, 145 insertions(+), 130 deletions(-)
Range-diff against v1:
1: 7d97605df363 = 1: 8ba6e9faa18c PCI: Simplify pci_device_remove()
2: aec84c688d0f = 2: d8a7dc52091f PCI: Drop useless check from pci_device_probe()
-: ------------ > 3: f4b78aa41776 xen/pci: Drop some checks that are always true
3: e6f933f532c9 = 4: 50f3daa64170 PCI: Provide wrapper to access a pci_dev's bound driver
4: d678a2924143 ! 5: 21cbd3f180a1 PCI: Adapt all code locations to not use struct pci_dev::driver directly
@@ drivers/message/fusion/mptbase.c: mpt_device_driver_register(struct mpt_pci_driv
- id = ioc->pcidev->driver ?
- ioc->pcidev->driver->id_table : NULL;
+ struct pci_driver *pdrv = pci_driver_of_dev(ioc->pcidev);
-+ id = pdrv ? pdrv->id_table : NULL;
++ id = pdrv ? pdrv->id_table : NULL;
if (dd_cbfunc->probe)
dd_cbfunc->probe(ioc->pcidev, id);
}
@@ drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c: static void hns3_get_drvinfo
}
- strncpy(drvinfo->driver, h->pdev->driver->name,
-- sizeof(drvinfo->driver));
-+ strncpy(drvinfo->driver, pci_driver_of_dev(h->pdev)->name, sizeof(drvinfo->driver));
++ strncpy(drvinfo->driver, pci_driver_of_dev(h->pdev)->name,
+ sizeof(drvinfo->driver));
drvinfo->driver[sizeof(drvinfo->driver) - 1] = '\0';
- strncpy(drvinfo->bus_info, pci_name(h->pdev),
## drivers/net/ethernet/marvell/prestera/prestera_pci.c ##
@@ drivers/net/ethernet/marvell/prestera/prestera_pci.c: static int prestera_fw_load(struct prestera_fw *fw)
@@ drivers/pci/xen-pcifront.c: static pci_ers_result_t pcifront_common_process(int
pcidev = pci_get_domain_bus_and_slot(domain, bus, devfn);
- if (!pcidev || !pcidev->driver) {
-+ pdrv = pci_driver_of_dev(pcidev);
-+ if (!pcidev || !pdrv) {
++ if (!pcidev || !(pdrv = pci_driver_of_dev(pcidev))) {
dev_err(&pdev->xdev->dev, "device or AER driver is NULL\n");
pci_dev_put(pcidev);
return result;
}
- pdrv = pcidev->driver;
- if (pdrv) {
- if (pdrv->err_handler && pdrv->err_handler->error_detected) {
+ if (pdrv->err_handler && pdrv->err_handler->error_detected) {
+ pci_dbg(pcidev, "trying to call AER service\n");
## drivers/ssb/pcihost_wrapper.c ##
@@ drivers/ssb/pcihost_wrapper.c: static int ssb_pcihost_probe(struct pci_dev *dev,
@@ drivers/ssb/pcihost_wrapper.c: static int ssb_pcihost_probe(struct pci_dev *dev,
name = dev_name(&dev->dev);
- if (dev->driver && dev->driver->name)
- name = dev->driver->name;
-+
++
+ pdrv = pci_driver_of_dev(dev);
+ if (pdrv && pdrv->name)
+ name = pdrv->name;
5: 8c70ffd24380 ! 6: 02e6da6e5919 PCI: Drop duplicated tracking of a pci_dev's bound driver
@@ Metadata
## Commit message ##
PCI: Drop duplicated tracking of a pci_dev's bound driver
+ Currently it's tracked twice which driver is bound to a given pci
+ device. Now that all users of the pci specific one (struct
+ pci_dev::driver) are updated to use an access macro
+ (pci_driver_of_dev()), change the macro to use the information from the
+ driver core and remove the driver member from struct pci_dev.
+
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
## drivers/pci/pci-driver.c ##
base-commit: 2734d6c1b1a089fb593ef6a23d4b70903526fe0c
--
2.30.2
next reply other threads:[~2021-08-03 10:03 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-03 10:01 Uwe Kleine-König [this message]
2021-08-03 10:01 ` [PATCH v2 1/6] PCI: Simplify pci_device_remove() Uwe Kleine-König
2021-08-03 10:01 ` [PATCH v2 2/6] PCI: Drop useless check from pci_device_probe() Uwe Kleine-König
2021-08-03 10:01 ` [PATCH v2 3/6] xen/pci: Drop some checks that are always true Uwe Kleine-König
2021-08-03 13:50 ` Boris Ostrovsky
2021-08-03 10:01 ` [PATCH v2 4/6] PCI: Provide wrapper to access a pci_dev's bound driver Uwe Kleine-König
2021-08-03 14:37 ` Andy Shevchenko
2021-08-03 10:01 ` [PATCH v2 5/6] PCI: Adapt all code locations to not use struct pci_dev::driver directly Uwe Kleine-König
2021-08-03 13:53 ` Boris Ostrovsky
2021-08-03 14:38 ` Andy Shevchenko
2021-08-03 14:46 ` Ido Schimmel
2021-08-05 15:09 ` Andrew Donnellan
2021-08-03 10:01 ` [PATCH v2 6/6] PCI: Drop duplicated tracking of a pci_dev's bound driver Uwe Kleine-König
2021-08-05 23:42 ` [PATCH v2 0/6] " Bjorn Helgaas
2021-08-06 6:46 ` Uwe Kleine-König
2021-08-06 21:24 ` Bjorn Helgaas
2021-08-07 9:26 ` Uwe Kleine-König
2021-08-09 18:14 ` Bjorn Helgaas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210803100150.1543597-1-u.kleine-koenig@pengutronix.de \
--to=u.kleine-koenig@pengutronix.de \
--cc=MPT-FusionLinux.pdl@broadcom.com \
--cc=acme@kernel.org \
--cc=ajd@linux.ibm.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=alexanderduyck@fb.com \
--cc=andriy.shevchenko@intel.com \
--cc=arnd@arndb.de \
--cc=benh@kernel.crashing.org \
--cc=bhelgaas@google.com \
--cc=boris.ostrovsky@oracle.com \
--cc=bp@alien8.de \
--cc=davem@davemloft.net \
--cc=fbarrat@linux.ibm.com \
--cc=fiona.trahe@intel.com \
--cc=giovanni.cabiddu@intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=herbert@gondor.apana.org.au \
--cc=hpa@zytor.com \
--cc=idosch@nvidia.com \
--cc=jgross@suse.com \
--cc=jiri@nvidia.com \
--cc=jolsa@redhat.com \
--cc=kernel@pengutronix.de \
--cc=konrad.wilk@oracle.com \
--cc=kuba@kernel.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=m@bues.ch \
--cc=mark.rutland@arm.com \
--cc=mathias.nyman@intel.com \
--cc=mingo@redhat.com \
--cc=mpe@ellerman.id.au \
--cc=namhyung@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=oohall@gmail.com \
--cc=oss-drivers@corigine.com \
--cc=paulus@samba.org \
--cc=peterz@infradead.org \
--cc=qat-linux@intel.com \
--cc=ruscur@russell.cc \
--cc=salil.mehta@huawei.com \
--cc=sathya.prakash@broadcom.com \
--cc=simon.horman@corigine.com \
--cc=sreekanth.reddy@broadcom.com \
--cc=sstabellini@kernel.org \
--cc=suganath-prabu.subramani@broadcom.com \
--cc=tchornyi@marvell.com \
--cc=tglx@linutronix.de \
--cc=vkochan@marvell.com \
--cc=wangzhou1@hisilicon.com \
--cc=wojciech.ziemba@intel.com \
--cc=x86@kernel.org \
--cc=xen-devel@lists.xenproject.org \
--cc=yisen.zhuang@huawei.com \
--cc=zajec5@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).