From d40d75d2d787b9d4f949422b88de18ede4ee20b6 Mon Sep 17 00:00:00 2001 From: Jiri Pirko Date: Thu, 24 Oct 2019 10:16:19 +0200 Subject: 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 --- tools/syz-execprog/execprog.go | 3 +++ tools/syz-prog2c/prog2c.go | 1 + tools/syz-reprolist/reprolist.go | 4 ++++ tools/syz-stress/stress.go | 3 +++ 4 files changed, 11 insertions(+) (limited to 'tools') 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) } -- cgit mrf-deployment