vm/gce: add support GCE VMs

xairy · Oct 6, 2016 · 83374d7 · 83374d7
1 parent 2bdb521
commit 83374d7
Show file tree

Hide file tree

Showing 5 changed files with 480 additions and 27 deletions.
diff --git a/config/config.go b/config/config.go
@@ -46,6 +46,8 @@ type Config struct {
 	// "namespace": create a new namespace for fuzzer using CLONE_NEWNS/CLONE_NEWNET/CLONE_NEWPID/etc,
 	//	requires building kernel with CONFIG_NAMESPACES, CONFIG_UTS_NS, CONFIG_USER_NS, CONFIG_PID_NS and CONFIG_NET_NS.
 
+	Machine_Type string // GCE machine type (e.g. "n1-highcpu-2")
+
 	Cover bool // use kcov coverage (default: true)
 	Leak  bool // do memory leak checking
 
@@ -116,6 +118,11 @@ func parse(data []byte) (*Config, map[int]bool, []*regexp.Regexp, error) {
 			return nil, nil, nil, fmt.Errorf("specify at least 1 adb device")
 		}
 		cfg.Count = len(cfg.Devices)
+	case "gce":
+		if cfg.Machine_Type == "" {
+			return nil, nil, nil, fmt.Errorf("machine_type parameter is empty (required for gce)")
+		}
+		fallthrough
 	default:
 		if cfg.Count <= 0 || cfg.Count > 1000 {
 			return nil, nil, nil, fmt.Errorf("invalid config param count: %v, want (1, 1000]", cfg.Count)
@@ -243,19 +250,20 @@ func CreateVMConfig(cfg *Config, index int) (*vm.Config, error) {
 		return nil, fmt.Errorf("failed to create instance temp dir: %v", err)
 	}
 	vmCfg := &vm.Config{
-		Name:     fmt.Sprintf("%v-%v", cfg.Type, index),
-		Index:    index,
-		Workdir:  workdir,
-		Bin:      cfg.Bin,
-		Kernel:   cfg.Kernel,
-		Cmdline:  cfg.Cmdline,
-		Image:    cfg.Image,
-		Initrd:   cfg.Initrd,
-		Sshkey:   cfg.Sshkey,
-		Executor: filepath.Join(cfg.Syzkaller, "bin", "syz-executor"),
-		Cpu:      cfg.Cpu,
-		Mem:      cfg.Mem,
-		Debug:    cfg.Debug,
+		Name:        fmt.Sprintf("%v-%v", cfg.Type, index),
+		Index:       index,
+		Workdir:     workdir,
+		Bin:         cfg.Bin,
+		Kernel:      cfg.Kernel,
+		Cmdline:     cfg.Cmdline,
+		Image:       cfg.Image,
+		Initrd:      cfg.Initrd,
+		Sshkey:      cfg.Sshkey,
+		Executor:    filepath.Join(cfg.Syzkaller, "bin", "syz-executor"),
+		Cpu:         cfg.Cpu,
+		Mem:         cfg.Mem,
+		Debug:       cfg.Debug,
+		MachineType: cfg.Machine_Type,
 	}
 	if len(cfg.Devices) != 0 {
 		vmCfg.Device = cfg.Devices[index]
@@ -293,6 +301,7 @@ func checkUnknownFields(data []byte) (string, error) {
 		"Disable_Syscalls",
 		"Suppressions",
 		"Initrd",
+		"Machine_Type",
 	}
 	f := make(map[string]interface{})
 	if err := json.Unmarshal(data, &f); err != nil {

diff --git a/syz-manager/manager.go b/syz-manager/manager.go
@@ -30,6 +30,7 @@ import (
 	"github.com/google/syzkaller/sys"
 	"github.com/google/syzkaller/vm"
 	_ "github.com/google/syzkaller/vm/adb"
+	_ "github.com/google/syzkaller/vm/gce"
 	_ "github.com/google/syzkaller/vm/kvm"
 	_ "github.com/google/syzkaller/vm/local"
 	_ "github.com/google/syzkaller/vm/qemu"

diff --git a/tools/syz-repro/repro.go b/tools/syz-repro/repro.go
@@ -22,6 +22,7 @@ import (
 	"github.com/google/syzkaller/report"
 	"github.com/google/syzkaller/vm"
 	_ "github.com/google/syzkaller/vm/adb"
+	_ "github.com/google/syzkaller/vm/gce"
 	_ "github.com/google/syzkaller/vm/kvm"
 	_ "github.com/google/syzkaller/vm/qemu"
 )