From: Matt Corallo <git@bluematt.me>
Date: Sun, 4 Apr 2021 17:15:06 +0000 (-0400)
Subject: Print diagnostics about install location
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=130bf4a7a1418ae03a79993fd77ccbdae5f814e7;p=flowspec-xdp

Print diagnostics about install location
---

diff --git a/install.sh b/install.sh
index d93664c..be3ead3 100755
--- a/install.sh
+++ b/install.sh
@@ -5,7 +5,7 @@ RULES="$(birdc show route table flowspec4)
 $(birdc show route table flowspec6)"
 
 echo "$RULES" | ./genrules.py --8021q=drop-vlan --v6frag=ignore-parse-if-rule --ihl=drop-options
-clang -std=c99 -pedantic -Wall -Wextra -Wno-pointer-arith -Wno-unused-variable -Os -emit-llvm -c xdp.c -o - | llc -march=bpf -filetype=obj -o xdp
+clang -std=c99 -pedantic -Wall -Wextra -Wno-pointer-arith -Wno-unused-variable -O3 -emit-llvm -c xdp.c -o - | llc -O3 -march=bpf -filetype=obj -o xdp
 
 echo "Before unload drop count was:"
 ./dropcount.sh || echo "Not loaded"
@@ -13,4 +13,8 @@ echo "Before unload drop count was:"
 ip link set "$1" xdp off
 ip link set "$1" xdpgeneric off
 # Note that sometimes the automated fallback does not work properly so we have to || generic here
-ip link set "$1" xdp obj xdp sec xdp_drop || ip link set "$1" xdpgeneric obj xdp sec xdp_drop
+ip link set "$1" xdpoffload obj xdp sec xdp_drop || (
+	echo "Failed to install in NIC, testing in driver..." && ip link set "$1" xdpdrv obj xdp sec xdp_drop || (
+		echo "Failed to install in driver, using generic..." && ip link set "$1" xdpgeneric obj xdp sec xdp_drop
+	)
+)