diff options
| author | Jiri Pirko <jiri@mellanox.com> | 2019-10-24 10:16:19 +0200 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2019-11-03 14:20:59 +0100 |
| commit | d40d75d2d787b9d4f949422b88de18ede4ee20b6 (patch) | |
| tree | 18713cd0e1884616ceee1c74381eba65419aff9f /tools | |
| parent | 97f4b019d87a073ff02a3ff8b08ada59aea6e688 (diff) | |
executor: move fixed pci devlink handle into network namespace
In case there is a fixed pci devlink handle "pci/pci/0000:00:10.0"
on the system (initial network namespace), it is moved to a working
network namespace.
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/syz-execprog/execprog.go | 3 | ||||
| -rw-r--r-- | tools/syz-prog2c/prog2c.go | 1 | ||||
| -rw-r--r-- | tools/syz-reprolist/reprolist.go | 4 | ||||
| -rw-r--r-- | tools/syz-stress/stress.go | 3 |
4 files changed, 11 insertions, 0 deletions
diff --git a/tools/syz-execprog/execprog.go b/tools/syz-execprog/execprog.go index 32ba987ae..909715b7c 100644 --- a/tools/syz-execprog/execprog.go +++ b/tools/syz-execprog/execprog.go @@ -326,5 +326,8 @@ func createConfig(target *prog.Target, if featuresFlags["close_fds"].Enabled { config.Flags |= ipc.FlagEnableCloseFds } + if featuresFlags["devlink_pci"].Enabled && features[host.FeatureDevlinkPCI].Enabled { + config.Flags |= ipc.FlagEnableDevlinkPCI + } return config, execOpts } diff --git a/tools/syz-prog2c/prog2c.go b/tools/syz-prog2c/prog2c.go index de704b353..c1a3f50ef 100644 --- a/tools/syz-prog2c/prog2c.go +++ b/tools/syz-prog2c/prog2c.go @@ -88,6 +88,7 @@ func main() { EnableBinfmtMisc: features["binfmt_misc"].Enabled, EnableCloseFds: features["close_fds"].Enabled, EnableKCSAN: features["kcsan"].Enabled, + EnableDevlinkPCI: features["devlink_pci"].Enabled, UseTmpDir: *flagUseTmpDir, HandleSegv: *flagHandleSegv, Repro: false, diff --git a/tools/syz-reprolist/reprolist.go b/tools/syz-reprolist/reprolist.go index 85e328fac..5d082b37e 100644 --- a/tools/syz-reprolist/reprolist.go +++ b/tools/syz-reprolist/reprolist.go @@ -215,6 +215,10 @@ func createProg2CArgs(bug *dashapi.LoadBugResp, opts csource.Options, file strin if opts.EnableCloseFds && haveCloseFds { enable = append(enable, "close_fds") } + if opts.EnableDevlinkPCI { + enable = append(enable, "devlink_pci") + flags = append(flags, "-devlinkpci") + } if !haveEnableFlag { args = append(args, flags...) } else if len(enable) != 0 { diff --git a/tools/syz-stress/stress.go b/tools/syz-stress/stress.go index af78906ab..9323013c0 100644 --- a/tools/syz-stress/stress.go +++ b/tools/syz-stress/stress.go @@ -98,6 +98,9 @@ func main() { if featuresFlags["close_fds"].Enabled { config.Flags |= ipc.FlagEnableCloseFds } + if featuresFlags["devlink_pci"].Enabled && features[host.FeatureDevlinkPCI].Enabled { + config.Flags |= ipc.FlagEnableDevlinkPCI + } if err = host.Setup(target, features, featuresFlags, config.Executor); err != nil { log.Fatal(err) } |