PCI: fix of read-write config operation in SMP environment
PATCH 1/1 PCI: fix of read-write config operation in SMP environment
Read modify write operations performed on same pci configuration registers which have bit fields may not work properly in SMP environment. Let us assume one thread tries to set master bit and other thread memory bit of PCI_COMMAND register, result may be unpredictable.
Better we introduce a new routine in struct pci_ops like (int (*modify_safe)(struct pci_bus *bus, unsigned int devfn, int where, int size, u32 old, u32 new);
This routine may first read current value and apply diff.
Signed-off-by Hari Vyas <[email protected]>
--- drivers/pci/access.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++ drivers/pci/pci.c | 1 + drivers/pci/setup-res.c | 2 +- include/linux/pci.h | 4 ++++ 4 files changed, 67 insertions(+), 1 deletion(-)
drivers/pci/access.c +61 -0
@@ -588,3 +588,64 @@ int pci_write_config_dword(const struct pci_dev *dev, int where,return pci_bus_write_config_dword (dev->bus, dev->devfn, where, val); }EXPORT_SYMBOL (pci_write_config_dword); + +#define PCI_OP_MODIFY (size, type, len) \ +int pci_bus_modify_config_##size \ + (struct pci_bus *bus, unsigned int devfn, int pos, \ + type rval, type wval) \ +{ \ + int res; \ + unsigned long flags; \ + u32 rdata = 0; \ + u32 wdata = 0; \ + u32 temp_data = 0; \ + if (PCI_##size##_BAD) return PCIBIOS_BAD_REGISTER_NUMBER; \ + pci_lock_config(flags); \ + if (bus->ops->modify) { \ + res = bus->ops->modify(bus, devfn, pos, len, \ + rval, wval); \ + } else { \ + temp_data = rval ^ wval; \ + res = bus->ops->read(bus, devfn, pos, len, &rdata); \ + wdata = rdata ^ temp_data; \ + res = bus->ops->write(bus, devfn, pos, len, wdata); \ + } \ + pci_unlock_config(flags); \ + return res; \ +} + +PCI_OP_MODIFY(byte, u8, 1) +PCI_OP_MODIFY(word, u16, 2) +PCI_OP_MODIFY(dword, u32, 4) +int pci_modify_config_byte (const struct pci_dev *dev,int where, +u8 rval,u8 wval) +{ +if (pci_dev_is_disconnected (dev)) { +return PCIBIOS_DEVICE_NOT_FOUND ; + } +return pci_bus_modify_config_byte (dev->bus, dev->devfn, where, + rval, wval); +} +EXPORT_SYMBOL (pci_modify_config_byte); + +int pci_modify_config_word (const struct pci_dev *dev,int where, +u16 rval,u16 wval) +{ +if (pci_dev_is_disconnected (dev)) { +return PCIBIOS_DEVICE_NOT_FOUND ; + } +return pci_bus_modify_config_word (dev->bus, dev->devfn, where, + rval, wval); +} +EXPORT_SYMBOL (pci_modify_config_word); + +int pci_modify_config_dword (const struct pci_dev *dev,int where, +u32 rval,u32 wval) +{ +if (pci_dev_is_disconnected (dev)) { +return PCIBIOS_DEVICE_NOT_FOUND ; + } +return pci_bus_modify_config_dword (dev->bus, dev->devfn, where, + rval, wval); +} +EXPORT_SYMBOL (pci_modify_config_dword);
drivers/pci/pci.c +1 -0
@@ -3712,6 +3712,7 @@ static void __pci_set_master(struct pci_dev *dev, bool enable)pci_dbg (dev,"%s bus mastering\n" , enable ?"enabling" :"disabling" );pci_write_config_word (dev,PCI_COMMAND , cmd); +pci_modify_config_word (dev,PCI_COMMAND , old_cmd, cmd); } dev->is_busmaster = enable; }
drivers/pci/setup-res.c +1 -1
@@ -493,7 +493,7 @@ int pci_enable_resources(struct pci_dev *dev, int mask)if (cmd != old_cmd) {pci_info (dev,"enabling device (%04x -> %04x)\n" , old_cmd, cmd); -pci_write_config_word (dev,PCI_COMMAND , cmd); +pci_modify_config_word (dev,PCI_COMMAND , old_cmd, cmd); }return 0 ; }
include/linux/pci.h +4 -0
@@ -664,6 +664,7 @@ struct pci_ops {void __iomem *(*map_bus)(struct pci_bus *bus,unsigned int devfn,int where);int (*read)(struct pci_bus *bus,unsigned int devfn,int where,int size,u32 *val);int (*write)(struct pci_bus *bus,unsigned int devfn,int where,int size,u32 val); +int (*modify)(struct pci_bus *bus,unsigned int devfn,int where,int size,u32 rval,u32 wval); };/*
@@ -991,6 +992,9 @@ int pci_generic_config_write32(struct pci_bus *bus, unsigned int devfn,int pci_write_config_byte (const struct pci_dev *dev,int where,u8 val);int pci_write_config_word (const struct pci_dev *dev,int where,u16 val);int pci_write_config_dword (const struct pci_dev *dev,int where,u32 val); +int pci_modify_config_byte (const struct pci_dev *dev,int where,u8 rval,u8 wval); +int pci_modify_config_word (const struct pci_dev *dev,int where,u16 rval,u16 wval); +int pci_modify_config_dword (const struct pci_dev *dev,int where,u32 rval,u32 wval);int pcie_capability_read_word (struct pci_dev *dev,int pos,u16 *val);int pcie_capability_read_dword (struct pci_dev *dev,int pos,u32 *val);
Signature · 1 line
1.9.1
Quoted 5 lines · Hari Vyas
Read modify write operations performed on same pci configuration registers which have bit fields may not work properly in SMP environment. Let us assume one thread tries to set master bit and other thread memory bit of
PCI_COMMANDregister, result may be unpredictable.
It's possible we'll need something like this, but we would have to have a clear understanding of what threads are involved.
For example, if the problem were that a driver had two threads and thread A tried to set PCI_COMMAND_MASTER and thread B tried to set PCI_COMMAND_MEMORY, I'd say that's just a driver synchronization problem that should be fixed in the driver.
So I'm going to defer this until we work through Ben's patches. If you think we still need this after that, please repost it.
Quoted 132 lines
Better we introduce a new routine in struct
pci_opslike (int (*modify_safe)(structpci_bus*bus, unsigned int devfn, int where, int size, u32 old, u32 new);
This routine may first read current value and apply diff.Signed-off-by Hari Vyas <[email protected]>--- drivers/pci/access.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++ drivers/pci/pci.c | 1 + drivers/pci/setup-res.c | 2 +- include/linux/pci.h | 4 ++++ 4 files changed, 67 insertions(+), 1 deletion(-)drivers/pci/access.c +61
-0@@ -588,3 +588,64 @@ int pci_write_config_dword(const struct pci_dev *dev, int where,return pci_bus_write_config_dword (dev->bus, dev->devfn, where, val); }EXPORT_SYMBOL (pci_write_config_dword); + +#define PCI_OP_MODIFY (size, type, len) \ +int pci_bus_modify_config_##size \ + (struct pci_bus *bus, unsigned int devfn, int pos, \ + type rval, type wval) \ +{ \ + int res; \ + unsigned long flags; \ + u32 rdata = 0; \ + u32 wdata = 0; \ + u32 temp_data = 0; \ + if (PCI_##size##_BAD) return PCIBIOS_BAD_REGISTER_NUMBER; \ + pci_lock_config(flags); \ + if (bus->ops->modify) { \ + res = bus->ops->modify(bus, devfn, pos, len, \ + rval, wval); \ + } else { \ + temp_data = rval ^ wval; \ + res = bus->ops->read(bus, devfn, pos, len, &rdata); \ + wdata = rdata ^ temp_data; \ + res = bus->ops->write(bus, devfn, pos, len, wdata); \ + } \ + pci_unlock_config(flags); \ + return res; \ +} + +PCI_OP_MODIFY(byte, u8, 1) +PCI_OP_MODIFY(word, u16, 2) +PCI_OP_MODIFY(dword, u32, 4) +int pci_modify_config_byte (const struct pci_dev *dev,int where, +u8 rval,u8 wval) +{ +if (pci_dev_is_disconnected (dev)) { +return PCIBIOS_DEVICE_NOT_FOUND ; + } +return pci_bus_modify_config_byte (dev->bus, dev->devfn, where, + rval, wval); +} +EXPORT_SYMBOL (pci_modify_config_byte); + +int pci_modify_config_word (const struct pci_dev *dev,int where, +u16 rval,u16 wval) +{ +if (pci_dev_is_disconnected (dev)) { +return PCIBIOS_DEVICE_NOT_FOUND ; + } +return pci_bus_modify_config_word (dev->bus, dev->devfn, where, + rval, wval); +} +EXPORT_SYMBOL (pci_modify_config_word); + +int pci_modify_config_dword (const struct pci_dev *dev,int where, +u32 rval,u32 wval) +{ +if (pci_dev_is_disconnected (dev)) { +return PCIBIOS_DEVICE_NOT_FOUND ; + } +return pci_bus_modify_config_dword (dev->bus, dev->devfn, where, + rval, wval); +} +EXPORT_SYMBOL (pci_modify_config_dword);drivers/pci/pci.c +1
-0@@ -3712,6 +3712,7 @@ static void __pci_set_master(struct pci_dev *dev, bool enable)pci_dbg (dev,"%s bus mastering\n" , enable ?"enabling" :"disabling" );pci_write_config_word (dev,PCI_COMMAND , cmd); +pci_modify_config_word (dev,PCI_COMMAND , old_cmd, cmd); } dev->is_busmaster = enable; }drivers/pci/setup-res.c +1
-1@@ -493,7 +493,7 @@ int pci_enable_resources(struct pci_dev *dev, int mask)if (cmd != old_cmd) {pci_info (dev,"enabling device (%04x -> %04x)\n" , old_cmd, cmd); -pci_write_config_word (dev,PCI_COMMAND , cmd); +pci_modify_config_word (dev,PCI_COMMAND , old_cmd, cmd); }return 0 ; }include/linux/pci.h +4
-0@@ -664,6 +664,7 @@ struct pci_ops {void __iomem *(*map_bus)(struct pci_bus *bus,unsigned int devfn,int where);int (*read)(struct pci_bus *bus,unsigned int devfn,int where,int size,u32 *val);int (*write)(struct pci_bus *bus,unsigned int devfn,int where,int size,u32 val); +int (*modify)(struct pci_bus *bus,unsigned int devfn,int where,int size,u32 rval,u32 wval); };/* @@ -991,6 +992,9 @@ int pci_generic_config_write32(struct pci_bus *bus, unsigned int devfn,int pci_write_config_byte (const struct pci_dev *dev,int where,u8 val);int pci_write_config_word (const struct pci_dev *dev,int where,u16 val);int pci_write_config_dword (const struct pci_dev *dev,int where,u32 val); +int pci_modify_config_byte (const struct pci_dev *dev,int where,u8 rval,u8 wval); +int pci_modify_config_word (const struct pci_dev *dev,int where,u16 rval,u16 wval); +int pci_modify_config_dword (const struct pci_dev *dev,int where,u32 rval,u32 wval);int pcie_capability_read_word (struct pci_dev *dev,int pos,u16 *val);int pcie_capability_read_dword (struct pci_dev *dev,int pos,u32 *val);Signature · 1 line
1.9.1
Quoted 10 lines · Bjorn Helgaas
Quoted 5 lines · Hari Vyas
Read modify write operations performed on same pci configuration registers which have bit fields may not work properly in SMP environment. Let us assume one thread tries to set master bit and other thread memory bit of
PCI_COMMANDregister, result may be unpredictable.It's possible we'll need something like this, but we would have to have a clear understanding of what threads are involved.
Quoted 8 lines
For example, if the problem were that a driver had two threads and thread A tried to set
PCI_COMMAND_MASTERand thread B tried to setPCI_COMMAND_MEMORY, I'd say that's just a driver synchronization problem that should be fixed in the driver.So I'm going to defer this until we work through Ben's patches. If you think we still need this after that, please repost it.
Thanks for your comment. I just raised patch to open up discussion. Whichever one is good, we
should move to that one. I know this is bit heavy approach but concern is handled
at lower layer which is root cause so could avoid unknown problematic scenarios from higher level driver but I agree, Let's first try out Ben's patch and proceed accordingly.
Regards,
hari
Quoted 132 lines
Quoted 132 lines
Better we introduce a new routine in struct
pci_opslike (int (*modify_safe)(structpci_bus*bus, unsigned int devfn, int where, int size, u32 old, u32 new);
This routine may first read current value and apply diff.Signed-off-by Hari Vyas <[email protected]>--- drivers/pci/access.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++ drivers/pci/pci.c | 1 + drivers/pci/setup-res.c | 2 +- include/linux/pci.h | 4 ++++ 4 files changed, 67 insertions(+), 1 deletion(-)drivers/pci/access.c +61
-0@@ -588,3 +588,64 @@ int pci_write_config_dword(const struct pci_dev *dev, int where,return pci_bus_write_config_dword (dev->bus, dev->devfn, where, val); }EXPORT_SYMBOL (pci_write_config_dword); + +#define PCI_OP_MODIFY (size, type, len) \ +int pci_bus_modify_config_##size \ + (struct pci_bus *bus, unsigned int devfn, int pos, \ + type rval, type wval) \ +{ \ + int res; \ + unsigned long flags; \ + u32 rdata = 0; \ + u32 wdata = 0; \ + u32 temp_data = 0; \ + if (PCI_##size##_BAD) return PCIBIOS_BAD_REGISTER_NUMBER; \ + pci_lock_config(flags); \ + if (bus->ops->modify) { \ + res = bus->ops->modify(bus, devfn, pos, len, \ + rval, wval); \ + } else { \ + temp_data = rval ^ wval; \ + res = bus->ops->read(bus, devfn, pos, len, &rdata); \ + wdata = rdata ^ temp_data; \ + res = bus->ops->write(bus, devfn, pos, len, wdata); \ + } \ + pci_unlock_config(flags); \ + return res; \ +} + +PCI_OP_MODIFY(byte, u8, 1) +PCI_OP_MODIFY(word, u16, 2) +PCI_OP_MODIFY(dword, u32, 4) +int pci_modify_config_byte (const struct pci_dev *dev,int where, +u8 rval,u8 wval) +{ +if (pci_dev_is_disconnected (dev)) { +return PCIBIOS_DEVICE_NOT_FOUND ; + } +return pci_bus_modify_config_byte (dev->bus, dev->devfn, where, + rval, wval); +} +EXPORT_SYMBOL (pci_modify_config_byte); + +int pci_modify_config_word (const struct pci_dev *dev,int where, +u16 rval,u16 wval) +{ +if (pci_dev_is_disconnected (dev)) { +return PCIBIOS_DEVICE_NOT_FOUND ; + } +return pci_bus_modify_config_word (dev->bus, dev->devfn, where, + rval, wval); +} +EXPORT_SYMBOL (pci_modify_config_word); + +int pci_modify_config_dword (const struct pci_dev *dev,int where, +u32 rval,u32 wval) +{ +if (pci_dev_is_disconnected (dev)) { +return PCIBIOS_DEVICE_NOT_FOUND ; + } +return pci_bus_modify_config_dword (dev->bus, dev->devfn, where, + rval, wval); +} +EXPORT_SYMBOL (pci_modify_config_dword);drivers/pci/pci.c +1
-0@@ -3712,6 +3712,7 @@ static void __pci_set_master(struct pci_dev *dev, bool enable)pci_dbg (dev,"%s bus mastering\n" , enable ?"enabling" :"disabling" );pci_write_config_word (dev,PCI_COMMAND , cmd); +pci_modify_config_word (dev,PCI_COMMAND , old_cmd, cmd); } dev->is_busmaster = enable; }drivers/pci/setup-res.c +1
-1@@ -493,7 +493,7 @@ int pci_enable_resources(struct pci_dev *dev, int mask)if (cmd != old_cmd) {pci_info (dev,"enabling device (%04x -> %04x)\n" , old_cmd, cmd); -pci_write_config_word (dev,PCI_COMMAND , cmd); +pci_modify_config_word (dev,PCI_COMMAND , old_cmd, cmd); }return 0 ; }include/linux/pci.h +4
-1@@ -664,6 +664,7 @@ struct pci_ops {void __iomem *(*map_bus)(struct pci_bus *bus,unsigned int devfn,int where);int (*read)(struct pci_bus *bus,unsigned int devfn,int where,int size,u32 *val);int (*write)(struct pci_bus *bus,unsigned int devfn,int where,int size,u32 val); +int (*modify)(struct pci_bus *bus,unsigned int devfn,int where,int size,u32 rval,u32 wval); };/* @@ -991,6 +992,9 @@ int pci_generic_config_write32(struct pci_bus *bus, unsigned int devfn,int pci_write_config_byte (const struct pci_dev *dev,int where,u8 val);int pci_write_config_word (const struct pci_dev *dev,int where,u16 val);int pci_write_config_dword (const struct pci_dev *dev,int where,u32 val); +int pci_modify_config_byte (const struct pci_dev *dev,int where,u8 rval,u8 wval); +int pci_modify_config_word (const struct pci_dev *dev,int where,u16 rval,u16 wval); +int pci_modify_config_dword (const struct pci_dev *dev,int where,u32 rval,u32 wval);int pcie_capability_read_word (struct pci_dev *dev,int pos,u16 *val);int pcie_capability_read_dword (struct pci_dev *dev,int pos,u32 *val); --1.9.1