integrate netpfga/p4 generic

p4src/actions_controller.p4

@@ -3,19 +3,30 @@
 
 /********************** GENERAL ACTIONS ***********************************/
 
-    action controller_reply(task_t task) {
-        meta.task = task;
-        meta.ingress_port = standard_metadata.ingress_port;
-        clone3(CloneType.I2E, 100, meta);
-    }
+#ifndef _SUME_SWITCH_P4_
+action controller_reply(task_t task) {
+    meta.task = task;
+    meta.ingress_port = sume_metadata.src_port;
+    clone3(CloneType.I2E, 100, meta);
+}
 
-    action controller_debug_table_id(table_t table_id) {
-        meta.table_id = table_id;
-        controller_reply(TASK_DEBUG);
-    }
+#else
+#include "action_egress.p4"
 
-    action controller_debug() {
-        controller_reply(TASK_DEBUG);
-    }
+action controller_reply(task_t task) {
+    meta.task = task;
+    meta.ingress_port = standard_metadata.ingress_port;
+    set_egress_port(4); /* port1 = 1,  port2 = 2, port3=4 */
+}
+#endif /* _SUME_SWITCH_P4_ */
+
+action controller_debug_table_id(table_t table_id) {
+    meta.table_id = table_id;
+    controller_reply(TASK_DEBUG);
+}
+
+action controller_debug() {
+    controller_reply(TASK_DEBUG);
+}
 
 #endif

p4src/actions_egress.p4

@@ -4,45 +4,48 @@
 
 /********************** ROUTING (egress definiton) TABLES ***********************************/
 
-	action set_egress_port (port_t out_port) {
-        standard_metadata.egress_spec = out_port;
-	}
+action set_egress_port (port_t out_port) {
+    #ifndef _SUME_SWITCH_P4_
+    standard_metadata.egress_spec = out_port;
+    #else
+    sume_metadata.dst_port = out_port;
+    #endif
+}
 
-	action set_egress_port_and_mac (port_t out_port, mac_addr_t mac_addr) {
-        hdr.ethernet.dst_addr = mac_addr;
-        standard_metadata.egress_spec = out_port;
-	}
+action set_egress_port_and_mac (port_t out_port, mac_addr_t mac_addr) {
+    hdr.ethernet.dst_addr = mac_addr;
+    set_egress_port(out_port);
+}
 
-    table v6_networks {
-        key = {
-            hdr.ipv6.dst_addr: lpm;
-        }
-        actions = {
-			set_egress_port;
-			set_egress_port_and_mac;
-            controller_debug;
-            controller_reply;
-            controller_debug_table_id;
-            NoAction;
-        }
-        size = ROUTING_TABLE_SIZE;
-
-        default_action = controller_debug_table_id(TABLE_V6_NETWORKS);
+table v6_networks {
+    key = {
+        hdr.ipv6.dst_addr: lpm;
     }
-
-    table v4_networks {
-        key = {
-            hdr.ipv4.dst_addr: lpm;
-        }
-        actions = {
-			set_egress_port;
-			set_egress_port_and_mac;
-            controller_debug;
-            controller_debug_table_id;
-            NoAction;
-        }
-        size = ROUTING_TABLE_SIZE;
-        default_action = controller_debug_table_id(TABLE_V4_NETWORKS);
+    actions = {
+		set_egress_port;
+		set_egress_port_and_mac;
+        controller_debug;
+        controller_reply;
+        controller_debug_table_id;
+        NoAction;
     }
+    size = ROUTING_TABLE_SIZE;
 
+    default_action = controller_debug_table_id(TABLE_V6_NETWORKS);
+}
+
+table v4_networks {
+    key = {
+        hdr.ipv4.dst_addr: lpm;
+        }
+    actions = {
+		set_egress_port;
+		set_egress_port_and_mac;
+        controller_debug;
+        controller_debug_table_id;
+        NoAction;
+    }
+    size = ROUTING_TABLE_SIZE;
+    default_action = controller_debug_table_id(TABLE_V4_NETWORKS);
+}
 #endif

p4src/checksum_diff.p4

@@ -15,120 +15,11 @@ parser MyParser(packet_in packet,
     inout     metadata meta,
     inout     standard_metadata_t standard_metadata) {
 
-    state start {
-        meta.chk_icmp        = 0;
-        meta.chk_icmp6       = 0;
-        meta.chk_icmp6_na_ns = 0;
-        meta.chk_ipv4        = 0;
-        meta.chk_udp_v6      = 0;
-        meta.chk_udp_v4      = 0;
-        meta.chk_tcp_v6      = 0;
-        meta.chk_tcp_v4      = 0;
-        meta.v4sum           = 0;
-        meta.v6sum           = 0;
-
-        packet.extract(hdr.ethernet);
-        transition select(hdr.ethernet.ethertype){
-            TYPE_IPV4: ipv4;
-            TYPE_IPV6: ipv6;
-            TYPE_ARP: arp;
-
-            default: accept;
-        }
-    }
-
-    state ipv4 {
-        packet.extract(hdr.ipv4);
-		meta.length_without_ip_header = hdr.ipv4.totalLen - 16w20;
-
-        transition select(hdr.ipv4.protocol){
-            PROTO_TCP: tcp;
-            PROTO_UDP: udp;
-            PROTO_ICMP: icmp;
-
-            default: accept;
-        }
-    }
-
-    state ipv6 {
-        packet.extract(hdr.ipv6);
-		meta.length_without_ip_header = hdr.ipv6.payload_length;
-
-        transition select(hdr.ipv6.next_header){
-            PROTO_TCP: tcp;
-            PROTO_UDP: udp;
-            PROTO_ICMP6: icmp6;
-            default: accept;
-        }
-    }
-
-    state icmp6 {
-        packet.extract(hdr.icmp6);
-        transition select(hdr.icmp6.type) {
-            ICMP6_NS: icmp6_neighbor_solicitation;
-            default: accept;
-        }
-    }
-
-    state icmp6_neighbor_solicitation {
-        packet.extract(hdr.icmp6_na_ns);
-
-        /* BUG: This MIGHT fail */
-        packet.extract(hdr.icmp6_option_link_layer_addr);
-
-        transition accept;
-    }
-
-    /* Leaf */
-    state tcp {
-        packet.extract(hdr.tcp);
-        transition accept;
-    }
-
-    state udp {
-        packet.extract(hdr.udp);
-        transition accept;
-    }
-
-    state icmp {
-        packet.extract(hdr.icmp);
-        transition accept;
-    }
-
-    state arp {
-        packet.extract(hdr.arp);
-        transition accept;
-    }
-
+    #include "parsers.p4"
 }
 
-/*************************************************************************
-************************  D E P A R S E R  *******************************
-*************************************************************************/
-
 control MyDeparser(packet_out packet, in headers hdr) {
-    apply {
-        /* always */
-        packet.emit(hdr.ethernet);
-
-        /* only if information is sent to the controller */
-        packet.emit(hdr.cpu);
-
-        /* either */
-        packet.emit(hdr.ipv4);
-        packet.emit(hdr.ipv6);
-        packet.emit(hdr.arp);
-
-        /* either */
-        packet.emit(hdr.tcp);
-        packet.emit(hdr.udp);
-        packet.emit(hdr.icmp);
-
-        /* might be more than one subtype */
-        packet.emit(hdr.icmp6);
-        packet.emit(hdr.icmp6_na_ns);
-        packet.emit(hdr.icmp6_option_link_layer_addr);
-    }
+    #include "deparser.p4"
 }
 
 // OK-UNTIL-HERE

p4src/deparser.p4

@@ -0,0 +1,28 @@
+/* -*- P4_16 -*- */
+#ifndef DEPARSERS_P4
+#define DEPARSERS_P4
+
+    apply {
+        /* always */
+        packet.emit(hdr.ethernet);
+
+        /* only if information is sent to the controller */
+        packet.emit(hdr.cpu);
+
+        /* either */
+        packet.emit(hdr.ipv4);
+        packet.emit(hdr.ipv6);
+        packet.emit(hdr.arp);
+
+        /* either */
+        packet.emit(hdr.tcp);
+        packet.emit(hdr.udp);
+        packet.emit(hdr.icmp);
+
+        /* might be more than one subtype */
+        packet.emit(hdr.icmp6);
+        packet.emit(hdr.icmp6_na_ns);
+        packet.emit(hdr.icmp6_option_link_layer_addr);
+
+    }
+#endif

p4src/minip4_solution-mirror.p4

@@ -0,0 +1,133 @@
+#include <core.p4>
+#include <sume_switch.p4>
+#include "headers.p4"
+
+/********************************************************************************
+ * Header
+ */
+
+typedef bit<48> EthAddr_t;
+header Ethernet_h {
+    EthAddr_t dstAddr;
+    EthAddr_t srcAddr;
+    bit<16> etherType;
+}
+
+struct Parsed_packet {
+    Ethernet_h ethernet;
+}
+
+// user defined metadata: can be used to share information between
+// TopParser, TopPipe, and TopDeparser
+struct user_metadata_t {
+    bit<8>  unused;
+}
+
+// digest_data, MUST be 256 bits -- what is this used for?
+struct digest_data_t {
+    bit<256> unused;
+}
+
+
+/********************************************************************************
+ * Parser
+ */
+
+@Xilinx_MaxPacketRegion(1024)
+parser TopParser(packet_in b,
+                 out Parsed_packet p,
+                 out user_metadata_t user_metadata,
+                 out digest_data_t digest_data,
+                 inout sume_metadata_t sume_metadata) {
+    state start {
+        b.extract(p.ethernet);
+        user_metadata.unused = 0;
+        digest_data.unused = 0;
+
+        transition accept;
+    }
+}
+
+/********************************************************************************
+ * Main
+ */
+control TopPipe(inout Parsed_packet p,
+                inout user_metadata_t user_metadata,
+                inout digest_data_t digest_data,
+                inout sume_metadata_t sume_metadata) {
+
+    action swap_eth_addresses() {
+        EthAddr_t temp = p.ethernet.dstAddr;
+        p.ethernet.dstAddr = p.ethernet.srcAddr;
+        p.ethernet.srcAddr = temp;
+
+        /* set egress port */
+        sume_metadata.dst_port = sume_metadata.src_port;
+    }
+
+    action send_to_port1() {
+        sume_metadata.dst_port = 1;
+    }
+
+    action send_to_all_ports() {
+        /* Taken from commands.txt of the "int" project:
+        table_cam_add_entry forward set_output_port 0xffffffffffff => 0b01010101
+
+        python convert:
+        >>> 0b01010101
+        85
+
+        */
+        sume_metadata.dst_port = 85;
+    }
+
+    action do_nothing() {
+        EthAddr_t temp = p.ethernet.dstAddr;
+    }
+
+    table lookup_table {
+        key = {
+            p.ethernet.dstAddr: exact;
+        }
+
+        actions = {
+            swap_eth_addresses;
+            do_nothing;
+            send_to_port1;
+            send_to_all_ports;
+        }
+        size = 64;
+//        default_action = swap_eth_addresses; // test_mirror(): in gen_testdata.py
+//        default_action = send_to_port1; // test_port1()
+        default_action = send_to_all_ports; // test_allports():
+    }
+
+    apply {
+        lookup_table.apply();
+    }
+}
+
+/********************************************************************************
+ * Deparser
+ */
+
+@Xilinx_MaxPacketRegion(1024)
+control TopDeparser(packet_out b,
+                    in Parsed_packet p,
+                    in user_metadata_t user_metadata,
+                    inout digest_data_t digest_data,
+                    inout sume_metadata_t sume_metadata) {
+    apply {
+        b.emit(p.ethernet);
+    }
+}
+
+/********************************************************************************
+ * Switch
+ */
+
+SimpleSumeSwitch(
+    TopParser(),
+    TopPipe(),
+    TopDeparser()
+) main;

p4src/minip4_solution-nat64.p4

@@ -0,0 +1,117 @@
+#include <core.p4>
+#include <sume_switch.p4>
+#include "headers.p4"
+#include "settings.p4"
+
+/********************************************************************************
+ * Possible bugs / things to fix:
+
+- Does NoAction exist?
+- Aligment of "meta" /  replace metadate with our own
+- what does sume_metadata contain? ingress port is where?
+nico@nsg-System:~$ find . -name sume_switch.p4
+./master-thesis/support/semester-thesis-1/project/SSS_example_2_SS/bitsnpices/sume_switch.p4
+nico@nsg-System:~$
+
+/******************** INFO ONLY *************************/
+
+// one-hot encoded: {DMA, NF3, DMA, NF2, DMA, NF1, DMA, NF0}
+// typedef bit<8> port_t;
+
+/* standard sume switch metadata */
+// struct sume_metadata_t {
+//     bit<16> dma_q_size; // measured in 32-byte words
+//     bit<16> nf3_q_size; // measured in 32-byte words
+//     bit<16> nf2_q_size; // measured in 32-byte words
+//     bit<16> nf1_q_size; // measured in 32-byte words
+//     bit<16> nf0_q_size; // measured in 32-byte words
+//     bit<8> send_dig_to_cpu; // send digest_data to CPU
+//     bit<8> drop;
+//     port_t dst_port; // one-hot encoded: {DMA, NF3, DMA, NF2, DMA, NF1, DMA, NF0}
+//     port_t src_port; // one-hot encoded: {DMA, NF3, DMA, NF2, DMA, NF1, DMA, NF0}
+//     bit<16> pkt_len; // unsigned int
+// }
+
+
+
+/********************************************************************************
+ * Header
+ */
+
+
+// digest_data, MUST be 256 bits -- not used by us
+struct digest_data_t {
+    bit<256> unused;
+}
+
+
+@Xilinx_MaxPacketRegion(1024)
+parser TopParser(packet_in packet,
+                 out headers hdr,
+                 out metadata meta,
+                 out digest_data_t digest_data,
+                 inout sume_metadata_t standard_metadata) {
+
+    #include "parsers.p4"
+}
+
+/********************************************************************************
+ * Main
+ */
+control TopPipe(inout Parsed_packet hdr,
+                inout metadata meta,
+                inout digest_data_t digest_data,
+                inout sume_metadata_t sume_metadata) {
+
+    /* FIXME: not sure what to do on netpfga */
+    action drop() {
+#ifndef _SUME_SWITCH_P4_
+        mark_to_drop();
+#endif
+    }
+
+    table dummy_table_for_netpfga {
+        key = {
+            hdr.ethernet.dst_addr: exact;
+        }
+
+        actions = {
+            swap_eth_addresses;
+            do_nothing;
+            send_to_port1;
+//            send_to_all_ports;
+        }
+        size = TEST_TABLE_SIZE;
+//        default_action = swap_eth_addresses; // test_mirror(): in gen_testdata.py
+        default_action = send_to_port1; // test_port1()
+//        default_action = send_to_all_ports; // test_allports():
+    }
+
+    apply {
+        lookup_table.apply();
+    }
+}
+
+/********************************************************************************
+ * Deparser
+ */
+
+@Xilinx_MaxPacketRegion(1024)
+control TopDeparser(packet_out packet,
+                    in headers hdr,
+                    in metadata meta,
+                    inout digest_data_t digest_data,
+                    inout sume_metadata_t sume_metadata) {
+
+    #include "deparser.p4"
+}
+
+/********************************************************************************
+ * Switch
+ */
+
+SimpleSumeSwitch(
+    TopParser(),
+    TopPipe(),
+    TopDeparser()
+) main;

p4src/minip4_solution-v6zero.p4

@@ -0,0 +1,123 @@
+#include <core.p4>
+#include <sume_switch.p4>
+#include "headers.p4"
+
+/********************************************************************************
+ * Header
+ */
+
+typedef bit<48> EthAddr_t;
+header Ethernet_h {
+    EthAddr_t dstAddr;
+    EthAddr_t srcAddr;
+    bit<16> etherType;
+}
+
+struct Parsed_packet {
+    Ethernet_h ethernet;
+}
+
+// user defined metadata: can be used to share information between
+// TopParser, TopPipe, and TopDeparser
+struct user_metadata_t {
+    bit<8>  unused;
+}
+
+// digest_data, MUST be 256 bits -- what is this used for?
+struct digest_data_t {
+    bit<256> unused;
+}
+
+
+/********************************************************************************
+ * Parser
+ */
+
+@Xilinx_MaxPacketRegion(1024)
+parser TopParser(packet_in packet,
+                 out Parsed_packet hdr,
+                 out user_metadata_t meta
+                 out digest_data_t digest_data,
+                 inout sume_metadata_t sume_metadata) {
+    state start {
+        meta.unused = 0;
+        digest_data.unused = 0;
+
+        packet.extract(hdr.ethernet);
+        transition select(hdr.ethernet.ethertype) {
+            TYPE_IPV6: ipv6;
+            default: accept;
+        }
+    }
+
+    state ipv6 {
+        packet.extract(hdr.ipv6);
+        transition accept;
+    }
+}
+
+/********************************************************************************
+ * Main
+ */
+control TopPipe(inout Parsed_packet hdr,
+                inout user_metadata_t meta,
+                inout digest_data_t digest_data,
+                inout sume_metadata_t sume_metadata) {
+
+    action do_nothing() {
+        EthAddr_t temp = p.ethernet.dstAddr;
+    }
+
+    action send_to_port1() {
+        sume_metadata.dst_port = 1;
+    }
+
+    action modify_ipv6 () {
+        hdr.ipv6.src_addr += 1;
+        hdr.ipv6.dst_addr += 2;
+
+        send_to_port1();
+    }
+
+    table lookup_table {
+        key = {
+            p.ethernet.dstAddr: exact;
+        }
+
+        actions = {
+            do_nothing;
+            send_to_port1;
+        }
+        size = 64;
+        default_action = modify_ipv6;
+    }
+
+    apply {
+        lookup_table.apply();
+    }
+}
+
+/********************************************************************************
+ * Deparser
+ */
+
+@Xilinx_MaxPacketRegion(1024)
+control TopDeparser(packet_out b,
+                    in Parsed_packet p,
+                    in user_metadata_t user_metadata,
+                    inout digest_data_t digest_data,
+                    inout sume_metadata_t sume_metadata) {
+    apply {
+        b.emit(p.ethernet);
+    }
+}
+
+/********************************************************************************
+ * Switch
+ */
+
+SimpleSumeSwitch(
+    TopParser(),
+    TopPipe(),
+    TopDeparser()
+) main;

p4src/minip4_solution.p4

@@ -0,0 +1 @@
+minip4_solution-nat64.p4

p4src/parsers.p4

@@ -2,15 +2,7 @@
 #ifndef PARSERS_P4
 #define PARSERS_P4
 
-#include <core.p4>
-#include <v1model.p4>
-
-#include "headers.p4"
-
-parser MyParser(packet_in packet,
-    out       headers hdr,
-    inout     metadata meta,
-    inout     standard_metadata_t standard_metadata) {
+/* to be included into the parser block */
 
     state start {
         meta.chk_icmp        = 0;
@@ -21,6 +13,8 @@ parser MyParser(packet_in packet,
         meta.chk_udp_v4      = 0;
         meta.chk_tcp_v6      = 0;
         meta.chk_tcp_v4      = 0;
+        meta.v4sum           = 0;
+        meta.v6sum           = 0;
 
         packet.extract(hdr.ethernet);
         transition select(hdr.ethernet.ethertype){
@@ -74,7 +68,6 @@ parser MyParser(packet_in packet,
         transition accept;
     }
 
-
     /* Leaf */
     state tcp {
         packet.extract(hdr.tcp);
@@ -86,11 +79,6 @@ parser MyParser(packet_in packet,
         transition accept;
     }
 
-    // state icmp6 {
-        //     packet.extract(hdr.icmp6);
-        //     transition accept;
-        // }
-
     state icmp {
         packet.extract(hdr.icmp);
         transition accept;
@@ -101,36 +89,5 @@ parser MyParser(packet_in packet,
         transition accept;
     }
 
-}
-
-/*************************************************************************
-************************  D E P A R S E R  *******************************
-*************************************************************************/
-
-control MyDeparser(packet_out packet, in headers hdr) {
-    apply {
-        /* always */
-        packet.emit(hdr.ethernet);
-
-        /* only if information is sent to the controller */
-        packet.emit(hdr.cpu);
-
-        /* either */
-        packet.emit(hdr.ipv4);
-        packet.emit(hdr.ipv6);
-        packet.emit(hdr.arp);
-
-        /* either */
-        packet.emit(hdr.tcp);
-        packet.emit(hdr.udp);
-        packet.emit(hdr.icmp);
-
-        /* might be more than one subtype */
-        packet.emit(hdr.icmp6);
-        packet.emit(hdr.icmp6_na_ns);
-        packet.emit(hdr.icmp6_option_link_layer_addr);
-    }
-}
-
 
 #endif