diff options
| author | Aleksandr Nogikh <nogikh@google.com> | 2023-07-19 14:14:10 +0200 |
|---|---|---|
| committer | Aleksandr Nogikh <nogikh@google.com> | 2023-07-20 07:33:29 +0000 |
| commit | d922ca7efda29b23dfb85abe37aee1641c4fbe05 (patch) | |
| tree | 7c7d78500ef5536f36717c45de2e0adeb1a62a33 /syz-ci | |
| parent | 37668e463d42d68846539559443ec458c9b05acb (diff) | |
syz-ci: specify per-manager bisection backports
It might be the case that the kernels that are being fuzzed on syz-ci
require their own backports to build/test older revisions during
bisection.
Let users specify it in the syz-ci config.
Diffstat (limited to 'syz-ci')
| -rw-r--r-- | syz-ci/jobs.go | 1 | ||||
| -rw-r--r-- | syz-ci/syz-ci.go | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/syz-ci/jobs.go b/syz-ci/jobs.go index ee62e7e03..4c10fc7b7 100644 --- a/syz-ci/jobs.go +++ b/syz-ci/jobs.go @@ -498,6 +498,7 @@ func (jp *JobProcessor) bisect(job *Job, mgrcfg *mgrconfig.Config) error { Config: req.KernelConfig, BaselineConfig: baseline, Userspace: mgr.mgrcfg.Userspace, + Backports: mgr.mgrcfg.BisectBackports, }, Syzkaller: bisect.SyzkallerConfig{ Repo: jp.cfg.SyzkallerRepo, diff --git a/syz-ci/syz-ci.go b/syz-ci/syz-ci.go index e7d75918d..94b574360 100644 --- a/syz-ci/syz-ci.go +++ b/syz-ci/syz-ci.go @@ -71,6 +71,7 @@ import ( "github.com/google/syzkaller/pkg/log" "github.com/google/syzkaller/pkg/mgrconfig" "github.com/google/syzkaller/pkg/osutil" + "github.com/google/syzkaller/pkg/vcs" ) var ( @@ -182,6 +183,8 @@ type ManagerConfig struct { // File with sysctl values (e.g. output of sysctl -a, optional). KernelSysctl string `json:"kernel_sysctl"` Jobs ManagerJobs `json:"jobs"` + // Extra commits to cherry pick to older kernel revisions. + BisectBackports []vcs.BackportCommit `json:"bisect_backports"` ManagerConfig json.RawMessage `json:"manager_config"` managercfg *mgrconfig.Config |