-
Notifications
You must be signed in to change notification settings - Fork 1.3k
RFC: syz-cluster: consider git diffs during series triage #5934
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
a-nogikh
wants to merge
1
commit into
google:master
Choose a base branch
from
a-nogikh:features/filter-series-by-diff
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+122
−0
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
// Copyright 2025 syzkaller project authors. All rights reserved. | ||
// Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file. | ||
|
||
package triage | ||
|
||
import ( | ||
"path/filepath" | ||
|
||
"github.com/google/syzkaller/pkg/vcs" | ||
"github.com/google/syzkaller/syz-cluster/pkg/api" | ||
) | ||
|
||
// For now, follow the simplest strategy - just verify whether the series modifies only the files | ||
// irrelevant for the kernel builds. | ||
|
||
// There are many opportunities to make it smarter: | ||
// 1. Some source files are not compiled. | ||
// 2. Some source files are compiled but we have never been able to cover them during fuzzing. | ||
|
||
const reasonNotAffectsBuild = "the series only modifies irrelevant files" | ||
|
||
// NeedFuzzing returns an empty string if the series is worth of fuzzing, | ||
// and otherwise it returns an explanation why it is not. | ||
func NeedFuzzing(series *api.Series) string { | ||
for _, patch := range series.Patches { | ||
files := vcs.ParseGitDiff(patch.Body) | ||
for _, file := range files { | ||
if irrelevantPath[file] { | ||
continue | ||
} | ||
if irrelevantExt[filepath.Ext(file)] { | ||
continue | ||
} | ||
return "" | ||
} | ||
} | ||
return reasonNotAffectsBuild | ||
} | ||
|
||
var irrelevantExt = map[string]bool{ | ||
".txt": true, | ||
".rst": true, | ||
".json": true, | ||
".py": true, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There are some codegen scripts in Python, at least I see "gen_header.py". |
||
} | ||
|
||
var irrelevantPath = map[string]bool{ | ||
"MAINTAINERS": true, | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,66 @@ | ||
// Copyright 2025 syzkaller project authors. All rights reserved. | ||
// Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file. | ||
|
||
package triage | ||
|
||
import ( | ||
"testing" | ||
|
||
"github.com/google/syzkaller/syz-cluster/pkg/api" | ||
"github.com/stretchr/testify/assert" | ||
) | ||
|
||
func TestNeedFuzzing(t *testing.T) { | ||
tests := []struct { | ||
Name string | ||
Patch string | ||
Verdict string | ||
}{ | ||
{ | ||
Name: "source code changes", | ||
Patch: `diff --git a/a.c b/a.c | ||
index c4bfa5f..7b82a4b 100644 | ||
--- a/a.c | ||
+++ b/a.c | ||
@@ -1,2 +1,2 @@ | ||
-Old text | ||
+new text`, | ||
Verdict: "", | ||
}, | ||
{ | ||
Name: "unrelated changes", | ||
Patch: `diff --git a/documentation.txt b/documentation.txt | ||
new file mode 100644 | ||
index 0000000..e15621b | ||
--- /dev/null | ||
+++ b/documentation.txt | ||
@@ -0,0 +1 @@ | ||
+new text file`, | ||
Verdict: reasonNotAffectsBuild, | ||
}, | ||
{ | ||
Name: "irrelevant file", | ||
Patch: `diff --git a/MAINTAINERS b/MAINTAINERS | ||
new file mode 100644 | ||
index 0000000..e15621b | ||
--- /dev/null | ||
+++ b/MAINTAINERS | ||
@@ -0,0 +1 @@ | ||
+new text file`, | ||
Verdict: reasonNotAffectsBuild, | ||
}, | ||
} | ||
|
||
for _, test := range tests { | ||
t.Run(test.Name, func(t *testing.T) { | ||
reason := NeedFuzzing(&api.Series{ | ||
Patches: []api.SeriesPatch{ | ||
{ | ||
Body: []byte(test.Patch), | ||
}, | ||
}, | ||
}) | ||
assert.Equal(t, test.Verdict, reason) | ||
}) | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Add a TODO that this should be replaced with build signatures, rather than extended be more and more complex.