Temporarily disable UPF feature and tests

UPF feature for vanilla firecracker requires a separate integration effort (vhive-serverless#807), so temporarily disable this feature and all tests for it. Signed-off-by: Georgiy Lebedev <[email protected]>
CuriousGeorgiy · Sep 26, 2023 · 9bb67e2 · 9bb67e2
1 parent 4512efd
commit 9bb67e2
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 5 deletions.
diff --git a/.github/workflows/nightly_tests.yml b/.github/workflows/nightly_tests.yml
@@ -58,7 +58,9 @@ jobs:
  strategy:
  fail-fast: false
  matrix:
- vhive_args: ["-dbg", "-dbg -snapshots", "-dbg -snapshots -upf"]
+ # User-level page faults are temporarily disabled (gh-807)
+ # vhive_args: ["-dbg", "-dbg -snapshots", "-dbg -snapshots -upf"]
+ vhive_args: [ "-dbg", "-dbg -snapshots" ]
  env:
  GITHUB_RUN_ID: ${{ github.run_id }}
  GITHUB_JOB: ${{ github.job }}

diff --git a/Makefile b/Makefile
@@ -24,8 +24,11 @@ SUBDIRS:=ctriface taps misc profile
 EXTRAGOARGS:=-v -race -cover
 EXTRAGOARGS_NORACE:=-v
 EXTRATESTFILES:=vhive_test.go stats.go vhive.go functions.go
-WITHUPF:=-upfTest
-WITHLAZY:=-lazyTest
+# User-level page faults are temporarily disabled (gh-807)
+# WITHUPF:=-upfTest
+# WITHLAZY:=-lazyTest
+WITHUPF:=
+WITHLAZY:=
 WITHSNAPSHOTS:=-snapshotsTest
 CTRDLOGDIR:=/tmp/ctrd-logs
 

diff --git a/ctriface/Makefile b/ctriface/Makefile
@@ -23,8 +23,11 @@
 EXTRAGOARGS:=-v -race -cover
 EXTRATESTFILES:=iface_test.go iface.go orch_options.go orch.go
 BENCHFILES:=bench_test.go iface.go orch_options.go orch.go
-WITHUPF:=-upf
-WITHLAZY:=-lazy
+# User-level page faults are temporarily disabled (gh-807)
+# WITHUPF:=-upf
+# WITHLAZY:=-lazy
+WITHUPF:=
+WITHLAZY:=
 GOBENCH:=-v -timeout 1500s
 CTRDLOGDIR:=/tmp/ctrd-logs
 

diff --git a/ctriface/iface_test.go b/ctriface/iface_test.go
@@ -45,6 +45,17 @@ var (
  isWithCache = flag.Bool("withCache", false, "Do not drop the cache before measurements")
 )
 
+func TestMain(m *testing.M) {
+ flag.Parse()
+
+ if *isUPFEnabled {
+ log.Error("User-level page faults are temporarily disabled (gh-807)")
+ os.Exit(-1)
+ }
+
+ os.Exit(m.Run())
+}
+
 func TestPauseSnapResume(t *testing.T) {
  log.SetFormatter(&log.TextFormatter{
  TimestampFormat: ctrdlog.RFC3339NanoFixed,

diff --git a/vhive.go b/vhive.go
@@ -89,6 +89,11 @@ func main() {
  return
  }
 
+ if *isUPFEnabled {
+ log.Error("User-level page faults are temporarily disabled (gh-807)")
+ return
+ }
+
  if *isUPFEnabled && !*isSnapshotsEnabled {
  log.Error("User-level page faults are not supported without snapshots")
  return

diff --git a/vhive_test.go b/vhive_test.go
@@ -65,6 +65,11 @@ func TestMain(m *testing.M) {
 
  flag.Parse()
 
+ if *isUPFEnabledTest {
+ log.Error("User-level page faults are temporarily disabled (gh-807)")
+ os.Exit(-1)
+ }
+
  log.Infof("Orchestrator snapshots enabled: %t", *isSnapshotsEnabledTest)
  log.Infof("Orchestrator UPF enabled: %t", *isUPFEnabledTest)
  log.Infof("Orchestrator lazy serving mode enabled: %t", *isLazyModeTest)