| Message ID | 174107250696.1288555.15924775074966673629.stgit@dwillia2-xfh.jf.intel.com (mailing list archive) |
|---|---|
| State | New |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
| Series | PCI/TSM: Core infrastructure for PCI device security (TDISP) | expand |
Hi Dan, kernel test robot noticed the following build warnings: [auto build test WARNING on 7eb172143d5508b4da468ed59ee857c6e5e01da6] url: https://github.com/intel-lab-lkp/linux/commits/Dan-Williams/configfs-tsm-Namespace-TSM-report-symbols/20250304-152958 base: 7eb172143d5508b4da468ed59ee857c6e5e01da6 patch link: https://lore.kernel.org/r/174107250696.1288555.15924775074966673629.stgit%40dwillia2-xfh.jf.intel.com patch subject: [PATCH v2 09/11] PCI/IDE: Report available IDE streams config: s390-allyesconfig (https://download.01.org/0day-ci/archive/20250304/202503042126.FUEGx8dD-lkp@intel.com/config) compiler: s390-linux-gcc (GCC) 14.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250304/202503042126.FUEGx8dD-lkp@intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp@intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202503042126.FUEGx8dD-lkp@intel.com/ All warnings (new ones prefixed by >>): >> drivers/pci/ide.c:495: warning: expecting prototype for pci_init_nr_ide_streams(). Prototype was for pci_ide_init_nr_streams() instead vim +495 drivers/pci/ide.c 480 481 /** 482 * pci_init_nr_ide_streams() - size the pool of IDE Stream resources 483 * @hb: host bridge boundary for the stream pool 484 * @nr: number of streams 485 * 486 * Enable IDE Stream establishment by setting the number of stream 487 * resources available at the host bridge. Platform init code must set 488 * this before the first pci_ide_stream_alloc() call. 489 * 490 * The "PCI_IDE" symbol namespace is required because this is typically 491 * a detail that is settled in early PCI init, i.e. only an expert or 492 * test module should consume this export. 493 */ 494 void pci_ide_init_nr_streams(struct pci_host_bridge *hb, int nr) > 495 {
On Mon, Mar 3, 2025 at 11:20 PM Dan Williams <dan.j.williams@intel.com> wrote: > > The limited number of link-encryption (IDE) streams that a given set of > host bridges supports is a platform specific detail. Provide > pci_ide_init_nr_streams() as a generic facility for either platform TSM > drivers, or PCI core native IDE, to report the number available streams. > After invoking pci_ide_init_nr_streams() an "available_secure_streams" > attribute appears in PCI host bridge sysfs to convey that count. > > Cc: Bjorn Helgaas <bhelgaas@google.com> > Cc: Lukas Wunner <lukas@wunner.de> > Cc: Samuel Ortiz <sameo@rivosinc.com> > Cc: Alexey Kardashevskiy <aik@amd.com> > Cc: Xu Yilun <yilun.xu@linux.intel.com> > Signed-off-by: Dan Williams <dan.j.williams@intel.com> > --- > .../ABI/testing/sysfs-devices-pci-host-bridge | 12 ++++ > drivers/pci/ide.c | 58 ++++++++++++++++++++ > drivers/pci/pci.h | 3 + > drivers/pci/probe.c | 12 ++++ > include/linux/pci.h | 8 +++ > 5 files changed, 92 insertions(+), 1 deletion(-) > > diff --git a/Documentation/ABI/testing/sysfs-devices-pci-host-bridge b/Documentation/ABI/testing/sysfs-devices-pci-host-bridge > index 51dc9eed9353..4624469e56d4 100644 > --- a/Documentation/ABI/testing/sysfs-devices-pci-host-bridge > +++ b/Documentation/ABI/testing/sysfs-devices-pci-host-bridge > @@ -20,6 +20,7 @@ What: pciDDDD:BB/streamH.R.E:DDDD:BB:DD:F > Date: December, 2024 > Contact: linux-pci@vger.kernel.org > Description: > +<<<<<<< current Drop? > (RO) When a platform has established a secure connection, PCIe > IDE, between two Partner Ports, this symlink appears. The > primary function is to account the stream slot / resources > @@ -30,3 +31,14 @@ Description: > assigned Selective IDE Stream Register Block in the Root Port > and Endpoint, and H represents a platform specific pool of > stream resources shared by the Root Ports in a host bridge. > + > +What: pciDDDD:BB/available_secure_streams > +Date: December, 2024 > +Contact: linux-pci@vger.kernel.org > +Description: > + (RO) When a host bridge has Root Ports that support PCIe IDE > + (link encryption and integrity protection) there may be a > + limited number of streams that can be used for establishing new > + secure links. This attribute decrements upon secure link setup, > + and increments upon secure link teardown. The in-use stream > + count is determined by counting stream symlinks. Please describe the expected form metavariables DDDD and BB will take. > diff --git a/drivers/pci/ide.c b/drivers/pci/ide.c > index b2091f6260e6..0c72985e6a65 100644 > --- a/drivers/pci/ide.c > +++ b/drivers/pci/ide.c > @@ -439,3 +439,61 @@ void pci_ide_stream_disable(struct pci_dev *pdev, struct pci_ide *ide) > pci_write_config_dword(pdev, pos + PCI_IDE_SEL_CTL, 0); > } > EXPORT_SYMBOL_GPL(pci_ide_stream_disable); > + > +static ssize_t available_secure_streams_show(struct device *dev, > + struct device_attribute *attr, > + char *buf) > +{ > + struct pci_host_bridge *hb = to_pci_host_bridge(dev); > + int avail; > + > + if (hb->nr_ide_streams < 0) > + return -ENXIO; > + > + avail = hb->nr_ide_streams - > + bitmap_weight(hb->ide_stream_map, hb->nr_ide_streams); > + return sysfs_emit(buf, "%d\n", avail); > +} > +static DEVICE_ATTR_RO(available_secure_streams); > + > +static struct attribute *pci_ide_attrs[] = { > + &dev_attr_available_secure_streams.attr, > + NULL, > +}; > + > +static umode_t pci_ide_attr_visible(struct kobject *kobj, struct attribute *a, int n) > +{ > + struct device *dev = kobj_to_dev(kobj); > + struct pci_host_bridge *hb = to_pci_host_bridge(dev); > + > + if (a == &dev_attr_available_secure_streams.attr) > + if (hb->nr_ide_streams < 0) > + return 0; > + > + return a->mode; > +} > + > +struct attribute_group pci_ide_attr_group = { > + .attrs = pci_ide_attrs, > + .is_visible = pci_ide_attr_visible, > +}; > + > +/** > + * pci_init_nr_ide_streams() - size the pool of IDE Stream resources /size/sets the size of/ > + * @hb: host bridge boundary for the stream pool > + * @nr: number of streams > + * > + * Enable IDE Stream establishment by setting the number of stream > + * resources available at the host bridge. Platform init code must set > + * this before the first pci_ide_stream_alloc() call. Is failing to call this a caught error by pci_ide_stream_alloc? > + * > + * The "PCI_IDE" symbol namespace is required because this is typically > + * a detail that is settled in early PCI init, i.e. only an expert or > + * test module should consume this export. Perhaps start with "Expert use only"? > + */ > +void pci_ide_init_nr_streams(struct pci_host_bridge *hb, int nr) > +{ > + hb->nr_ide_streams = nr; > + sysfs_update_group(&hb->dev.kobj, &pci_ide_attr_group); > +} > +EXPORT_SYMBOL_NS_GPL(pci_ide_init_nr_streams, "PCI_IDE"); > diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h > index b38bdd91e742..6c050eb9a91b 100644 > --- a/drivers/pci/pci.h > +++ b/drivers/pci/pci.h > @@ -458,8 +458,11 @@ static inline void pci_npem_remove(struct pci_dev *dev) { } > > #ifdef CONFIG_PCI_IDE > void pci_ide_init(struct pci_dev *dev); > +extern struct attribute_group pci_ide_attr_group; > +#define PCI_IDE_ATTR_GROUP (&pci_ide_attr_group) > #else > static inline void pci_ide_init(struct pci_dev *dev) { } > +#define PCI_IDE_ATTR_GROUP NULL > #endif > > #ifdef CONFIG_PCI_TSM > diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c > index e1c915629864..a383cc32c84b 100644 > --- a/drivers/pci/probe.c > +++ b/drivers/pci/probe.c > @@ -633,6 +633,16 @@ static void pci_release_host_bridge_dev(struct device *dev) > kfree(bridge); > } > > +static const struct attribute_group *pci_host_bridge_groups[] = { > + PCI_IDE_ATTR_GROUP, > + NULL, > +}; > + > +static const struct device_type pci_host_bridge_type = { > + .groups = pci_host_bridge_groups, > + .release = pci_release_host_bridge_dev, > +}; > + > static void pci_init_host_bridge(struct pci_host_bridge *bridge) > { > INIT_LIST_HEAD(&bridge->windows); > @@ -652,6 +662,7 @@ static void pci_init_host_bridge(struct pci_host_bridge *bridge) > bridge->native_dpc = 1; > bridge->domain_nr = PCI_DOMAIN_NR_NOT_SET; > bridge->native_cxl_error = 1; > + bridge->dev.type = &pci_host_bridge_type; > > device_initialize(&bridge->dev); > } > @@ -665,7 +676,6 @@ struct pci_host_bridge *pci_alloc_host_bridge(size_t priv) > return NULL; > > pci_init_host_bridge(bridge); > - bridge->dev.release = pci_release_host_bridge_dev; > > return bridge; > } > diff --git a/include/linux/pci.h b/include/linux/pci.h > index 0f9d6aece346..c2f18f31f7a7 100644 > --- a/include/linux/pci.h > +++ b/include/linux/pci.h > @@ -660,6 +660,14 @@ void pci_set_host_bridge_release(struct pci_host_bridge *bridge, > void (*release_fn)(struct pci_host_bridge *), > void *release_data); > > +#ifdef CONFIG_PCI_IDE > +void pci_ide_init_nr_streams(struct pci_host_bridge *hb, int nr); > +#else > +static inline void pci_ide_init_nr_streams(struct pci_host_bridge *hb, int nr) > +{ > +} > +#endif > + > int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge); > > #define PCI_REGION_FLAG_MASK 0x0fU /* These bits of resource flags tell us the PCI region flags */ > >
diff --git a/Documentation/ABI/testing/sysfs-devices-pci-host-bridge b/Documentation/ABI/testing/sysfs-devices-pci-host-bridge index 51dc9eed9353..4624469e56d4 100644 --- a/Documentation/ABI/testing/sysfs-devices-pci-host-bridge +++ b/Documentation/ABI/testing/sysfs-devices-pci-host-bridge @@ -20,6 +20,7 @@ What: pciDDDD:BB/streamH.R.E:DDDD:BB:DD:F Date: December, 2024 Contact: linux-pci@vger.kernel.org Description: +<<<<<<< current (RO) When a platform has established a secure connection, PCIe IDE, between two Partner Ports, this symlink appears. The primary function is to account the stream slot / resources @@ -30,3 +31,14 @@ Description: assigned Selective IDE Stream Register Block in the Root Port and Endpoint, and H represents a platform specific pool of stream resources shared by the Root Ports in a host bridge. + +What: pciDDDD:BB/available_secure_streams +Date: December, 2024 +Contact: linux-pci@vger.kernel.org +Description: + (RO) When a host bridge has Root Ports that support PCIe IDE + (link encryption and integrity protection) there may be a + limited number of streams that can be used for establishing new + secure links. This attribute decrements upon secure link setup, + and increments upon secure link teardown. The in-use stream + count is determined by counting stream symlinks. diff --git a/drivers/pci/ide.c b/drivers/pci/ide.c index b2091f6260e6..0c72985e6a65 100644 --- a/drivers/pci/ide.c +++ b/drivers/pci/ide.c @@ -439,3 +439,61 @@ void pci_ide_stream_disable(struct pci_dev *pdev, struct pci_ide *ide) pci_write_config_dword(pdev, pos + PCI_IDE_SEL_CTL, 0); } EXPORT_SYMBOL_GPL(pci_ide_stream_disable); + +static ssize_t available_secure_streams_show(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct pci_host_bridge *hb = to_pci_host_bridge(dev); + int avail; + + if (hb->nr_ide_streams < 0) + return -ENXIO; + + avail = hb->nr_ide_streams - + bitmap_weight(hb->ide_stream_map, hb->nr_ide_streams); + return sysfs_emit(buf, "%d\n", avail); +} +static DEVICE_ATTR_RO(available_secure_streams); + +static struct attribute *pci_ide_attrs[] = { + &dev_attr_available_secure_streams.attr, + NULL, +}; + +static umode_t pci_ide_attr_visible(struct kobject *kobj, struct attribute *a, int n) +{ + struct device *dev = kobj_to_dev(kobj); + struct pci_host_bridge *hb = to_pci_host_bridge(dev); + + if (a == &dev_attr_available_secure_streams.attr) + if (hb->nr_ide_streams < 0) + return 0; + + return a->mode; +} + +struct attribute_group pci_ide_attr_group = { + .attrs = pci_ide_attrs, + .is_visible = pci_ide_attr_visible, +}; + +/** + * pci_init_nr_ide_streams() - size the pool of IDE Stream resources + * @hb: host bridge boundary for the stream pool + * @nr: number of streams + * + * Enable IDE Stream establishment by setting the number of stream + * resources available at the host bridge. Platform init code must set + * this before the first pci_ide_stream_alloc() call. + * + * The "PCI_IDE" symbol namespace is required because this is typically + * a detail that is settled in early PCI init, i.e. only an expert or + * test module should consume this export. + */ +void pci_ide_init_nr_streams(struct pci_host_bridge *hb, int nr) +{ + hb->nr_ide_streams = nr; + sysfs_update_group(&hb->dev.kobj, &pci_ide_attr_group); +} +EXPORT_SYMBOL_NS_GPL(pci_ide_init_nr_streams, "PCI_IDE"); diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index b38bdd91e742..6c050eb9a91b 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -458,8 +458,11 @@ static inline void pci_npem_remove(struct pci_dev *dev) { } #ifdef CONFIG_PCI_IDE void pci_ide_init(struct pci_dev *dev); +extern struct attribute_group pci_ide_attr_group; +#define PCI_IDE_ATTR_GROUP (&pci_ide_attr_group) #else static inline void pci_ide_init(struct pci_dev *dev) { } +#define PCI_IDE_ATTR_GROUP NULL #endif #ifdef CONFIG_PCI_TSM diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index e1c915629864..a383cc32c84b 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -633,6 +633,16 @@ static void pci_release_host_bridge_dev(struct device *dev) kfree(bridge); } +static const struct attribute_group *pci_host_bridge_groups[] = { + PCI_IDE_ATTR_GROUP, + NULL, +}; + +static const struct device_type pci_host_bridge_type = { + .groups = pci_host_bridge_groups, + .release = pci_release_host_bridge_dev, +}; + static void pci_init_host_bridge(struct pci_host_bridge *bridge) { INIT_LIST_HEAD(&bridge->windows); @@ -652,6 +662,7 @@ static void pci_init_host_bridge(struct pci_host_bridge *bridge) bridge->native_dpc = 1; bridge->domain_nr = PCI_DOMAIN_NR_NOT_SET; bridge->native_cxl_error = 1; + bridge->dev.type = &pci_host_bridge_type; device_initialize(&bridge->dev); } @@ -665,7 +676,6 @@ struct pci_host_bridge *pci_alloc_host_bridge(size_t priv) return NULL; pci_init_host_bridge(bridge); - bridge->dev.release = pci_release_host_bridge_dev; return bridge; } diff --git a/include/linux/pci.h b/include/linux/pci.h index 0f9d6aece346..c2f18f31f7a7 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -660,6 +660,14 @@ void pci_set_host_bridge_release(struct pci_host_bridge *bridge, void (*release_fn)(struct pci_host_bridge *), void *release_data); +#ifdef CONFIG_PCI_IDE +void pci_ide_init_nr_streams(struct pci_host_bridge *hb, int nr); +#else +static inline void pci_ide_init_nr_streams(struct pci_host_bridge *hb, int nr) +{ +} +#endif + int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge); #define PCI_REGION_FLAG_MASK 0x0fU /* These bits of resource flags tell us the PCI region flags */
The limited number of link-encryption (IDE) streams that a given set of host bridges supports is a platform specific detail. Provide pci_ide_init_nr_streams() as a generic facility for either platform TSM drivers, or PCI core native IDE, to report the number available streams. After invoking pci_ide_init_nr_streams() an "available_secure_streams" attribute appears in PCI host bridge sysfs to convey that count. Cc: Bjorn Helgaas <bhelgaas@google.com> Cc: Lukas Wunner <lukas@wunner.de> Cc: Samuel Ortiz <sameo@rivosinc.com> Cc: Alexey Kardashevskiy <aik@amd.com> Cc: Xu Yilun <yilun.xu@linux.intel.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com> --- .../ABI/testing/sysfs-devices-pci-host-bridge | 12 ++++ drivers/pci/ide.c | 58 ++++++++++++++++++++ drivers/pci/pci.h | 3 + drivers/pci/probe.c | 12 ++++ include/linux/pci.h | 8 +++ 5 files changed, 92 insertions(+), 1 deletion(-)