Merge branch 'google:master' into master

Author: dvyukov

dashboard/app/api.go

@@ -726,7 +726,6 @@ func reportCrash(c context.Context, build *Build, req *dashapi.Crash) (*Bug, err
 		if err := db.Get(c, bugKey, bug); err != nil {
 			return fmt.Errorf("failed to get bug: %v", err)
 		}
-		bug.NumCrashes++
 		bug.LastTime = now
 		if save {
 			bug.LastSavedCrash = now
@@ -741,6 +740,7 @@ func reportCrash(c context.Context, build *Build, req *dashapi.Crash) (*Bug, err
 		if len(req.Report) != 0 {
 			bug.HasReport = true
 		}
+		bug.increaseCrashStats(now)
 		bug.HappenedOn = mergeString(bug.HappenedOn, build.Manager)
 		// Migration of older entities (for new bugs Title is always in MergedTitles).
 		bug.MergedTitles = mergeString(bug.MergedTitles, bug.Title)

dashboard/app/app_test.go

@@ -385,13 +385,24 @@ func TestApp(t *testing.T) {
 	c.client.pollBug()
 
 	// Provoke purgeOldCrashes.
-	for i := 0; i < 30; i++ {
+	const purgeTestIters = 30
+	for i := 0; i < purgeTestIters; i++ {
+		// Also test how daily counts work.
+		if i == purgeTestIters/2 {
+			c.advanceTime(48 * time.Hour)
+		}
 		crash := testCrash(build, 3)
 		crash.Log = []byte(fmt.Sprintf("log%v", i))
 		crash.Report = []byte(fmt.Sprintf("report%v", i))
 		c.client.ReportCrash(crash)
 	}
-	c.client.pollBug()
+	rep := c.client.pollBug()
+	bug, _, _ := c.loadBug(rep.ID)
+	c.expectNE(bug, nil)
+	c.expectEQ(bug.DailyStats, []BugDailyStats{
+		{20000101, purgeTestIters / 2},
+		{20000103, purgeTestIters / 2},
+	})
 
 	cid := &dashapi.CrashID{
 		BuildID: "build1",

dashboard/app/entities.go

@@ -21,7 +21,8 @@ const (
 	maxTextLen   = 200
 	MaxStringLen = 1024
 
-	maxCrashes = 40
+	maxCrashes        = 40
+	maxBugHistoryDays = 365 * 5
 )
 
 type Manager struct {
@@ -101,6 +102,12 @@ type Bug struct {
 	// bit 0 - the bug is published
 	// bit 1 - don't want to publish it (syzkaller build/test errors)
 	KcidbStatus int64
+	DailyStats  []BugDailyStats
+}
+
+type BugDailyStats struct {
+	Date       int // YYYYMMDD
+	CrashCount int
 }
 
 type Commit struct {
@@ -533,6 +540,25 @@ func (bug *Bug) getCommitInfo(i int) Commit {
 	return Commit{}
 }
 
+func (bug *Bug) increaseCrashStats(now time.Time) {
+	bug.NumCrashes++
+	date := timeDate(now)
+	if len(bug.DailyStats) == 0 || bug.DailyStats[len(bug.DailyStats)-1].Date < date {
+		bug.DailyStats = append(bug.DailyStats, BugDailyStats{date, 1})
+	} else {
+		// It is theoretically possible that this method might get into a situation, when
+		// the latest saved date is later than now. But we assume that this can only happen
+		// in a small window around the start of the day and it is better to attribute a
+		// crash to the next day than to get a mismatch between NumCrashes and the sum of
+		// CrashCount.
+		bug.DailyStats[len(bug.DailyStats)-1].CrashCount++
+	}
+
+	if len(bug.DailyStats) > maxBugHistoryDays {
+		bug.DailyStats = bug.DailyStats[len(bug.DailyStats)-maxBugHistoryDays:]
+	}
+}
+
 func markCrashReported(c context.Context, crashID int64, bugKey *db.Key, now time.Time) error {
 	crash := new(Crash)
 	crashKey := db.NewKey(c, "Crash", "", crashID, bugKey)

dashboard/app/jobs_test.go

@@ -327,6 +327,7 @@ kernel config:  %[2]v
 dashboard link: https://testapp.appspot.com/bug?extid=%[1]v
 compiler:       compiler2
 
+Note: no patches were applied.
 Note: testing is done by a robot and is best-effort only.
 `, extBugID, kernelConfigLink))
 		c.checkURLContents(kernelConfigLink, testBuild.KernelConfig)

dashboard/app/mail_test_result.txt

@@ -27,5 +27,6 @@ git tree:       {{.KernelRepoAlias}}
 compiler:       {{.CompilerID}}
 {{if .UserSpaceArch}}userspace arch: {{.UserSpaceArch}}
 {{end}}{{if .PatchLink}}patch:          {{.PatchLink}}
-{{end}}{{if and (not .CrashTitle) (not .Error)}}
+{{else}}
+Note: no patches were applied.{{end}}{{if and (not .CrashTitle) (not .Error)}}
 Note: testing is done by a robot and is best-effort only.{{end}}

dashboard/config/linux/bits/apparmor.yml

@@ -5,6 +5,8 @@ config:
  - SECURITY_SELINUX: n
  - SECURITY_SMACK: n
  - SECURITY_APPARMOR
+ # TODO: remove linux-next once it reaches mainline.
+ - SECURITY_APPARMOR_INTROSPECT_POLICY: [v5.17, linux-next]
  - SECURITY_APPARMOR_HASH
  - SECURITY_APPARMOR_HASH_DEFAULT
  - SECURITY_APPARMOR_DEBUG

dashboard/config/linux/bits/arm64.yml

@@ -23,7 +23,8 @@ config:
  - ARCH_VEXPRESS
  - I2C_VERSATILE
  - CLK_SP810
- - ICST
+ - ICST: [-v5.16]
+ - CLK_ICST: [v5.16]
 
  # These are enabled by defconfig, but we don't test them (presumably).
  # Disable them to speed up kernel boot (slow in emulation).
@@ -47,7 +48,6 @@ config:
  - DRM_LIMA: n
  - DRM_PANFROST: n
  - DRM_LEGACY: n
- - FB_SMSCUFX: n
  - FB_IBM_GXT4500: n
  - SMS_SIANO_RC: n
  - V4L_PLATFORM_DRIVERS: n

dashboard/config/linux/bits/base.yml

@@ -94,6 +94,9 @@ config:
  # Added in 919067cc845f ("net: add CONFIG_PCPU_DEV_REFCNT") and should appear in v5.13.
  - PCPU_DEV_REFCNT: [n, v5.13]
 
+ - NET_DEV_REFCNT_TRACKER: [v5.17]
+ - NET_NS_REFCNT_TRACKER: [v5.17]
+
  # This config does not add any debug checks (only debug output).
  - DEBUG_KOBJECT: n
 
@@ -109,9 +112,11 @@ config:
  # KCOV slows down execution too much with KASAN_HW_TAGS and in qemu emulation in general.
  # KCOV crashes on Arm:
  # https://lore.kernel.org/linux-arm-kernel/20210119130010.GA2338@C02TD0UTHF1T.local/T/#m78fdfcc41ae831f91c93ad5dabe63f7ccfb482f0
- - KCOV: [-arm64, -arm]
- - KCOV_INSTRUMENT_ALL: [-arm64, -arm]
- - KCOV_ENABLE_COMPARISONS: [-arm64, -arm]
+ # KCOV is not supported on s390 with our toolchain now, config depends on:
+ # (!ARCH_WANTS_NO_INSTR [=y] || STACK_VALIDATION [=n] || GCC_VERSION [=110200]>=120000 || CLANG_VERSION [=0]>=130000)
+ - KCOV: [-arm64, -arm, -s390]
+ - KCOV_INSTRUMENT_ALL: [-arm64, -arm, -s390]
+ - KCOV_ENABLE_COMPARISONS: [-arm64, -arm, -s390]
  - DEBUG_FS
 
  # Required for KCOV but also eliminates unnecessary non-determinism.
@@ -168,6 +173,9 @@ config:
  # Don't test/need this (may be enabled via HID_HYPERV_MOUSE in USB/HID configs).
  - HYPERV: n
 
+ # Don't test/need this.
+ - XEN: n
+
  # These are legacy gadget drivers that we don't reach/test and some of these break boot:
  # https://github.com/google/syzkaller/pull/1975#issuecomment-712807462
  - USB_G_NCM: n

dashboard/config/linux/bits/chromeos-5.10.yml

@@ -3,7 +3,8 @@
 
 kernel:
  repo: https://chromium.googlesource.com/chromiumos/third_party/kernel
- tag: c147240ea86e
+ # HEAD of chromeos-5.10 branch.
+ tag: f8eeaf8c39fb2e2ab00f24cbc728de960815aa69
 
 shell:
  - chromeos/scripts/prepareconfig chromiumos-x86_64 ${BUILDDIR}/.config

dashboard/config/linux/bits/chromeos-5.15.yml

@@ -3,7 +3,8 @@
 
 kernel:
  repo: https://chromium.googlesource.com/chromiumos/third_party/kernel
- tag: 0faa8c9f9dc4
+ # HEAD of chromeos-5.15 branch.
+ tag: 2ee474844f9c81d30317b9ad7f26009556414504
 
 shell:
  - chromeos/scripts/prepareconfig chromiumos-x86_64 ${BUILDDIR}/.config