Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07604628 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'bus-agnostic-num-vf' 



Phil Sutter says:

====================
Retrieve number of VFs in a bus-agnostic way

Previously, it was assumed that only PCI NICs would be capable of having
virtual functions - with my proposed enhancement of dummy NIC driver
implementing (fake) ones for testing purposes, this is no longer true.

Discussion of said patch has led to the suggestion of implementing a
bus-agnostic method for VF count retrieval so rtnetlink could work with
both real VF-capable PCI NICs as well as my dummy modifications without
introducing ugly hacks.

The following series tries to achieve just that by introducing a bus
type callback to retrieve a device's number of VFs, implementing this
callback for PCI bus and finally adjusting rtnetlink to make use of the
generalized infrastructure.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6c59ebd3 9af15c38

drivers/pci/pci-driver.c

+6 −0
Original line number Diff line number Diff line
@@ -1432,6 +1432,11 @@ static int pci_uevent(struct device *dev, struct kobj_uevent_env *env) 
	return 0;

}



static int pci_bus_num_vf(struct device *dev)

{

	return pci_num_vf(to_pci_dev(dev));

}



struct bus_type pci_bus_type = {

	.name		= "pci",

	.match		= pci_bus_match,
@@ -1443,6 +1448,7 @@ struct bus_type pci_bus_type = { 
	.bus_groups	= pci_bus_groups,

	.drv_groups	= pci_drv_groups,

	.pm		= PCI_PM_OPS_PTR,

	.num_vf		= pci_bus_num_vf,

};

EXPORT_SYMBOL(pci_bus_type);

include/linux/device.h

+11 −0
Original line number Diff line number Diff line
@@ -88,6 +88,8 @@ extern void bus_remove_file(struct bus_type *, struct bus_attribute *); 
 *

 * @suspend:	Called when a device on this bus wants to go to sleep mode.

 * @resume:	Called to bring a device on this bus out of sleep mode.

 * @num_vf:	Called to find out how many virtual functions a device on this

 *		bus supports.

 * @pm:		Power management operations of this bus, callback the specific

 *		device driver's pm-ops.

 * @iommu_ops:  IOMMU specific operations for this bus, used to attach IOMMU
@@ -127,6 +129,8 @@ struct bus_type { 
	int (*suspend)(struct device *dev, pm_message_t state);

	int (*resume)(struct device *dev);



	int (*num_vf)(struct device *dev);



	const struct dev_pm_ops *pm;



	const struct iommu_ops *iommu_ops;
@@ -1140,6 +1144,13 @@ extern int device_online(struct device *dev); 
extern void set_primary_fwnode(struct device *dev, struct fwnode_handle *fwnode);

extern void set_secondary_fwnode(struct device *dev, struct fwnode_handle *fwnode);



static inline int dev_num_vf(struct device *dev)

{

	if (dev->bus && dev->bus->num_vf)

		return dev->bus->num_vf(dev);

	return 0;

}



/*

 * Root device objects for grouping under /sys/devices

 */

include/linux/pci.h

+0 −2
Original line number Diff line number Diff line
@@ -885,7 +885,6 @@ void pcibios_setup_bridge(struct pci_bus *bus, unsigned long type); 
void pci_sort_breadthfirst(void);

#define dev_is_pci(d) ((d)->bus == &pci_bus_type)

#define dev_is_pf(d) ((dev_is_pci(d) ? to_pci_dev(d)->is_physfn : false))

#define dev_num_vf(d) ((dev_is_pci(d) ? pci_num_vf(to_pci_dev(d)) : 0))



/* Generic PCI functions exported to card drivers */
@@ -1630,7 +1629,6 @@ static inline int pci_get_new_domain_nr(void) { return -ENOSYS; } 


#define dev_is_pci(d) (false)

#define dev_is_pf(d) (false)

#define dev_num_vf(d) (0)

#endif /* CONFIG_PCI */



/* Include architecture-dependent settings and functions */

net/core/rtnetlink.c

+1 −2
Original line number Diff line number Diff line
@@ -837,8 +837,7 @@ static void copy_rtnl_link_stats(struct rtnl_link_stats *a, 
static inline int rtnl_vfinfo_size(const struct net_device *dev,

				   u32 ext_filter_mask)

{

	if (dev->dev.parent && dev_is_pci(dev->dev.parent) &&

	    (ext_filter_mask & RTEXT_FILTER_VF)) {

	if (dev->dev.parent && (ext_filter_mask & RTEXT_FILTER_VF)) {

		int num_vfs = dev_num_vf(dev->dev.parent);

		size_t size = nla_total_size(0);

		size += num_vfs *