From 409ee912f2c4f07e3064b4e6f4a83e1f812531d8 Mon Sep 17 00:00:00 2001
From: Aleksandr Nogikh <nogikh@google.com>
Date: Fri, 15 Mar 2024 19:53:15 +0100
Subject: all: move fuzzer to the host

Instead of doing fuzzing in parallel in running VM, make all decisions
in the host syz-manager process.

Instantiate and keep a fuzzer.Fuzzer object in syz-manager and update
the RPC between syz-manager and syz-fuzzer to exchange exact programs to
execute and their resulting signal and coverage.

To optimize the networking traffic, exchange mostly only the difference
between the known max signal and the detected signal.
---
 pkg/signal/signal.go | 71 ++++++++++++++++++++++------------------------------
 1 file changed, 30 insertions(+), 41 deletions(-)

(limited to 'pkg/signal')

diff --git a/pkg/signal/signal.go b/pkg/signal/signal.go
index 7a2a8bd16..2860be95e 100644
--- a/pkg/signal/signal.go
+++ b/pkg/signal/signal.go
@@ -11,11 +11,6 @@ type (
 
 type Signal map[elemType]prioType
 
-type Serial struct {
-	Elems []elemType
-	Prios []prioType
-}
-
 func (s Signal) Len() int {
 	return len(s)
 }
@@ -64,42 +59,6 @@ func FromRaw(raw []uint32, prio uint8) Signal {
 	return s
 }
 
-func (s Signal) Serialize() Serial {
-	if s.Empty() {
-		return Serial{}
-	}
-	res := Serial{
-		Elems: make([]elemType, len(s)),
-		Prios: make([]prioType, len(s)),
-	}
-	i := 0
-	for e, p := range s {
-		res.Elems[i] = e
-		res.Prios[i] = p
-		i++
-	}
-	return res
-}
-
-func (ser *Serial) AddElem(elem uint32, prio prioType) {
-	ser.Elems = append(ser.Elems, elemType(elem))
-	ser.Prios = append(ser.Prios, prio)
-}
-
-func (ser Serial) Deserialize() Signal {
-	if len(ser.Elems) != len(ser.Prios) {
-		panic("corrupted Serial")
-	}
-	if len(ser.Elems) == 0 {
-		return nil
-	}
-	s := make(Signal, len(ser.Elems))
-	for i, e := range ser.Elems {
-		s[e] = ser.Prios[i]
-	}
-	return s
-}
-
 func (s Signal) Diff(s1 Signal) Signal {
 	if s1.Empty() {
 		return nil
@@ -160,6 +119,36 @@ func (s *Signal) Merge(s1 Signal) {
 	}
 }
 
+// FilterRaw returns a subset of original raw elements that coincides with the one in Signal.
+func (s Signal) FilterRaw(raw []uint32) []uint32 {
+	var ret []uint32
+	for _, e := range raw {
+		if _, ok := s[elemType(e)]; ok {
+			ret = append(ret, e)
+		}
+	}
+	return ret
+}
+
+// DiffFromRaw returns a subset of the raw elements that is not present in Signal.
+func (s Signal) DiffFromRaw(raw []uint32) []uint32 {
+	var ret []uint32
+	for _, e := range raw {
+		if _, ok := s[elemType(e)]; !ok {
+			ret = append(ret, e)
+		}
+	}
+	return ret
+}
+
+func (s Signal) ToRaw() []uint32 {
+	var raw []uint32
+	for e := range s {
+		raw = append(raw, uint32(e))
+	}
+	return raw
+}
+
 type Context struct {
 	Signal  Signal
 	Context interface{}
-- 
cgit mrf-deployment