Merge release-20210315.0-15-gacb4c6288 (automated)

6 files changed, 22 insertions, 0 deletions

diff --git a/pkg/sentry/arch/arch_aarch64_state_autogen.go b/pkg/sentry/arch/arch_aarch64_state_autogen.go
index 817679b05..b3d9425e4 100644
--- a/pkg/sentry/arch/arch_aarch64_state_autogen.go
+++ b/pkg/sentry/arch/arch_aarch64_state_autogen.go
@@ -21,6 +21,7 @@ func (r *Registers) StateFields() []string {
 
 func (r *Registers) beforeSave() {}
 
+// +checklocksignore
 func (r *Registers) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.PtraceRegs)
@@ -29,6 +30,7 @@ func (r *Registers) StateSave(stateSinkObject state.Sink) {
 
 func (r *Registers) afterLoad() {}
 
+// +checklocksignore
 func (r *Registers) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.PtraceRegs)
 	stateSourceObject.Load(1, &r.TPIDR_EL0)
@@ -49,6 +51,7 @@ func (s *State) StateFields() []string {
 
 func (s *State) beforeSave() {}
 
+// +checklocksignore
 func (s *State) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.Regs)
@@ -59,6 +62,7 @@ func (s *State) StateSave(stateSinkObject state.Sink) {
 
 func (s *State) afterLoad() {}
 
+// +checklocksignore
 func (s *State) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.Regs)
 	stateSourceObject.LoadWait(1, &s.aarch64FPState)
diff --git a/pkg/sentry/arch/arch_amd64_state_autogen.go b/pkg/sentry/arch/arch_amd64_state_autogen.go
index 7fe18338d..d74b4267b 100644
--- a/pkg/sentry/arch/arch_amd64_state_autogen.go
+++ b/pkg/sentry/arch/arch_amd64_state_autogen.go
@@ -23,6 +23,7 @@ func (c *context64) StateFields() []string {
 
 func (c *context64) beforeSave() {}
 
+// +checklocksignore
 func (c *context64) StateSave(stateSinkObject state.Sink) {
 	c.beforeSave()
 	stateSinkObject.Save(0, &c.State)
@@ -31,6 +32,7 @@ func (c *context64) StateSave(stateSinkObject state.Sink) {
 
 func (c *context64) afterLoad() {}
 
+// +checklocksignore
 func (c *context64) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &c.State)
 	stateSourceObject.Load(1, &c.sigFPState)
diff --git a/pkg/sentry/arch/arch_arm64_state_autogen.go b/pkg/sentry/arch/arch_arm64_state_autogen.go
index bece3fa9e..4f6fe0744 100644
--- a/pkg/sentry/arch/arch_arm64_state_autogen.go
+++ b/pkg/sentry/arch/arch_arm64_state_autogen.go
@@ -23,6 +23,7 @@ func (c *context64) StateFields() []string {
 
 func (c *context64) beforeSave() {}
 
+// +checklocksignore
 func (c *context64) StateSave(stateSinkObject state.Sink) {
 	c.beforeSave()
 	stateSinkObject.Save(0, &c.State)
@@ -31,6 +32,7 @@ func (c *context64) StateSave(stateSinkObject state.Sink) {
 
 func (c *context64) afterLoad() {}
 
+// +checklocksignore
 func (c *context64) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &c.State)
 	stateSourceObject.Load(1, &c.sigFPState)
diff --git a/pkg/sentry/arch/arch_state_autogen.go b/pkg/sentry/arch/arch_state_autogen.go
index e0a1de627..fd93f89dd 100644
--- a/pkg/sentry/arch/arch_state_autogen.go
+++ b/pkg/sentry/arch/arch_state_autogen.go
@@ -25,6 +25,7 @@ func (m *MmapLayout) StateFields() []string {
 
 func (m *MmapLayout) beforeSave() {}
 
+// +checklocksignore
 func (m *MmapLayout) StateSave(stateSinkObject state.Sink) {
 	m.beforeSave()
 	stateSinkObject.Save(0, &m.MinAddr)
@@ -37,6 +38,7 @@ func (m *MmapLayout) StateSave(stateSinkObject state.Sink) {
 
 func (m *MmapLayout) afterLoad() {}
 
+// +checklocksignore
 func (m *MmapLayout) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &m.MinAddr)
 	stateSourceObject.Load(1, &m.MaxAddr)
@@ -59,6 +61,7 @@ func (a *AuxEntry) StateFields() []string {
 
 func (a *AuxEntry) beforeSave() {}
 
+// +checklocksignore
 func (a *AuxEntry) StateSave(stateSinkObject state.Sink) {
 	a.beforeSave()
 	stateSinkObject.Save(0, &a.Key)
@@ -67,6 +70,7 @@ func (a *AuxEntry) StateSave(stateSinkObject state.Sink) {
 
 func (a *AuxEntry) afterLoad() {}
 
+// +checklocksignore
 func (a *AuxEntry) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &a.Key)
 	stateSourceObject.Load(1, &a.Value)
@@ -87,6 +91,7 @@ func (s *SignalAct) StateFields() []string {
 
 func (s *SignalAct) beforeSave() {}
 
+// +checklocksignore
 func (s *SignalAct) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.Handler)
@@ -97,6 +102,7 @@ func (s *SignalAct) StateSave(stateSinkObject state.Sink) {
 
 func (s *SignalAct) afterLoad() {}
 
+// +checklocksignore
 func (s *SignalAct) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.Handler)
 	stateSourceObject.Load(1, &s.Flags)
@@ -118,6 +124,7 @@ func (s *SignalStack) StateFields() []string {
 
 func (s *SignalStack) beforeSave() {}
 
+// +checklocksignore
 func (s *SignalStack) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.Addr)
@@ -127,6 +134,7 @@ func (s *SignalStack) StateSave(stateSinkObject state.Sink) {
 
 func (s *SignalStack) afterLoad() {}
 
+// +checklocksignore
 func (s *SignalStack) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.Addr)
 	stateSourceObject.Load(1, &s.Flags)
@@ -148,6 +156,7 @@ func (s *SignalInfo) StateFields() []string {
 
 func (s *SignalInfo) beforeSave() {}
 
+// +checklocksignore
 func (s *SignalInfo) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.Signo)
@@ -158,6 +167,7 @@ func (s *SignalInfo) StateSave(stateSinkObject state.Sink) {
 
 func (s *SignalInfo) afterLoad() {}
 
+// +checklocksignore
 func (s *SignalInfo) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.Signo)
 	stateSourceObject.Load(1, &s.Errno)
diff --git a/pkg/sentry/arch/arch_x86_impl_state_autogen.go b/pkg/sentry/arch/arch_x86_impl_state_autogen.go
index e584c3f83..403a28c47 100644
--- a/pkg/sentry/arch/arch_x86_impl_state_autogen.go
+++ b/pkg/sentry/arch/arch_x86_impl_state_autogen.go
@@ -22,6 +22,7 @@ func (s *State) StateFields() []string {
 
 func (s *State) beforeSave() {}
 
+// +checklocksignore
 func (s *State) StateSave(stateSinkObject state.Sink) {
 	s.beforeSave()
 	stateSinkObject.Save(0, &s.Regs)
@@ -29,6 +30,7 @@ func (s *State) StateSave(stateSinkObject state.Sink) {
 	stateSinkObject.Save(2, &s.FeatureSet)
 }
 
+// +checklocksignore
 func (s *State) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &s.Regs)
 	stateSourceObject.LoadWait(1, &s.x86FPState)
diff --git a/pkg/sentry/arch/arch_x86_state_autogen.go b/pkg/sentry/arch/arch_x86_state_autogen.go
index 11378624b..7584e42c5 100644
--- a/pkg/sentry/arch/arch_x86_state_autogen.go
+++ b/pkg/sentry/arch/arch_x86_state_autogen.go
@@ -21,6 +21,7 @@ func (r *Registers) StateFields() []string {
 
 func (r *Registers) beforeSave() {}
 
+// +checklocksignore
 func (r *Registers) StateSave(stateSinkObject state.Sink) {
 	r.beforeSave()
 	stateSinkObject.Save(0, &r.PtraceRegs)
@@ -28,6 +29,7 @@ func (r *Registers) StateSave(stateSinkObject state.Sink) {
 
 func (r *Registers) afterLoad() {}
 
+// +checklocksignore
 func (r *Registers) StateLoad(stateSourceObject state.Source) {
 	stateSourceObject.Load(0, &r.PtraceRegs)
 }