On Thu, May 30, 2013 at 10:21 PM, Jiang Liu <liuj97@xxxxxxxxx> wrote:
> From: Jiang Liu <liuj97@xxxxxxxxx>
>
> PCI devices for SR-IOV virtual functions should only be created/
> destroyed by pci_enable_sriov()/pci_disable_sriov() because special
> data structures are associated with SR-IOV virtual functions.
> So hide hotplug related sysfs interfaces "remove" and "rescan" for
> SR-IOV virtual functions, otherwise it may causes memory leakage
> and other issues.
>
> Signed-off-by: Jiang Liu <jiang.liu@xxxxxxxxxx>
> Signed-off-by: Yijing Wang <wangyijing@xxxxxxxxxx>
> Signed-off-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
> Cc: Donald Dutile <ddutile@xxxxxxxxxx>
> Cc: Yinghai Lu <yinghai@xxxxxxxxxx>
> Cc: Ram Pai <linuxram@xxxxxxxxxx>
Applied to my -next branch for v3.11, thanks!
> ---
> drivers/pci/pci-sysfs.c | 30 ++++++++++++++++++++++++++++--
> 1 file changed, 28 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
> index 5b4a9d9..403da60 100644
> --- a/drivers/pci/pci-sysfs.c
> +++ b/drivers/pci/pci-sysfs.c
> @@ -325,6 +325,8 @@ dev_rescan_store(struct device *dev, struct device_attribute *attr,
> }
> return count;
> }
> +struct device_attribute dev_rescan_attr = __ATTR(rescan, (S_IWUSR|S_IWGRP),
> + NULL, dev_rescan_store);
>
> static void remove_callback(struct device *dev)
> {
> @@ -354,6 +356,8 @@ remove_store(struct device *dev, struct device_attribute *dummy,
> count = ret;
> return count;
> }
> +struct device_attribute dev_remove_attr = __ATTR(remove, (S_IWUSR|S_IWGRP),
> + NULL, remove_store);
>
> static ssize_t
> dev_bus_rescan_store(struct device *dev, struct device_attribute *attr,
> @@ -504,8 +508,6 @@ struct device_attribute pci_dev_attrs[] = {
> __ATTR(broken_parity_status,(S_IRUGO|S_IWUSR),
> broken_parity_status_show,broken_parity_status_store),
> __ATTR(msi_bus, 0644, msi_bus_show, msi_bus_store),
> - __ATTR(remove, (S_IWUSR|S_IWGRP), NULL, remove_store),
> - __ATTR(rescan, (S_IWUSR|S_IWGRP), NULL, dev_rescan_store),
> #if defined(CONFIG_PM_RUNTIME) && defined(CONFIG_ACPI)
> __ATTR(d3cold_allowed, 0644, d3cold_allowed_show, d3cold_allowed_store),
> #endif
> @@ -1463,6 +1465,29 @@ static umode_t pci_dev_attrs_are_visible(struct kobject *kobj,
> return a->mode;
> }
>
> +static struct attribute *pci_dev_hp_attrs[] = {
> + &dev_remove_attr.attr,
> + &dev_rescan_attr.attr,
> + NULL,
> +};
> +
> +static umode_t pci_dev_hp_attrs_are_visible(struct kobject *kobj,
> + struct attribute *a, int n)
> +{
> + struct device *dev = container_of(kobj, struct device, kobj);
> + struct pci_dev *pdev = to_pci_dev(dev);
> +
> + if (pdev->is_virtfn)
> + return 0;
> +
> + return a->mode;
> +}
> +
> +static struct attribute_group pci_dev_hp_attr_group = {
> + .attrs = pci_dev_hp_attrs,
> + .is_visible = pci_dev_hp_attrs_are_visible,
> +};
> +
> #ifdef CONFIG_PCI_IOV
> static struct attribute *sriov_dev_attrs[] = {
> &sriov_totalvfs_attr.attr,
> @@ -1494,6 +1519,7 @@ static struct attribute_group pci_dev_attr_group = {
>
> static const struct attribute_group *pci_dev_attr_groups[] = {
> &pci_dev_attr_group,
> + &pci_dev_hp_attr_group,
> #ifdef CONFIG_PCI_IOV
> &sriov_dev_attr_group,
> #endif
> --
> 1.8.1.2
>
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
