Merge pull request #155 from robhoes/master

CA-310413: Unconditionally apply enic workaround (again)

Author: robhoes

lib/network_utils.ml

@@ -123,13 +123,6 @@ module Sysfs = struct
       warn "Failed to obtain list of drivers from sysfs";
       []
 
-  let get_driver_version driver () =
-    try
-      Some (String.trim (Xapi_stdext_unix.Unixext.string_of_file ("/sys/bus/pci/drivers/" ^ driver ^ "/module/version")))
-    with _ ->
-      warn "Failed to obtain driver version from sysfs";
-      None
-
   let getpath dev attr =
     Printf.sprintf "/sys/class/net/%s/%s" dev attr
 

networkd/network_server.ml

@@ -25,7 +25,6 @@ type context = unit
 let network_conf = ref "/etc/xcp/network.conf"
 let config : config_t ref = ref Network_config.empty_config
 let backend_kind = ref Openvswitch
-let enic_workaround_until_version = ref "2.3.0.30"
 
 let legacy_management_interface_start () =
   try
@@ -95,30 +94,12 @@ let set_dns_interface _dbg name =
   debug "Setting DNS interface to %s" name;
   config := {!config with dns_interface = Some name}
 
-(* Returns `true` if vs1 is older than vs2 *)
-let is_older_version vs1 vs2 () =
-  try
-    let list_of_version vs = List.map int_of_string (Astring.String.cuts ~empty:false ~sep:"." vs) in
-    let rec loop vs1' vs2' =
-      match vs1', vs2' with
-      | [], _ | _, [] -> false
-      | a :: _, b :: _ when a < b -> true
-      | _ :: tl1, _ :: tl2 -> loop tl1 tl2
-    in
-    loop (list_of_version vs1) (list_of_version vs2)
-  with _ ->
-    warn "Failed to compare driver version.";
-    false
-
 (* The enic driver is for Cisco UCS devices. The current driver adds VLAN0 headers
  * to all incoming packets, which confuses certain guests OSes. The workaround
  * constitutes adding a VLAN0 Linux device to strip those headers again.
 *)
 let need_enic_workaround () =
-  !backend_kind = Bridge && List.mem "enic" (Sysfs.list_drivers ()) && (!enic_workaround_until_version <> "") && (
-    match Sysfs.get_driver_version "enic" () with
-    | Some vs -> (is_older_version vs !enic_workaround_until_version ())
-    | None -> false )
+  !backend_kind = Bridge && List.mem "enic" (Sysfs.list_drivers ())
 
 module Sriov = struct
   open S.Sriov

networkd/networkd.ml

@@ -50,7 +50,6 @@ let resources = [
 let options = [
   "monitor_whitelist", Arg.String (fun x -> Network_monitor_thread.monitor_whitelist := Astring.String.cuts ~empty:false ~sep:"," x), (fun () -> String.concat "," !Network_monitor_thread.monitor_whitelist), "List of prefixes of interface names that are to be monitored";
   "mac-table-size", Arg.Set_int Network_utils.mac_table_size, (fun () -> string_of_int !Network_utils.mac_table_size), "Default value for the mac-table-size openvswitch parameter (see ovs-vswitchd.conf.db.5)";
-  "enic-workaround-until-version", Arg.Set_string Network_server.enic_workaround_until_version, (fun () -> !Network_server.enic_workaround_until_version), "The version till enic driver workaround will be applied or the version set to an empty string for not applying the workaround.";
   "pvs-proxy-socket", Arg.Set_string Network_server.PVS_proxy.path, (fun () -> !Network_server.PVS_proxy.path), "Path to the Unix domain socket for the PVS-proxy daemon";
   "igmp-query-maxresp-time", Arg.Set_string Network_utils.igmp_query_maxresp_time, (fun () -> !Network_utils.igmp_query_maxresp_time), "Maximum Response Time in IGMP Query message to send";
   "enable-ipv6-mcast-snooping", Arg.Bool (fun x -> Network_utils.enable_ipv6_mcast_snooping := x), (fun () -> string_of_bool !Network_utils.enable_ipv6_mcast_snooping), "IPv6 multicast snooping toggle";