4.17-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Stephen Hemminger <step...@networkplumber.org>

commit f59acbc5e0f7f90452efd4c3318d5e5ec042c3e0 upstream.

In 4.9 kernel, the sysfs files for Hyper-V VMBus changed name but
the documentation files were not updated. The current sysfs file
names are /sys/bus/vmbus/devices/<UUID>/...

See commit 9a56e5d6a0ba ("Drivers: hv: make VMBus bus ids persistent")
and commit f6b2db084b65 ("vmbus: make sysfs names consistent with PCI")

Reported-by: Michael Kelley <mikel...@microsoft.com>
Signed-off-by: Stephen Hemminger <sthem...@microsoft.com>
Cc: sta...@vger.kernel.org
Signed-off-by: K. Y. Srinivasan <k...@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>

---
 Documentation/ABI/stable/sysfs-bus-vmbus |   40 +++++++++++++++----------------
 1 file changed, 20 insertions(+), 20 deletions(-)

--- a/Documentation/ABI/stable/sysfs-bus-vmbus
+++ b/Documentation/ABI/stable/sysfs-bus-vmbus
@@ -1,25 +1,25 @@
-What:          /sys/bus/vmbus/devices/vmbus_*/id
+What:          /sys/bus/vmbus/devices/<UUID>/id
 Date:          Jul 2009
 KernelVersion: 2.6.31
 Contact:       K. Y. Srinivasan <k...@microsoft.com>
 Description:   The VMBus child_relid of the device's primary channel
 Users:         tools/hv/lsvmbus
 
-What:          /sys/bus/vmbus/devices/vmbus_*/class_id
+What:          /sys/bus/vmbus/devices/<UUID>/class_id
 Date:          Jul 2009
 KernelVersion: 2.6.31
 Contact:       K. Y. Srinivasan <k...@microsoft.com>
 Description:   The VMBus interface type GUID of the device
 Users:         tools/hv/lsvmbus
 
-What:          /sys/bus/vmbus/devices/vmbus_*/device_id
+What:          /sys/bus/vmbus/devices/<UUID>/device_id
 Date:          Jul 2009
 KernelVersion: 2.6.31
 Contact:       K. Y. Srinivasan <k...@microsoft.com>
 Description:   The VMBus interface instance GUID of the device
 Users:         tools/hv/lsvmbus
 
-What:          /sys/bus/vmbus/devices/vmbus_*/channel_vp_mapping
+What:          /sys/bus/vmbus/devices/<UUID>/channel_vp_mapping
 Date:          Jul 2015
 KernelVersion: 4.2.0
 Contact:       K. Y. Srinivasan <k...@microsoft.com>
@@ -28,112 +28,112 @@ Description:      The mapping of which primar
                Format: <channel's child_relid:the bound cpu's number>
 Users:         tools/hv/lsvmbus
 
-What:          /sys/bus/vmbus/devices/vmbus_*/device
+What:          /sys/bus/vmbus/devices/<UUID>/device
 Date:          Dec. 2015
 KernelVersion: 4.5
 Contact:       K. Y. Srinivasan <k...@microsoft.com>
 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
+What:          /sys/bus/vmbus/devices/<UUID>/vendor
 Date:          Dec. 2015
 KernelVersion: 4.5
 Contact:       K. Y. Srinivasan <k...@microsoft.com>
 Description:   The 16 bit vendor ID of the device
 Users:         tools/hv/lsvmbus and user level RDMA libraries
 
-What:          /sys/bus/vmbus/devices/vmbus_*/channels/NN
+What:          /sys/bus/vmbus/devices/<UUID>/channels/<N>
 Date:          September. 2017
 KernelVersion: 4.14
 Contact:       Stephen Hemminger <sthem...@microsoft.com>
 Description:   Directory for per-channel information
                NN is the VMBUS relid associtated with the channel.
 
-What:          /sys/bus/vmbus/devices/vmbus_*/channels/NN/cpu
+What:          /sys/bus/vmbus/devices/<UUID>/channels/<N>/cpu
 Date:          September. 2017
 KernelVersion: 4.14
 Contact:       Stephen Hemminger <sthem...@microsoft.com>
 Description:   VCPU (sub)channel is affinitized to
 Users:         tools/hv/lsvmbus and other debugging tools
 
-What:          /sys/bus/vmbus/devices/vmbus_*/channels/NN/cpu
+What:          /sys/bus/vmbus/devices/<UUID>/channels/<N>/cpu
 Date:          September. 2017
 KernelVersion: 4.14
 Contact:       Stephen Hemminger <sthem...@microsoft.com>
 Description:   VCPU (sub)channel is affinitized to
 Users:         tools/hv/lsvmbus and other debugging tools
 
-What:          /sys/bus/vmbus/devices/vmbus_*/channels/NN/in_mask
+What:          /sys/bus/vmbus/devices/<UUID>/channels/<N>/in_mask
 Date:          September. 2017
 KernelVersion: 4.14
 Contact:       Stephen Hemminger <sthem...@microsoft.com>
 Description:   Host to guest channel interrupt mask
 Users:         Debugging tools
 
-What:          /sys/bus/vmbus/devices/vmbus_*/channels/NN/latency
+What:          /sys/bus/vmbus/devices/<UUID>/channels/<N>/latency
 Date:          September. 2017
 KernelVersion: 4.14
 Contact:       Stephen Hemminger <sthem...@microsoft.com>
 Description:   Channel signaling latency
 Users:         Debugging tools
 
-What:          /sys/bus/vmbus/devices/vmbus_*/channels/NN/out_mask
+What:          /sys/bus/vmbus/devices/<UUID>/channels/<N>/out_mask
 Date:          September. 2017
 KernelVersion: 4.14
 Contact:       Stephen Hemminger <sthem...@microsoft.com>
 Description:   Guest to host channel interrupt mask
 Users:         Debugging tools
 
-What:          /sys/bus/vmbus/devices/vmbus_*/channels/NN/pending
+What:          /sys/bus/vmbus/devices/<UUID>/channels/<N>/pending
 Date:          September. 2017
 KernelVersion: 4.14
 Contact:       Stephen Hemminger <sthem...@microsoft.com>
 Description:   Channel interrupt pending state
 Users:         Debugging tools
 
-What:          /sys/bus/vmbus/devices/vmbus_*/channels/NN/read_avail
+What:          /sys/bus/vmbus/devices/<UUID>/channels/<N>/read_avail
 Date:          September. 2017
 KernelVersion: 4.14
 Contact:       Stephen Hemminger <sthem...@microsoft.com>
 Description:   Bytes available to read
 Users:         Debugging tools
 
-What:          /sys/bus/vmbus/devices/vmbus_*/channels/NN/write_avail
+What:          /sys/bus/vmbus/devices/<UUID>/channels/<N>/write_avail
 Date:          September. 2017
 KernelVersion: 4.14
 Contact:       Stephen Hemminger <sthem...@microsoft.com>
 Description:   Bytes available to write
 Users:         Debugging tools
 
-What:          /sys/bus/vmbus/devices/vmbus_*/channels/NN/events
+What:          /sys/bus/vmbus/devices/<UUID>/channels/<N>/events
 Date:          September. 2017
 KernelVersion: 4.14
 Contact:       Stephen Hemminger <sthem...@microsoft.com>
 Description:   Number of times we have signaled the host
 Users:         Debugging tools
 
-What:          /sys/bus/vmbus/devices/vmbus_*/channels/NN/interrupts
+What:          /sys/bus/vmbus/devices/<UUID>/channels/<N>/interrupts
 Date:          September. 2017
 KernelVersion: 4.14
 Contact:       Stephen Hemminger <sthem...@microsoft.com>
 Description:   Number of times we have taken an interrupt (incoming)
 Users:         Debugging tools
 
-What:          /sys/bus/vmbus/devices/vmbus_*/channels/NN/subchannel_id
+What:          /sys/bus/vmbus/devices/<UUID>/channels/<N>/subchannel_id
 Date:          January. 2018
 KernelVersion: 4.16
 Contact:       Stephen Hemminger <sthem...@microsoft.com>
 Description:   Subchannel ID associated with VMBUS channel
 Users:         Debugging tools and userspace drivers
 
-What:          /sys/bus/vmbus/devices/vmbus_*/channels/NN/monitor_id
+What:          /sys/bus/vmbus/devices/<UUID>/channels/<N>/monitor_id
 Date:          January. 2018
 KernelVersion: 4.16
 Contact:       Stephen Hemminger <sthem...@microsoft.com>
 Description:   Monitor bit associated with channel
 Users:         Debugging tools and userspace drivers
 
-What:          /sys/bus/vmbus/devices/vmbus_*/channels/NN/ring
+What:          /sys/bus/vmbus/devices/<UUID>/channels/<N>/ring
 Date:          January. 2018
 KernelVersion: 4.16
 Contact:       Stephen Hemminger <sthem...@microsoft.com>


Reply via email to