Skip to contentSkip to conversation

PCI: Make pci_bus_type constant

PATCH Applied Kunwu Chan 2 participants 2 messages Aug 23, 2024 PCI

lore
Share & tools
lore

Kunwu Chan

author
#0 lore raw

PATCH 1/1 PCI: Make pci_bus_type constant

From: Kunwu Chan <[email protected]>

Since commit d492cc2573a0 ("driver core: device.h: make struct bus_type a const *"), the driver core can properly handle constant struct bus_type, move the pci_bus_type variable to be a constant structure as well, placing it into read-only memory which can not be modified at runtime.

---
 drivers/pci/pci-driver.c | 2 +-
 include/linux/pci.h      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/pci/pci-driver.c +1 -1
index f412ef73a6e4..35270172c833 100644
@@ -1670,7 +1670,7 @@ static void pci_dma_cleanup(struct device *dev)
 		iommu_device_unuse_default_domain(dev);
 }
 
-struct bus_type pci_bus_type = {
+const struct bus_type pci_bus_type = {
 	.name		= "pci",
 	.match		= pci_bus_match,
 	.uevent		= pci_uevent,
include/linux/pci.h +1 -1
index 4246cb790c7b..0d6c1c089aca 100644
@@ -1098,7 +1098,7 @@ enum pcie_bus_config_types {
 
 extern enum pcie_bus_config_types pcie_bus_config;
 
-extern struct bus_type pci_bus_type;
+extern const struct bus_type pci_bus_type;
 
 /* Do NOT directly access these two variables, unless you are arch-specific PCI
  * code, or PCI core code. */
Signature · 1 line
2.41.0
#1 lore raw
Quoted 8 lines · Kunwu Chan

From: Kunwu Chan <[email protected]>

Since commit d492cc2573a0 ("driver core: device.h: make struct bus_type a const *"), the driver core can properly handle constant struct bus_type, move the pci_bus_type variable to be a constant structure as well, placing it into read-only memory which can not be modified at runtime.

Quoted 4 lines

Applied to pci/misc for v6.12, thanks!

Quoted 34 lines
---
 drivers/pci/pci-driver.c | 2 +-
 include/linux/pci.h      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/pci/pci-driver.c +1 -1
index f412ef73a6e4..35270172c833 100644
@@ -1670,7 +1670,7 @@ static void pci_dma_cleanup(struct device *dev)
 		iommu_device_unuse_default_domain(dev);
 }
 
-struct bus_type pci_bus_type = {
+const struct bus_type pci_bus_type = {
 	.name		= "pci",
 	.match		= pci_bus_match,
 	.uevent		= pci_uevent,
include/linux/pci.h +1 -1
index 4246cb790c7b..0d6c1c089aca 100644
@@ -1098,7 +1098,7 @@ enum pcie_bus_config_types {
 
 extern enum pcie_bus_config_types pcie_bus_config;
 
-extern struct bus_type pci_bus_type;
+extern const struct bus_type pci_bus_type;
 
 /* Do NOT directly access these two variables, unless you are arch-specific PCI
  * code, or PCI core code. */
Signature · 1 line
2.41.0