Merge pull request #215 from xapi-project/sr-iov

Merge feature SR-IOV to master

Author: mseri

lib/jbuild

@@ -32,7 +32,7 @@ let runtime_coverage_enabled, coverage_dep =
   else
     "disabled.ml", ""
 
-let rewriters = ["ppx_deriving_rpc"]
+let rewriters = ["ppx_deriving_rpc"; "ppx_sexp_conv"]
 let flags = flags rewriters
 
 let () = Printf.ksprintf Jbuild_plugin.V1.send {|
@@ -56,6 +56,7 @@ let () = Printf.ksprintf Jbuild_plugin.V1.send {|
     message-switch-core
     message-switch-unix
     ppx_deriving_rpc
+    ppx_sexp_conv
     re
     rpclib
     rpclib.xml

lib/xcp_pci.ml

@@ -0,0 +1,17 @@
+open Sexplib.Std
+
+type address = {
+	domain: int;
+	bus: int;
+	dev: int;
+	fn: int;
+}
+[@@deriving sexp, rpc, rpcty]
+
+let address_of_string str =
+	Scanf.sscanf str "%04x:%02x:%02x.%02x"
+		(fun domain bus dev fn -> {domain; bus; dev; fn})
+
+let string_of_address address =
+	Printf.sprintf "%04x:%02x:%02x.%01x"
+		address.domain address.bus address.dev address.fn

network/network_interface.ml

@@ -18,7 +18,6 @@ module D = Debug.Make(struct let name = "network_interface" end)
 open D
 
 (** {2 Helper functions} *)
-
 let service_name = "networkd"
 let queue_name = ref (Xcp_service.common_prefix ^ service_name)
 
@@ -325,6 +324,13 @@ module Interface_API(R : RPC) = struct
         ["Check interface existence"]
         (debug_info_p @-> iface_name_p @-> returning result err)
 
+    let get_pci_bus_path =
+      let result = Param.mk ~description:["PCI bus path"] Types.string in
+      declare
+        "Interface.get_pci_bus_path"
+        ["Get PCI bus path of the interface"]
+        (debug_info_p @-> iface_name_p @-> returning result err)
+
     let get_mac =
       let result = Param.mk ~description:["MAC address"] Types.string in
       declare
@@ -631,5 +637,63 @@ module Interface_API(R : RPC) = struct
         ["Remove site"]
         (debug_info_p @-> site_p @-> returning unit_p err)
   end
-end
 
+  module Sriov = struct
+    type sriov_pci_t = {
+      mac: string option;
+      vlan: int64 option;
+      rate: int64 option;
+	  } [@@deriving rpcty]
+
+    type enable_action_result =
+      | Modprobe_successful_requires_reboot
+      | Modprobe_successful
+      | Sysfs_successful
+    [@@deriving rpcty]
+
+    type enable_result =
+      | Ok of enable_action_result
+      | Error of string
+    [@@deriving rpcty]
+
+    type disable_result =
+      | Ok
+      | Error of string
+    [@@deriving rpcty]
+
+    type config_error =
+      | Config_vf_rate_not_supported
+      | Unknown of string
+    [@@deriving rpcty]
+
+    type config_result =
+      | Ok
+      | Error of config_error
+    [@@deriving rpcty]
+
+    let iface_name_p = Param.mk ~name:"name" ~description:["interface name"] iface
+
+    let enable =
+      let result_p = Param.mk ~description:["SR-IOV enable result"] enable_result in
+      declare
+        "Sriov.enable"
+        ["Enable SR-IOV"]
+        (debug_info_p @-> iface_name_p @-> returning result_p err)
+
+    let disable =
+      let result_p = Param.mk ~description:["SR-IOV disable result"] disable_result in
+      declare
+        "Sriov.disable"
+        ["Disable SR-IOV"]
+        (debug_info_p @-> iface_name_p @-> returning result_p err)
+
+    let make_vf_config =
+      let pci_address_p = Param.mk ~description:["pci address"] Xcp_pci.address in
+      let vf_info_p = Param.mk ~description:["vf info"] sriov_pci_t in
+      let result_t = Param.mk ~description:["SR-IOV make vf configuration result"] config_result in
+      declare
+        "Sriov.make_vf_config"
+        ["Make SR-IOV vf config"]
+        (debug_info_p @-> pci_address_p @-> vf_info_p @-> returning result_t err)
+  end
+end

xen/xenops_interface.ml

@@ -82,21 +82,14 @@ module Network = struct
 	type t =
 		| Local of string (** name of a local switch *)
 		| Remote of string * string (** vm.id * switch *)
+		| Sriov of Xcp_pci.address (** Xcp_pci.address *)
 	type ts = t list
 
 	let default_t = Local "xenbr0"
 end
 
 module Pci = struct
-  include Xenops_types.Pci
-
-	let address_of_string str =
-		Scanf.sscanf str "%04x:%02x:%02x.%02x"
-			(fun domain bus dev fn -> {domain; bus; dev; fn})
-
-	let string_of_address address =
-		Printf.sprintf "%04x:%02x:%02x.%01x"
-			address.domain address.bus address.dev address.fn
+	include Xcp_pci
 
 	type id = string * string
 
@@ -284,6 +277,7 @@ module Vif = struct
 		ipv4_configuration: ipv4_configuration;
 		ipv6_configuration: ipv6_configuration;
 		pvs_proxy: PVS_proxy.t option;
+		vlan: int64 option;
 	}
 
 	let default_t = {
@@ -300,6 +294,7 @@ module Vif = struct
 		ipv4_configuration = default_ipv4_configuration;
 		ipv6_configuration = default_ipv6_configuration;
 		pvs_proxy = None;
+		vlan = None;
 	}
 
 	let t_of_rpc rpc = Rpc.struct_extend rpc (rpc_of_t default_t) |> t_of_rpc

xen/xenops_types.ml

@@ -1,4 +1,5 @@
 open Sexplib.Std
+open Xcp_pci
 
 module TopLevel = struct
   type power_state =
@@ -14,33 +15,22 @@ module TopLevel = struct
   [@@deriving sexp, rpc]
 end
 
-module Pci = struct
-  type address = {
-    domain: int;
-    bus: int;
-    dev: int;
-    fn: int;
-  }
-  [@@deriving sexp, rpc]
-
-end
-
 module Vgpu = struct
   type gvt_g = {
-    physical_pci_address: Pci.address option; (* unused; promoted to Vgpu.t *)
+    physical_pci_address: address option; (* unused; promoted to Vgpu.t *)
     low_gm_sz: int64;
     high_gm_sz: int64;
     fence_sz: int64;
     monitor_config_file: string option;
   } [@@deriving sexp, rpc]
 
   type nvidia = {
-    physical_pci_address: Pci.address option; (* unused; promoted to Vgpu.t *)
+    physical_pci_address: address option; (* unused; promoted to Vgpu.t *)
     config_file: string;
   } [@@deriving sexp, rpc]
 
   type mxgpu = {
-    physical_function: Pci.address option; (* unused; promoted to Vgpu.t *)
+    physical_function: address option; (* unused; promoted to Vgpu.t *)
     vgpus_per_pgpu: int64;
     framebufferbytes: int64;
   } [@@deriving sexp, rpc]