Increase runtime (#592)

* Run for 2 hours Signed-off-by: Alan Jowett <[email protected]> * Only run regression for pull requests Signed-off-by: Alan Jowett <[email protected]> * Fix CLI option Signed-off-by: Alan Jowett <[email protected]> * Fix typo Signed-off-by: Alan Jowett <[email protected]> * PR feedback Signed-off-by: Alan Jowett <[email protected]> --------- Signed-off-by: Alan Jowett <[email protected]> Co-authored-by: Alan Jowett <[email protected]>
iovisor · Oct 29, 2024 · e6bf9d4 · e6bf9d4
1 parent f76c009
commit e6bf9d4
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 7 deletions.
diff --git a/.github/workflows/fuzzing.yml b/.github/workflows/fuzzing.yml
@@ -11,6 +11,12 @@ on:
     - cron: '00 21 * * *'
   workflow_dispatch: # Run manually
   workflow_call:
+    inputs:
+      regression_test:
+        description: 'Run the fuzzer over the corpus as a regression test.'
+        required: false
+        default: false
+        type: boolean
 
 jobs:
   build-posix:
@@ -220,23 +226,32 @@ jobs:
       if: matrix.platform == 'ubuntu-24.04'
       run: chmod a+x ubpf_fuzzer
 
+    # If this is a workflow call, run ubpf_fuzzer over each file in the corpus as a regression test.
+    - name: Run fuzzing regression
+      if: inputs.regression_test == true
+      run: |
+        ./ubpf_fuzzer -merge=1 fuzz/corpus new_corpus
+
+    # If this is a scheduled run or a manual run, run ubpf_fuzzer to attempt to find new crashes. Runs for 2 hours.
     - name: Run fuzzing
-      if: matrix.platform == 'ubuntu-24.04'
+      if: matrix.platform == 'ubuntu-24.04' && inputs.regression_test != true
       run: |
         ls
-        UBPF_FUZZER_CONSTRAINT_CHECK=1 ./ubpf_fuzzer new_corpus -artifact_prefix=artifacts/ -use_value_profile=1 -max_total_time=300 -dict=dictionary.txt
+        UBPF_FUZZER_CONSTRAINT_CHECK=1 ./ubpf_fuzzer new_corpus -artifact_prefix=artifacts/ -use_value_profile=1 -max_total_time=7200 -dict=dictionary.txt -jobs=1024
 
+    # If this is a scheduled run or a manual run, run ubpf_fuzzer to attempt to find new crashes. Runs for 2 hours.
     - name: Run fuzzing
-      if: matrix.platform == 'windows-latest'
+      if: matrix.platform == 'windows-latest' && inputs.regression_test != true
       run: |
         ls
-        ./ubpf_fuzzer new_corpus -artifact_prefix=artifacts/ -use_value_profile=1 -max_total_time=300
+        ./ubpf_fuzzer new_corpus -artifact_prefix=artifacts/ -use_value_profile=1 -max_total_time=7200 -jobs=1024
 
+    # Merge the new corpus into the existing corpus and push the changes to the repository.
     - name: Merge corpus into fuzz/corpus
-      if: ${{ github.event_name == 'schedule' }}
+      if: inputs.regression_test != true
       run: |
-        git pull
         ./ubpf_fuzzer -merge=1 fuzz/corpus new_corpus
+        git pull
         git add fuzz/corpus
         git config --global user.email '[email protected]'
         git config --global user.name 'Github Action'

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -342,6 +342,8 @@ jobs:
 
   fuzzing:
     uses: ./.github/workflows/fuzzing.yml
+    with:
+      regression_test: ${{ github.event_name == 'pull_request' || github.event_name == 'schedule' }}
 
   # Disabled until https://github.com/iovisor/ubpf/issues/155 is resolved.
   # linux_debug_arm64_sanitizers:

diff --git a/external/ebpf-verifier b/external/ebpf-verifier
+2 −1		src/assertions.cpp
+3 −13		src/crab_verifier.hpp
+12 −20		src/test/ebpf_yaml.cpp
+1 −1		src/test/ebpf_yaml.hpp
+1 −8		test-data/add.yaml
+6 −0		test-data/jump.yaml
+0 −19		test-data/loop.yaml
+0 −82		test-data/uninit.yaml