Merge branch 'master' into master

Author: Radon10043

.github/workflows/gemini-pr-review.yml

@@ -631,7 +631,7 @@ <h1>{{.Caption}}:</h1>
 			<td class="stat">{{link $item.KernelCommitLink (formatTagHash $item.KernelCommit)}}</td>
 			<td>
 				{{if $item.ReproCLink}}<a href="{{$item.ReproCLink}}">C</a>
-				{{else if $item.ReproSyzLink}}<a href="{{$item.ReproSyzLink}}">C</a>{{end}}
+				{{else if $item.ReproSyzLink}}<a href="{{$item.ReproSyzLink}}">syz</a>{{end}}
 			</td>
 			{{if ne $item.CrashTitle ""}}
 			<td class="status-crashed">

dashboard/app/templates/templates.html

@@ -175,9 +175,6 @@ func runMake(params Params, extraArgs ...string) error {
 		"KBUILD_BUILD_TIMESTAMP=now",
 		"KBUILD_BUILD_USER=syzkaller",
 		"KBUILD_BUILD_HOST=syzkaller",
-		"KERNELVERSION=syzkaller",
-		"KERNELRELEASE=syzkaller",
-		"LOCALVERSION=-syzkaller",
 	)
 	output, err := osutil.Run(time.Hour, cmd)
 	params.Tracer.Log("Build log:\n%s", output)
@@ -186,6 +183,11 @@ func runMake(params Params, extraArgs ...string) error {
 
 func LinuxMakeArgs(target *targets.Target, compiler, linker, ccache, buildDir string, jobs int) []string {
 	args := []string{
+		// Make still overrides these if they are passed as env variables.
+		// Let's pass them directly as make arguments.
+		"KERNELVERSION=syzkaller",
+		"KERNELRELEASE=syzkaller",
+		"LOCALVERSION=-syzkaller",
 		"-j", fmt.Sprint(jobs),
 		"ARCH=" + target.KernelArch,
 	}

pkg/build/linux.go

@@ -111,10 +111,11 @@ type server struct {
 }
 
 type Stats struct {
-	StatExecs      *stat.Val
-	StatNumFuzzing *stat.Val
-	StatVMRestarts *stat.Val
-	StatModules    *stat.Val
+	StatExecs            *stat.Val
+	StatNumFuzzing       *stat.Val
+	StatVMRestarts       *stat.Val
+	StatModules          *stat.Val
+	StatExecutorRestarts *stat.Val
 }
 
 func NewStats() Stats {
@@ -139,6 +140,8 @@ func NewNamedStats(name string) Stats {
 			stat.Rate{}, stat.NoGraph),
 		StatModules: stat.New("modules"+suffix, "Number of loaded kernel modules",
 			stat.NoGraph, stat.Link("/modules"+linkSuffix)),
+		StatExecutorRestarts: stat.New("executor restarts"+suffix,
+			"Number of times executor process was restarted", stat.Rate{}, stat.Graph("executor")),
 	}
 }
 
@@ -209,8 +212,7 @@ func newImpl(cfg *Config, mgr Manager) *server {
 			statExecRetries: stat.New("exec retries",
 				"Number of times a test program was restarted because the first run failed",
 				stat.Rate{}, stat.Graph("executor")),
-			statExecutorRestarts: stat.New("executor restarts",
-				"Number of times executor process was restarted", stat.Rate{}, stat.Graph("executor")),
+			statExecutorRestarts:   cfg.Stats.StatExecutorRestarts,
 			statExecBufferTooSmall: queue.StatExecBufferTooSmall,
 			statExecs:              cfg.Stats.StatExecs,
 			statNoExecRequests:     queue.StatNoExecRequests,

pkg/rpcserver/rpcserver.go

@@ -138,7 +138,7 @@ func parse(interner *Interner, s *bufio.Scanner) ([]Frame, error) {
 	var frames []Frame
 	for s.Scan() {
 		ln := s.Text()
-		if len(ln) > 3 && ln[0] == '0' && ln[1] == 'x' {
+		if len(ln) >= 3 && ln[0] == '0' && ln[1] == 'x' {
 			break
 		}
 		fn := ln

pkg/symbolizer/addr2line.go

@@ -46,7 +46,7 @@ func (repo *StatsRepository) FindingsPerWeek(ctx context.Context) (
   TIMESTAMP_TRUNC(Sessions.FinishedAt, WEEK) as Date,
   COUNT(*) as Count
 FROM Findings
-JOIN Sessions ON Sessions.ID = Findings.SessionID
+JOIN Sessions ON Sessions.ID = Findings.SessionID AND Sessions.FinishedAt IS NOT NULL
 GROUP BY Date
 ORDER BY Date`,
 	})

syz-cluster/pkg/db/stats_repo.go

@@ -15,19 +15,26 @@ func TestStatsSQLs(t *testing.T) {
 	// That already brings a lot of value.
 	client, ctx := NewTransientDB(t)
 
-	// Add some data to test field decoding as well.
+	checkStats := func() {
+		statsRepo := NewStatsRepository(client)
+		_, err := statsRepo.ProcessedSeriesPerWeek(ctx)
+		assert.NoError(t, err)
+		_, err = statsRepo.FindingsPerWeek(ctx)
+		assert.NoError(t, err)
+		_, err = statsRepo.SessionStatusPerWeek(ctx)
+		assert.NoError(t, err)
+		_, err = statsRepo.DelayPerWeek(ctx)
+		assert.NoError(t, err)
+	}
+
 	dtd := &dummyTestData{t, ctx, client}
 	session := dtd.dummySession(dtd.dummySeries())
+	checkStats()
 	dtd.startSession(session)
+	dtd.addSessionTest(session, "test")
+	checkStats()
+	dtd.addFinding(session, "test", "test")
+	checkStats()
 	dtd.finishSession(session)
-
-	statsRepo := NewStatsRepository(client)
-	_, err := statsRepo.ProcessedSeriesPerWeek(ctx)
-	assert.NoError(t, err)
-	_, err = statsRepo.FindingsPerWeek(ctx)
-	assert.NoError(t, err)
-	_, err = statsRepo.SessionStatusPerWeek(ctx)
-	assert.NoError(t, err)
-	_, err = statsRepo.DelayPerWeek(ctx)
-	assert.NoError(t, err)
+	checkStats()
 }