Merge release-20210927.0-60-g8682ce689 (automated)

1 files changed, 120 insertions, 117 deletions

diff --git a/pkg/sentry/kernel/kernel_state_autogen.go b/pkg/sentry/kernel/kernel_state_autogen.go
index d48c96425..ef8dd88f6 100644
--- a/pkg/sentry/kernel/kernel_state_autogen.go
+++ b/pkg/sentry/kernel/kernel_state_autogen.go
@@ -1318,6 +1318,7 @@ func (t *Task) StateFields() []string {
 		"haveSavedSignalMask",
 		"savedSignalMask",
 		"signalStack",
+		"signalQueue",
 		"groupStopPending",
 		"groupStopAcknowledged",
 		"trapStopPending",
@@ -1377,15 +1378,12 @@ func (t *Task) beforeSave() {}
 // +checklocksignore
 func (t *Task) StateSave(stateSinkObject state.Sink) {
 	t.beforeSave()
-	if !state.IsZeroValue(&t.signalQueue) {
-		state.Failf("signalQueue is %#v, expected zero", &t.signalQueue)
-	}
 	var ptraceTracerValue *Task
 	ptraceTracerValue = t.savePtraceTracer()
-	stateSinkObject.SaveValue(31, ptraceTracerValue)
+	stateSinkObject.SaveValue(32, ptraceTracerValue)
 	var syscallFiltersValue []bpf.Program
 	syscallFiltersValue = t.saveSyscallFilters()
-	stateSinkObject.SaveValue(48, syscallFiltersValue)
+	stateSinkObject.SaveValue(49, syscallFiltersValue)
 	stateSinkObject.Save(0, &t.taskNode)
 	stateSinkObject.Save(1, &t.runState)
 	stateSinkObject.Save(2, &t.taskWorkCount)
@@ -1399,55 +1397,56 @@ func (t *Task) StateSave(stateSinkObject state.Sink) {
 	stateSinkObject.Save(10, &t.haveSavedSignalMask)
 	stateSinkObject.Save(11, &t.savedSignalMask)
 	stateSinkObject.Save(12, &t.signalStack)
-	stateSinkObject.Save(13, &t.groupStopPending)
-	stateSinkObject.Save(14, &t.groupStopAcknowledged)
-	stateSinkObject.Save(15, &t.trapStopPending)
-	stateSinkObject.Save(16, &t.trapNotifyPending)
-	stateSinkObject.Save(17, &t.stop)
-	stateSinkObject.Save(18, &t.exitStatus)
-	stateSinkObject.Save(19, &t.syscallRestartBlock)
-	stateSinkObject.Save(20, &t.k)
-	stateSinkObject.Save(21, &t.containerID)
-	stateSinkObject.Save(22, &t.image)
-	stateSinkObject.Save(23, &t.fsContext)
-	stateSinkObject.Save(24, &t.fdTable)
-	stateSinkObject.Save(25, &t.vforkParent)
-	stateSinkObject.Save(26, &t.exitState)
-	stateSinkObject.Save(27, &t.exitTracerNotified)
-	stateSinkObject.Save(28, &t.exitTracerAcked)
-	stateSinkObject.Save(29, &t.exitParentNotified)
-	stateSinkObject.Save(30, &t.exitParentAcked)
-	stateSinkObject.Save(32, &t.ptraceTracees)
-	stateSinkObject.Save(33, &t.ptraceSeized)
-	stateSinkObject.Save(34, &t.ptraceOpts)
-	stateSinkObject.Save(35, &t.ptraceSyscallMode)
-	stateSinkObject.Save(36, &t.ptraceSinglestep)
-	stateSinkObject.Save(37, &t.ptraceCode)
-	stateSinkObject.Save(38, &t.ptraceSiginfo)
-	stateSinkObject.Save(39, &t.ptraceEventMsg)
-	stateSinkObject.Save(40, &t.ptraceYAMAExceptionAdded)
-	stateSinkObject.Save(41, &t.ioUsage)
-	stateSinkObject.Save(42, &t.creds)
-	stateSinkObject.Save(43, &t.utsns)
-	stateSinkObject.Save(44, &t.ipcns)
-	stateSinkObject.Save(45, &t.abstractSockets)
-	stateSinkObject.Save(46, &t.mountNamespaceVFS2)
-	stateSinkObject.Save(47, &t.parentDeathSignal)
-	stateSinkObject.Save(49, &t.cleartid)
-	stateSinkObject.Save(50, &t.allowedCPUMask)
-	stateSinkObject.Save(51, &t.cpu)
-	stateSinkObject.Save(52, &t.niceness)
-	stateSinkObject.Save(53, &t.numaPolicy)
-	stateSinkObject.Save(54, &t.numaNodeMask)
-	stateSinkObject.Save(55, &t.netns)
-	stateSinkObject.Save(56, &t.rseqCPU)
-	stateSinkObject.Save(57, &t.oldRSeqCPUAddr)
-	stateSinkObject.Save(58, &t.rseqAddr)
-	stateSinkObject.Save(59, &t.rseqSignature)
-	stateSinkObject.Save(60, &t.robustList)
-	stateSinkObject.Save(61, &t.startTime)
-	stateSinkObject.Save(62, &t.kcov)
-	stateSinkObject.Save(63, &t.cgroups)
+	stateSinkObject.Save(13, &t.signalQueue)
+	stateSinkObject.Save(14, &t.groupStopPending)
+	stateSinkObject.Save(15, &t.groupStopAcknowledged)
+	stateSinkObject.Save(16, &t.trapStopPending)
+	stateSinkObject.Save(17, &t.trapNotifyPending)
+	stateSinkObject.Save(18, &t.stop)
+	stateSinkObject.Save(19, &t.exitStatus)
+	stateSinkObject.Save(20, &t.syscallRestartBlock)
+	stateSinkObject.Save(21, &t.k)
+	stateSinkObject.Save(22, &t.containerID)
+	stateSinkObject.Save(23, &t.image)
+	stateSinkObject.Save(24, &t.fsContext)
+	stateSinkObject.Save(25, &t.fdTable)
+	stateSinkObject.Save(26, &t.vforkParent)
+	stateSinkObject.Save(27, &t.exitState)
+	stateSinkObject.Save(28, &t.exitTracerNotified)
+	stateSinkObject.Save(29, &t.exitTracerAcked)
+	stateSinkObject.Save(30, &t.exitParentNotified)
+	stateSinkObject.Save(31, &t.exitParentAcked)
+	stateSinkObject.Save(33, &t.ptraceTracees)
+	stateSinkObject.Save(34, &t.ptraceSeized)
+	stateSinkObject.Save(35, &t.ptraceOpts)
+	stateSinkObject.Save(36, &t.ptraceSyscallMode)
+	stateSinkObject.Save(37, &t.ptraceSinglestep)
+	stateSinkObject.Save(38, &t.ptraceCode)
+	stateSinkObject.Save(39, &t.ptraceSiginfo)
+	stateSinkObject.Save(40, &t.ptraceEventMsg)
+	stateSinkObject.Save(41, &t.ptraceYAMAExceptionAdded)
+	stateSinkObject.Save(42, &t.ioUsage)
+	stateSinkObject.Save(43, &t.creds)
+	stateSinkObject.Save(44, &t.utsns)
+	stateSinkObject.Save(45, &t.ipcns)
+	stateSinkObject.Save(46, &t.abstractSockets)
+	stateSinkObject.Save(47, &t.mountNamespaceVFS2)
+	stateSinkObject.Save(48, &t.parentDeathSignal)
+	stateSinkObject.Save(50, &t.cleartid)
+	stateSinkObject.Save(51, &t.allowedCPUMask)
+	stateSinkObject.Save(52, &t.cpu)
+	stateSinkObject.Save(53, &t.niceness)
+	stateSinkObject.Save(54, &t.numaPolicy)
+	stateSinkObject.Save(55, &t.numaNodeMask)
+	stateSinkObject.Save(56, &t.netns)
+	stateSinkObject.Save(57, &t.rseqCPU)
+	stateSinkObject.Save(58, &t.oldRSeqCPUAddr)
+	stateSinkObject.Save(59, &t.rseqAddr)
+	stateSinkObject.Save(60, &t.rseqSignature)
+	stateSinkObject.Save(61, &t.robustList)
+	stateSinkObject.Save(62, &t.startTime)
+	stateSinkObject.Save(63, &t.kcov)
+	stateSinkObject.Save(64, &t.cgroups)
 }
 
 // +checklocksignore
@@ -1465,57 +1464,58 @@ func (t *Task) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(10, &t.haveSavedSignalMask)
 	stateSourceObject.Load(11, &t.savedSignalMask)
 	stateSourceObject.Load(12, &t.signalStack)
-	stateSourceObject.Load(13, &t.groupStopPending)
-	stateSourceObject.Load(14, &t.groupStopAcknowledged)
-	stateSourceObject.Load(15, &t.trapStopPending)
-	stateSourceObject.Load(16, &t.trapNotifyPending)
-	stateSourceObject.Load(17, &t.stop)
-	stateSourceObject.Load(18, &t.exitStatus)
-	stateSourceObject.Load(19, &t.syscallRestartBlock)
-	stateSourceObject.Load(20, &t.k)
-	stateSourceObject.Load(21, &t.containerID)
-	stateSourceObject.Load(22, &t.image)
-	stateSourceObject.Load(23, &t.fsContext)
-	stateSourceObject.Load(24, &t.fdTable)
-	stateSourceObject.Load(25, &t.vforkParent)
-	stateSourceObject.Load(26, &t.exitState)
-	stateSourceObject.Load(27, &t.exitTracerNotified)
-	stateSourceObject.Load(28, &t.exitTracerAcked)
-	stateSourceObject.Load(29, &t.exitParentNotified)
-	stateSourceObject.Load(30, &t.exitParentAcked)
-	stateSourceObject.Load(32, &t.ptraceTracees)
-	stateSourceObject.Load(33, &t.ptraceSeized)
-	stateSourceObject.Load(34, &t.ptraceOpts)
-	stateSourceObject.Load(35, &t.ptraceSyscallMode)
-	stateSourceObject.Load(36, &t.ptraceSinglestep)
-	stateSourceObject.Load(37, &t.ptraceCode)
-	stateSourceObject.Load(38, &t.ptraceSiginfo)
-	stateSourceObject.Load(39, &t.ptraceEventMsg)
-	stateSourceObject.Load(40, &t.ptraceYAMAExceptionAdded)
-	stateSourceObject.Load(41, &t.ioUsage)
-	stateSourceObject.Load(42, &t.creds)
-	stateSourceObject.Load(43, &t.utsns)
-	stateSourceObject.Load(44, &t.ipcns)
-	stateSourceObject.Load(45, &t.abstractSockets)
-	stateSourceObject.Load(46, &t.mountNamespaceVFS2)
-	stateSourceObject.Load(47, &t.parentDeathSignal)
-	stateSourceObject.Load(49, &t.cleartid)
-	stateSourceObject.Load(50, &t.allowedCPUMask)
-	stateSourceObject.Load(51, &t.cpu)
-	stateSourceObject.Load(52, &t.niceness)
-	stateSourceObject.Load(53, &t.numaPolicy)
-	stateSourceObject.Load(54, &t.numaNodeMask)
-	stateSourceObject.Load(55, &t.netns)
-	stateSourceObject.Load(56, &t.rseqCPU)
-	stateSourceObject.Load(57, &t.oldRSeqCPUAddr)
-	stateSourceObject.Load(58, &t.rseqAddr)
-	stateSourceObject.Load(59, &t.rseqSignature)
-	stateSourceObject.Load(60, &t.robustList)
-	stateSourceObject.Load(61, &t.startTime)
-	stateSourceObject.Load(62, &t.kcov)
-	stateSourceObject.Load(63, &t.cgroups)
-	stateSourceObject.LoadValue(31, new(*Task), func(y interface{}) { t.loadPtraceTracer(y.(*Task)) })
-	stateSourceObject.LoadValue(48, new([]bpf.Program), func(y interface{}) { t.loadSyscallFilters(y.([]bpf.Program)) })
+	stateSourceObject.Load(13, &t.signalQueue)
+	stateSourceObject.Load(14, &t.groupStopPending)
+	stateSourceObject.Load(15, &t.groupStopAcknowledged)
+	stateSourceObject.Load(16, &t.trapStopPending)
+	stateSourceObject.Load(17, &t.trapNotifyPending)
+	stateSourceObject.Load(18, &t.stop)
+	stateSourceObject.Load(19, &t.exitStatus)
+	stateSourceObject.Load(20, &t.syscallRestartBlock)
+	stateSourceObject.Load(21, &t.k)
+	stateSourceObject.Load(22, &t.containerID)
+	stateSourceObject.Load(23, &t.image)
+	stateSourceObject.Load(24, &t.fsContext)
+	stateSourceObject.Load(25, &t.fdTable)
+	stateSourceObject.Load(26, &t.vforkParent)
+	stateSourceObject.Load(27, &t.exitState)
+	stateSourceObject.Load(28, &t.exitTracerNotified)
+	stateSourceObject.Load(29, &t.exitTracerAcked)
+	stateSourceObject.Load(30, &t.exitParentNotified)
+	stateSourceObject.Load(31, &t.exitParentAcked)
+	stateSourceObject.Load(33, &t.ptraceTracees)
+	stateSourceObject.Load(34, &t.ptraceSeized)
+	stateSourceObject.Load(35, &t.ptraceOpts)
+	stateSourceObject.Load(36, &t.ptraceSyscallMode)
+	stateSourceObject.Load(37, &t.ptraceSinglestep)
+	stateSourceObject.Load(38, &t.ptraceCode)
+	stateSourceObject.Load(39, &t.ptraceSiginfo)
+	stateSourceObject.Load(40, &t.ptraceEventMsg)
+	stateSourceObject.Load(41, &t.ptraceYAMAExceptionAdded)
+	stateSourceObject.Load(42, &t.ioUsage)
+	stateSourceObject.Load(43, &t.creds)
+	stateSourceObject.Load(44, &t.utsns)
+	stateSourceObject.Load(45, &t.ipcns)
+	stateSourceObject.Load(46, &t.abstractSockets)
+	stateSourceObject.Load(47, &t.mountNamespaceVFS2)
+	stateSourceObject.Load(48, &t.parentDeathSignal)
+	stateSourceObject.Load(50, &t.cleartid)
+	stateSourceObject.Load(51, &t.allowedCPUMask)
+	stateSourceObject.Load(52, &t.cpu)
+	stateSourceObject.Load(53, &t.niceness)
+	stateSourceObject.Load(54, &t.numaPolicy)
+	stateSourceObject.Load(55, &t.numaNodeMask)
+	stateSourceObject.Load(56, &t.netns)
+	stateSourceObject.Load(57, &t.rseqCPU)
+	stateSourceObject.Load(58, &t.oldRSeqCPUAddr)
+	stateSourceObject.Load(59, &t.rseqAddr)
+	stateSourceObject.Load(60, &t.rseqSignature)
+	stateSourceObject.Load(61, &t.robustList)
+	stateSourceObject.Load(62, &t.startTime)
+	stateSourceObject.Load(63, &t.kcov)
+	stateSourceObject.Load(64, &t.cgroups)
+	stateSourceObject.LoadValue(32, new(*Task), func(y interface{}) { t.loadPtraceTracer(y.(*Task)) })
+	stateSourceObject.LoadValue(49, new([]bpf.Program), func(y interface{}) { t.loadSyscallFilters(y.([]bpf.Program)) })
 	stateSourceObject.AfterLoad(t.afterLoad)
 }
 
@@ -2296,6 +2296,7 @@ func (t *threadGroupNode) StateTypeName() string {
 func (t *threadGroupNode) StateFields() []string {
 	return []string{
 		"pidns",
+		"eventQueue",
 		"leader",
 		"execing",
 		"tasks",
@@ -2311,12 +2312,13 @@ func (t *threadGroupNode) beforeSave() {}
 func (t *threadGroupNode) StateSave(stateSinkObject state.Sink) {
 	t.beforeSave()
 	stateSinkObject.Save(0, &t.pidns)
-	stateSinkObject.Save(1, &t.leader)
-	stateSinkObject.Save(2, &t.execing)
-	stateSinkObject.Save(3, &t.tasks)
-	stateSinkObject.Save(4, &t.tasksCount)
-	stateSinkObject.Save(5, &t.liveTasks)
-	stateSinkObject.Save(6, &t.activeTasks)
+	stateSinkObject.Save(1, &t.eventQueue)
+	stateSinkObject.Save(2, &t.leader)
+	stateSinkObject.Save(3, &t.execing)
+	stateSinkObject.Save(4, &t.tasks)
+	stateSinkObject.Save(5, &t.tasksCount)
+	stateSinkObject.Save(6, &t.liveTasks)
+	stateSinkObject.Save(7, &t.activeTasks)
 }
 
 func (t *threadGroupNode) afterLoad() {}
@@ -2324,12 +2326,13 @@ func (t *threadGroupNode) afterLoad() {}
 // +checklocksignore
 func (t *threadGroupNode) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &t.pidns)
-	stateSourceObject.Load(1, &t.leader)
-	stateSourceObject.Load(2, &t.execing)
-	stateSourceObject.Load(3, &t.tasks)
-	stateSourceObject.Load(4, &t.tasksCount)
-	stateSourceObject.Load(5, &t.liveTasks)
-	stateSourceObject.Load(6, &t.activeTasks)
+	stateSourceObject.Load(1, &t.eventQueue)
+	stateSourceObject.Load(2, &t.leader)
+	stateSourceObject.Load(3, &t.execing)
+	stateSourceObject.Load(4, &t.tasks)
+	stateSourceObject.Load(5, &t.tasksCount)
+	stateSourceObject.Load(6, &t.liveTasks)
+	stateSourceObject.Load(7, &t.activeTasks)
 }
 
 func (t *taskNode) StateTypeName() string {