Merge remote-tracking branch 'up/master'

jafingerhut · jafingerhut · commit f562b70963cf · 2026-02-21T12:39:16.000-05:00
diff --git a/.github/workflows/dco-welcome.yml b/.github/workflows/dco-welcome.yml
@@ -0,0 +1,30 @@
+name: DCO Assistant for First-Time Contributors
+
+on:
+  pull_request_target:
+    types: [opened]
+
+jobs:
+  dco-help:
+    runs-on: ubuntu-latest
+    # Only run for first-time contributors or users with no previous history
+    if: |
+      github.event.pull_request.author_association == 'FIRST_TIME_CONTRIBUTOR' || 
+      github.event.pull_request.author_association == 'NONE'
+    steps:
+      - name: Post DCO Instructions
+        uses: peter-evans/create-or-update-comment@v3
+        with:
+          issue-number: ${{ github.event.pull_request.number }}
+          body: |
+            Welcome to the project, @${{ github.actor }}!
+            
+            It looks like this is your first contribution. We noticed the **DCO (Developer Certificate of Origin)** check might fail if your commits aren't signed. 
+            
+            To fix this, please ensure every commit has a `Signed-off-by: Name <email>` line. You can do this automatically by using the `-s` flag:
+            `git commit -s -m "Your message"`
+            
+            For existing commits, you can fix them with:
+            `git commit --amend --signoff` or `git rebase -i HEAD~N --signoff` (where N is the number of commits)
+            The Developer Community DCO guide also provides helpful tips on fixing DCO inconveniences. Setting a commit hook in the git repository will automate adding the DCO signoff.
+            See https://github.com/p4lang/governance/wiki/P4-DCO-Guidelines for information.
diff --git a/README.md b/README.md
@@ -78,7 +78,7 @@ which contains various examples that you can refer to.
 
 ## P4 Documentation
 
-The documentation for P4_16 and P4Runtime is available [here](https://p4.org/specs/)
+The documentation for P4_16 and P4Runtime is available [here](https://p4.org/specifications/)
 
 All exercises in this repository use the v1model architecture, the documentation for which is available at:
 1. The BMv2 Simple Switch target document accessible [here](https://github.com/p4lang/behavioral-model/blob/master/docs/simple_switch.md) talks mainly about the v1model architecture.
diff --git a/exercises/basic/README.md b/exercises/basic/README.md
@@ -192,7 +192,7 @@ Congratulations, your implementation works! Move onto the next assignment
 
 ## Relevant Documentation
 
-The documentation for P4_16 and P4Runtime is available [here](https://p4.org/specs/)
+The documentation for P4_16 and P4Runtime is available [here](https://p4.org/specifications/)
 
 All excercises in this repository use the v1model architecture, the documentation for which is available at:
 1. The BMv2 Simple Switch target document accessible [here](https://github.com/p4lang/behavioral-model/blob/master/docs/simple_switch.md) talks mainly about the v1model architecture.
diff --git a/exercises/basic_tunnel/README.md b/exercises/basic_tunnel/README.md
@@ -197,7 +197,7 @@ Congratulations, your implementation works! Move onto the next assignment
 
 Documentation on the Usage of Gateway (gw) and ARP Commands in topology.json is [here](https://github.com/p4lang/tutorials/tree/master/exercises/basic#the-use-of-gateway-gw-and-arp-commands-in-topologyjson)
 
-The documentation for P4_16 and P4Runtime is available [here](https://p4.org/specs/)
+The documentation for P4_16 and P4Runtime is available [here](https://p4.org/specifications/)
 
 All excercises in this repository use the v1model architecture, the documentation for which is available at:
 1. The BMv2 Simple Switch target document accessible [here](https://github.com/p4lang/behavioral-model/blob/master/docs/simple_switch.md) talks mainly about the v1model architecture.
diff --git a/exercises/calc/README.md b/exercises/calc/README.md
@@ -117,7 +117,7 @@ Congratulations, your implementation works! Move on to
 
 ## Relevant Documentation
 
-The documentation for P4_16 and P4Runtime is available [here](https://p4.org/specs/)
+The documentation for P4_16 and P4Runtime is available [here](https://p4.org/specifications/)
 
 All excercises in this repository use the v1model architecture, the documentation for which is available at:
 1. The BMv2 Simple Switch target document accessible [here](https://github.com/p4lang/behavioral-model/blob/master/docs/simple_switch.md) talks mainly about the v1model architecture.
diff --git a/exercises/ecn/README.md b/exercises/ecn/README.md
@@ -217,7 +217,7 @@ Congratulations, your implementation works! Move onto the next assignment
 
 Documentation on the Usage of Gateway (gw) and ARP Commands in topology.json is [here](https://github.com/p4lang/tutorials/tree/master/exercises/basic#the-use-of-gateway-gw-and-arp-commands-in-topologyjson)
 
-The documentation for P4_16 and P4Runtime is available [here](https://p4.org/specs/)
+The documentation for P4_16 and P4Runtime is available [here](https://p4.org/specifications/)
 
 All excercises in this repository use the v1model architecture, the documentation for which is available at:
 1. The BMv2 Simple Switch target document accessible [here](https://github.com/p4lang/behavioral-model/blob/master/docs/simple_switch.md) talks mainly about the v1model architecture.
diff --git a/exercises/firewall/README.md b/exercises/firewall/README.md
@@ -225,7 +225,7 @@ Congratulations, your implementation works! Move on to [Link Monitoring](../link
 
 Documentation on the Usage of Gateway (gw) and ARP Commands in topology.json is [here](https://github.com/p4lang/tutorials/tree/master/exercises/basic#the-use-of-gateway-gw-and-arp-commands-in-topologyjson)
 
-The documentation for P4_16 and P4Runtime is available [here](https://p4.org/specs/)
+The documentation for P4_16 and P4Runtime is available [here](https://p4.org/specifications/)
 
 All excercises in this repository use the v1model architecture, the documentation for which is available at:
 1. The BMv2 Simple Switch target document accessible [here](https://github.com/p4lang/behavioral-model/blob/master/docs/simple_switch.md) talks mainly about the v1model architecture.
diff --git a/exercises/flowcache/README.md b/exercises/flowcache/README.md
@@ -204,7 +204,7 @@ Congratulations, your implementation works! Move onto the next assignment
 
 Documentation on the Usage of Gateway (gw) and ARP Commands in topology.json is [here](https://github.com/p4lang/tutorials/tree/master/exercises/basic#the-use-of-gateway-gw-and-arp-commands-in-topologyjson)
 
-The documentation for P4_16 and P4Runtime is available [here](https://p4.org/specs/)
+The documentation for P4_16 and P4Runtime is available [here](https://p4.org/specifications/)
 
 All excercises in this repository use the v1model architecture, the documentation for which is available at:
 1. The BMv2 Simple Switch target document accessible [here](https://github.com/p4lang/behavioral-model/blob/master/docs/simple_switch.md) talks mainly about the v1model architecture.
diff --git a/exercises/link_monitor/README.md b/exercises/link_monitor/README.md
@@ -232,7 +232,7 @@ load-balancing decisions?
 
 Documentation on the Usage of Gateway (gw) and ARP Commands in topology.json is [here](https://github.com/p4lang/tutorials/tree/master/exercises/basic#the-use-of-gateway-gw-and-arp-commands-in-topologyjson)
 
-The documentation for P4_16 and P4Runtime is available [here](https://p4.org/specs/)
+The documentation for P4_16 and P4Runtime is available [here](https://p4.org/specifications/)
 
 All excercises in this repository use the v1model architecture, the documentation for which is available at:
 1. The BMv2 Simple Switch target document accessible [here](https://github.com/p4lang/behavioral-model/blob/master/docs/simple_switch.md) talks mainly about the v1model architecture.
diff --git a/exercises/load_balance/README.md b/exercises/load_balance/README.md
@@ -137,7 +137,7 @@ Congratulations, your implementation works! Move on to [Quality of Service](../q
 
 Documentation on the Usage of Gateway (gw) and ARP Commands in topology.json is [here](https://github.com/p4lang/tutorials/tree/master/exercises/basic#the-use-of-gateway-gw-and-arp-commands-in-topologyjson)
 
-The documentation for P4_16 and P4Runtime is available [here](https://p4.org/specs/)
+The documentation for P4_16 and P4Runtime is available [here](https://p4.org/specifications/)
 
 All excercises in this repository use the v1model architecture, the documentation for which is available at:
 1. The BMv2 Simple Switch target document accessible [here](https://github.com/p4lang/behavioral-model/blob/master/docs/simple_switch.md) talks mainly about the v1model architecture.
diff --git a/exercises/load_balance/load_balance.p4 b/exercises/load_balance/load_balance.p4
@@ -136,8 +136,9 @@ control MyIngress(inout headers hdr,
         /* TODO: apply ecmp_group table and ecmp_nhop table if IPv4 header is
          * valid and TTL hasn't reached zero
          */
-        ecmp_group.apply();
-        ecmp_nhop.apply();
+        if (ecmp_group.apply().hit) { 
+            ecmp_nhop.apply(); 
+        }
     }
 }
 
diff --git a/exercises/load_balance/solution/load_balance.p4 b/exercises/load_balance/solution/load_balance.p4
@@ -141,8 +141,9 @@ control MyIngress(inout headers hdr,
     }
     apply {
         if (hdr.ipv4.isValid() && hdr.ipv4.ttl > 0) {
-            ecmp_group.apply();
-            ecmp_nhop.apply();
+            if (ecmp_group.apply().hit) { 
+                ecmp_nhop.apply(); 
+            }
         }
     }
 }
diff --git a/exercises/mri/README.md b/exercises/mri/README.md
@@ -269,7 +269,7 @@ Routing](../source_routing).
 
 Documentation on the Usage of Gateway (gw) and ARP Commands in topology.json is [here](https://github.com/p4lang/tutorials/tree/master/exercises/basic#the-use-of-gateway-gw-and-arp-commands-in-topologyjson)
 
-The documentation for P4_16 and P4Runtime is available [here](https://p4.org/specs/)
+The documentation for P4_16 and P4Runtime is available [here](https://p4.org/specifications/)
 
 All excercises in this repository use the v1model architecture, the documentation for which is available at:
 1. The BMv2 Simple Switch target document accessible [here](https://github.com/p4lang/behavioral-model/blob/master/docs/simple_switch.md) talks mainly about the v1model architecture.
diff --git a/exercises/multicast/README.md b/exercises/multicast/README.md
@@ -161,7 +161,7 @@ Congratulations, your implementation works! Move on to [Firewall](../firewall).
 
 Documentation on the Usage of Gateway (gw) and ARP Commands in topology.json is [here](https://github.com/p4lang/tutorials/tree/master/exercises/basic#the-use-of-gateway-gw-and-arp-commands-in-topologyjson)
 
-The documentation for P4_16 and P4Runtime is available [here](https://p4.org/specs/)
+The documentation for P4_16 and P4Runtime is available [here](https://p4.org/specifications/)
 
 All excercises in this repository use the v1model architecture, the documentation for which is available at:
 1. The BMv2 Simple Switch target document accessible [here](https://github.com/p4lang/behavioral-model/blob/master/docs/simple_switch.md) talks mainly about the v1model architecture.
diff --git a/exercises/p4runtime/README.md b/exercises/p4runtime/README.md
@@ -194,7 +194,7 @@ Congratulations, your implementation works! Move onto the next assignment
 
 Documentation on the Usage of Gateway (gw) and ARP Commands in topology.json is [here](https://github.com/p4lang/tutorials/tree/master/exercises/basic#the-use-of-gateway-gw-and-arp-commands-in-topologyjson)
 
-The documentation for P4_16 and P4Runtime is available [here](https://p4.org/specs/)
+The documentation for P4_16 and P4Runtime is available [here](https://p4.org/specifications/)
 
 All excercises in this repository use the v1model architecture, the documentation for which is available at:
 1. The BMv2 Simple Switch target document accessible [here](https://github.com/p4lang/behavioral-model/blob/master/docs/simple_switch.md) talks mainly about the v1model architecture.
diff --git a/exercises/qos/README.md b/exercises/qos/README.md
@@ -177,7 +177,7 @@ Congratulations, your implementation works! Move on to [Multicasting](../multica
 
 Documentation on the Usage of Gateway (gw) and ARP Commands in topology.json is [here](https://github.com/p4lang/tutorials/tree/master/exercises/basic#the-use-of-gateway-gw-and-arp-commands-in-topologyjson)
 
-The documentation for P4_16 and P4Runtime is available [here](https://p4.org/specs/)
+The documentation for P4_16 and P4Runtime is available [here](https://p4.org/specifications/)
 
 All excercises in this repository use the v1model architecture, the documentation for which is available at:
 1. The BMv2 Simple Switch target document accessible [here](https://github.com/p4lang/behavioral-model/blob/master/docs/simple_switch.md) talks mainly about the v1model architecture.
diff --git a/exercises/source_routing/README.md b/exercises/source_routing/README.md
@@ -156,7 +156,7 @@ Congratulations, your implementation works! Move on to
 
 Documentation on the Usage of Gateway (gw) and ARP Commands in topology.json is [here](https://github.com/p4lang/tutorials/tree/master/exercises/basic#the-use-of-gateway-gw-and-arp-commands-in-topologyjson)
 
-The documentation for P4_16 and P4Runtime is available [here](https://p4.org/specs/)
+The documentation for P4_16 and P4Runtime is available [here](https://p4.org/specifications/)
 
 All excercises in this repository use the v1model architecture, the documentation for which is available at:
 1. The BMv2 Simple Switch target document accessible [here](https://github.com/p4lang/behavioral-model/blob/master/docs/simple_switch.md) talks mainly about the v1model architecture.
diff --git a/utils/p4runtime_switch.py b/utils/p4runtime_switch.py
@@ -94,6 +94,10 @@ def __init__(self, name, sw_path = None, json_path = None,
         if "cpu_port" in kwargs:
             self.cpu_port = kwargs["cpu_port"]
 
+        self.priority_queues = None
+        if "priority_queues" in kwargs:
+            self.priority_queues = kwargs["priority_queues"]
+
 
     def check_switch_started(self, pid):
         for _ in range(SWITCH_START_TIMEOUT * 2):
@@ -129,6 +133,8 @@ def start(self, controllers):
             args.append("-- --grpc-server-addr 0.0.0.0:" + str(self.grpc_port))
         if self.cpu_port:
             args.append("--cpu-port " + str(self.cpu_port))
+        if self.priority_queues:
+            args.append("--priority-queues " + str(self.priority_queues))
         cmd = ' '.join(args)
         info(cmd + "\n")
         print(cmd + "\n")
diff --git a/utils/run_exercise.py b/utils/run_exercise.py
@@ -92,10 +92,17 @@ def __init__(self, hosts, switches, links, log_dir, bmv2_exe, pcap_dir, **opts):
             else:
                 # add default switch
                 switchClass = None
-            if "cpu_port" in params:
-                self.addSwitch(sw, log_file="%s/%s.log" %(log_dir, sw), cpu_port=params["cpu_port"], cls=switchClass)
-            else:
-                self.addSwitch(sw, log_file="%s/%s.log" %(log_dir, sw), cls=switchClass)
+
+            switch_opts = {
+                "log_file": "%s/%s.log" % (log_dir, sw),
+                "cls": switchClass
+            }
+
+            for key in ("cpu_port", "priority_queues"):
+                if key in params:
+                    switch_opts[key] = params[key]
+
+            self.addSwitch(sw, **switch_opts)
 
         for link in host_links:
             host_name = link['node1']
