Skip to contentSkip to conversation

PVUSB: xm/xend support

RFC PATCH New Noboru Iwamatsu 1 participant 1 message Dec 10, 2009

lore
Share & tools
lore
#0 lore raw

RFC PATCH 1/1 PVUSB: xm/xend support

Hi,

Attached patches add xm/xend support for pvusb that I have explained in the last Xen Summit.

You can see the following slides to understand the usage.
http://www.xen.org/files/xensummit_intel09/PVUSBStatusUpdate.pdf
Limitations:
"xm usb-hc-create" accepts up to 16 ports, but, current usbfront can work with up to 15 ports. This may be bug and I'm preparing to fix it.

Both patches can be applied cleanly, but I have been testing only with xen-3.4-testing.hg.

This xm/xend support requires linux-2.6.18-xen.hg c/s 939 or above. I recommend latest tip.

This is the initial version. I don't consider the command interface is mature enough. Any comments and hacks are welcome.

tools/hotplug/Linux/xend.rules +1 -0
diff -r 20a0a2e75c52 -r 52f07c5779d8 tools/hotplug/Linux/xend.rules
@@ -1,3 +1,4 @@
 SUBSYSTEM=="pci", RUN+="socket:/org/xen/xend/udev_event"
 SUBSYSTEM=="scsi", RUN+="socket:/org/xen/xend/udev_event"
+SUBSYSTEM=="usb", RUN+="socket:/org/xen/xend/udev_event"
 #SUBSYSTEM=="net", KERNEL!="vif[0-9]*.[0-9]*|tap[0-9]*.[0-9]*", RUN+="socket:/org/xen/xend/udev_event"
tools/python/xen/util/vusb_util.py new file +338 -0

338 lines not on this page · raw message

tools/python/xen/xend/XendConfig.py +82 -0

100 lines not on this page · raw message

tools/python/xen/xend/XendDevices.py +2 -1
diff -r 20a0a2e75c52 -r 52f07c5779d8 tools/python/xen/xend/XendDevices.py
@@ -19,7 +19,7 @@
 # A collection of DevControllers 
 #
 
-from xen.xend.server import blkif, netif, tpmif, pciif, iopif, irqif, vfbif, vscsiif, netif2
+from xen.xend.server import blkif, netif, tpmif, pciif, iopif, irqif, vfbif, vscsiif, netif2, vusbif
 from xen.xend.server.BlktapController import BlktapController, Blktap2Controller
 from xen.xend.server.ConsoleController import ConsoleController
 
@@ -48,6 +48,7 @@
         'vkbd': vfbif.VkbdifController,
         'console': ConsoleController,
         'vscsi': vscsiif.VSCSIController,
+        'vusb': vusbif.VUSBController,
     }
 
     #@classmethod
tools/python/xen/xend/XendDomainInfo.py +31 -0
diff -r 20a0a2e75c52 -r 52f07c5779d8 tools/python/xen/xend/XendDomainInfo.py
@@ -1102,6 +1102,27 @@
 
         return True
 
+    def vusb_device_configure(self, dev_sxp, devid):
+        """Configure a virtual root port.
+        """
+        dev_class = sxp.name(dev_sxp)
+        if dev_class != 'vusb':
+            return False
+
+        dev_config = {}
+        ports = sxp.child(dev_sxp, 'port')
+        for port in ports[1:]:
+            try:
+                num, bus = port
+                dev_config['port-%i' % int(num)] = str(bus)
+            except TypeError:
+                pass
+
+        dev_control = self.getDeviceController(dev_class)
+        dev_control.reconfigureDevice(devid, dev_config)
+
+        return True
+
     def device_configure(self, dev_sxp, devid = None):
         """Configure an existing device.
         
@@ -1123,6 +1144,9 @@
         if dev_class == 'vscsi':
             return self.vscsi_device_configure(dev_sxp)
 
+        if dev_class == 'vusb':
+            return self.vusb_device_configure(dev_sxp, devid)
+
         for opt_val in dev_sxp[1:]:
             try:
                 dev_config[opt_val[0]] = opt_val[1]
@@ -1378,6 +1402,13 @@
                 return dev_info
         return None
 
+    def _getDeviceInfo_vusb(self, devid):
+        for dev_type, dev_info in self.info.all_devices_sxpr():
+            if dev_type != 'vusb':
+                continue
+            return dev_info
+        return None
+
     def _get_assigned_pci_devices(self, devid = 0):
         if self.domid is not None:
             return get_assigned_pci_devices(self.domid)
tools/python/xen/xend/XendNode.py +15 -0
diff -r 20a0a2e75c52 -r 52f07c5779d8 tools/python/xen/xend/XendNode.py
@@ -24,6 +24,7 @@
 from xen.util import Brctl
 from xen.util import pci as PciUtil
 from xen.util import vscsi_util
+from xen.util import vusb_util
 from xen.xend import XendAPIStore
 from xen.xend import osdep
 from xen.xend.XendConstants import *
@@ -478,6 +479,20 @@
 
                 return
 
+    def add_usbdev(self, busid):
+        # if the adding usb device should be owned by usbback
+        # and is probed by other usb drivers, seize it!
+        bus, intf = busid.split(':')
+        buses = vusb_util.get_assigned_buses()
+        if str(bus) in buses:
+            if not vusb_util.usb_intf_is_binded(busid):
+                log.debug("add_usb(): %s is binded to other driver" % busid)
+                vusb_util.unbind_usb_device(bus)
+                vusb_util.bind_usb_device(bus)
+        return
+
+    def remove_usbdev(self, busid):
+        log.debug("remove_usbdev(): Not implemented.")
 
 ##    def network_destroy(self, net_uuid):
  ##       del self.networks[net_uuid]
tools/python/xen/xend/server/udevevent.py +12 -0
diff -r 20a0a2e75c52 -r 52f07c5779d8 tools/python/xen/xend/server/udevevent.py
@@ -60,6 +60,18 @@
                     log.info("Removing scsi device %s", hctl)
                     XendNode.instance().remove_PSCSI(hctl)
 
+            elif (udev_event.get('SUBSYSTEM', None) == 'usb'):
+                busid = udev_event.get('KERNEL', None)
+                if busid:
+                    if len(busid.split(':')) != 2:
+                        return
+                if (udev_event['ACTION'] == 'add'):
+                    log.info("Adding usb device %s", busid)
+                    XendNode.instance().add_usbdev(busid)
+                elif (udev_event['ACTION'] == 'remove'):
+                    log.info("Removing usb device %s", busid)
+                    XendNode.instance().remove_usbdev(busid)
+
             elif (udev_event.get('SUBSYSTEM', None) == 'net'):
                 interface = udev_event.get('INTERFACE', None)
                 if (udev_event['ACTION'] == 'add'):
tools/python/xen/xend/server/vusbif.py new file +126 -0

126 lines not on this page · raw message

tools/python/xen/xm/create.py +45 -0

63 lines not on this page · raw message

tools/python/xen/xm/main.py +151 -0

193 lines not on this page · raw message

tools/hotplug/Linux/xend.rules +1 -0
diff -r d12425fad689 -r 8772e0bc4b9a tools/hotplug/Linux/xend.rules
@@ -1,3 +1,4 @@
 SUBSYSTEM=="pci", RUN+="socket:/org/xen/xend/udev_event"
 SUBSYSTEM=="scsi", RUN+="socket:/org/xen/xend/udev_event"
+SUBSYSTEM=="usb", RUN+="socket:/org/xen/xend/udev_event"
 #SUBSYSTEM=="net", KERNEL!="vif[0-9]*.[0-9]*|tap[0-9]*.[0-9]*", RUN+="socket:/org/xen/xend/udev_event"
tools/python/xen/util/vusb_util.py new file +338 -0

338 lines not on this page · raw message

tools/python/xen/xend/XendConfig.py +82 -0

100 lines not on this page · raw message

tools/python/xen/xend/XendDevices.py +2 -1
diff -r d12425fad689 -r 8772e0bc4b9a tools/python/xen/xend/XendDevices.py
@@ -19,7 +19,7 @@
 # A collection of DevControllers 
 #
 
-from xen.xend.server import blkif, netif, tpmif, pciif, iopif, irqif, vfbif, vscsiif
+from xen.xend.server import blkif, netif, tpmif, pciif, iopif, irqif, vfbif, vscsiif, vusbif
 from xen.xend.server.BlktapController import BlktapController
 from xen.xend.server.ConsoleController import ConsoleController
 
@@ -46,6 +46,7 @@
         'vkbd': vfbif.VkbdifController,
         'console': ConsoleController,
         'vscsi': vscsiif.VSCSIController,
+        'vusb': vusbif.VUSBController,
     }
 
     #@classmethod
tools/python/xen/xend/XendDomainInfo.py +31 -0
diff -r d12425fad689 -r 8772e0bc4b9a tools/python/xen/xend/XendDomainInfo.py
@@ -1022,6 +1022,27 @@
 
         return True
 
+    def vusb_device_configure(self, dev_sxp, devid):
+        """Configure a virtual root port.
+        """
+        dev_class = sxp.name(dev_sxp)
+        if dev_class != 'vusb':
+            return False
+
+        dev_config = {}
+        ports = sxp.child(dev_sxp, 'port')
+        for port in ports[1:]:
+            try:
+                num, bus = port
+                dev_config['port-%i' % int(num)] = str(bus)
+            except TypeError:
+                pass
+
+        dev_control = self.getDeviceController(dev_class)
+        dev_control.reconfigureDevice(devid, dev_config)
+
+        return True
+
     def device_configure(self, dev_sxp, devid = None):
         """Configure an existing device.
         
@@ -1043,6 +1064,9 @@
         if dev_class == 'vscsi':
             return self.vscsi_device_configure(dev_sxp)
 
+        if dev_class == 'vusb':
+            return self.vusb_device_configure(dev_sxp, devid)
+
         for opt_val in dev_sxp[1:]:
             try:
                 dev_config[opt_val[0]] = opt_val[1]
@@ -1275,6 +1299,13 @@
                 return dev_info
         return None
 
+    def _getDeviceInfo_vusb(self, devid):
+        for dev_type, dev_info in self.info.all_devices_sxpr():
+            if dev_type != 'vusb':
+                continue
+            return dev_info
+        return None
+
     def _get_assigned_pci_devices(self, devid = 0):
         if self.domid is not None:
             return get_assigned_pci_devices(self.domid)
tools/python/xen/xend/XendNode.py +15 -0
diff -r d12425fad689 -r 8772e0bc4b9a tools/python/xen/xend/XendNode.py
@@ -24,6 +24,7 @@
 from xen.util import Brctl
 from xen.util import pci as PciUtil
 from xen.util import vscsi_util
+from xen.util import vusb_util
 from xen.xend import XendAPIStore
 from xen.xend import osdep
 
@@ -411,6 +412,20 @@
                 self.save_PSCSIs()
                 return
 
+    def add_usbdev(self, busid):
+        # if the adding usb device should be owned by usbback
+        # and is probed by other usb drivers, seize it!
+        bus, intf = busid.split(':')
+        buses = vusb_util.get_assigned_buses()
+        if str(bus) in buses:
+            if not vusb_util.usb_intf_is_binded(busid):
+                log.debug("add_usb(): %s is binded to other driver" % busid)
+                vusb_util.unbind_usb_device(bus)
+                vusb_util.bind_usb_device(bus)
+        return
+
+    def remove_usbdev(self, busid):
+        log.debug("remove_usbdev(): Not implemented.")
 
 ##    def network_destroy(self, net_uuid):
  ##       del self.networks[net_uuid]
tools/python/xen/xend/server/udevevent.py +12 -0
diff -r d12425fad689 -r 8772e0bc4b9a tools/python/xen/xend/server/udevevent.py
@@ -60,6 +60,18 @@
                     log.info("Removing scsi device %s", hctl)
                     XendNode.instance().remove_PSCSI(hctl)
 
+            elif (udev_event.get('SUBSYSTEM', None) == 'usb'):
+                busid = udev_event.get('KERNEL', None)
+                if busid:
+                    if len(busid.split(':')) != 2:
+                        return
+                if (udev_event['ACTION'] == 'add'):
+                    log.info("Adding usb device %s", busid)
+                    XendNode.instance().add_usbdev(busid)
+                elif (udev_event['ACTION'] == 'remove'):
+                    log.info("Removing usb device %s", busid)
+                    XendNode.instance().remove_usbdev(busid)
+
             elif (udev_event.get('SUBSYSTEM', None) == 'net'):
                 interface = udev_event.get('INTERFACE', None)
                 if (udev_event['ACTION'] == 'add'):
tools/python/xen/xend/server/vusbif.py new file +126 -0

126 lines not on this page · raw message

tools/python/xen/xm/create.py +45 -0

63 lines not on this page · raw message

tools/python/xen/xm/main.py +151 -0

193 lines not on this page · raw message

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel