Merge pull request snabbco#402 from mwiget/raw

Linux network interface support via RawSocket for snabbvmx

src/program/snabbvmx/lwaftr/README

@@ -7,7 +7,7 @@ Arguments:
 
   --conf    <config-file>   configuration file for lwaftr service
   --id      <port-id>       port_id for virtio socket
-  --pci     <pci-addr>      PCI device number for NIC
+  --pci     <pci-addr>      PCI device number for NIC (or Linux interface name)
   --mac     <mac address>   Ethernet address of virtio interface
   --sock    <socket-path>   Socket path for virtio-user interfaces
 
@@ -18,9 +18,9 @@ Optional:
 
 Example config file:
 
-# cat snabbvmx-lwaftr-em3-em4.cfg
+# cat snabbvmx-lwaftr-xe0.cfg
 return {
-   lwaftr = "snabbvmx-lwaftr-em3-em4.conf",
+   lwaftr = "snabbvmx-lwaftr-xe0.conf",
    ipv6_interface = {
       ipv6_address = "fc00::100",
       mtu = 9500,

src/program/snabbvmx/lwaftr/setup.lua

@@ -15,6 +15,7 @@ local lwcounter = require("apps.lwaftr.lwcounter")
 local nh_fwd = require("apps.nh_fwd.nh_fwd")
 local pci = require("lib.hardware.pci")
 local tap = require("apps.tap.tap")
+local raw        = require("apps.socket.raw")
 
 local yesno = lib.yesno
 
@@ -31,6 +32,11 @@ local function nic_exists (pci_addr)
       dir_exists(("%s/0000:%s"):format(devices, pci_addr))
 end
 
+local function net_exists (pci_addr)
+   local devices="/sys/class/net"
+   return dir_exists(("%s/%s"):format(devices, pci_addr))
+end
+
 local function fatal (msg)
    print(msg)
    main.exit(1)
@@ -58,6 +64,13 @@ local function load_phy (c, nic_id, interface)
                                       },
                                       macaddr = interface.mac_address, mtu = interface.mtu })
       chain_input, chain_output = nic_id .. ".rx", nic_id .. ".tx"
+   elseif net_exists(interface.pci) then
+      print(("%s network interface %s"):format(nic_id, interface.pci))
+      if vlan then
+         print(("WARNING: VLAN not supported over %s. %s vlan %d"):format(interface.pci, nic_id, vlan))
+      end
+      config.app(c, nic_id, raw.RawSocket, interface.pci)
+      chain_input, chain_output = nic_id .. ".rx", nic_id .. ".tx"
    else
       print(("Couldn't find device info for PCI address '%s'"):format(interface.pci))
       if not interface.mirror_id then