Skip to contentSkip to conversation

Drivers: hv: vmbus: Add vendor and device atttributes

PATCH Superseded K. Y. Srinivasan 2 participants 3 messages Dec 17, 2015 – Dec 21, 2015 Hyper-V/Azure core and drivers

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Drivers: hv: vmbus: Add vendor and device atttributes

Add vendor and device attributes to VMBUS devices. These will be used by Hyper-V tools as well user-level RDMA libraries that will use the vendor/device tuple to discover the RDMA device.

---
 Documentation/ABI/stable/sysfs-bus-vmbus |   14 ++++++++++++++
 drivers/hv/vmbus_drv.c                   |   21 +++++++++++++++++++++
 include/linux/hyperv.h                   |    2 ++
 3 files changed, 37 insertions(+), 0 deletions(-)
Documentation/ABI/stable/sysfs-bus-vmbus +14 -0
index 636e938..5d0125f 100644
@@ -27,3 +27,17 @@ Description:	The mapping of which primary/sub channels are bound to which
 		Virtual Processors.
 		Format: <channel's child_relid:the bound cpu's number>
 Users:		tools/hv/lsvmbus
+
+What:		/sys/bus/vmbus/devices/vmbus_*/device
+Date:		Dec. 2015
+KernelVersion:	4.5
+Contact:	K. Y. Srinivasan <[email protected]>
+Description:	The 16 bit device ID of the device
+Users:		tools/hv/lsvmbus and user level RDMA libraries
+
+What:		/sys/bus/vmbus/devices/vmbus_*/vendor
+Date:		Dec. 2015
+KernelVersion:	4.5
+Contact:	K. Y. Srinivasan <[email protected]>
+Description:	The 16 bit vendor ID of the device
+Users:		tools/hv/lsvmbus and user level RDMA libraries
drivers/hv/vmbus_drv.c +21 -0
index 328e4c3..3668a95 100644
@@ -477,6 +477,24 @@ static ssize_t channel_vp_mapping_show(struct device *dev,
 }
 static DEVICE_ATTR_RO(channel_vp_mapping);
 
+static ssize_t vendor_show(struct device *dev,
+			   struct device_attribute *dev_attr,
+			   char *buf)
+{
+	struct hv_device *hv_dev = device_to_hv_device(dev);
+	return sprintf(buf, "0x%x\n", hv_dev->vendor_id);
+}
+static DEVICE_ATTR_RO(vendor);
+
+static ssize_t device_show(struct device *dev,
+			   struct device_attribute *dev_attr,
+			   char *buf)
+{
+	struct hv_device *hv_dev = device_to_hv_device(dev);
+	return sprintf(buf, "0x%x\n", hv_dev->device_id);
+}
+static DEVICE_ATTR_RO(device);
+
 /* Set up per device attributes in /sys/bus/vmbus/devices/<bus device> */
 static struct attribute *vmbus_attrs[] = {
 	&dev_attr_id.attr,
@@ -502,6 +520,8 @@ static struct attribute *vmbus_attrs[] = {
 	&dev_attr_in_read_bytes_avail.attr,
 	&dev_attr_in_write_bytes_avail.attr,
 	&dev_attr_channel_vp_mapping.attr,
+	&dev_attr_vendor.attr,
+	&dev_attr_device.attr,
 	NULL,
 };
 ATTRIBUTE_GROUPS(vmbus);
@@ -957,6 +977,7 @@ struct hv_device *vmbus_device_create(const uuid_le *type,
 	memcpy(&child_device_obj->dev_type, type, sizeof(uuid_le));
 	memcpy(&child_device_obj->dev_instance, instance,
 	       sizeof(uuid_le));
+	child_device_obj->vendor_id = 0x1414; /* MSFT vendor ID */
 
 
 	return child_device_obj;
include/linux/hyperv.h +2 -0
index 179ff33..02478c6 100644
@@ -959,6 +959,8 @@ struct hv_device {
 
 	/* the device instance id of this device */
 	uuid_le dev_instance;
+	u16 vendor_id;
+	u16 device_id;
 
 	struct device device;
 
Signature · 1 line
1.7.4.1
#1 lore raw
Quoted 16 lines · K. Y. Srinivasan

Add vendor and device attributes to VMBUS devices. These will be used by Hyper-V tools as well user-level RDMA libraries that will use the vendor/device tuple to discover the RDMA device.

---
 Documentation/ABI/stable/sysfs-bus-vmbus |   14 ++++++++++++++
 drivers/hv/vmbus_drv.c                   |   21 +++++++++++++++++++++
 include/linux/hyperv.h                   |    2 ++
 3 files changed, 37 insertions(+), 0 deletions(-)
Documentation/ABI/stable/sysfs-bus-vmbus +0 -0
index 636e938..5d0125f 100644

Documentation/ABI/stable/sysfs-bus-vmbus Description: The mapping of which primary/sub channels are bound to which · line 31

Quoted 5 lines
Documentation/ABI/stable/sysfs-bus-vmbus +2 -0
@@ -27,3 +27,17 @@ Description:	The mapping of which primary/sub channels are bound to which
 		Virtual Processors.
 		Format: <channel's child_relid:the bound cpu's number>
 Users:		tools/hv/lsvmbus
+
+What:		/sys/bus/vmbus/devices/vmbus_*/device

Shouldn't that be 'device_id' as 'device' is a symlink in the sysfs tree?

Documentation/ABI/stable/sysfs-bus-vmbus Description: The mapping of which primary/sub channels are bound to which · line 38

Quoted 7 lines
Documentation/ABI/stable/sysfs-bus-vmbus +7 -0
+Date:		Dec. 2015
+KernelVersion:	4.5
+Contact:	K. Y. Srinivasan <[email protected]>
+Description:	The 16 bit device ID of the device
+Users:		tools/hv/lsvmbus and user level RDMA libraries
+
+What:		/sys/bus/vmbus/devices/vmbus_*/vendor

'vendor_id'?

Quoted 44 lines
Documentation/ABI/stable/sysfs-bus-vmbus +5 -0
+Date:		Dec. 2015
+KernelVersion:	4.5
+Contact:	K. Y. Srinivasan <[email protected]>
+Description:	The 16 bit vendor ID of the device
+Users:		tools/hv/lsvmbus and user level RDMA libraries
drivers/hv/vmbus_drv.c +20 -0
index 328e4c3..3668a95 100644
@@ -477,6 +477,24 @@ static ssize_t channel_vp_mapping_show(struct device *dev,
 }
 static DEVICE_ATTR_RO(channel_vp_mapping);
 
+static ssize_t vendor_show(struct device *dev,
+			   struct device_attribute *dev_attr,
+			   char *buf)
+{
+	struct hv_device *hv_dev = device_to_hv_device(dev);
+	return sprintf(buf, "0x%x\n", hv_dev->vendor_id);
+}
+static DEVICE_ATTR_RO(vendor);
+
+static ssize_t device_show(struct device *dev,
+			   struct device_attribute *dev_attr,
+			   char *buf)
+{
+	struct hv_device *hv_dev = device_to_hv_device(dev);
+	return sprintf(buf, "0x%x\n", hv_dev->device_id);
+}
+static DEVICE_ATTR_RO(device);
+
 /* Set up per device attributes in /sys/bus/vmbus/devices/<bus device> */
 static struct attribute *vmbus_attrs[] = {
 	&dev_attr_id.attr,
@@ -502,6 +520,8 @@ static struct attribute *vmbus_attrs[] = {
 	&dev_attr_in_read_bytes_avail.attr,
 	&dev_attr_in_write_bytes_avail.attr,
 	&dev_attr_channel_vp_mapping.attr,
+	&dev_attr_vendor.attr,
+	&dev_attr_device.attr,
 	NULL,
 };
 ATTRIBUTE_GROUPS(vmbus);

drivers/hv/vmbus_drv.c struct hv_device *vmbus_device_create(const uuid_le *type, · line 980

Quoted 4 lines
drivers/hv/vmbus_drv.c +1 -0
@@ -957,6 +977,7 @@ struct hv_device *vmbus_device_create(const uuid_le *type,
 	memcpy(&child_device_obj->dev_type, type, sizeof(uuid_le));
 	memcpy(&child_device_obj->dev_instance, instance,
 	       sizeof(uuid_le));
+	child_device_obj->vendor_id = 0x1414; /* MSFT vendor ID */

So this is always the same value?

And device_id is never set? What does it default to? Why include it in this patch if it's never used?

thanks,

greg k-h

#2 lore raw
Quoted 31 lines

-----Original Message-----
From: Greg KH [mailto:[email protected]]
Sent: Monday, December 21, 2015 1:15 PM
To: KY Srinivasan <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH 1/1] Drivers: hv: vmbus: Add vendor and device atttributes

Quoted 4 lines · K. Y. Srinivasan

Add vendor and device attributes to VMBUS devices. These will be used by Hyper-V tools as well user-level RDMA libraries that will use the vendor/device tuple to discover the RDMA device.

Review

Quoted 8 lines
---
 Documentation/ABI/stable/sysfs-bus-vmbus |   14 ++++++++++++++
 drivers/hv/vmbus_drv.c                   |   21 +++++++++++++++++++++
 include/linux/hyperv.h                   |    2 ++
 3 files changed, 37 insertions(+), 0 deletions(-)
(quoted diff) +0 -0

b/Documentation/ABI/stable/sysfs-bus-vmbus

Documentation/ABI/stable/sysfs-bus-vmbus Description: The mapping of which primary/sub

Quoted 4 lines

index 636e938..5d0125f 100644

Documentation/ABI/stable/sysfs-bus-vmbus +0 -0
@@ -27,3 +27,17 @@ Description:	The mapping of which primary/sub

channels are bound to which

Quoted 8 lines

Documentation/ABI/stable/sysfs-bus-vmbus Description: The mapping of which primary/sub channels are bound to which · line 31

Quoted 5 lines
Documentation/ABI/stable/sysfs-bus-vmbus +2 -0
 		Virtual Processors.
 		Format: <channel's child_relid:the bound cpu's number>
 Users:		tools/hv/lsvmbus
+
+What:		/sys/bus/vmbus/devices/vmbus_*/device

Shouldn't that be 'device_id' as 'device' is a symlink in the sysfs tree?

We currently have device_id as one of the attributes - this is the instance GUID. We want to add the 16 bit device attribute to VMBUS devices.

Quoted 10 lines

Documentation/ABI/stable/sysfs-bus-vmbus Description: The mapping of which primary/sub channels are bound to which · line 38

Quoted 8 lines
Documentation/ABI/stable/sysfs-bus-vmbus +7 -0
+Date:		Dec. 2015
+KernelVersion:	4.5
+Contact:	K. Y. Srinivasan <[email protected]>
+Description:	The 16 bit device ID of the device
+Users:		tools/hv/lsvmbus and user level RDMA libraries
+
+What:		/sys/bus/vmbus/devices/vmbus_*/vendor

'vendor_id'?

We want to have the device and vendor attributes like the PCI devices have.

Quoted 49 lines

drivers/hv/vmbus_drv.c static ssize_t channel_vp_mapping_show(struct

Quoted 12 lines
Documentation/ABI/stable/sysfs-bus-vmbus +5 -0
+Date:		Dec. 2015
+KernelVersion:	4.5
+Contact:	K. Y. Srinivasan <[email protected]>
+Description:	The 16 bit vendor ID of the device
+Users:		tools/hv/lsvmbus and user level RDMA libraries
drivers/hv/vmbus_drv.c +0 -0
index 328e4c3..3668a95 100644
@@ -477,6 +477,24 @@ static ssize_t channel_vp_mapping_show(struct

device *dev,

Quoted 12 lines
drivers/hv/vmbus_drv.c +9 -0
 }
 static DEVICE_ATTR_RO(channel_vp_mapping);
 
+static ssize_t vendor_show(struct device *dev,
+			   struct device_attribute *dev_attr,
+			   char *buf)
+{
+	struct hv_device *hv_dev = device_to_hv_device(dev);
+	return sprintf(buf, "0x%x\n", hv_dev->vendor_id);
+}
+static DEVICE_ATTR_RO(vendor);
+

drivers/hv/vmbus_drv.c static ssize_t channel_vp_mapping_show(struct device *dev,

Quoted 10 lines
drivers/hv/vmbus_drv.c +9 -0
+static ssize_t device_show(struct device *dev,
+			   struct device_attribute *dev_attr,
+			   char *buf)
+{
+	struct hv_device *hv_dev = device_to_hv_device(dev);
+	return sprintf(buf, "0x%x\n", hv_dev->device_id);
+}
+static DEVICE_ATTR_RO(device);
+
 /* Set up per device attributes in /sys/bus/vmbus/devices/<bus device>

*/

drivers/hv/vmbus_drv.c struct hv_device *vmbus_device_create(const

Quoted 12 lines
drivers/hv/vmbus_drv.c +2 -0
 static struct attribute *vmbus_attrs[] = {
 	&dev_attr_id.attr,
@@ -502,6 +520,8 @@ static struct attribute *vmbus_attrs[] = {
 	&dev_attr_in_read_bytes_avail.attr,
 	&dev_attr_in_write_bytes_avail.attr,
 	&dev_attr_channel_vp_mapping.attr,
+	&dev_attr_vendor.attr,
+	&dev_attr_device.attr,
 	NULL,
 };
 ATTRIBUTE_GROUPS(vmbus);
@@ -957,6 +977,7 @@ struct hv_device *vmbus_device_create(const

uuid_le *type,

Quoted 6 lines

drivers/hv/vmbus_drv.c struct hv_device *vmbus_device_create(const uuid_le *type, · line 980

Quoted 4 lines
drivers/hv/vmbus_drv.c +1 -0
 	memcpy(&child_device_obj->dev_type, type, sizeof(uuid_le));
 	memcpy(&child_device_obj->dev_instance, instance,
 	       sizeof(uuid_le));
+	child_device_obj->vendor_id = 0x1414; /* MSFT vendor ID */

So this is always the same value?

The MSFT PCI Vendor ID is the default value.

Quoted 3 lines

And device_id is never set? What does it default to? Why include it in this patch if it's never used?

I will add that and resubmit.

Regards,

K. Y