Merge release-20201005.0-102-g54e989ec3 (automated)

13 files changed, 2177 insertions, 1125 deletions

diff --git a/pkg/eventchannel/event.go b/pkg/eventchannel/event.go
index 9a29c58bd..7172ce75d 100644
--- a/pkg/eventchannel/event.go
+++ b/pkg/eventchannel/event.go
@@ -24,8 +24,8 @@ import (
 	"fmt"
 	"syscall"
 
-	"github.com/golang/protobuf/proto"
-	"github.com/golang/protobuf/ptypes"
+	"google.golang.org/protobuf/encoding/prototext"
+	"google.golang.org/protobuf/proto"
 	pb "gvisor.dev/gvisor/pkg/eventchannel/eventchannel_go_proto"
 	"gvisor.dev/gvisor/pkg/log"
 	"gvisor.dev/gvisor/pkg/sync"
@@ -118,22 +118,6 @@ func (me *multiEmitter) Close() error {
 	return err
 }
 
-func marshal(msg proto.Message) ([]byte, error) {
-	anypb, err := ptypes.MarshalAny(msg)
-	if err != nil {
-		return nil, err
-	}
-
-	// Wire format is uvarint message length followed by binary proto.
-	bufMsg, err := proto.Marshal(anypb)
-	if err != nil {
-		return nil, err
-	}
-	p := make([]byte, binary.MaxVarintLen64)
-	n := binary.PutUvarint(p, uint64(len(bufMsg)))
-	return append(p[:n], bufMsg...), nil
-}
-
 // socketEmitter emits proto messages on a socket.
 type socketEmitter struct {
 	socket *unet.Socket
@@ -155,10 +139,19 @@ func SocketEmitter(fd int) (Emitter, error) {
 
 // Emit implements Emitter.Emit.
 func (s *socketEmitter) Emit(msg proto.Message) (bool, error) {
-	p, err := marshal(msg)
+	any, err := newAny(msg)
 	if err != nil {
 		return false, err
 	}
+	bufMsg, err := proto.Marshal(any)
+	if err != nil {
+		return false, err
+	}
+
+	// Wire format is uvarint message length followed by binary proto.
+	p := make([]byte, binary.MaxVarintLen64)
+	n := binary.PutUvarint(p, uint64(len(bufMsg)))
+	p = append(p[:n], bufMsg...)
 	for done := 0; done < len(p); {
 		n, err := s.socket.Write(p[done:])
 		if err != nil {
@@ -166,6 +159,7 @@ func (s *socketEmitter) Emit(msg proto.Message) (bool, error) {
 		}
 		done += n
 	}
+
 	return false, nil
 }
 
@@ -189,9 +183,13 @@ func DebugEmitterFrom(inner Emitter) Emitter {
 }
 
 func (d *debugEmitter) Emit(msg proto.Message) (bool, error) {
+	text, err := prototext.Marshal(msg)
+	if err != nil {
+		return false, err
+	}
 	ev := &pb.DebugEvent{
-		Name: proto.MessageName(msg),
-		Text: proto.MarshalTextString(msg),
+		Name: string(msg.ProtoReflect().Descriptor().FullName()),
+		Text: string(text),
 	}
 	return d.inner.Emit(ev)
 }
diff --git a/pkg/eventchannel/event_any.go b/pkg/eventchannel/event_any.go
new file mode 100644
index 000000000..a5549f6cd
--- /dev/null
+++ b/pkg/eventchannel/event_any.go
@@ -0,0 +1,25 @@
+// Copyright 2018 The gVisor Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package eventchannel
+
+import (
+	"google.golang.org/protobuf/types/known/anypb"
+
+	"google.golang.org/protobuf/proto"
+)
+
+func newAny(m proto.Message) (*anypb.Any, error) {
+	return anypb.New(m)
+}
diff --git a/pkg/eventchannel/eventchannel_go_proto/event.pb.go b/pkg/eventchannel/eventchannel_go_proto/event.pb.go
index bb71ed3e6..b78f9211f 100644
--- a/pkg/eventchannel/eventchannel_go_proto/event.pb.go
+++ b/pkg/eventchannel/eventchannel_go_proto/event.pb.go
@@ -1,85 +1,156 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.25.0
+// 	protoc        v3.9.0
 // source: pkg/eventchannel/event.proto
 
 package gvisor
 
 import (
-	fmt "fmt"
 	proto "github.com/golang/protobuf/proto"
-	math "math"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
+const (
+	// Verify that this generated code is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+	// Verify that runtime/protoimpl is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
 
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
+// This is a compile-time assertion that a sufficiently up-to-date version
+// of the legacy proto package is being used.
+const _ = proto.ProtoPackageIsVersion4
 
 type DebugEvent struct {
-	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	Text                 string   `protobuf:"bytes,2,opt,name=text,proto3" json:"text,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
-}
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 
-func (m *DebugEvent) Reset()         { *m = DebugEvent{} }
-func (m *DebugEvent) String() string { return proto.CompactTextString(m) }
-func (*DebugEvent) ProtoMessage()    {}
-func (*DebugEvent) Descriptor() ([]byte, []int) {
-	return fileDescriptor_fcfbd51abd9de962, []int{0}
+	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	Text string `protobuf:"bytes,2,opt,name=text,proto3" json:"text,omitempty"`
 }
 
-func (m *DebugEvent) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_DebugEvent.Unmarshal(m, b)
-}
-func (m *DebugEvent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_DebugEvent.Marshal(b, m, deterministic)
-}
-func (m *DebugEvent) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DebugEvent.Merge(m, src)
+func (x *DebugEvent) Reset() {
+	*x = DebugEvent{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_pkg_eventchannel_event_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
 }
-func (m *DebugEvent) XXX_Size() int {
-	return xxx_messageInfo_DebugEvent.Size(m)
+
+func (x *DebugEvent) String() string {
+	return protoimpl.X.MessageStringOf(x)
 }
-func (m *DebugEvent) XXX_DiscardUnknown() {
-	xxx_messageInfo_DebugEvent.DiscardUnknown(m)
+
+func (*DebugEvent) ProtoMessage() {}
+
+func (x *DebugEvent) ProtoReflect() protoreflect.Message {
+	mi := &file_pkg_eventchannel_event_proto_msgTypes[0]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
 }
 
-var xxx_messageInfo_DebugEvent proto.InternalMessageInfo
+// Deprecated: Use DebugEvent.ProtoReflect.Descriptor instead.
+func (*DebugEvent) Descriptor() ([]byte, []int) {
+	return file_pkg_eventchannel_event_proto_rawDescGZIP(), []int{0}
+}
 
-func (m *DebugEvent) GetName() string {
-	if m != nil {
-		return m.Name
+func (x *DebugEvent) GetName() string {
+	if x != nil {
+		return x.Name
 	}
 	return ""
 }
 
-func (m *DebugEvent) GetText() string {
-	if m != nil {
-		return m.Text
+func (x *DebugEvent) GetText() string {
+	if x != nil {
+		return x.Text
 	}
 	return ""
 }
 
-func init() {
-	proto.RegisterType((*DebugEvent)(nil), "gvisor.DebugEvent")
+var File_pkg_eventchannel_event_proto protoreflect.FileDescriptor
+
+var file_pkg_eventchannel_event_proto_rawDesc = []byte{
+	0x0a, 0x1c, 0x70, 0x6b, 0x67, 0x2f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x63, 0x68, 0x61, 0x6e, 0x6e,
+	0x65, 0x6c, 0x2f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06,
+	0x67, 0x76, 0x69, 0x73, 0x6f, 0x72, 0x22, 0x34, 0x0a, 0x0a, 0x44, 0x65, 0x62, 0x75, 0x67, 0x45,
+	0x76, 0x65, 0x6e, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x65, 0x78, 0x74,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x74, 0x65, 0x78, 0x74, 0x62, 0x06, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x33,
+}
+
+var (
+	file_pkg_eventchannel_event_proto_rawDescOnce sync.Once
+	file_pkg_eventchannel_event_proto_rawDescData = file_pkg_eventchannel_event_proto_rawDesc
+)
+
+func file_pkg_eventchannel_event_proto_rawDescGZIP() []byte {
+	file_pkg_eventchannel_event_proto_rawDescOnce.Do(func() {
+		file_pkg_eventchannel_event_proto_rawDescData = protoimpl.X.CompressGZIP(file_pkg_eventchannel_event_proto_rawDescData)
+	})
+	return file_pkg_eventchannel_event_proto_rawDescData
 }
 
-func init() { proto.RegisterFile("pkg/eventchannel/event.proto", fileDescriptor_fcfbd51abd9de962) }
-
-var fileDescriptor_fcfbd51abd9de962 = []byte{
-	// 103 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x29, 0xc8, 0x4e, 0xd7,
-	0x4f, 0x2d, 0x4b, 0xcd, 0x2b, 0x49, 0xce, 0x48, 0xcc, 0xcb, 0x4b, 0xcd, 0x81, 0x70, 0xf4, 0x0a,
-	0x8a, 0xf2, 0x4b, 0xf2, 0x85, 0xd8, 0xd2, 0xcb, 0x32, 0x8b, 0xf3, 0x8b, 0x94, 0x4c, 0xb8, 0xb8,
-	0x5c, 0x52, 0x93, 0x4a, 0xd3, 0x5d, 0x41, 0x72, 0x42, 0x42, 0x5c, 0x2c, 0x79, 0x89, 0xb9, 0xa9,
-	0x12, 0x8c, 0x0a, 0x8c, 0x1a, 0x9c, 0x41, 0x60, 0x36, 0x48, 0xac, 0x24, 0xb5, 0xa2, 0x44, 0x82,
-	0x09, 0x22, 0x06, 0x62, 0x27, 0xb1, 0x81, 0x0d, 0x31, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x17,
-	0xee, 0x7f, 0xef, 0x64, 0x00, 0x00, 0x00,
+var file_pkg_eventchannel_event_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
+var file_pkg_eventchannel_event_proto_goTypes = []interface{}{
+	(*DebugEvent)(nil), // 0: gvisor.DebugEvent
+}
+var file_pkg_eventchannel_event_proto_depIdxs = []int32{
+	0, // [0:0] is the sub-list for method output_type
+	0, // [0:0] is the sub-list for method input_type
+	0, // [0:0] is the sub-list for extension type_name
+	0, // [0:0] is the sub-list for extension extendee
+	0, // [0:0] is the sub-list for field type_name
+}
+
+func init() { file_pkg_eventchannel_event_proto_init() }
+func file_pkg_eventchannel_event_proto_init() {
+	if File_pkg_eventchannel_event_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_pkg_eventchannel_event_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*DebugEvent); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_pkg_eventchannel_event_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   1,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_pkg_eventchannel_event_proto_goTypes,
+		DependencyIndexes: file_pkg_eventchannel_event_proto_depIdxs,
+		MessageInfos:      file_pkg_eventchannel_event_proto_msgTypes,
+	}.Build()
+	File_pkg_eventchannel_event_proto = out.File
+	file_pkg_eventchannel_event_proto_rawDesc = nil
+	file_pkg_eventchannel_event_proto_goTypes = nil
+	file_pkg_eventchannel_event_proto_depIdxs = nil
 }
diff --git a/pkg/eventchannel/rate.go b/pkg/eventchannel/rate.go
index 179226c92..74960e16a 100644
--- a/pkg/eventchannel/rate.go
+++ b/pkg/eventchannel/rate.go
@@ -15,8 +15,8 @@
 package eventchannel
 
 import (
-	"github.com/golang/protobuf/proto"
 	"golang.org/x/time/rate"
+	"google.golang.org/protobuf/proto"
 )
 
 // rateLimitedEmitter wraps an emitter and limits events to the given limits.
diff --git a/pkg/metric/metric_go_proto/metric.pb.go b/pkg/metric/metric_go_proto/metric.pb.go
index 13f41a80d..83f53d86c 100644
--- a/pkg/metric/metric_go_proto/metric.pb.go
+++ b/pkg/metric/metric_go_proto/metric.pb.go
@@ -1,24 +1,29 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.25.0
+// 	protoc        v3.9.0
 // source: pkg/metric/metric.proto
 
 package gvisor
 
 import (
-	fmt "fmt"
 	proto "github.com/golang/protobuf/proto"
-	math "math"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
+const (
+	// Verify that this generated code is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+	// Verify that runtime/protoimpl is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
 
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
+// This is a compile-time assertion that a sufficiently up-to-date version
+// of the legacy proto package is being used.
+const _ = proto.ProtoPackageIsVersion4
 
 type MetricMetadata_Type int32
 
@@ -26,20 +31,41 @@ const (
 	MetricMetadata_TYPE_UINT64 MetricMetadata_Type = 0
 )
 
-var MetricMetadata_Type_name = map[int32]string{
-	0: "TYPE_UINT64",
-}
+// Enum value maps for MetricMetadata_Type.
+var (
+	MetricMetadata_Type_name = map[int32]string{
+		0: "TYPE_UINT64",
+	}
+	MetricMetadata_Type_value = map[string]int32{
+		"TYPE_UINT64": 0,
+	}
+)
 
-var MetricMetadata_Type_value = map[string]int32{
-	"TYPE_UINT64": 0,
+func (x MetricMetadata_Type) Enum() *MetricMetadata_Type {
+	p := new(MetricMetadata_Type)
+	*p = x
+	return p
 }
 
 func (x MetricMetadata_Type) String() string {
-	return proto.EnumName(MetricMetadata_Type_name, int32(x))
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (MetricMetadata_Type) Descriptor() protoreflect.EnumDescriptor {
+	return file_pkg_metric_metric_proto_enumTypes[0].Descriptor()
+}
+
+func (MetricMetadata_Type) Type() protoreflect.EnumType {
+	return &file_pkg_metric_metric_proto_enumTypes[0]
+}
+
+func (x MetricMetadata_Type) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
 }
 
+// Deprecated: Use MetricMetadata_Type.Descriptor instead.
 func (MetricMetadata_Type) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_87b8778a4ff2ab5c, []int{0, 0}
+	return file_pkg_metric_metric_proto_rawDescGZIP(), []int{0, 0}
 }
 
 type MetricMetadata_Units int32
@@ -49,194 +75,229 @@ const (
 	MetricMetadata_UNITS_NANOSECONDS MetricMetadata_Units = 1
 )
 
-var MetricMetadata_Units_name = map[int32]string{
-	0: "UNITS_NONE",
-	1: "UNITS_NANOSECONDS",
-}
+// Enum value maps for MetricMetadata_Units.
+var (
+	MetricMetadata_Units_name = map[int32]string{
+		0: "UNITS_NONE",
+		1: "UNITS_NANOSECONDS",
+	}
+	MetricMetadata_Units_value = map[string]int32{
+		"UNITS_NONE":        0,
+		"UNITS_NANOSECONDS": 1,
+	}
+)
 
-var MetricMetadata_Units_value = map[string]int32{
-	"UNITS_NONE":        0,
-	"UNITS_NANOSECONDS": 1,
+func (x MetricMetadata_Units) Enum() *MetricMetadata_Units {
+	p := new(MetricMetadata_Units)
+	*p = x
+	return p
 }
 
 func (x MetricMetadata_Units) String() string {
-	return proto.EnumName(MetricMetadata_Units_name, int32(x))
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
 }
 
-func (MetricMetadata_Units) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_87b8778a4ff2ab5c, []int{0, 1}
+func (MetricMetadata_Units) Descriptor() protoreflect.EnumDescriptor {
+	return file_pkg_metric_metric_proto_enumTypes[1].Descriptor()
 }
 
-type MetricMetadata struct {
-	Name                 string               `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	Description          string               `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"`
-	Cumulative           bool                 `protobuf:"varint,3,opt,name=cumulative,proto3" json:"cumulative,omitempty"`
-	Sync                 bool                 `protobuf:"varint,4,opt,name=sync,proto3" json:"sync,omitempty"`
-	Type                 MetricMetadata_Type  `protobuf:"varint,5,opt,name=type,proto3,enum=gvisor.MetricMetadata_Type" json:"type,omitempty"`
-	Units                MetricMetadata_Units `protobuf:"varint,6,opt,name=units,proto3,enum=gvisor.MetricMetadata_Units" json:"units,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
-	XXX_unrecognized     []byte               `json:"-"`
-	XXX_sizecache        int32                `json:"-"`
-}
-
-func (m *MetricMetadata) Reset()         { *m = MetricMetadata{} }
-func (m *MetricMetadata) String() string { return proto.CompactTextString(m) }
-func (*MetricMetadata) ProtoMessage()    {}
-func (*MetricMetadata) Descriptor() ([]byte, []int) {
-	return fileDescriptor_87b8778a4ff2ab5c, []int{0}
+func (MetricMetadata_Units) Type() protoreflect.EnumType {
+	return &file_pkg_metric_metric_proto_enumTypes[1]
 }
 
-func (m *MetricMetadata) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_MetricMetadata.Unmarshal(m, b)
+func (x MetricMetadata_Units) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
 }
-func (m *MetricMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_MetricMetadata.Marshal(b, m, deterministic)
+
+// Deprecated: Use MetricMetadata_Units.Descriptor instead.
+func (MetricMetadata_Units) EnumDescriptor() ([]byte, []int) {
+	return file_pkg_metric_metric_proto_rawDescGZIP(), []int{0, 1}
 }
-func (m *MetricMetadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MetricMetadata.Merge(m, src)
+
+type MetricMetadata struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Name        string               `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	Description string               `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"`
+	Cumulative  bool                 `protobuf:"varint,3,opt,name=cumulative,proto3" json:"cumulative,omitempty"`
+	Sync        bool                 `protobuf:"varint,4,opt,name=sync,proto3" json:"sync,omitempty"`
+	Type        MetricMetadata_Type  `protobuf:"varint,5,opt,name=type,proto3,enum=gvisor.MetricMetadata_Type" json:"type,omitempty"`
+	Units       MetricMetadata_Units `protobuf:"varint,6,opt,name=units,proto3,enum=gvisor.MetricMetadata_Units" json:"units,omitempty"`
+}
+
+func (x *MetricMetadata) Reset() {
+	*x = MetricMetadata{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_pkg_metric_metric_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
 }
-func (m *MetricMetadata) XXX_Size() int {
-	return xxx_messageInfo_MetricMetadata.Size(m)
+
+func (x *MetricMetadata) String() string {
+	return protoimpl.X.MessageStringOf(x)
 }
-func (m *MetricMetadata) XXX_DiscardUnknown() {
-	xxx_messageInfo_MetricMetadata.DiscardUnknown(m)
+
+func (*MetricMetadata) ProtoMessage() {}
+
+func (x *MetricMetadata) ProtoReflect() protoreflect.Message {
+	mi := &file_pkg_metric_metric_proto_msgTypes[0]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
 }
 
-var xxx_messageInfo_MetricMetadata proto.InternalMessageInfo
+// Deprecated: Use MetricMetadata.ProtoReflect.Descriptor instead.
+func (*MetricMetadata) Descriptor() ([]byte, []int) {
+	return file_pkg_metric_metric_proto_rawDescGZIP(), []int{0}
+}
 
-func (m *MetricMetadata) GetName() string {
-	if m != nil {
-		return m.Name
+func (x *MetricMetadata) GetName() string {
+	if x != nil {
+		return x.Name
 	}
 	return ""
 }
 
-func (m *MetricMetadata) GetDescription() string {
-	if m != nil {
-		return m.Description
+func (x *MetricMetadata) GetDescription() string {
+	if x != nil {
+		return x.Description
 	}
 	return ""
 }
 
-func (m *MetricMetadata) GetCumulative() bool {
-	if m != nil {
-		return m.Cumulative
+func (x *MetricMetadata) GetCumulative() bool {
+	if x != nil {
+		return x.Cumulative
 	}
 	return false
 }
 
-func (m *MetricMetadata) GetSync() bool {
-	if m != nil {
-		return m.Sync
+func (x *MetricMetadata) GetSync() bool {
+	if x != nil {
+		return x.Sync
 	}
 	return false
 }
 
-func (m *MetricMetadata) GetType() MetricMetadata_Type {
-	if m != nil {
-		return m.Type
+func (x *MetricMetadata) GetType() MetricMetadata_Type {
+	if x != nil {
+		return x.Type
 	}
 	return MetricMetadata_TYPE_UINT64
 }
 
-func (m *MetricMetadata) GetUnits() MetricMetadata_Units {
-	if m != nil {
-		return m.Units
+func (x *MetricMetadata) GetUnits() MetricMetadata_Units {
+	if x != nil {
+		return x.Units
 	}
 	return MetricMetadata_UNITS_NONE
 }
 
 type MetricRegistration struct {
-	Metrics              []*MetricMetadata `protobuf:"bytes,1,rep,name=metrics,proto3" json:"metrics,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
-	XXX_unrecognized     []byte            `json:"-"`
-	XXX_sizecache        int32             `json:"-"`
-}
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 
-func (m *MetricRegistration) Reset()         { *m = MetricRegistration{} }
-func (m *MetricRegistration) String() string { return proto.CompactTextString(m) }
-func (*MetricRegistration) ProtoMessage()    {}
-func (*MetricRegistration) Descriptor() ([]byte, []int) {
-	return fileDescriptor_87b8778a4ff2ab5c, []int{1}
+	Metrics []*MetricMetadata `protobuf:"bytes,1,rep,name=metrics,proto3" json:"metrics,omitempty"`
 }
 
-func (m *MetricRegistration) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_MetricRegistration.Unmarshal(m, b)
-}
-func (m *MetricRegistration) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_MetricRegistration.Marshal(b, m, deterministic)
-}
-func (m *MetricRegistration) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MetricRegistration.Merge(m, src)
+func (x *MetricRegistration) Reset() {
+	*x = MetricRegistration{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_pkg_metric_metric_proto_msgTypes[1]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
 }
-func (m *MetricRegistration) XXX_Size() int {
-	return xxx_messageInfo_MetricRegistration.Size(m)
+
+func (x *MetricRegistration) String() string {
+	return protoimpl.X.MessageStringOf(x)
 }
-func (m *MetricRegistration) XXX_DiscardUnknown() {
-	xxx_messageInfo_MetricRegistration.DiscardUnknown(m)
+
+func (*MetricRegistration) ProtoMessage() {}
+
+func (x *MetricRegistration) ProtoReflect() protoreflect.Message {
+	mi := &file_pkg_metric_metric_proto_msgTypes[1]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
 }
 
-var xxx_messageInfo_MetricRegistration proto.InternalMessageInfo
+// Deprecated: Use MetricRegistration.ProtoReflect.Descriptor instead.
+func (*MetricRegistration) Descriptor() ([]byte, []int) {
+	return file_pkg_metric_metric_proto_rawDescGZIP(), []int{1}
+}
 
-func (m *MetricRegistration) GetMetrics() []*MetricMetadata {
-	if m != nil {
-		return m.Metrics
+func (x *MetricRegistration) GetMetrics() []*MetricMetadata {
+	if x != nil {
+		return x.Metrics
 	}
 	return nil
 }
 
 type MetricValue struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	// Types that are valid to be assigned to Value:
+	// Types that are assignable to Value:
 	//	*MetricValue_Uint64Value
-	Value                isMetricValue_Value `protobuf_oneof:"value"`
-	XXX_NoUnkeyedLiteral struct{}            `json:"-"`
-	XXX_unrecognized     []byte              `json:"-"`
-	XXX_sizecache        int32               `json:"-"`
+	Value isMetricValue_Value `protobuf_oneof:"value"`
 }
 
-func (m *MetricValue) Reset()         { *m = MetricValue{} }
-func (m *MetricValue) String() string { return proto.CompactTextString(m) }
-func (*MetricValue) ProtoMessage()    {}
-func (*MetricValue) Descriptor() ([]byte, []int) {
-	return fileDescriptor_87b8778a4ff2ab5c, []int{2}
+func (x *MetricValue) Reset() {
+	*x = MetricValue{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_pkg_metric_metric_proto_msgTypes[2]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
 }
 
-func (m *MetricValue) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_MetricValue.Unmarshal(m, b)
-}
-func (m *MetricValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_MetricValue.Marshal(b, m, deterministic)
-}
-func (m *MetricValue) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MetricValue.Merge(m, src)
-}
-func (m *MetricValue) XXX_Size() int {
-	return xxx_messageInfo_MetricValue.Size(m)
-}
-func (m *MetricValue) XXX_DiscardUnknown() {
-	xxx_messageInfo_MetricValue.DiscardUnknown(m)
+func (x *MetricValue) String() string {
+	return protoimpl.X.MessageStringOf(x)
 }
 
-var xxx_messageInfo_MetricValue proto.InternalMessageInfo
+func (*MetricValue) ProtoMessage() {}
 
-func (m *MetricValue) GetName() string {
-	if m != nil {
-		return m.Name
+func (x *MetricValue) ProtoReflect() protoreflect.Message {
+	mi := &file_pkg_metric_metric_proto_msgTypes[2]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
 	}
-	return ""
+	return mi.MessageOf(x)
 }
 
-type isMetricValue_Value interface {
-	isMetricValue_Value()
+// Deprecated: Use MetricValue.ProtoReflect.Descriptor instead.
+func (*MetricValue) Descriptor() ([]byte, []int) {
+	return file_pkg_metric_metric_proto_rawDescGZIP(), []int{2}
 }
 
-type MetricValue_Uint64Value struct {
-	Uint64Value uint64 `protobuf:"varint,2,opt,name=uint64_value,json=uint64Value,proto3,oneof"`
+func (x *MetricValue) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
 }
 
-func (*MetricValue_Uint64Value) isMetricValue_Value() {}
-
 func (m *MetricValue) GetValue() isMetricValue_Value {
 	if m != nil {
 		return m.Value
@@ -244,92 +305,219 @@ func (m *MetricValue) GetValue() isMetricValue_Value {
 	return nil
 }
 
-func (m *MetricValue) GetUint64Value() uint64 {
-	if x, ok := m.GetValue().(*MetricValue_Uint64Value); ok {
+func (x *MetricValue) GetUint64Value() uint64 {
+	if x, ok := x.GetValue().(*MetricValue_Uint64Value); ok {
 		return x.Uint64Value
 	}
 	return 0
 }
 
-// XXX_OneofWrappers is for the internal use of the proto package.
-func (*MetricValue) XXX_OneofWrappers() []interface{} {
-	return []interface{}{
-		(*MetricValue_Uint64Value)(nil),
-	}
+type isMetricValue_Value interface {
+	isMetricValue_Value()
 }
 
-type MetricUpdate struct {
-	Metrics              []*MetricValue `protobuf:"bytes,1,rep,name=metrics,proto3" json:"metrics,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
-	XXX_unrecognized     []byte         `json:"-"`
-	XXX_sizecache        int32          `json:"-"`
+type MetricValue_Uint64Value struct {
+	Uint64Value uint64 `protobuf:"varint,2,opt,name=uint64_value,json=uint64Value,proto3,oneof"`
 }
 
-func (m *MetricUpdate) Reset()         { *m = MetricUpdate{} }
-func (m *MetricUpdate) String() string { return proto.CompactTextString(m) }
-func (*MetricUpdate) ProtoMessage()    {}
-func (*MetricUpdate) Descriptor() ([]byte, []int) {
-	return fileDescriptor_87b8778a4ff2ab5c, []int{3}
-}
+func (*MetricValue_Uint64Value) isMetricValue_Value() {}
 
-func (m *MetricUpdate) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_MetricUpdate.Unmarshal(m, b)
-}
-func (m *MetricUpdate) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_MetricUpdate.Marshal(b, m, deterministic)
+type MetricUpdate struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Metrics []*MetricValue `protobuf:"bytes,1,rep,name=metrics,proto3" json:"metrics,omitempty"`
 }
-func (m *MetricUpdate) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MetricUpdate.Merge(m, src)
+
+func (x *MetricUpdate) Reset() {
+	*x = MetricUpdate{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_pkg_metric_metric_proto_msgTypes[3]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
 }
-func (m *MetricUpdate) XXX_Size() int {
-	return xxx_messageInfo_MetricUpdate.Size(m)
+
+func (x *MetricUpdate) String() string {
+	return protoimpl.X.MessageStringOf(x)
 }
-func (m *MetricUpdate) XXX_DiscardUnknown() {
-	xxx_messageInfo_MetricUpdate.DiscardUnknown(m)
+
+func (*MetricUpdate) ProtoMessage() {}
+
+func (x *MetricUpdate) ProtoReflect() protoreflect.Message {
+	mi := &file_pkg_metric_metric_proto_msgTypes[3]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
 }
 
-var xxx_messageInfo_MetricUpdate proto.InternalMessageInfo
+// Deprecated: Use MetricUpdate.ProtoReflect.Descriptor instead.
+func (*MetricUpdate) Descriptor() ([]byte, []int) {
+	return file_pkg_metric_metric_proto_rawDescGZIP(), []int{3}
+}
 
-func (m *MetricUpdate) GetMetrics() []*MetricValue {
-	if m != nil {
-		return m.Metrics
+func (x *MetricUpdate) GetMetrics() []*MetricValue {
+	if x != nil {
+		return x.Metrics
 	}
 	return nil
 }
 
-func init() {
-	proto.RegisterEnum("gvisor.MetricMetadata_Type", MetricMetadata_Type_name, MetricMetadata_Type_value)
-	proto.RegisterEnum("gvisor.MetricMetadata_Units", MetricMetadata_Units_name, MetricMetadata_Units_value)
-	proto.RegisterType((*MetricMetadata)(nil), "gvisor.MetricMetadata")
-	proto.RegisterType((*MetricRegistration)(nil), "gvisor.MetricRegistration")
-	proto.RegisterType((*MetricValue)(nil), "gvisor.MetricValue")
-	proto.RegisterType((*MetricUpdate)(nil), "gvisor.MetricUpdate")
-}
-
-func init() { proto.RegisterFile("pkg/metric/metric.proto", fileDescriptor_87b8778a4ff2ab5c) }
-
-var fileDescriptor_87b8778a4ff2ab5c = []byte{
-	// 349 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x92, 0x4f, 0x4f, 0xc2, 0x40,
-	0x10, 0xc5, 0x29, 0xb4, 0xa0, 0x53, 0x82, 0xb8, 0x46, 0x69, 0xa2, 0x31, 0x4d, 0xbd, 0xf4, 0x62,
-	0x31, 0x48, 0xb8, 0x79, 0xf0, 0x0f, 0x46, 0x0e, 0xb4, 0xa6, 0xb4, 0x26, 0x9e, 0xc8, 0x5a, 0x36,
-	0x64, 0x23, 0xb4, 0x4d, 0xbb, 0x25, 0xe1, 0x1b, 0xf9, 0x31, 0x4d, 0x67, 0xd1, 0x80, 0xc1, 0x53,
-	0xa7, 0xf3, 0xde, 0x9b, 0xfd, 0xed, 0x64, 0xa1, 0x93, 0x7e, 0xce, 0xbb, 0x4b, 0x26, 0x32, 0x1e,
-	0x6d, 0x3e, 0x4e, 0x9a, 0x25, 0x22, 0x21, 0xf5, 0xf9, 0x8a, 0xe7, 0x49, 0x66, 0x7d, 0x55, 0xa1,
-	0x35, 0x46, 0x61, 0xcc, 0x04, 0x9d, 0x51, 0x41, 0x09, 0x01, 0x35, 0xa6, 0x4b, 0x66, 0x28, 0xa6,
-	0x62, 0x1f, 0xfa, 0x58, 0x13, 0x13, 0xf4, 0x19, 0xcb, 0xa3, 0x8c, 0xa7, 0x82, 0x27, 0xb1, 0x51,
-	0x45, 0x69, 0xbb, 0x45, 0x2e, 0x01, 0xa2, 0x62, 0x59, 0x2c, 0xa8, 0xe0, 0x2b, 0x66, 0xd4, 0x4c,
-	0xc5, 0x3e, 0xf0, 0xb7, 0x3a, 0xe5, 0xd4, 0x7c, 0x1d, 0x47, 0x86, 0x8a, 0x0a, 0xd6, 0xa4, 0x0b,
-	0xaa, 0x58, 0xa7, 0xcc, 0xd0, 0x4c, 0xc5, 0x6e, 0xf5, 0xce, 0x1d, 0xc9, 0xe4, 0xec, 0xf2, 0x38,
-	0xc1, 0x3a, 0x65, 0x3e, 0x1a, 0x49, 0x0f, 0xb4, 0x22, 0xe6, 0x22, 0x37, 0xea, 0x98, 0xb8, 0xf8,
-	0x27, 0x11, 0x96, 0x1e, 0x5f, 0x5a, 0xad, 0x0e, 0xa8, 0xe5, 0x04, 0x72, 0x04, 0x7a, 0xf0, 0xfe,
-	0x3a, 0x9c, 0x86, 0x23, 0x37, 0x18, 0xf4, 0xdb, 0x15, 0xcb, 0x01, 0x0d, 0x8d, 0xa4, 0x05, 0x10,
-	0xba, 0xa3, 0x60, 0x32, 0x75, 0x3d, 0x77, 0xd8, 0xae, 0x90, 0x53, 0x38, 0xde, 0xfc, 0xdf, 0xbb,
-	0xde, 0x64, 0xf8, 0xe8, 0xb9, 0x4f, 0x93, 0xb6, 0x62, 0x3d, 0x03, 0x91, 0xe7, 0xf8, 0x6c, 0xce,
-	0x73, 0x91, 0x51, 0xbc, 0xf7, 0x0d, 0x34, 0xe4, 0x62, 0x73, 0x43, 0x31, 0x6b, 0xb6, 0xde, 0x3b,
-	0xdb, 0x0f, 0xe5, 0xff, 0xd8, 0x2c, 0x0f, 0x74, 0x29, 0xbd, 0xd1, 0x45, 0xc1, 0xf6, 0xae, 0xfb,
-	0x0a, 0x9a, 0x05, 0x8f, 0xc5, 0xa0, 0x3f, 0x5d, 0x95, 0x1e, 0xdc, 0xb7, 0xfa, 0x52, 0xf1, 0x75,
-	0xd9, 0xc5, 0xe0, 0x43, 0x03, 0x34, 0x54, 0xad, 0x3b, 0x68, 0xca, 0x81, 0x61, 0x3a, 0xa3, 0x82,
-	0x91, 0xeb, 0xbf, 0x48, 0x27, 0xbb, 0x48, 0x18, 0xff, 0xe5, 0xf9, 0xa8, 0xe3, 0x8b, 0xb8, 0xfd,
-	0x0e, 0x00, 0x00, 0xff, 0xff, 0x80, 0x9d, 0x7d, 0x0b, 0x2c, 0x02, 0x00, 0x00,
+var File_pkg_metric_metric_proto protoreflect.FileDescriptor
+
+var file_pkg_metric_metric_proto_rawDesc = []byte{
+	0x0a, 0x17, 0x70, 0x6b, 0x67, 0x2f, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x2f, 0x6d, 0x65, 0x74,
+	0x72, 0x69, 0x63, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x67, 0x76, 0x69, 0x73, 0x6f,
+	0x72, 0x22, 0xa8, 0x02, 0x0a, 0x0e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x4d, 0x65, 0x74, 0x61,
+	0x64, 0x61, 0x74, 0x61, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63,
+	0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64,
+	0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x75,
+	0x6d, 0x75, 0x6c, 0x61, 0x74, 0x69, 0x76, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a,
+	0x63, 0x75, 0x6d, 0x75, 0x6c, 0x61, 0x74, 0x69, 0x76, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x79,
+	0x6e, 0x63, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x73, 0x79, 0x6e, 0x63, 0x12, 0x2f,
+	0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1b, 0x2e, 0x67,
+	0x76, 0x69, 0x73, 0x6f, 0x72, 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x4d, 0x65, 0x74, 0x61,
+	0x64, 0x61, 0x74, 0x61, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12,
+	0x32, 0x0a, 0x05, 0x75, 0x6e, 0x69, 0x74, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1c,
+	0x2e, 0x67, 0x76, 0x69, 0x73, 0x6f, 0x72, 0x2e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x4d, 0x65,
+	0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x55, 0x6e, 0x69, 0x74, 0x73, 0x52, 0x05, 0x75, 0x6e,
+	0x69, 0x74, 0x73, 0x22, 0x17, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x54,
+	0x59, 0x50, 0x45, 0x5f, 0x55, 0x49, 0x4e, 0x54, 0x36, 0x34, 0x10, 0x00, 0x22, 0x2e, 0x0a, 0x05,
+	0x55, 0x6e, 0x69, 0x74, 0x73, 0x12, 0x0e, 0x0a, 0x0a, 0x55, 0x4e, 0x49, 0x54, 0x53, 0x5f, 0x4e,
+	0x4f, 0x4e, 0x45, 0x10, 0x00, 0x12, 0x15, 0x0a, 0x11, 0x55, 0x4e, 0x49, 0x54, 0x53, 0x5f, 0x4e,
+	0x41, 0x4e, 0x4f, 0x53, 0x45, 0x43, 0x4f, 0x4e, 0x44, 0x53, 0x10, 0x01, 0x22, 0x46, 0x0a, 0x12,
+	0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x12, 0x30, 0x0a, 0x07, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x18, 0x01, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x67, 0x76, 0x69, 0x73, 0x6f, 0x72, 0x2e, 0x4d, 0x65, 0x74,
+	0x72, 0x69, 0x63, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x52, 0x07, 0x6d, 0x65, 0x74,
+	0x72, 0x69, 0x63, 0x73, 0x22, 0x4f, 0x0a, 0x0b, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x56, 0x61,
+	0x6c, 0x75, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x23, 0x0a, 0x0c, 0x75, 0x69, 0x6e, 0x74, 0x36,
+	0x34, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x48, 0x00, 0x52,
+	0x0b, 0x75, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x07, 0x0a, 0x05,
+	0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x3d, 0x0a, 0x0c, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x55,
+	0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x2d, 0x0a, 0x07, 0x6d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73,
+	0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x67, 0x76, 0x69, 0x73, 0x6f, 0x72, 0x2e,
+	0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x07, 0x6d, 0x65, 0x74,
+	0x72, 0x69, 0x63, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var (
+	file_pkg_metric_metric_proto_rawDescOnce sync.Once
+	file_pkg_metric_metric_proto_rawDescData = file_pkg_metric_metric_proto_rawDesc
+)
+
+func file_pkg_metric_metric_proto_rawDescGZIP() []byte {
+	file_pkg_metric_metric_proto_rawDescOnce.Do(func() {
+		file_pkg_metric_metric_proto_rawDescData = protoimpl.X.CompressGZIP(file_pkg_metric_metric_proto_rawDescData)
+	})
+	return file_pkg_metric_metric_proto_rawDescData
+}
+
+var file_pkg_metric_metric_proto_enumTypes = make([]protoimpl.EnumInfo, 2)
+var file_pkg_metric_metric_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
+var file_pkg_metric_metric_proto_goTypes = []interface{}{
+	(MetricMetadata_Type)(0),   // 0: gvisor.MetricMetadata.Type
+	(MetricMetadata_Units)(0),  // 1: gvisor.MetricMetadata.Units
+	(*MetricMetadata)(nil),     // 2: gvisor.MetricMetadata
+	(*MetricRegistration)(nil), // 3: gvisor.MetricRegistration
+	(*MetricValue)(nil),        // 4: gvisor.MetricValue
+	(*MetricUpdate)(nil),       // 5: gvisor.MetricUpdate
+}
+var file_pkg_metric_metric_proto_depIdxs = []int32{
+	0, // 0: gvisor.MetricMetadata.type:type_name -> gvisor.MetricMetadata.Type
+	1, // 1: gvisor.MetricMetadata.units:type_name -> gvisor.MetricMetadata.Units
+	2, // 2: gvisor.MetricRegistration.metrics:type_name -> gvisor.MetricMetadata
+	4, // 3: gvisor.MetricUpdate.metrics:type_name -> gvisor.MetricValue
+	4, // [4:4] is the sub-list for method output_type
+	4, // [4:4] is the sub-list for method input_type
+	4, // [4:4] is the sub-list for extension type_name
+	4, // [4:4] is the sub-list for extension extendee
+	0, // [0:4] is the sub-list for field type_name
+}
+
+func init() { file_pkg_metric_metric_proto_init() }
+func file_pkg_metric_metric_proto_init() {
+	if File_pkg_metric_metric_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_pkg_metric_metric_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*MetricMetadata); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_pkg_metric_metric_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*MetricRegistration); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_pkg_metric_metric_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*MetricValue); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_pkg_metric_metric_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*MetricUpdate); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
+	file_pkg_metric_metric_proto_msgTypes[2].OneofWrappers = []interface{}{
+		(*MetricValue_Uint64Value)(nil),
+	}
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_pkg_metric_metric_proto_rawDesc,
+			NumEnums:      2,
+			NumMessages:   4,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_pkg_metric_metric_proto_goTypes,
+		DependencyIndexes: file_pkg_metric_metric_proto_depIdxs,
+		EnumInfos:         file_pkg_metric_metric_proto_enumTypes,
+		MessageInfos:      file_pkg_metric_metric_proto_msgTypes,
+	}.Build()
+	File_pkg_metric_metric_proto = out.File
+	file_pkg_metric_metric_proto_rawDesc = nil
+	file_pkg_metric_metric_proto_goTypes = nil
+	file_pkg_metric_metric_proto_depIdxs = nil
 }
diff --git a/pkg/sentry/arch/registers_go_proto/registers.pb.go b/pkg/sentry/arch/registers_go_proto/registers.pb.go
index 4b11db4c0..eb0d36273 100644
--- a/pkg/sentry/arch/registers_go_proto/registers.pb.go
+++ b/pkg/sentry/arch/registers_go_proto/registers.pb.go
@@ -1,634 +1,647 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.25.0
+// 	protoc        v3.9.0
 // source: pkg/sentry/arch/registers.proto
 
 package gvisor
 
 import (
-	fmt "fmt"
 	proto "github.com/golang/protobuf/proto"
-	math "math"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
+const (
+	// Verify that this generated code is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+	// Verify that runtime/protoimpl is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
 
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
+// This is a compile-time assertion that a sufficiently up-to-date version
+// of the legacy proto package is being used.
+const _ = proto.ProtoPackageIsVersion4
 
 type AMD64Registers struct {
-	Rax                  uint64   `protobuf:"varint,1,opt,name=rax,proto3" json:"rax,omitempty"`
-	Rbx                  uint64   `protobuf:"varint,2,opt,name=rbx,proto3" json:"rbx,omitempty"`
-	Rcx                  uint64   `protobuf:"varint,3,opt,name=rcx,proto3" json:"rcx,omitempty"`
-	Rdx                  uint64   `protobuf:"varint,4,opt,name=rdx,proto3" json:"rdx,omitempty"`
-	Rsi                  uint64   `protobuf:"varint,5,opt,name=rsi,proto3" json:"rsi,omitempty"`
-	Rdi                  uint64   `protobuf:"varint,6,opt,name=rdi,proto3" json:"rdi,omitempty"`
-	Rsp                  uint64   `protobuf:"varint,7,opt,name=rsp,proto3" json:"rsp,omitempty"`
-	Rbp                  uint64   `protobuf:"varint,8,opt,name=rbp,proto3" json:"rbp,omitempty"`
-	R8                   uint64   `protobuf:"varint,9,opt,name=r8,proto3" json:"r8,omitempty"`
-	R9                   uint64   `protobuf:"varint,10,opt,name=r9,proto3" json:"r9,omitempty"`
-	R10                  uint64   `protobuf:"varint,11,opt,name=r10,proto3" json:"r10,omitempty"`
-	R11                  uint64   `protobuf:"varint,12,opt,name=r11,proto3" json:"r11,omitempty"`
-	R12                  uint64   `protobuf:"varint,13,opt,name=r12,proto3" json:"r12,omitempty"`
-	R13                  uint64   `protobuf:"varint,14,opt,name=r13,proto3" json:"r13,omitempty"`
-	R14                  uint64   `protobuf:"varint,15,opt,name=r14,proto3" json:"r14,omitempty"`
-	R15                  uint64   `protobuf:"varint,16,opt,name=r15,proto3" json:"r15,omitempty"`
-	Rip                  uint64   `protobuf:"varint,17,opt,name=rip,proto3" json:"rip,omitempty"`
-	Rflags               uint64   `protobuf:"varint,18,opt,name=rflags,proto3" json:"rflags,omitempty"`
-	OrigRax              uint64   `protobuf:"varint,19,opt,name=orig_rax,json=origRax,proto3" json:"orig_rax,omitempty"`
-	Cs                   uint64   `protobuf:"varint,20,opt,name=cs,proto3" json:"cs,omitempty"`
-	Ds                   uint64   `protobuf:"varint,21,opt,name=ds,proto3" json:"ds,omitempty"`
-	Es                   uint64   `protobuf:"varint,22,opt,name=es,proto3" json:"es,omitempty"`
-	Fs                   uint64   `protobuf:"varint,23,opt,name=fs,proto3" json:"fs,omitempty"`
-	Gs                   uint64   `protobuf:"varint,24,opt,name=gs,proto3" json:"gs,omitempty"`
-	Ss                   uint64   `protobuf:"varint,25,opt,name=ss,proto3" json:"ss,omitempty"`
-	FsBase               uint64   `protobuf:"varint,26,opt,name=fs_base,json=fsBase,proto3" json:"fs_base,omitempty"`
-	GsBase               uint64   `protobuf:"varint,27,opt,name=gs_base,json=gsBase,proto3" json:"gs_base,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
-}
-
-func (m *AMD64Registers) Reset()         { *m = AMD64Registers{} }
-func (m *AMD64Registers) String() string { return proto.CompactTextString(m) }
-func (*AMD64Registers) ProtoMessage()    {}
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Rax     uint64 `protobuf:"varint,1,opt,name=rax,proto3" json:"rax,omitempty"`
+	Rbx     uint64 `protobuf:"varint,2,opt,name=rbx,proto3" json:"rbx,omitempty"`
+	Rcx     uint64 `protobuf:"varint,3,opt,name=rcx,proto3" json:"rcx,omitempty"`
+	Rdx     uint64 `protobuf:"varint,4,opt,name=rdx,proto3" json:"rdx,omitempty"`
+	Rsi     uint64 `protobuf:"varint,5,opt,name=rsi,proto3" json:"rsi,omitempty"`
+	Rdi     uint64 `protobuf:"varint,6,opt,name=rdi,proto3" json:"rdi,omitempty"`
+	Rsp     uint64 `protobuf:"varint,7,opt,name=rsp,proto3" json:"rsp,omitempty"`
+	Rbp     uint64 `protobuf:"varint,8,opt,name=rbp,proto3" json:"rbp,omitempty"`
+	R8      uint64 `protobuf:"varint,9,opt,name=r8,proto3" json:"r8,omitempty"`
+	R9      uint64 `protobuf:"varint,10,opt,name=r9,proto3" json:"r9,omitempty"`
+	R10     uint64 `protobuf:"varint,11,opt,name=r10,proto3" json:"r10,omitempty"`
+	R11     uint64 `protobuf:"varint,12,opt,name=r11,proto3" json:"r11,omitempty"`
+	R12     uint64 `protobuf:"varint,13,opt,name=r12,proto3" json:"r12,omitempty"`
+	R13     uint64 `protobuf:"varint,14,opt,name=r13,proto3" json:"r13,omitempty"`
+	R14     uint64 `protobuf:"varint,15,opt,name=r14,proto3" json:"r14,omitempty"`
+	R15     uint64 `protobuf:"varint,16,opt,name=r15,proto3" json:"r15,omitempty"`
+	Rip     uint64 `protobuf:"varint,17,opt,name=rip,proto3" json:"rip,omitempty"`
+	Rflags  uint64 `protobuf:"varint,18,opt,name=rflags,proto3" json:"rflags,omitempty"`
+	OrigRax uint64 `protobuf:"varint,19,opt,name=orig_rax,json=origRax,proto3" json:"orig_rax,omitempty"`
+	Cs      uint64 `protobuf:"varint,20,opt,name=cs,proto3" json:"cs,omitempty"`
+	Ds      uint64 `protobuf:"varint,21,opt,name=ds,proto3" json:"ds,omitempty"`
+	Es      uint64 `protobuf:"varint,22,opt,name=es,proto3" json:"es,omitempty"`
+	Fs      uint64 `protobuf:"varint,23,opt,name=fs,proto3" json:"fs,omitempty"`
+	Gs      uint64 `protobuf:"varint,24,opt,name=gs,proto3" json:"gs,omitempty"`
+	Ss      uint64 `protobuf:"varint,25,opt,name=ss,proto3" json:"ss,omitempty"`
+	FsBase  uint64 `protobuf:"varint,26,opt,name=fs_base,json=fsBase,proto3" json:"fs_base,omitempty"`
+	GsBase  uint64 `protobuf:"varint,27,opt,name=gs_base,json=gsBase,proto3" json:"gs_base,omitempty"`
+}
+
+func (x *AMD64Registers) Reset() {
+	*x = AMD64Registers{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_pkg_sentry_arch_registers_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *AMD64Registers) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*AMD64Registers) ProtoMessage() {}
+
+func (x *AMD64Registers) ProtoReflect() protoreflect.Message {
+	mi := &file_pkg_sentry_arch_registers_proto_msgTypes[0]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use AMD64Registers.ProtoReflect.Descriptor instead.
 func (*AMD64Registers) Descriptor() ([]byte, []int) {
-	return fileDescriptor_082b7510610e0457, []int{0}
-}
-
-func (m *AMD64Registers) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_AMD64Registers.Unmarshal(m, b)
-}
-func (m *AMD64Registers) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_AMD64Registers.Marshal(b, m, deterministic)
+	return file_pkg_sentry_arch_registers_proto_rawDescGZIP(), []int{0}
 }
-func (m *AMD64Registers) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AMD64Registers.Merge(m, src)
-}
-func (m *AMD64Registers) XXX_Size() int {
-	return xxx_messageInfo_AMD64Registers.Size(m)
-}
-func (m *AMD64Registers) XXX_DiscardUnknown() {
-	xxx_messageInfo_AMD64Registers.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_AMD64Registers proto.InternalMessageInfo
 
-func (m *AMD64Registers) GetRax() uint64 {
-	if m != nil {
-		return m.Rax
+func (x *AMD64Registers) GetRax() uint64 {
+	if x != nil {
+		return x.Rax
 	}
 	return 0
 }
 
-func (m *AMD64Registers) GetRbx() uint64 {
-	if m != nil {
-		return m.Rbx
+func (x *AMD64Registers) GetRbx() uint64 {
+	if x != nil {
+		return x.Rbx
 	}
 	return 0
 }
 
-func (m *AMD64Registers) GetRcx() uint64 {
-	if m != nil {
-		return m.Rcx
+func (x *AMD64Registers) GetRcx() uint64 {
+	if x != nil {
+		return x.Rcx
 	}
 	return 0
 }
 
-func (m *AMD64Registers) GetRdx() uint64 {
-	if m != nil {
-		return m.Rdx
+func (x *AMD64Registers) GetRdx() uint64 {
+	if x != nil {
+		return x.Rdx
 	}
 	return 0
 }
 
-func (m *AMD64Registers) GetRsi() uint64 {
-	if m != nil {
-		return m.Rsi
+func (x *AMD64Registers) GetRsi() uint64 {
+	if x != nil {
+		return x.Rsi
 	}
 	return 0
 }
 
-func (m *AMD64Registers) GetRdi() uint64 {
-	if m != nil {
-		return m.Rdi
+func (x *AMD64Registers) GetRdi() uint64 {
+	if x != nil {
+		return x.Rdi
 	}
 	return 0
 }
 
-func (m *AMD64Registers) GetRsp() uint64 {
-	if m != nil {
-		return m.Rsp
+func (x *AMD64Registers) GetRsp() uint64 {
+	if x != nil {
+		return x.Rsp
 	}
 	return 0
 }
 
-func (m *AMD64Registers) GetRbp() uint64 {
-	if m != nil {
-		return m.Rbp
+func (x *AMD64Registers) GetRbp() uint64 {
+	if x != nil {
+		return x.Rbp
 	}
 	return 0
 }
 
-func (m *AMD64Registers) GetR8() uint64 {
-	if m != nil {
-		return m.R8
+func (x *AMD64Registers) GetR8() uint64 {
+	if x != nil {
+		return x.R8
 	}
 	return 0
 }
 
-func (m *AMD64Registers) GetR9() uint64 {
-	if m != nil {
-		return m.R9
+func (x *AMD64Registers) GetR9() uint64 {
+	if x != nil {
+		return x.R9
 	}
 	return 0
 }
 
-func (m *AMD64Registers) GetR10() uint64 {
-	if m != nil {
-		return m.R10
+func (x *AMD64Registers) GetR10() uint64 {
+	if x != nil {
+		return x.R10
 	}
 	return 0
 }
 
-func (m *AMD64Registers) GetR11() uint64 {
-	if m != nil {
-		return m.R11
+func (x *AMD64Registers) GetR11() uint64 {
+	if x != nil {
+		return x.R11
 	}
 	return 0
 }
 
-func (m *AMD64Registers) GetR12() uint64 {
-	if m != nil {
-		return m.R12
+func (x *AMD64Registers) GetR12() uint64 {
+	if x != nil {
+		return x.R12
 	}
 	return 0
 }
 
-func (m *AMD64Registers) GetR13() uint64 {
-	if m != nil {
-		return m.R13
+func (x *AMD64Registers) GetR13() uint64 {
+	if x != nil {
+		return x.R13
 	}
 	return 0
 }
 
-func (m *AMD64Registers) GetR14() uint64 {
-	if m != nil {
-		return m.R14
+func (x *AMD64Registers) GetR14() uint64 {
+	if x != nil {
+		return x.R14
 	}
 	return 0
 }
 
-func (m *AMD64Registers) GetR15() uint64 {
-	if m != nil {
-		return m.R15
+func (x *AMD64Registers) GetR15() uint64 {
+	if x != nil {
+		return x.R15
 	}
 	return 0
 }
 
-func (m *AMD64Registers) GetRip() uint64 {
-	if m != nil {
-		return m.Rip
+func (x *AMD64Registers) GetRip() uint64 {
+	if x != nil {
+		return x.Rip
 	}
 	return 0
 }
 
-func (m *AMD64Registers) GetRflags() uint64 {
-	if m != nil {
-		return m.Rflags
+func (x *AMD64Registers) GetRflags() uint64 {
+	if x != nil {
+		return x.Rflags
 	}
 	return 0
 }
 
-func (m *AMD64Registers) GetOrigRax() uint64 {
-	if m != nil {
-		return m.OrigRax
+func (x *AMD64Registers) GetOrigRax() uint64 {
+	if x != nil {
+		return x.OrigRax
 	}
 	return 0
 }
 
-func (m *AMD64Registers) GetCs() uint64 {
-	if m != nil {
-		return m.Cs
+func (x *AMD64Registers) GetCs() uint64 {
+	if x != nil {
+		return x.Cs
 	}
 	return 0
 }
 
-func (m *AMD64Registers) GetDs() uint64 {
-	if m != nil {
-		return m.Ds
+func (x *AMD64Registers) GetDs() uint64 {
+	if x != nil {
+		return x.Ds
 	}
 	return 0
 }
 
-func (m *AMD64Registers) GetEs() uint64 {
-	if m != nil {
-		return m.Es
+func (x *AMD64Registers) GetEs() uint64 {
+	if x != nil {
+		return x.Es
 	}
 	return 0
 }
 
-func (m *AMD64Registers) GetFs() uint64 {
-	if m != nil {
-		return m.Fs
+func (x *AMD64Registers) GetFs() uint64 {
+	if x != nil {
+		return x.Fs
 	}
 	return 0
 }
 
-func (m *AMD64Registers) GetGs() uint64 {
-	if m != nil {
-		return m.Gs
+func (x *AMD64Registers) GetGs() uint64 {
+	if x != nil {
+		return x.Gs
 	}
 	return 0
 }
 
-func (m *AMD64Registers) GetSs() uint64 {
-	if m != nil {
-		return m.Ss
+func (x *AMD64Registers) GetSs() uint64 {
+	if x != nil {
+		return x.Ss
 	}
 	return 0
 }
 
-func (m *AMD64Registers) GetFsBase() uint64 {
-	if m != nil {
-		return m.FsBase
+func (x *AMD64Registers) GetFsBase() uint64 {
+	if x != nil {
+		return x.FsBase
 	}
 	return 0
 }
 
-func (m *AMD64Registers) GetGsBase() uint64 {
-	if m != nil {
-		return m.GsBase
+func (x *AMD64Registers) GetGsBase() uint64 {
+	if x != nil {
+		return x.GsBase
 	}
 	return 0
 }
 
 type ARM64Registers struct {
-	R0                   uint64   `protobuf:"varint,1,opt,name=r0,proto3" json:"r0,omitempty"`
-	R1                   uint64   `protobuf:"varint,2,opt,name=r1,proto3" json:"r1,omitempty"`
-	R2                   uint64   `protobuf:"varint,3,opt,name=r2,proto3" json:"r2,omitempty"`
-	R3                   uint64   `protobuf:"varint,4,opt,name=r3,proto3" json:"r3,omitempty"`
-	R4                   uint64   `protobuf:"varint,5,opt,name=r4,proto3" json:"r4,omitempty"`
-	R5                   uint64   `protobuf:"varint,6,opt,name=r5,proto3" json:"r5,omitempty"`
-	R6                   uint64   `protobuf:"varint,7,opt,name=r6,proto3" json:"r6,omitempty"`
-	R7                   uint64   `protobuf:"varint,8,opt,name=r7,proto3" json:"r7,omitempty"`
-	R8                   uint64   `protobuf:"varint,9,opt,name=r8,proto3" json:"r8,omitempty"`
-	R9                   uint64   `protobuf:"varint,10,opt,name=r9,proto3" json:"r9,omitempty"`
-	R10                  uint64   `protobuf:"varint,11,opt,name=r10,proto3" json:"r10,omitempty"`
-	R11                  uint64   `protobuf:"varint,12,opt,name=r11,proto3" json:"r11,omitempty"`
-	R12                  uint64   `protobuf:"varint,13,opt,name=r12,proto3" json:"r12,omitempty"`
-	R13                  uint64   `protobuf:"varint,14,opt,name=r13,proto3" json:"r13,omitempty"`
-	R14                  uint64   `protobuf:"varint,15,opt,name=r14,proto3" json:"r14,omitempty"`
-	R15                  uint64   `protobuf:"varint,16,opt,name=r15,proto3" json:"r15,omitempty"`
-	R16                  uint64   `protobuf:"varint,17,opt,name=r16,proto3" json:"r16,omitempty"`
-	R17                  uint64   `protobuf:"varint,18,opt,name=r17,proto3" json:"r17,omitempty"`
-	R18                  uint64   `protobuf:"varint,19,opt,name=r18,proto3" json:"r18,omitempty"`
-	R19                  uint64   `protobuf:"varint,20,opt,name=r19,proto3" json:"r19,omitempty"`
-	R20                  uint64   `protobuf:"varint,21,opt,name=r20,proto3" json:"r20,omitempty"`
-	R21                  uint64   `protobuf:"varint,22,opt,name=r21,proto3" json:"r21,omitempty"`
-	R22                  uint64   `protobuf:"varint,23,opt,name=r22,proto3" json:"r22,omitempty"`
-	R23                  uint64   `protobuf:"varint,24,opt,name=r23,proto3" json:"r23,omitempty"`
-	R24                  uint64   `protobuf:"varint,25,opt,name=r24,proto3" json:"r24,omitempty"`
-	R25                  uint64   `protobuf:"varint,26,opt,name=r25,proto3" json:"r25,omitempty"`
-	R26                  uint64   `protobuf:"varint,27,opt,name=r26,proto3" json:"r26,omitempty"`
-	R27                  uint64   `protobuf:"varint,28,opt,name=r27,proto3" json:"r27,omitempty"`
-	R28                  uint64   `protobuf:"varint,29,opt,name=r28,proto3" json:"r28,omitempty"`
-	R29                  uint64   `protobuf:"varint,30,opt,name=r29,proto3" json:"r29,omitempty"`
-	R30                  uint64   `protobuf:"varint,31,opt,name=r30,proto3" json:"r30,omitempty"`
-	Sp                   uint64   `protobuf:"varint,32,opt,name=sp,proto3" json:"sp,omitempty"`
-	Pc                   uint64   `protobuf:"varint,33,opt,name=pc,proto3" json:"pc,omitempty"`
-	Pstate               uint64   `protobuf:"varint,34,opt,name=pstate,proto3" json:"pstate,omitempty"`
-	Tls                  uint64   `protobuf:"varint,35,opt,name=tls,proto3" json:"tls,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
-}
-
-func (m *ARM64Registers) Reset()         { *m = ARM64Registers{} }
-func (m *ARM64Registers) String() string { return proto.CompactTextString(m) }
-func (*ARM64Registers) ProtoMessage()    {}
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	R0     uint64 `protobuf:"varint,1,opt,name=r0,proto3" json:"r0,omitempty"`
+	R1     uint64 `protobuf:"varint,2,opt,name=r1,proto3" json:"r1,omitempty"`
+	R2     uint64 `protobuf:"varint,3,opt,name=r2,proto3" json:"r2,omitempty"`
+	R3     uint64 `protobuf:"varint,4,opt,name=r3,proto3" json:"r3,omitempty"`
+	R4     uint64 `protobuf:"varint,5,opt,name=r4,proto3" json:"r4,omitempty"`
+	R5     uint64 `protobuf:"varint,6,opt,name=r5,proto3" json:"r5,omitempty"`
+	R6     uint64 `protobuf:"varint,7,opt,name=r6,proto3" json:"r6,omitempty"`
+	R7     uint64 `protobuf:"varint,8,opt,name=r7,proto3" json:"r7,omitempty"`
+	R8     uint64 `protobuf:"varint,9,opt,name=r8,proto3" json:"r8,omitempty"`
+	R9     uint64 `protobuf:"varint,10,opt,name=r9,proto3" json:"r9,omitempty"`
+	R10    uint64 `protobuf:"varint,11,opt,name=r10,proto3" json:"r10,omitempty"`
+	R11    uint64 `protobuf:"varint,12,opt,name=r11,proto3" json:"r11,omitempty"`
+	R12    uint64 `protobuf:"varint,13,opt,name=r12,proto3" json:"r12,omitempty"`
+	R13    uint64 `protobuf:"varint,14,opt,name=r13,proto3" json:"r13,omitempty"`
+	R14    uint64 `protobuf:"varint,15,opt,name=r14,proto3" json:"r14,omitempty"`
+	R15    uint64 `protobuf:"varint,16,opt,name=r15,proto3" json:"r15,omitempty"`
+	R16    uint64 `protobuf:"varint,17,opt,name=r16,proto3" json:"r16,omitempty"`
+	R17    uint64 `protobuf:"varint,18,opt,name=r17,proto3" json:"r17,omitempty"`
+	R18    uint64 `protobuf:"varint,19,opt,name=r18,proto3" json:"r18,omitempty"`
+	R19    uint64 `protobuf:"varint,20,opt,name=r19,proto3" json:"r19,omitempty"`
+	R20    uint64 `protobuf:"varint,21,opt,name=r20,proto3" json:"r20,omitempty"`
+	R21    uint64 `protobuf:"varint,22,opt,name=r21,proto3" json:"r21,omitempty"`
+	R22    uint64 `protobuf:"varint,23,opt,name=r22,proto3" json:"r22,omitempty"`
+	R23    uint64 `protobuf:"varint,24,opt,name=r23,proto3" json:"r23,omitempty"`
+	R24    uint64 `protobuf:"varint,25,opt,name=r24,proto3" json:"r24,omitempty"`
+	R25    uint64 `protobuf:"varint,26,opt,name=r25,proto3" json:"r25,omitempty"`
+	R26    uint64 `protobuf:"varint,27,opt,name=r26,proto3" json:"r26,omitempty"`
+	R27    uint64 `protobuf:"varint,28,opt,name=r27,proto3" json:"r27,omitempty"`
+	R28    uint64 `protobuf:"varint,29,opt,name=r28,proto3" json:"r28,omitempty"`
+	R29    uint64 `protobuf:"varint,30,opt,name=r29,proto3" json:"r29,omitempty"`
+	R30    uint64 `protobuf:"varint,31,opt,name=r30,proto3" json:"r30,omitempty"`
+	Sp     uint64 `protobuf:"varint,32,opt,name=sp,proto3" json:"sp,omitempty"`
+	Pc     uint64 `protobuf:"varint,33,opt,name=pc,proto3" json:"pc,omitempty"`
+	Pstate uint64 `protobuf:"varint,34,opt,name=pstate,proto3" json:"pstate,omitempty"`
+	Tls    uint64 `protobuf:"varint,35,opt,name=tls,proto3" json:"tls,omitempty"`
+}
+
+func (x *ARM64Registers) Reset() {
+	*x = ARM64Registers{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_pkg_sentry_arch_registers_proto_msgTypes[1]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ARM64Registers) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ARM64Registers) ProtoMessage() {}
+
+func (x *ARM64Registers) ProtoReflect() protoreflect.Message {
+	mi := &file_pkg_sentry_arch_registers_proto_msgTypes[1]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ARM64Registers.ProtoReflect.Descriptor instead.
 func (*ARM64Registers) Descriptor() ([]byte, []int) {
-	return fileDescriptor_082b7510610e0457, []int{1}
+	return file_pkg_sentry_arch_registers_proto_rawDescGZIP(), []int{1}
 }
 
-func (m *ARM64Registers) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_ARM64Registers.Unmarshal(m, b)
-}
-func (m *ARM64Registers) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_ARM64Registers.Marshal(b, m, deterministic)
-}
-func (m *ARM64Registers) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ARM64Registers.Merge(m, src)
-}
-func (m *ARM64Registers) XXX_Size() int {
-	return xxx_messageInfo_ARM64Registers.Size(m)
-}
-func (m *ARM64Registers) XXX_DiscardUnknown() {
-	xxx_messageInfo_ARM64Registers.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_ARM64Registers proto.InternalMessageInfo
-
-func (m *ARM64Registers) GetR0() uint64 {
-	if m != nil {
-		return m.R0
+func (x *ARM64Registers) GetR0() uint64 {
+	if x != nil {
+		return x.R0
 	}
 	return 0
 }
 
-func (m *ARM64Registers) GetR1() uint64 {
-	if m != nil {
-		return m.R1
+func (x *ARM64Registers) GetR1() uint64 {
+	if x != nil {
+		return x.R1
 	}
 	return 0
 }
 
-func (m *ARM64Registers) GetR2() uint64 {
-	if m != nil {
-		return m.R2
+func (x *ARM64Registers) GetR2() uint64 {
+	if x != nil {
+		return x.R2
 	}
 	return 0
 }
 
-func (m *ARM64Registers) GetR3() uint64 {
-	if m != nil {
-		return m.R3
+func (x *ARM64Registers) GetR3() uint64 {
+	if x != nil {
+		return x.R3
 	}
 	return 0
 }
 
-func (m *ARM64Registers) GetR4() uint64 {
-	if m != nil {
-		return m.R4
+func (x *ARM64Registers) GetR4() uint64 {
+	if x != nil {
+		return x.R4
 	}
 	return 0
 }
 
-func (m *ARM64Registers) GetR5() uint64 {
-	if m != nil {
-		return m.R5
+func (x *ARM64Registers) GetR5() uint64 {
+	if x != nil {
+		return x.R5
 	}
 	return 0
 }
 
-func (m *ARM64Registers) GetR6() uint64 {
-	if m != nil {
-		return m.R6
+func (x *ARM64Registers) GetR6() uint64 {
+	if x != nil {
+		return x.R6
 	}
 	return 0
 }
 
-func (m *ARM64Registers) GetR7() uint64 {
-	if m != nil {
-		return m.R7
+func (x *ARM64Registers) GetR7() uint64 {
+	if x != nil {
+		return x.R7
 	}
 	return 0
 }
 
-func (m *ARM64Registers) GetR8() uint64 {
-	if m != nil {
-		return m.R8
+func (x *ARM64Registers) GetR8() uint64 {
+	if x != nil {
+		return x.R8
 	}
 	return 0
 }
 
-func (m *ARM64Registers) GetR9() uint64 {
-	if m != nil {
-		return m.R9
+func (x *ARM64Registers) GetR9() uint64 {
+	if x != nil {
+		return x.R9
 	}
 	return 0
 }
 
-func (m *ARM64Registers) GetR10() uint64 {
-	if m != nil {
-		return m.R10
+func (x *ARM64Registers) GetR10() uint64 {
+	if x != nil {
+		return x.R10
 	}
 	return 0
 }
 
-func (m *ARM64Registers) GetR11() uint64 {
-	if m != nil {
-		return m.R11
+func (x *ARM64Registers) GetR11() uint64 {
+	if x != nil {
+		return x.R11
 	}
 	return 0
 }
 
-func (m *ARM64Registers) GetR12() uint64 {
-	if m != nil {
-		return m.R12
+func (x *ARM64Registers) GetR12() uint64 {
+	if x != nil {
+		return x.R12
 	}
 	return 0
 }
 
-func (m *ARM64Registers) GetR13() uint64 {
-	if m != nil {
-		return m.R13
+func (x *ARM64Registers) GetR13() uint64 {
+	if x != nil {
+		return x.R13
 	}
 	return 0
 }
 
-func (m *ARM64Registers) GetR14() uint64 {
-	if m != nil {
-		return m.R14
+func (x *ARM64Registers) GetR14() uint64 {
+	if x != nil {
+		return x.R14
 	}
 	return 0
 }
 
-func (m *ARM64Registers) GetR15() uint64 {
-	if m != nil {
-		return m.R15
+func (x *ARM64Registers) GetR15() uint64 {
+	if x != nil {
+		return x.R15
 	}
 	return 0
 }
 
-func (m *ARM64Registers) GetR16() uint64 {
-	if m != nil {
-		return m.R16
+func (x *ARM64Registers) GetR16() uint64 {
+	if x != nil {
+		return x.R16
 	}
 	return 0
 }
 
-func (m *ARM64Registers) GetR17() uint64 {
-	if m != nil {
-		return m.R17
+func (x *ARM64Registers) GetR17() uint64 {
+	if x != nil {
+		return x.R17
 	}
 	return 0
 }
 
-func (m *ARM64Registers) GetR18() uint64 {
-	if m != nil {
-		return m.R18
+func (x *ARM64Registers) GetR18() uint64 {
+	if x != nil {
+		return x.R18
 	}
 	return 0
 }
 
-func (m *ARM64Registers) GetR19() uint64 {
-	if m != nil {
-		return m.R19
+func (x *ARM64Registers) GetR19() uint64 {
+	if x != nil {
+		return x.R19
 	}
 	return 0
 }
 
-func (m *ARM64Registers) GetR20() uint64 {
-	if m != nil {
-		return m.R20
+func (x *ARM64Registers) GetR20() uint64 {
+	if x != nil {
+		return x.R20
 	}
 	return 0
 }
 
-func (m *ARM64Registers) GetR21() uint64 {
-	if m != nil {
-		return m.R21
+func (x *ARM64Registers) GetR21() uint64 {
+	if x != nil {
+		return x.R21
 	}
 	return 0
 }
 
-func (m *ARM64Registers) GetR22() uint64 {
-	if m != nil {
-		return m.R22
+func (x *ARM64Registers) GetR22() uint64 {
+	if x != nil {
+		return x.R22
 	}
 	return 0
 }
 
-func (m *ARM64Registers) GetR23() uint64 {
-	if m != nil {
-		return m.R23
+func (x *ARM64Registers) GetR23() uint64 {
+	if x != nil {
+		return x.R23
 	}
 	return 0
 }
 
-func (m *ARM64Registers) GetR24() uint64 {
-	if m != nil {
-		return m.R24
+func (x *ARM64Registers) GetR24() uint64 {
+	if x != nil {
+		return x.R24
 	}
 	return 0
 }
 
-func (m *ARM64Registers) GetR25() uint64 {
-	if m != nil {
-		return m.R25
+func (x *ARM64Registers) GetR25() uint64 {
+	if x != nil {
+		return x.R25
 	}
 	return 0
 }
 
-func (m *ARM64Registers) GetR26() uint64 {
-	if m != nil {
-		return m.R26
+func (x *ARM64Registers) GetR26() uint64 {
+	if x != nil {
+		return x.R26
 	}
 	return 0
 }
 
-func (m *ARM64Registers) GetR27() uint64 {
-	if m != nil {
-		return m.R27
+func (x *ARM64Registers) GetR27() uint64 {
+	if x != nil {
+		return x.R27
 	}
 	return 0
 }
 
-func (m *ARM64Registers) GetR28() uint64 {
-	if m != nil {
-		return m.R28
+func (x *ARM64Registers) GetR28() uint64 {
+	if x != nil {
+		return x.R28
 	}
 	return 0
 }
 
-func (m *ARM64Registers) GetR29() uint64 {
-	if m != nil {
-		return m.R29
+func (x *ARM64Registers) GetR29() uint64 {
+	if x != nil {
+		return x.R29
 	}
 	return 0
 }
 
-func (m *ARM64Registers) GetR30() uint64 {
-	if m != nil {
-		return m.R30
+func (x *ARM64Registers) GetR30() uint64 {
+	if x != nil {
+		return x.R30
 	}
 	return 0
 }
 
-func (m *ARM64Registers) GetSp() uint64 {
-	if m != nil {
-		return m.Sp
+func (x *ARM64Registers) GetSp() uint64 {
+	if x != nil {
+		return x.Sp
 	}
 	return 0
 }
 
-func (m *ARM64Registers) GetPc() uint64 {
-	if m != nil {
-		return m.Pc
+func (x *ARM64Registers) GetPc() uint64 {
+	if x != nil {
+		return x.Pc
 	}
 	return 0
 }
 
-func (m *ARM64Registers) GetPstate() uint64 {
-	if m != nil {
-		return m.Pstate
+func (x *ARM64Registers) GetPstate() uint64 {
+	if x != nil {
+		return x.Pstate
 	}
 	return 0
 }
 
-func (m *ARM64Registers) GetTls() uint64 {
-	if m != nil {
-		return m.Tls
+func (x *ARM64Registers) GetTls() uint64 {
+	if x != nil {
+		return x.Tls
 	}
 	return 0
 }
 
 type Registers struct {
-	// Types that are valid to be assigned to Arch:
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// Types that are assignable to Arch:
 	//	*Registers_Amd64
 	//	*Registers_Arm64
-	Arch                 isRegisters_Arch `protobuf_oneof:"arch"`
-	XXX_NoUnkeyedLiteral struct{}         `json:"-"`
-	XXX_unrecognized     []byte           `json:"-"`
-	XXX_sizecache        int32            `json:"-"`
+	Arch isRegisters_Arch `protobuf_oneof:"arch"`
 }
 
-func (m *Registers) Reset()         { *m = Registers{} }
-func (m *Registers) String() string { return proto.CompactTextString(m) }
-func (*Registers) ProtoMessage()    {}
-func (*Registers) Descriptor() ([]byte, []int) {
-	return fileDescriptor_082b7510610e0457, []int{2}
+func (x *Registers) Reset() {
+	*x = Registers{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_pkg_sentry_arch_registers_proto_msgTypes[2]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
 }
 
-func (m *Registers) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_Registers.Unmarshal(m, b)
-}
-func (m *Registers) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_Registers.Marshal(b, m, deterministic)
-}
-func (m *Registers) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Registers.Merge(m, src)
-}
-func (m *Registers) XXX_Size() int {
-	return xxx_messageInfo_Registers.Size(m)
-}
-func (m *Registers) XXX_DiscardUnknown() {
-	xxx_messageInfo_Registers.DiscardUnknown(m)
+func (x *Registers) String() string {
+	return protoimpl.X.MessageStringOf(x)
 }
 
-var xxx_messageInfo_Registers proto.InternalMessageInfo
+func (*Registers) ProtoMessage() {}
 
-type isRegisters_Arch interface {
-	isRegisters_Arch()
-}
-
-type Registers_Amd64 struct {
-	Amd64 *AMD64Registers `protobuf:"bytes,1,opt,name=amd64,proto3,oneof"`
+func (x *Registers) ProtoReflect() protoreflect.Message {
+	mi := &file_pkg_sentry_arch_registers_proto_msgTypes[2]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
 }
 
-type Registers_Arm64 struct {
-	Arm64 *ARM64Registers `protobuf:"bytes,2,opt,name=arm64,proto3,oneof"`
+// Deprecated: Use Registers.ProtoReflect.Descriptor instead.
+func (*Registers) Descriptor() ([]byte, []int) {
+	return file_pkg_sentry_arch_registers_proto_rawDescGZIP(), []int{2}
 }
 
-func (*Registers_Amd64) isRegisters_Arch() {}
-
-func (*Registers_Arm64) isRegisters_Arch() {}
-
 func (m *Registers) GetArch() isRegisters_Arch {
 	if m != nil {
 		return m.Arch
@@ -636,71 +649,215 @@ func (m *Registers) GetArch() isRegisters_Arch {
 	return nil
 }
 
-func (m *Registers) GetAmd64() *AMD64Registers {
-	if x, ok := m.GetArch().(*Registers_Amd64); ok {
+func (x *Registers) GetAmd64() *AMD64Registers {
+	if x, ok := x.GetArch().(*Registers_Amd64); ok {
 		return x.Amd64
 	}
 	return nil
 }
 
-func (m *Registers) GetArm64() *ARM64Registers {
-	if x, ok := m.GetArch().(*Registers_Arm64); ok {
+func (x *Registers) GetArm64() *ARM64Registers {
+	if x, ok := x.GetArch().(*Registers_Arm64); ok {
 		return x.Arm64
 	}
 	return nil
 }
 
-// XXX_OneofWrappers is for the internal use of the proto package.
-func (*Registers) XXX_OneofWrappers() []interface{} {
-	return []interface{}{
+type isRegisters_Arch interface {
+	isRegisters_Arch()
+}
+
+type Registers_Amd64 struct {
+	Amd64 *AMD64Registers `protobuf:"bytes,1,opt,name=amd64,proto3,oneof"`
+}
+
+type Registers_Arm64 struct {
+	Arm64 *ARM64Registers `protobuf:"bytes,2,opt,name=arm64,proto3,oneof"`
+}
+
+func (*Registers_Amd64) isRegisters_Arch() {}
+
+func (*Registers_Arm64) isRegisters_Arch() {}
+
+var File_pkg_sentry_arch_registers_proto protoreflect.FileDescriptor
+
+var file_pkg_sentry_arch_registers_proto_rawDesc = []byte{
+	0x0a, 0x1f, 0x70, 0x6b, 0x67, 0x2f, 0x73, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2f, 0x61, 0x72, 0x63,
+	0x68, 0x2f, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x12, 0x06, 0x67, 0x76, 0x69, 0x73, 0x6f, 0x72, 0x22, 0x83, 0x04, 0x0a, 0x0e, 0x41, 0x4d,
+	0x44, 0x36, 0x34, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x73, 0x12, 0x10, 0x0a, 0x03,
+	0x72, 0x61, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x03, 0x72, 0x61, 0x78, 0x12, 0x10,
+	0x0a, 0x03, 0x72, 0x62, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x03, 0x72, 0x62, 0x78,
+	0x12, 0x10, 0x0a, 0x03, 0x72, 0x63, 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x52, 0x03, 0x72,
+	0x63, 0x78, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x64, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x04, 0x52,
+	0x03, 0x72, 0x64, 0x78, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x73, 0x69, 0x18, 0x05, 0x20, 0x01, 0x28,
+	0x04, 0x52, 0x03, 0x72, 0x73, 0x69, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x64, 0x69, 0x18, 0x06, 0x20,
+	0x01, 0x28, 0x04, 0x52, 0x03, 0x72, 0x64, 0x69, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x73, 0x70, 0x18,
+	0x07, 0x20, 0x01, 0x28, 0x04, 0x52, 0x03, 0x72, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x62,
+	0x70, 0x18, 0x08, 0x20, 0x01, 0x28, 0x04, 0x52, 0x03, 0x72, 0x62, 0x70, 0x12, 0x0e, 0x0a, 0x02,
+	0x72, 0x38, 0x18, 0x09, 0x20, 0x01, 0x28, 0x04, 0x52, 0x02, 0x72, 0x38, 0x12, 0x0e, 0x0a, 0x02,
+	0x72, 0x39, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x04, 0x52, 0x02, 0x72, 0x39, 0x12, 0x10, 0x0a, 0x03,
+	0x72, 0x31, 0x30, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x04, 0x52, 0x03, 0x72, 0x31, 0x30, 0x12, 0x10,
+	0x0a, 0x03, 0x72, 0x31, 0x31, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x04, 0x52, 0x03, 0x72, 0x31, 0x31,
+	0x12, 0x10, 0x0a, 0x03, 0x72, 0x31, 0x32, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x04, 0x52, 0x03, 0x72,
+	0x31, 0x32, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x31, 0x33, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x04, 0x52,
+	0x03, 0x72, 0x31, 0x33, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x31, 0x34, 0x18, 0x0f, 0x20, 0x01, 0x28,
+	0x04, 0x52, 0x03, 0x72, 0x31, 0x34, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x31, 0x35, 0x18, 0x10, 0x20,
+	0x01, 0x28, 0x04, 0x52, 0x03, 0x72, 0x31, 0x35, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x69, 0x70, 0x18,
+	0x11, 0x20, 0x01, 0x28, 0x04, 0x52, 0x03, 0x72, 0x69, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x66,
+	0x6c, 0x61, 0x67, 0x73, 0x18, 0x12, 0x20, 0x01, 0x28, 0x04, 0x52, 0x06, 0x72, 0x66, 0x6c, 0x61,
+	0x67, 0x73, 0x12, 0x19, 0x0a, 0x08, 0x6f, 0x72, 0x69, 0x67, 0x5f, 0x72, 0x61, 0x78, 0x18, 0x13,
+	0x20, 0x01, 0x28, 0x04, 0x52, 0x07, 0x6f, 0x72, 0x69, 0x67, 0x52, 0x61, 0x78, 0x12, 0x0e, 0x0a,
+	0x02, 0x63, 0x73, 0x18, 0x14, 0x20, 0x01, 0x28, 0x04, 0x52, 0x02, 0x63, 0x73, 0x12, 0x0e, 0x0a,
+	0x02, 0x64, 0x73, 0x18, 0x15, 0x20, 0x01, 0x28, 0x04, 0x52, 0x02, 0x64, 0x73, 0x12, 0x0e, 0x0a,
+	0x02, 0x65, 0x73, 0x18, 0x16, 0x20, 0x01, 0x28, 0x04, 0x52, 0x02, 0x65, 0x73, 0x12, 0x0e, 0x0a,
+	0x02, 0x66, 0x73, 0x18, 0x17, 0x20, 0x01, 0x28, 0x04, 0x52, 0x02, 0x66, 0x73, 0x12, 0x0e, 0x0a,
+	0x02, 0x67, 0x73, 0x18, 0x18, 0x20, 0x01, 0x28, 0x04, 0x52, 0x02, 0x67, 0x73, 0x12, 0x0e, 0x0a,
+	0x02, 0x73, 0x73, 0x18, 0x19, 0x20, 0x01, 0x28, 0x04, 0x52, 0x02, 0x73, 0x73, 0x12, 0x17, 0x0a,
+	0x07, 0x66, 0x73, 0x5f, 0x62, 0x61, 0x73, 0x65, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x04, 0x52, 0x06,
+	0x66, 0x73, 0x42, 0x61, 0x73, 0x65, 0x12, 0x17, 0x0a, 0x07, 0x67, 0x73, 0x5f, 0x62, 0x61, 0x73,
+	0x65, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x04, 0x52, 0x06, 0x67, 0x73, 0x42, 0x61, 0x73, 0x65, 0x22,
+	0xf4, 0x04, 0x0a, 0x0e, 0x41, 0x52, 0x4d, 0x36, 0x34, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65,
+	0x72, 0x73, 0x12, 0x0e, 0x0a, 0x02, 0x72, 0x30, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x02,
+	0x72, 0x30, 0x12, 0x0e, 0x0a, 0x02, 0x72, 0x31, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x02,
+	0x72, 0x31, 0x12, 0x0e, 0x0a, 0x02, 0x72, 0x32, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x52, 0x02,
+	0x72, 0x32, 0x12, 0x0e, 0x0a, 0x02, 0x72, 0x33, 0x18, 0x04, 0x20, 0x01, 0x28, 0x04, 0x52, 0x02,
+	0x72, 0x33, 0x12, 0x0e, 0x0a, 0x02, 0x72, 0x34, 0x18, 0x05, 0x20, 0x01, 0x28, 0x04, 0x52, 0x02,
+	0x72, 0x34, 0x12, 0x0e, 0x0a, 0x02, 0x72, 0x35, 0x18, 0x06, 0x20, 0x01, 0x28, 0x04, 0x52, 0x02,
+	0x72, 0x35, 0x12, 0x0e, 0x0a, 0x02, 0x72, 0x36, 0x18, 0x07, 0x20, 0x01, 0x28, 0x04, 0x52, 0x02,
+	0x72, 0x36, 0x12, 0x0e, 0x0a, 0x02, 0x72, 0x37, 0x18, 0x08, 0x20, 0x01, 0x28, 0x04, 0x52, 0x02,
+	0x72, 0x37, 0x12, 0x0e, 0x0a, 0x02, 0x72, 0x38, 0x18, 0x09, 0x20, 0x01, 0x28, 0x04, 0x52, 0x02,
+	0x72, 0x38, 0x12, 0x0e, 0x0a, 0x02, 0x72, 0x39, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x04, 0x52, 0x02,
+	0x72, 0x39, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x31, 0x30, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x04, 0x52,
+	0x03, 0x72, 0x31, 0x30, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x31, 0x31, 0x18, 0x0c, 0x20, 0x01, 0x28,
+	0x04, 0x52, 0x03, 0x72, 0x31, 0x31, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x31, 0x32, 0x18, 0x0d, 0x20,
+	0x01, 0x28, 0x04, 0x52, 0x03, 0x72, 0x31, 0x32, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x31, 0x33, 0x18,
+	0x0e, 0x20, 0x01, 0x28, 0x04, 0x52, 0x03, 0x72, 0x31, 0x33, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x31,
+	0x34, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x04, 0x52, 0x03, 0x72, 0x31, 0x34, 0x12, 0x10, 0x0a, 0x03,
+	0x72, 0x31, 0x35, 0x18, 0x10, 0x20, 0x01, 0x28, 0x04, 0x52, 0x03, 0x72, 0x31, 0x35, 0x12, 0x10,
+	0x0a, 0x03, 0x72, 0x31, 0x36, 0x18, 0x11, 0x20, 0x01, 0x28, 0x04, 0x52, 0x03, 0x72, 0x31, 0x36,
+	0x12, 0x10, 0x0a, 0x03, 0x72, 0x31, 0x37, 0x18, 0x12, 0x20, 0x01, 0x28, 0x04, 0x52, 0x03, 0x72,
+	0x31, 0x37, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x31, 0x38, 0x18, 0x13, 0x20, 0x01, 0x28, 0x04, 0x52,
+	0x03, 0x72, 0x31, 0x38, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x31, 0x39, 0x18, 0x14, 0x20, 0x01, 0x28,
+	0x04, 0x52, 0x03, 0x72, 0x31, 0x39, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x32, 0x30, 0x18, 0x15, 0x20,
+	0x01, 0x28, 0x04, 0x52, 0x03, 0x72, 0x32, 0x30, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x32, 0x31, 0x18,
+	0x16, 0x20, 0x01, 0x28, 0x04, 0x52, 0x03, 0x72, 0x32, 0x31, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x32,
+	0x32, 0x18, 0x17, 0x20, 0x01, 0x28, 0x04, 0x52, 0x03, 0x72, 0x32, 0x32, 0x12, 0x10, 0x0a, 0x03,
+	0x72, 0x32, 0x33, 0x18, 0x18, 0x20, 0x01, 0x28, 0x04, 0x52, 0x03, 0x72, 0x32, 0x33, 0x12, 0x10,
+	0x0a, 0x03, 0x72, 0x32, 0x34, 0x18, 0x19, 0x20, 0x01, 0x28, 0x04, 0x52, 0x03, 0x72, 0x32, 0x34,
+	0x12, 0x10, 0x0a, 0x03, 0x72, 0x32, 0x35, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x04, 0x52, 0x03, 0x72,
+	0x32, 0x35, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x32, 0x36, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x04, 0x52,
+	0x03, 0x72, 0x32, 0x36, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x32, 0x37, 0x18, 0x1c, 0x20, 0x01, 0x28,
+	0x04, 0x52, 0x03, 0x72, 0x32, 0x37, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x32, 0x38, 0x18, 0x1d, 0x20,
+	0x01, 0x28, 0x04, 0x52, 0x03, 0x72, 0x32, 0x38, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x32, 0x39, 0x18,
+	0x1e, 0x20, 0x01, 0x28, 0x04, 0x52, 0x03, 0x72, 0x32, 0x39, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x33,
+	0x30, 0x18, 0x1f, 0x20, 0x01, 0x28, 0x04, 0x52, 0x03, 0x72, 0x33, 0x30, 0x12, 0x0e, 0x0a, 0x02,
+	0x73, 0x70, 0x18, 0x20, 0x20, 0x01, 0x28, 0x04, 0x52, 0x02, 0x73, 0x70, 0x12, 0x0e, 0x0a, 0x02,
+	0x70, 0x63, 0x18, 0x21, 0x20, 0x01, 0x28, 0x04, 0x52, 0x02, 0x70, 0x63, 0x12, 0x16, 0x0a, 0x06,
+	0x70, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x22, 0x20, 0x01, 0x28, 0x04, 0x52, 0x06, 0x70, 0x73,
+	0x74, 0x61, 0x74, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x6c, 0x73, 0x18, 0x23, 0x20, 0x01, 0x28,
+	0x04, 0x52, 0x03, 0x74, 0x6c, 0x73, 0x22, 0x73, 0x0a, 0x09, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74,
+	0x65, 0x72, 0x73, 0x12, 0x2e, 0x0a, 0x05, 0x61, 0x6d, 0x64, 0x36, 0x34, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x16, 0x2e, 0x67, 0x76, 0x69, 0x73, 0x6f, 0x72, 0x2e, 0x41, 0x4d, 0x44, 0x36,
+	0x34, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x73, 0x48, 0x00, 0x52, 0x05, 0x61, 0x6d,
+	0x64, 0x36, 0x34, 0x12, 0x2e, 0x0a, 0x05, 0x61, 0x72, 0x6d, 0x36, 0x34, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x16, 0x2e, 0x67, 0x76, 0x69, 0x73, 0x6f, 0x72, 0x2e, 0x41, 0x52, 0x4d, 0x36,
+	0x34, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x73, 0x48, 0x00, 0x52, 0x05, 0x61, 0x72,
+	0x6d, 0x36, 0x34, 0x42, 0x06, 0x0a, 0x04, 0x61, 0x72, 0x63, 0x68, 0x62, 0x06, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x33,
+}
+
+var (
+	file_pkg_sentry_arch_registers_proto_rawDescOnce sync.Once
+	file_pkg_sentry_arch_registers_proto_rawDescData = file_pkg_sentry_arch_registers_proto_rawDesc
+)
+
+func file_pkg_sentry_arch_registers_proto_rawDescGZIP() []byte {
+	file_pkg_sentry_arch_registers_proto_rawDescOnce.Do(func() {
+		file_pkg_sentry_arch_registers_proto_rawDescData = protoimpl.X.CompressGZIP(file_pkg_sentry_arch_registers_proto_rawDescData)
+	})
+	return file_pkg_sentry_arch_registers_proto_rawDescData
+}
+
+var file_pkg_sentry_arch_registers_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
+var file_pkg_sentry_arch_registers_proto_goTypes = []interface{}{
+	(*AMD64Registers)(nil), // 0: gvisor.AMD64Registers
+	(*ARM64Registers)(nil), // 1: gvisor.ARM64Registers
+	(*Registers)(nil),      // 2: gvisor.Registers
+}
+var file_pkg_sentry_arch_registers_proto_depIdxs = []int32{
+	0, // 0: gvisor.Registers.amd64:type_name -> gvisor.AMD64Registers
+	1, // 1: gvisor.Registers.arm64:type_name -> gvisor.ARM64Registers
+	2, // [2:2] is the sub-list for method output_type
+	2, // [2:2] is the sub-list for method input_type
+	2, // [2:2] is the sub-list for extension type_name
+	2, // [2:2] is the sub-list for extension extendee
+	0, // [0:2] is the sub-list for field type_name
+}
+
+func init() { file_pkg_sentry_arch_registers_proto_init() }
+func file_pkg_sentry_arch_registers_proto_init() {
+	if File_pkg_sentry_arch_registers_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_pkg_sentry_arch_registers_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*AMD64Registers); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_pkg_sentry_arch_registers_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ARM64Registers); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_pkg_sentry_arch_registers_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Registers); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
+	file_pkg_sentry_arch_registers_proto_msgTypes[2].OneofWrappers = []interface{}{
 		(*Registers_Amd64)(nil),
 		(*Registers_Arm64)(nil),
 	}
-}
-
-func init() {
-	proto.RegisterType((*AMD64Registers)(nil), "gvisor.AMD64Registers")
-	proto.RegisterType((*ARM64Registers)(nil), "gvisor.ARM64Registers")
-	proto.RegisterType((*Registers)(nil), "gvisor.Registers")
-}
-
-func init() { proto.RegisterFile("pkg/sentry/arch/registers.proto", fileDescriptor_082b7510610e0457) }
-
-var fileDescriptor_082b7510610e0457 = []byte{
-	// 555 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x94, 0x4b, 0x72, 0xd3, 0x40,
-	0x10, 0x86, 0xc9, 0xc4, 0x71, 0x92, 0x09, 0x84, 0x20, 0xc0, 0xe9, 0xf0, 0x4a, 0x30, 0x1b, 0x56,
-	0xb6, 0x5e, 0x96, 0xed, 0x25, 0x29, 0x16, 0x6c, 0xb2, 0xf1, 0x05, 0x52, 0xb2, 0x2c, 0x0b, 0x15,
-	0x0e, 0x9e, 0x9a, 0x56, 0x51, 0x66, 0xcd, 0x95, 0x39, 0x00, 0xd5, 0x8f, 0x81, 0xe4, 0x06, 0xec,
-	0xfa, 0xfb, 0xa6, 0x25, 0x8d, 0xf4, 0xb7, 0xc6, 0x5e, 0xba, 0x6f, 0xcd, 0x18, 0xeb, 0xef, 0x9d,
-	0xff, 0x39, 0x2e, 0x7d, 0xf5, 0x75, 0xec, 0xeb, 0xa6, 0xc5, 0xae, 0xf6, 0x38, 0x72, 0x7e, 0xdb,
-	0x6d, 0xa3, 0x7e, 0xf3, 0xa3, 0xc5, 0xad, 0x1f, 0xfe, 0xea, 0xd9, 0xd3, 0x4f, 0x37, 0x9f, 0x8b,
-	0x7c, 0x11, 0x1a, 0xa2, 0x33, 0xbb, 0xef, 0xcb, 0x1d, 0xec, 0x5d, 0xed, 0x7d, 0xec, 0x2d, 0xa8,
-	0x64, 0xb3, 0xdc, 0x81, 0x51, 0xb3, 0x14, 0x53, 0xed, 0x60, 0x5f, 0x4d, 0x25, 0x66, 0xb5, 0x83,
-	0x9e, 0x9a, 0x95, 0x18, 0x6c, 0xe1, 0x40, 0x0d, 0xb6, 0xd2, 0xd3, 0x42, 0x3f, 0xf4, 0x88, 0x41,
-	0x07, 0x87, 0xa1, 0xc7, 0xc9, 0xb3, 0x1c, 0x1c, 0x85, 0x67, 0xb9, 0xe8, 0xd4, 0x1a, 0x3f, 0x83,
-	0x63, 0x16, 0xc6, 0xcf, 0x98, 0xe7, 0x60, 0x95, 0xe7, 0x7c, 0x45, 0x12, 0xc3, 0x89, 0x5e, 0x91,
-	0xc4, 0x62, 0x12, 0x78, 0x1c, 0x4c, 0x22, 0x26, 0x85, 0x27, 0xc1, 0xa4, 0x62, 0x32, 0x38, 0x0d,
-	0x26, 0x13, 0x93, 0xc3, 0xd3, 0x60, 0x72, 0x31, 0x13, 0x38, 0x0b, 0x66, 0xc2, 0xa6, 0x75, 0xf0,
-	0x4c, 0x4d, 0xeb, 0xa2, 0x81, 0xed, 0xfb, 0xf5, 0xa6, 0x6c, 0x10, 0x22, 0x96, 0x4a, 0xd1, 0x85,
-	0x3d, 0xda, 0xfa, 0xb6, 0xb9, 0xa5, 0x4f, 0xf9, 0x9c, 0x57, 0x0e, 0x89, 0x17, 0xe5, 0x8e, 0x5e,
-	0xa0, 0x42, 0x78, 0x21, 0x2f, 0x50, 0x21, 0xf1, 0x0a, 0xe1, 0xa5, 0xf0, 0x8a, 0xb9, 0x46, 0x18,
-	0x08, 0xd7, 0xcc, 0x6b, 0x84, 0x73, 0xe1, 0x35, 0x73, 0x83, 0x00, 0xc2, 0x0d, 0x33, 0x22, 0x5c,
-	0x08, 0x23, 0x46, 0xe7, 0xf6, 0x70, 0x8d, 0xb7, 0xcb, 0x12, 0x6b, 0x78, 0x25, 0x7b, 0x5a, 0xe3,
-	0x75, 0x89, 0x35, 0x2d, 0x34, 0xba, 0xf0, 0x5a, 0x16, 0x1a, 0x5e, 0x18, 0xfe, 0xa6, 0x29, 0x58,
-	0xdc, 0xdc, 0x9f, 0x02, 0xfa, 0xca, 0xb1, 0x0e, 0x81, 0xf1, 0x31, 0x73, 0xa2, 0x23, 0x60, 0x7c,
-	0xc2, 0x9c, 0xea, 0x00, 0x18, 0x9f, 0x32, 0x67, 0x1a, 0xbf, 0xf1, 0x19, 0x73, 0xae, 0xe1, 0x1b,
-	0x9f, 0x33, 0x4f, 0x34, 0x7a, 0xe3, 0x27, 0xcc, 0x85, 0x06, 0x6f, 0x7c, 0xc1, 0x3c, 0xd5, 0xd8,
-	0x8d, 0x9f, 0xfe, 0x77, 0xa9, 0x27, 0xc5, 0xdf, 0xd4, 0x93, 0x42, 0xcc, 0x54, 0x23, 0xa7, 0x52,
-	0xcc, 0x4c, 0xa3, 0xa6, 0x52, 0xcc, 0x5c, 0x73, 0xa6, 0x92, 0x4d, 0x1a, 0x6b, 0xd2, 0x54, 0x8a,
-	0x49, 0x34, 0x6b, 0x2a, 0xc5, 0xa4, 0x9a, 0x36, 0x95, 0x62, 0x32, 0xcd, 0x9b, 0x4a, 0x31, 0xb9,
-	0x26, 0x4e, 0xa5, 0x98, 0x89, 0xc6, 0x4d, 0xa5, 0x98, 0x42, 0x73, 0xa6, 0x52, 0xcc, 0x14, 0xde,
-	0x04, 0x23, 0x7b, 0x4e, 0x67, 0xf0, 0x36, 0x18, 0xd9, 0x73, 0x3a, 0x87, 0x77, 0xc1, 0xc8, 0x9e,
-	0xb3, 0x18, 0x2e, 0xd5, 0x64, 0x3c, 0x09, 0xe8, 0xe0, 0x4a, 0xc7, 0x8d, 0xff, 0x4f, 0x57, 0xc1,
-	0x7b, 0x61, 0x57, 0xd1, 0x1f, 0xe1, 0xb0, 0x2b, 0xbb, 0x1a, 0x86, 0x32, 0x64, 0x42, 0x74, 0xa7,
-	0x6e, 0x83, 0xf0, 0x41, 0xee, 0xd4, 0x6d, 0x70, 0x88, 0xf6, 0xf8, 0xdf, 0xc0, 0x8d, 0xec, 0x41,
-	0x79, 0xb7, 0x2a, 0x72, 0x9e, 0xb9, 0x93, 0x74, 0x30, 0x92, 0x13, 0x6a, 0xf4, 0xf0, 0x74, 0xfa,
-	0xf2, 0x68, 0x21, 0x6d, 0xdc, 0xef, 0xef, 0x8a, 0x9c, 0x67, 0xf2, 0x7e, 0xff, 0x83, 0x39, 0xe6,
-	0x7e, 0x6a, 0xbb, 0xee, 0xdb, 0x1e, 0x9d, 0x84, 0xcb, 0x3e, 0x1f, 0x80, 0xd9, 0x9f, 0x00, 0x00,
-	0x00, 0xff, 0xff, 0xd3, 0xa0, 0x97, 0xf1, 0x23, 0x05, 0x00, 0x00,
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_pkg_sentry_arch_registers_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   3,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_pkg_sentry_arch_registers_proto_goTypes,
+		DependencyIndexes: file_pkg_sentry_arch_registers_proto_depIdxs,
+		MessageInfos:      file_pkg_sentry_arch_registers_proto_msgTypes,
+	}.Build()
+	File_pkg_sentry_arch_registers_proto = out.File
+	file_pkg_sentry_arch_registers_proto_rawDesc = nil
+	file_pkg_sentry_arch_registers_proto_goTypes = nil
+	file_pkg_sentry_arch_registers_proto_depIdxs = nil
 }
diff --git a/pkg/sentry/kernel/memevent/memory_events_go_proto/memory_events.pb.go b/pkg/sentry/kernel/memevent/memory_events_go_proto/memory_events.pb.go
index f8b857fa9..8b36a7b25 100644
--- a/pkg/sentry/kernel/memevent/memory_events_go_proto/memory_events.pb.go
+++ b/pkg/sentry/kernel/memevent/memory_events_go_proto/memory_events.pb.go
@@ -1,88 +1,158 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.25.0
+// 	protoc        v3.9.0
 // source: pkg/sentry/kernel/memevent/memory_events.proto
 
 package gvisor
 
 import (
-	fmt "fmt"
 	proto "github.com/golang/protobuf/proto"
-	math "math"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
+const (
+	// Verify that this generated code is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+	// Verify that runtime/protoimpl is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
 
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
+// This is a compile-time assertion that a sufficiently up-to-date version
+// of the legacy proto package is being used.
+const _ = proto.ProtoPackageIsVersion4
 
 type MemoryUsageEvent struct {
-	Total                uint64   `protobuf:"varint,1,opt,name=total,proto3" json:"total,omitempty"`
-	Mapped               uint64   `protobuf:"varint,2,opt,name=mapped,proto3" json:"mapped,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
-}
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 
-func (m *MemoryUsageEvent) Reset()         { *m = MemoryUsageEvent{} }
-func (m *MemoryUsageEvent) String() string { return proto.CompactTextString(m) }
-func (*MemoryUsageEvent) ProtoMessage()    {}
-func (*MemoryUsageEvent) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cd85fc8d1130e4b0, []int{0}
+	Total  uint64 `protobuf:"varint,1,opt,name=total,proto3" json:"total,omitempty"`
+	Mapped uint64 `protobuf:"varint,2,opt,name=mapped,proto3" json:"mapped,omitempty"`
 }
 
-func (m *MemoryUsageEvent) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_MemoryUsageEvent.Unmarshal(m, b)
-}
-func (m *MemoryUsageEvent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_MemoryUsageEvent.Marshal(b, m, deterministic)
-}
-func (m *MemoryUsageEvent) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MemoryUsageEvent.Merge(m, src)
+func (x *MemoryUsageEvent) Reset() {
+	*x = MemoryUsageEvent{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_pkg_sentry_kernel_memevent_memory_events_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
 }
-func (m *MemoryUsageEvent) XXX_Size() int {
-	return xxx_messageInfo_MemoryUsageEvent.Size(m)
+
+func (x *MemoryUsageEvent) String() string {
+	return protoimpl.X.MessageStringOf(x)
 }
-func (m *MemoryUsageEvent) XXX_DiscardUnknown() {
-	xxx_messageInfo_MemoryUsageEvent.DiscardUnknown(m)
+
+func (*MemoryUsageEvent) ProtoMessage() {}
+
+func (x *MemoryUsageEvent) ProtoReflect() protoreflect.Message {
+	mi := &file_pkg_sentry_kernel_memevent_memory_events_proto_msgTypes[0]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
 }
 
-var xxx_messageInfo_MemoryUsageEvent proto.InternalMessageInfo
+// Deprecated: Use MemoryUsageEvent.ProtoReflect.Descriptor instead.
+func (*MemoryUsageEvent) Descriptor() ([]byte, []int) {
+	return file_pkg_sentry_kernel_memevent_memory_events_proto_rawDescGZIP(), []int{0}
+}
 
-func (m *MemoryUsageEvent) GetTotal() uint64 {
-	if m != nil {
-		return m.Total
+func (x *MemoryUsageEvent) GetTotal() uint64 {
+	if x != nil {
+		return x.Total
 	}
 	return 0
 }
 
-func (m *MemoryUsageEvent) GetMapped() uint64 {
-	if m != nil {
-		return m.Mapped
+func (x *MemoryUsageEvent) GetMapped() uint64 {
+	if x != nil {
+		return x.Mapped
 	}
 	return 0
 }
 
-func init() {
-	proto.RegisterType((*MemoryUsageEvent)(nil), "gvisor.MemoryUsageEvent")
+var File_pkg_sentry_kernel_memevent_memory_events_proto protoreflect.FileDescriptor
+
+var file_pkg_sentry_kernel_memevent_memory_events_proto_rawDesc = []byte{
+	0x0a, 0x2e, 0x70, 0x6b, 0x67, 0x2f, 0x73, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2f, 0x6b, 0x65, 0x72,
+	0x6e, 0x65, 0x6c, 0x2f, 0x6d, 0x65, 0x6d, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x2f, 0x6d, 0x65, 0x6d,
+	0x6f, 0x72, 0x79, 0x5f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x12, 0x06, 0x67, 0x76, 0x69, 0x73, 0x6f, 0x72, 0x22, 0x40, 0x0a, 0x10, 0x4d, 0x65, 0x6d, 0x6f,
+	0x72, 0x79, 0x55, 0x73, 0x61, 0x67, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05,
+	0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x05, 0x74, 0x6f, 0x74,
+	0x61, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x6d, 0x61, 0x70, 0x70, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x04, 0x52, 0x06, 0x6d, 0x61, 0x70, 0x70, 0x65, 0x64, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x33,
+}
+
+var (
+	file_pkg_sentry_kernel_memevent_memory_events_proto_rawDescOnce sync.Once
+	file_pkg_sentry_kernel_memevent_memory_events_proto_rawDescData = file_pkg_sentry_kernel_memevent_memory_events_proto_rawDesc
+)
+
+func file_pkg_sentry_kernel_memevent_memory_events_proto_rawDescGZIP() []byte {
+	file_pkg_sentry_kernel_memevent_memory_events_proto_rawDescOnce.Do(func() {
+		file_pkg_sentry_kernel_memevent_memory_events_proto_rawDescData = protoimpl.X.CompressGZIP(file_pkg_sentry_kernel_memevent_memory_events_proto_rawDescData)
+	})
+	return file_pkg_sentry_kernel_memevent_memory_events_proto_rawDescData
 }
 
-func init() {
-	proto.RegisterFile("pkg/sentry/kernel/memevent/memory_events.proto", fileDescriptor_cd85fc8d1130e4b0)
+var file_pkg_sentry_kernel_memevent_memory_events_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
+var file_pkg_sentry_kernel_memevent_memory_events_proto_goTypes = []interface{}{
+	(*MemoryUsageEvent)(nil), // 0: gvisor.MemoryUsageEvent
+}
+var file_pkg_sentry_kernel_memevent_memory_events_proto_depIdxs = []int32{
+	0, // [0:0] is the sub-list for method output_type
+	0, // [0:0] is the sub-list for method input_type
+	0, // [0:0] is the sub-list for extension type_name
+	0, // [0:0] is the sub-list for extension extendee
+	0, // [0:0] is the sub-list for field type_name
 }
 
-var fileDescriptor_cd85fc8d1130e4b0 = []byte{
-	// 128 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0x2b, 0xc8, 0x4e, 0xd7,
-	0x2f, 0x4e, 0xcd, 0x2b, 0x29, 0xaa, 0xd4, 0xcf, 0x4e, 0x2d, 0xca, 0x4b, 0xcd, 0xd1, 0xcf, 0x4d,
-	0xcd, 0x4d, 0x2d, 0x4b, 0xcd, 0x2b, 0x01, 0x31, 0xf2, 0x8b, 0x2a, 0xe3, 0xc1, 0x9c, 0x62, 0xbd,
-	0x82, 0xa2, 0xfc, 0x92, 0x7c, 0x21, 0xb6, 0xf4, 0xb2, 0xcc, 0xe2, 0xfc, 0x22, 0x25, 0x07, 0x2e,
-	0x01, 0x5f, 0xb0, 0x74, 0x68, 0x71, 0x62, 0x7a, 0xaa, 0x2b, 0x48, 0x89, 0x90, 0x08, 0x17, 0x6b,
-	0x49, 0x7e, 0x49, 0x62, 0x8e, 0x04, 0xa3, 0x02, 0xa3, 0x06, 0x4b, 0x10, 0x84, 0x23, 0x24, 0xc6,
-	0xc5, 0x96, 0x9b, 0x58, 0x50, 0x90, 0x9a, 0x22, 0xc1, 0x04, 0x16, 0x86, 0xf2, 0x92, 0xd8, 0xc0,
-	0x06, 0x1a, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x99, 0x31, 0x2f, 0x9d, 0x82, 0x00, 0x00, 0x00,
+func init() { file_pkg_sentry_kernel_memevent_memory_events_proto_init() }
+func file_pkg_sentry_kernel_memevent_memory_events_proto_init() {
+	if File_pkg_sentry_kernel_memevent_memory_events_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_pkg_sentry_kernel_memevent_memory_events_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*MemoryUsageEvent); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_pkg_sentry_kernel_memevent_memory_events_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   1,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_pkg_sentry_kernel_memevent_memory_events_proto_goTypes,
+		DependencyIndexes: file_pkg_sentry_kernel_memevent_memory_events_proto_depIdxs,
+		MessageInfos:      file_pkg_sentry_kernel_memevent_memory_events_proto_msgTypes,
+	}.Build()
+	File_pkg_sentry_kernel_memevent_memory_events_proto = out.File
+	file_pkg_sentry_kernel_memevent_memory_events_proto_rawDesc = nil
+	file_pkg_sentry_kernel_memevent_memory_events_proto_goTypes = nil
+	file_pkg_sentry_kernel_memevent_memory_events_proto_depIdxs = nil
 }
diff --git a/pkg/sentry/kernel/uncaught_signal_go_proto/uncaught_signal.pb.go b/pkg/sentry/kernel/uncaught_signal_go_proto/uncaught_signal.pb.go
index 822e549ab..194ada066 100644
--- a/pkg/sentry/kernel/uncaught_signal_go_proto/uncaught_signal.pb.go
+++ b/pkg/sentry/kernel/uncaught_signal_go_proto/uncaught_signal.pb.go
@@ -1,119 +1,193 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.25.0
+// 	protoc        v3.9.0
 // source: pkg/sentry/kernel/uncaught_signal.proto
 
 package gvisor
 
 import (
-	fmt "fmt"
 	proto "github.com/golang/protobuf/proto"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	registers_go_proto "gvisor.dev/gvisor/pkg/sentry/arch/registers_go_proto"
-	math "math"
+	reflect "reflect"
+	sync "sync"
 )
 
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
+const (
+	// Verify that this generated code is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+	// Verify that runtime/protoimpl is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
 
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
+// This is a compile-time assertion that a sufficiently up-to-date version
+// of the legacy proto package is being used.
+const _ = proto.ProtoPackageIsVersion4
 
 type UncaughtSignal struct {
-	Tid                  int32                         `protobuf:"varint,1,opt,name=tid,proto3" json:"tid,omitempty"`
-	Pid                  int32                         `protobuf:"varint,2,opt,name=pid,proto3" json:"pid,omitempty"`
-	Registers            *registers_go_proto.Registers `protobuf:"bytes,3,opt,name=registers,proto3" json:"registers,omitempty"`
-	SignalNumber         int32                         `protobuf:"varint,4,opt,name=signal_number,json=signalNumber,proto3" json:"signal_number,omitempty"`
-	FaultAddr            uint64                        `protobuf:"varint,5,opt,name=fault_addr,json=faultAddr,proto3" json:"fault_addr,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                      `json:"-"`
-	XXX_unrecognized     []byte                        `json:"-"`
-	XXX_sizecache        int32                         `json:"-"`
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Tid          int32                         `protobuf:"varint,1,opt,name=tid,proto3" json:"tid,omitempty"`
+	Pid          int32                         `protobuf:"varint,2,opt,name=pid,proto3" json:"pid,omitempty"`
+	Registers    *registers_go_proto.Registers `protobuf:"bytes,3,opt,name=registers,proto3" json:"registers,omitempty"`
+	SignalNumber int32                         `protobuf:"varint,4,opt,name=signal_number,json=signalNumber,proto3" json:"signal_number,omitempty"`
+	FaultAddr    uint64                        `protobuf:"varint,5,opt,name=fault_addr,json=faultAddr,proto3" json:"fault_addr,omitempty"`
 }
 
-func (m *UncaughtSignal) Reset()         { *m = UncaughtSignal{} }
-func (m *UncaughtSignal) String() string { return proto.CompactTextString(m) }
-func (*UncaughtSignal) ProtoMessage()    {}
-func (*UncaughtSignal) Descriptor() ([]byte, []int) {
-	return fileDescriptor_5ca9e03e13704688, []int{0}
+func (x *UncaughtSignal) Reset() {
+	*x = UncaughtSignal{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_pkg_sentry_kernel_uncaught_signal_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
 }
 
-func (m *UncaughtSignal) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_UncaughtSignal.Unmarshal(m, b)
-}
-func (m *UncaughtSignal) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_UncaughtSignal.Marshal(b, m, deterministic)
-}
-func (m *UncaughtSignal) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UncaughtSignal.Merge(m, src)
+func (x *UncaughtSignal) String() string {
+	return protoimpl.X.MessageStringOf(x)
 }
-func (m *UncaughtSignal) XXX_Size() int {
-	return xxx_messageInfo_UncaughtSignal.Size(m)
-}
-func (m *UncaughtSignal) XXX_DiscardUnknown() {
-	xxx_messageInfo_UncaughtSignal.DiscardUnknown(m)
+
+func (*UncaughtSignal) ProtoMessage() {}
+
+func (x *UncaughtSignal) ProtoReflect() protoreflect.Message {
+	mi := &file_pkg_sentry_kernel_uncaught_signal_proto_msgTypes[0]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
 }
 
-var xxx_messageInfo_UncaughtSignal proto.InternalMessageInfo
+// Deprecated: Use UncaughtSignal.ProtoReflect.Descriptor instead.
+func (*UncaughtSignal) Descriptor() ([]byte, []int) {
+	return file_pkg_sentry_kernel_uncaught_signal_proto_rawDescGZIP(), []int{0}
+}
 
-func (m *UncaughtSignal) GetTid() int32 {
-	if m != nil {
-		return m.Tid
+func (x *UncaughtSignal) GetTid() int32 {
+	if x != nil {
+		return x.Tid
 	}
 	return 0
 }
 
-func (m *UncaughtSignal) GetPid() int32 {
-	if m != nil {
-		return m.Pid
+func (x *UncaughtSignal) GetPid() int32 {
+	if x != nil {
+		return x.Pid
 	}
 	return 0
 }
 
-func (m *UncaughtSignal) GetRegisters() *registers_go_proto.Registers {
-	if m != nil {
-		return m.Registers
+func (x *UncaughtSignal) GetRegisters() *registers_go_proto.Registers {
+	if x != nil {
+		return x.Registers
 	}
 	return nil
 }
 
-func (m *UncaughtSignal) GetSignalNumber() int32 {
-	if m != nil {
-		return m.SignalNumber
+func (x *UncaughtSignal) GetSignalNumber() int32 {
+	if x != nil {
+		return x.SignalNumber
 	}
 	return 0
 }
 
-func (m *UncaughtSignal) GetFaultAddr() uint64 {
-	if m != nil {
-		return m.FaultAddr
+func (x *UncaughtSignal) GetFaultAddr() uint64 {
+	if x != nil {
+		return x.FaultAddr
 	}
 	return 0
 }
 
-func init() {
-	proto.RegisterType((*UncaughtSignal)(nil), "gvisor.UncaughtSignal")
+var File_pkg_sentry_kernel_uncaught_signal_proto protoreflect.FileDescriptor
+
+var file_pkg_sentry_kernel_uncaught_signal_proto_rawDesc = []byte{
+	0x0a, 0x27, 0x70, 0x6b, 0x67, 0x2f, 0x73, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2f, 0x6b, 0x65, 0x72,
+	0x6e, 0x65, 0x6c, 0x2f, 0x75, 0x6e, 0x63, 0x61, 0x75, 0x67, 0x68, 0x74, 0x5f, 0x73, 0x69, 0x67,
+	0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x67, 0x76, 0x69, 0x73, 0x6f,
+	0x72, 0x1a, 0x1f, 0x70, 0x6b, 0x67, 0x2f, 0x73, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2f, 0x61, 0x72,
+	0x63, 0x68, 0x2f, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x22, 0xa9, 0x01, 0x0a, 0x0e, 0x55, 0x6e, 0x63, 0x61, 0x75, 0x67, 0x68, 0x74, 0x53,
+	0x69, 0x67, 0x6e, 0x61, 0x6c, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x69, 0x64, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x70, 0x69, 0x64, 0x12, 0x2f, 0x0a, 0x09, 0x72, 0x65, 0x67,
+	0x69, 0x73, 0x74, 0x65, 0x72, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x67,
+	0x76, 0x69, 0x73, 0x6f, 0x72, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x73, 0x52,
+	0x09, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x73, 0x69,
+	0x67, 0x6e, 0x61, 0x6c, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28,
+	0x05, 0x52, 0x0c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12,
+	0x1d, 0x0a, 0x0a, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x18, 0x05, 0x20,
+	0x01, 0x28, 0x04, 0x52, 0x09, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x41, 0x64, 0x64, 0x72, 0x62, 0x06,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
-func init() {
-	proto.RegisterFile("pkg/sentry/kernel/uncaught_signal.proto", fileDescriptor_5ca9e03e13704688)
+var (
+	file_pkg_sentry_kernel_uncaught_signal_proto_rawDescOnce sync.Once
+	file_pkg_sentry_kernel_uncaught_signal_proto_rawDescData = file_pkg_sentry_kernel_uncaught_signal_proto_rawDesc
+)
+
+func file_pkg_sentry_kernel_uncaught_signal_proto_rawDescGZIP() []byte {
+	file_pkg_sentry_kernel_uncaught_signal_proto_rawDescOnce.Do(func() {
+		file_pkg_sentry_kernel_uncaught_signal_proto_rawDescData = protoimpl.X.CompressGZIP(file_pkg_sentry_kernel_uncaught_signal_proto_rawDescData)
+	})
+	return file_pkg_sentry_kernel_uncaught_signal_proto_rawDescData
 }
 
-var fileDescriptor_5ca9e03e13704688 = []byte{
-	// 210 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x8e, 0x4d, 0x4a, 0xc6, 0x30,
-	0x10, 0x86, 0x89, 0xfd, 0x81, 0xc6, 0x1f, 0x34, 0xab, 0x20, 0x88, 0x45, 0x17, 0x76, 0xd5, 0x80,
-	0x9e, 0xc0, 0x0b, 0xb8, 0x88, 0xb8, 0x2e, 0x69, 0x13, 0xd3, 0xd0, 0x9a, 0x86, 0x49, 0x22, 0x78,
-	0x24, 0x6f, 0x29, 0x4d, 0xd4, 0xef, 0xdb, 0x0d, 0xcf, 0xbc, 0xf3, 0xcc, 0x8b, 0x1f, 0xdc, 0xa2,
-	0x99, 0x57, 0x36, 0xc0, 0x17, 0x5b, 0x14, 0x58, 0xb5, 0xb2, 0x68, 0x27, 0x11, 0xf5, 0x1c, 0x06,
-	0x6f, 0xb4, 0x15, 0x6b, 0xef, 0x60, 0x0b, 0x1b, 0xa9, 0xf5, 0xa7, 0xf1, 0x1b, 0x5c, 0xdf, 0x1e,
-	0x1d, 0x08, 0x98, 0x66, 0x06, 0x4a, 0x1b, 0x1f, 0x14, 0xf8, 0x1c, 0xbc, 0xfb, 0x46, 0xf8, 0xe2,
-	0xed, 0x57, 0xf1, 0x9a, 0x0c, 0xe4, 0x12, 0x17, 0xc1, 0x48, 0x8a, 0x5a, 0xd4, 0x55, 0x7c, 0x1f,
-	0x77, 0xe2, 0x8c, 0xa4, 0x27, 0x99, 0x38, 0x23, 0x09, 0xc3, 0xcd, 0xbf, 0x89, 0x16, 0x2d, 0xea,
-	0x4e, 0x1f, 0xaf, 0xfa, 0xfc, 0xb3, 0xe7, 0x7f, 0x0b, 0x7e, 0xc8, 0x90, 0x7b, 0x7c, 0x9e, 0x0b,
-	0x0e, 0x36, 0x7e, 0x8c, 0x0a, 0x68, 0x99, 0x64, 0x67, 0x19, 0xbe, 0x24, 0x46, 0x6e, 0x30, 0x7e,
-	0x17, 0x71, 0x0d, 0x83, 0x90, 0x12, 0x68, 0xd5, 0xa2, 0xae, 0xe4, 0x4d, 0x22, 0xcf, 0x52, 0xc2,
-	0x58, 0xa7, 0xca, 0x4f, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xfd, 0x62, 0x54, 0xdf, 0x06, 0x01,
-	0x00, 0x00,
+var file_pkg_sentry_kernel_uncaught_signal_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
+var file_pkg_sentry_kernel_uncaught_signal_proto_goTypes = []interface{}{
+	(*UncaughtSignal)(nil),               // 0: gvisor.UncaughtSignal
+	(*registers_go_proto.Registers)(nil), // 1: gvisor.Registers
+}
+var file_pkg_sentry_kernel_uncaught_signal_proto_depIdxs = []int32{
+	1, // 0: gvisor.UncaughtSignal.registers:type_name -> gvisor.Registers
+	1, // [1:1] is the sub-list for method output_type
+	1, // [1:1] is the sub-list for method input_type
+	1, // [1:1] is the sub-list for extension type_name
+	1, // [1:1] is the sub-list for extension extendee
+	0, // [0:1] is the sub-list for field type_name
+}
+
+func init() { file_pkg_sentry_kernel_uncaught_signal_proto_init() }
+func file_pkg_sentry_kernel_uncaught_signal_proto_init() {
+	if File_pkg_sentry_kernel_uncaught_signal_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_pkg_sentry_kernel_uncaught_signal_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*UncaughtSignal); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_pkg_sentry_kernel_uncaught_signal_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   1,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_pkg_sentry_kernel_uncaught_signal_proto_goTypes,
+		DependencyIndexes: file_pkg_sentry_kernel_uncaught_signal_proto_depIdxs,
+		MessageInfos:      file_pkg_sentry_kernel_uncaught_signal_proto_msgTypes,
+	}.Build()
+	File_pkg_sentry_kernel_uncaught_signal_proto = out.File
+	file_pkg_sentry_kernel_uncaught_signal_proto_rawDesc = nil
+	file_pkg_sentry_kernel_uncaught_signal_proto_goTypes = nil
+	file_pkg_sentry_kernel_uncaught_signal_proto_depIdxs = nil
 }
diff --git a/pkg/sentry/strace/strace_go_proto/strace.pb.go b/pkg/sentry/strace/strace_go_proto/strace.pb.go
index ef45661bc..b1b0f3fe9 100644
--- a/pkg/sentry/strace/strace_go_proto/strace.pb.go
+++ b/pkg/sentry/strace/strace_go_proto/strace.pb.go
@@ -1,80 +1,114 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.25.0
+// 	protoc        v3.9.0
 // source: pkg/sentry/strace/strace.proto
 
 package gvisor
 
 import (
-	fmt "fmt"
 	proto "github.com/golang/protobuf/proto"
-	math "math"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
+const (
+	// Verify that this generated code is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+	// Verify that runtime/protoimpl is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
 
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
+// This is a compile-time assertion that a sufficiently up-to-date version
+// of the legacy proto package is being used.
+const _ = proto.ProtoPackageIsVersion4
 
 type Strace struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
 	Process  string   `protobuf:"bytes,1,opt,name=process,proto3" json:"process,omitempty"`
 	Function string   `protobuf:"bytes,2,opt,name=function,proto3" json:"function,omitempty"`
 	Args     []string `protobuf:"bytes,3,rep,name=args,proto3" json:"args,omitempty"`
-	// Types that are valid to be assigned to Info:
+	// Types that are assignable to Info:
 	//	*Strace_Enter
 	//	*Strace_Exit
-	Info                 isStrace_Info `protobuf_oneof:"info"`
-	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
-	XXX_unrecognized     []byte        `json:"-"`
-	XXX_sizecache        int32         `json:"-"`
+	Info isStrace_Info `protobuf_oneof:"info"`
 }
 
-func (m *Strace) Reset()         { *m = Strace{} }
-func (m *Strace) String() string { return proto.CompactTextString(m) }
-func (*Strace) ProtoMessage()    {}
-func (*Strace) Descriptor() ([]byte, []int) {
-	return fileDescriptor_50c4b43677c82b5f, []int{0}
+func (x *Strace) Reset() {
+	*x = Strace{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_pkg_sentry_strace_strace_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
 }
 
-func (m *Strace) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_Strace.Unmarshal(m, b)
+func (x *Strace) String() string {
+	return protoimpl.X.MessageStringOf(x)
 }
-func (m *Strace) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_Strace.Marshal(b, m, deterministic)
+
+func (*Strace) ProtoMessage() {}
+
+func (x *Strace) ProtoReflect() protoreflect.Message {
+	mi := &file_pkg_sentry_strace_strace_proto_msgTypes[0]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
 }
-func (m *Strace) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Strace.Merge(m, src)
+
+// Deprecated: Use Strace.ProtoReflect.Descriptor instead.
+func (*Strace) Descriptor() ([]byte, []int) {
+	return file_pkg_sentry_strace_strace_proto_rawDescGZIP(), []int{0}
 }
-func (m *Strace) XXX_Size() int {
-	return xxx_messageInfo_Strace.Size(m)
+
+func (x *Strace) GetProcess() string {
+	if x != nil {
+		return x.Process
+	}
+	return ""
 }
-func (m *Strace) XXX_DiscardUnknown() {
-	xxx_messageInfo_Strace.DiscardUnknown(m)
+
+func (x *Strace) GetFunction() string {
+	if x != nil {
+		return x.Function
+	}
+	return ""
 }
 
-var xxx_messageInfo_Strace proto.InternalMessageInfo
+func (x *Strace) GetArgs() []string {
+	if x != nil {
+		return x.Args
+	}
+	return nil
+}
 
-func (m *Strace) GetProcess() string {
+func (m *Strace) GetInfo() isStrace_Info {
 	if m != nil {
-		return m.Process
+		return m.Info
 	}
-	return ""
+	return nil
 }
 
-func (m *Strace) GetFunction() string {
-	if m != nil {
-		return m.Function
+func (x *Strace) GetEnter() *StraceEnter {
+	if x, ok := x.GetInfo().(*Strace_Enter); ok {
+		return x.Enter
 	}
-	return ""
+	return nil
 }
 
-func (m *Strace) GetArgs() []string {
-	if m != nil {
-		return m.Args
+func (x *Strace) GetExit() *StraceExit {
+	if x, ok := x.GetInfo().(*Strace_Exit); ok {
+		return x.Exit
 	}
 	return nil
 }
@@ -95,153 +129,234 @@ func (*Strace_Enter) isStrace_Info() {}
 
 func (*Strace_Exit) isStrace_Info() {}
 
-func (m *Strace) GetInfo() isStrace_Info {
-	if m != nil {
-		return m.Info
-	}
-	return nil
+type StraceEnter struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 }
 
-func (m *Strace) GetEnter() *StraceEnter {
-	if x, ok := m.GetInfo().(*Strace_Enter); ok {
-		return x.Enter
+func (x *StraceEnter) Reset() {
+	*x = StraceEnter{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_pkg_sentry_strace_strace_proto_msgTypes[1]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
 	}
-	return nil
 }
 
-func (m *Strace) GetExit() *StraceExit {
-	if x, ok := m.GetInfo().(*Strace_Exit); ok {
-		return x.Exit
-	}
-	return nil
+func (x *StraceEnter) String() string {
+	return protoimpl.X.MessageStringOf(x)
 }
 
-// XXX_OneofWrappers is for the internal use of the proto package.
-func (*Strace) XXX_OneofWrappers() []interface{} {
-	return []interface{}{
-		(*Strace_Enter)(nil),
-		(*Strace_Exit)(nil),
-	}
-}
+func (*StraceEnter) ProtoMessage() {}
 
-type StraceEnter struct {
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
+func (x *StraceEnter) ProtoReflect() protoreflect.Message {
+	mi := &file_pkg_sentry_strace_strace_proto_msgTypes[1]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
 }
 
-func (m *StraceEnter) Reset()         { *m = StraceEnter{} }
-func (m *StraceEnter) String() string { return proto.CompactTextString(m) }
-func (*StraceEnter) ProtoMessage()    {}
+// Deprecated: Use StraceEnter.ProtoReflect.Descriptor instead.
 func (*StraceEnter) Descriptor() ([]byte, []int) {
-	return fileDescriptor_50c4b43677c82b5f, []int{1}
+	return file_pkg_sentry_strace_strace_proto_rawDescGZIP(), []int{1}
 }
 
-func (m *StraceEnter) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_StraceEnter.Unmarshal(m, b)
-}
-func (m *StraceEnter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_StraceEnter.Marshal(b, m, deterministic)
-}
-func (m *StraceEnter) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StraceEnter.Merge(m, src)
-}
-func (m *StraceEnter) XXX_Size() int {
-	return xxx_messageInfo_StraceEnter.Size(m)
+type StraceExit struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Return    string `protobuf:"bytes,1,opt,name=return,proto3" json:"return,omitempty"`
+	Error     string `protobuf:"bytes,2,opt,name=error,proto3" json:"error,omitempty"`
+	ErrNo     int64  `protobuf:"varint,3,opt,name=err_no,json=errNo,proto3" json:"err_no,omitempty"`
+	ElapsedNs int64  `protobuf:"varint,4,opt,name=elapsed_ns,json=elapsedNs,proto3" json:"elapsed_ns,omitempty"`
+}
+
+func (x *StraceExit) Reset() {
+	*x = StraceExit{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_pkg_sentry_strace_strace_proto_msgTypes[2]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
 }
-func (m *StraceEnter) XXX_DiscardUnknown() {
-	xxx_messageInfo_StraceEnter.DiscardUnknown(m)
+
+func (x *StraceExit) String() string {
+	return protoimpl.X.MessageStringOf(x)
 }
 
-var xxx_messageInfo_StraceEnter proto.InternalMessageInfo
+func (*StraceExit) ProtoMessage() {}
 
-type StraceExit struct {
-	Return               string   `protobuf:"bytes,1,opt,name=return,proto3" json:"return,omitempty"`
-	Error                string   `protobuf:"bytes,2,opt,name=error,proto3" json:"error,omitempty"`
-	ErrNo                int64    `protobuf:"varint,3,opt,name=err_no,json=errNo,proto3" json:"err_no,omitempty"`
-	ElapsedNs            int64    `protobuf:"varint,4,opt,name=elapsed_ns,json=elapsedNs,proto3" json:"elapsed_ns,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
-}
-
-func (m *StraceExit) Reset()         { *m = StraceExit{} }
-func (m *StraceExit) String() string { return proto.CompactTextString(m) }
-func (*StraceExit) ProtoMessage()    {}
-func (*StraceExit) Descriptor() ([]byte, []int) {
-	return fileDescriptor_50c4b43677c82b5f, []int{2}
+func (x *StraceExit) ProtoReflect() protoreflect.Message {
+	mi := &file_pkg_sentry_strace_strace_proto_msgTypes[2]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
 }
 
-func (m *StraceExit) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_StraceExit.Unmarshal(m, b)
-}
-func (m *StraceExit) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_StraceExit.Marshal(b, m, deterministic)
-}
-func (m *StraceExit) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_StraceExit.Merge(m, src)
-}
-func (m *StraceExit) XXX_Size() int {
-	return xxx_messageInfo_StraceExit.Size(m)
-}
-func (m *StraceExit) XXX_DiscardUnknown() {
-	xxx_messageInfo_StraceExit.DiscardUnknown(m)
+// Deprecated: Use StraceExit.ProtoReflect.Descriptor instead.
+func (*StraceExit) Descriptor() ([]byte, []int) {
+	return file_pkg_sentry_strace_strace_proto_rawDescGZIP(), []int{2}
 }
 
-var xxx_messageInfo_StraceExit proto.InternalMessageInfo
-
-func (m *StraceExit) GetReturn() string {
-	if m != nil {
-		return m.Return
+func (x *StraceExit) GetReturn() string {
+	if x != nil {
+		return x.Return
 	}
 	return ""
 }
 
-func (m *StraceExit) GetError() string {
-	if m != nil {
-		return m.Error
+func (x *StraceExit) GetError() string {
+	if x != nil {
+		return x.Error
 	}
 	return ""
 }
 
-func (m *StraceExit) GetErrNo() int64 {
-	if m != nil {
-		return m.ErrNo
+func (x *StraceExit) GetErrNo() int64 {
+	if x != nil {
+		return x.ErrNo
 	}
 	return 0
 }
 
-func (m *StraceExit) GetElapsedNs() int64 {
-	if m != nil {
-		return m.ElapsedNs
+func (x *StraceExit) GetElapsedNs() int64 {
+	if x != nil {
+		return x.ElapsedNs
 	}
 	return 0
 }
 
-func init() {
-	proto.RegisterType((*Strace)(nil), "gvisor.Strace")
-	proto.RegisterType((*StraceEnter)(nil), "gvisor.StraceEnter")
-	proto.RegisterType((*StraceExit)(nil), "gvisor.StraceExit")
-}
-
-func init() { proto.RegisterFile("pkg/sentry/strace/strace.proto", fileDescriptor_50c4b43677c82b5f) }
-
-var fileDescriptor_50c4b43677c82b5f = []byte{
-	// 255 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x90, 0xdd, 0x4a, 0xf4, 0x30,
-	0x10, 0x86, 0xb7, 0x5f, 0xdb, 0x7c, 0x76, 0x16, 0x4f, 0xc6, 0x1f, 0x82, 0xa0, 0x94, 0x1e, 0x05,
-	0x84, 0x2e, 0xe8, 0x1d, 0x08, 0xc2, 0x1e, 0xed, 0x41, 0xbc, 0x80, 0xa5, 0xd6, 0xd9, 0x12, 0x94,
-	0x24, 0x4c, 0xb2, 0xb2, 0x5e, 0x96, 0x77, 0x28, 0xa6, 0xf1, 0x07, 0x8f, 0x92, 0x67, 0xde, 0x87,
-	0x0c, 0x6f, 0xe0, 0xca, 0x3f, 0x4f, 0xab, 0x40, 0x36, 0xf2, 0xdb, 0x2a, 0x44, 0x1e, 0x46, 0xca,
-	0x47, 0xef, 0xd9, 0x45, 0x87, 0x62, 0x7a, 0x35, 0xc1, 0x71, 0xf7, 0x5e, 0x80, 0x78, 0x48, 0x01,
-	0x4a, 0xf8, 0xef, 0xd9, 0x8d, 0x14, 0x82, 0x2c, 0xda, 0x42, 0x35, 0xfa, 0x0b, 0xf1, 0x02, 0x8e,
-	0x76, 0x7b, 0x3b, 0x46, 0xe3, 0xac, 0xfc, 0x97, 0xa2, 0x6f, 0x46, 0x84, 0x6a, 0xe0, 0x29, 0xc8,
-	0xb2, 0x2d, 0x55, 0xa3, 0xd3, 0x1d, 0xaf, 0xa1, 0x26, 0x1b, 0x89, 0x65, 0xd5, 0x16, 0x6a, 0x79,
-	0x73, 0xd2, 0xcf, 0xcb, 0xfa, 0x79, 0xd1, 0xfd, 0x67, 0xb4, 0x5e, 0xe8, 0xd9, 0x41, 0x05, 0x15,
-	0x1d, 0x4c, 0x94, 0x75, 0x72, 0xf1, 0x8f, 0x7b, 0x30, 0x71, 0xbd, 0xd0, 0xc9, 0xb8, 0x13, 0x50,
-	0x19, 0xbb, 0x73, 0xdd, 0x31, 0x2c, 0x7f, 0xbd, 0xd4, 0x79, 0x80, 0x1f, 0x19, 0xcf, 0x41, 0x30,
-	0xc5, 0x3d, 0xdb, 0x5c, 0x22, 0x13, 0x9e, 0x42, 0x4d, 0xcc, 0x8e, 0x73, 0x81, 0x19, 0xf0, 0x0c,
-	0x04, 0x31, 0x6f, 0xad, 0x93, 0x65, 0x5b, 0xa8, 0x32, 0x8d, 0x37, 0x0e, 0x2f, 0x01, 0xe8, 0x65,
-	0xf0, 0x81, 0x9e, 0xb6, 0x36, 0xa4, 0x16, 0xa5, 0x6e, 0xf2, 0x64, 0x13, 0x1e, 0x45, 0xfa, 0xc3,
-	0xdb, 0x8f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x42, 0x9a, 0xbc, 0x81, 0x65, 0x01, 0x00, 0x00,
+var File_pkg_sentry_strace_strace_proto protoreflect.FileDescriptor
+
+var file_pkg_sentry_strace_strace_proto_rawDesc = []byte{
+	0x0a, 0x1e, 0x70, 0x6b, 0x67, 0x2f, 0x73, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2f, 0x73, 0x74, 0x72,
+	0x61, 0x63, 0x65, 0x2f, 0x73, 0x74, 0x72, 0x61, 0x63, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x12, 0x06, 0x67, 0x76, 0x69, 0x73, 0x6f, 0x72, 0x22, 0xb1, 0x01, 0x0a, 0x06, 0x53, 0x74, 0x72,
+	0x61, 0x63, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x12, 0x1a, 0x0a,
+	0x08, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x08, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x61, 0x72, 0x67,
+	0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x61, 0x72, 0x67, 0x73, 0x12, 0x2b, 0x0a,
+	0x05, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x67,
+	0x76, 0x69, 0x73, 0x6f, 0x72, 0x2e, 0x53, 0x74, 0x72, 0x61, 0x63, 0x65, 0x45, 0x6e, 0x74, 0x65,
+	0x72, 0x48, 0x00, 0x52, 0x05, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x12, 0x28, 0x0a, 0x04, 0x65, 0x78,
+	0x69, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x67, 0x76, 0x69, 0x73, 0x6f,
+	0x72, 0x2e, 0x53, 0x74, 0x72, 0x61, 0x63, 0x65, 0x45, 0x78, 0x69, 0x74, 0x48, 0x00, 0x52, 0x04,
+	0x65, 0x78, 0x69, 0x74, 0x42, 0x06, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x0d, 0x0a, 0x0b,
+	0x53, 0x74, 0x72, 0x61, 0x63, 0x65, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x22, 0x70, 0x0a, 0x0a, 0x53,
+	0x74, 0x72, 0x61, 0x63, 0x65, 0x45, 0x78, 0x69, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x74,
+	0x75, 0x72, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x65, 0x74, 0x75, 0x72,
+	0x6e, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x15, 0x0a, 0x06, 0x65, 0x72, 0x72, 0x5f, 0x6e,
+	0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x72, 0x72, 0x4e, 0x6f, 0x12, 0x1d,
+	0x0a, 0x0a, 0x65, 0x6c, 0x61, 0x70, 0x73, 0x65, 0x64, 0x5f, 0x6e, 0x73, 0x18, 0x04, 0x20, 0x01,
+	0x28, 0x03, 0x52, 0x09, 0x65, 0x6c, 0x61, 0x70, 0x73, 0x65, 0x64, 0x4e, 0x73, 0x62, 0x06, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var (
+	file_pkg_sentry_strace_strace_proto_rawDescOnce sync.Once
+	file_pkg_sentry_strace_strace_proto_rawDescData = file_pkg_sentry_strace_strace_proto_rawDesc
+)
+
+func file_pkg_sentry_strace_strace_proto_rawDescGZIP() []byte {
+	file_pkg_sentry_strace_strace_proto_rawDescOnce.Do(func() {
+		file_pkg_sentry_strace_strace_proto_rawDescData = protoimpl.X.CompressGZIP(file_pkg_sentry_strace_strace_proto_rawDescData)
+	})
+	return file_pkg_sentry_strace_strace_proto_rawDescData
+}
+
+var file_pkg_sentry_strace_strace_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
+var file_pkg_sentry_strace_strace_proto_goTypes = []interface{}{
+	(*Strace)(nil),      // 0: gvisor.Strace
+	(*StraceEnter)(nil), // 1: gvisor.StraceEnter
+	(*StraceExit)(nil),  // 2: gvisor.StraceExit
+}
+var file_pkg_sentry_strace_strace_proto_depIdxs = []int32{
+	1, // 0: gvisor.Strace.enter:type_name -> gvisor.StraceEnter
+	2, // 1: gvisor.Strace.exit:type_name -> gvisor.StraceExit
+	2, // [2:2] is the sub-list for method output_type
+	2, // [2:2] is the sub-list for method input_type
+	2, // [2:2] is the sub-list for extension type_name
+	2, // [2:2] is the sub-list for extension extendee
+	0, // [0:2] is the sub-list for field type_name
+}
+
+func init() { file_pkg_sentry_strace_strace_proto_init() }
+func file_pkg_sentry_strace_strace_proto_init() {
+	if File_pkg_sentry_strace_strace_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_pkg_sentry_strace_strace_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Strace); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_pkg_sentry_strace_strace_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*StraceEnter); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_pkg_sentry_strace_strace_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*StraceExit); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
+	file_pkg_sentry_strace_strace_proto_msgTypes[0].OneofWrappers = []interface{}{
+		(*Strace_Enter)(nil),
+		(*Strace_Exit)(nil),
+	}
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_pkg_sentry_strace_strace_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   3,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_pkg_sentry_strace_strace_proto_goTypes,
+		DependencyIndexes: file_pkg_sentry_strace_strace_proto_depIdxs,
+		MessageInfos:      file_pkg_sentry_strace_strace_proto_msgTypes,
+	}.Build()
+	File_pkg_sentry_strace_strace_proto = out.File
+	file_pkg_sentry_strace_strace_proto_rawDesc = nil
+	file_pkg_sentry_strace_strace_proto_goTypes = nil
+	file_pkg_sentry_strace_strace_proto_depIdxs = nil
 }
diff --git a/pkg/sentry/unimpl/unimplemented_syscall_go_proto/unimplemented_syscall.pb.go b/pkg/sentry/unimpl/unimplemented_syscall_go_proto/unimplemented_syscall.pb.go
index 4dfb169cc..49e1de316 100644
--- a/pkg/sentry/unimpl/unimplemented_syscall_go_proto/unimplemented_syscall.pb.go
+++ b/pkg/sentry/unimpl/unimplemented_syscall_go_proto/unimplemented_syscall.pb.go
@@ -1,91 +1,164 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.25.0
+// 	protoc        v3.9.0
 // source: pkg/sentry/unimpl/unimplemented_syscall.proto
 
 package gvisor
 
 import (
-	fmt "fmt"
 	proto "github.com/golang/protobuf/proto"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	registers_go_proto "gvisor.dev/gvisor/pkg/sentry/arch/registers_go_proto"
-	math "math"
+	reflect "reflect"
+	sync "sync"
 )
 
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
+const (
+	// Verify that this generated code is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+	// Verify that runtime/protoimpl is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
 
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
+// This is a compile-time assertion that a sufficiently up-to-date version
+// of the legacy proto package is being used.
+const _ = proto.ProtoPackageIsVersion4
 
 type UnimplementedSyscall struct {
-	Tid                  int32                         `protobuf:"varint,1,opt,name=tid,proto3" json:"tid,omitempty"`
-	Registers            *registers_go_proto.Registers `protobuf:"bytes,2,opt,name=registers,proto3" json:"registers,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                      `json:"-"`
-	XXX_unrecognized     []byte                        `json:"-"`
-	XXX_sizecache        int32                         `json:"-"`
-}
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 
-func (m *UnimplementedSyscall) Reset()         { *m = UnimplementedSyscall{} }
-func (m *UnimplementedSyscall) String() string { return proto.CompactTextString(m) }
-func (*UnimplementedSyscall) ProtoMessage()    {}
-func (*UnimplementedSyscall) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ddc2fcd2bea3c75d, []int{0}
+	Tid       int32                         `protobuf:"varint,1,opt,name=tid,proto3" json:"tid,omitempty"`
+	Registers *registers_go_proto.Registers `protobuf:"bytes,2,opt,name=registers,proto3" json:"registers,omitempty"`
 }
 
-func (m *UnimplementedSyscall) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_UnimplementedSyscall.Unmarshal(m, b)
-}
-func (m *UnimplementedSyscall) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_UnimplementedSyscall.Marshal(b, m, deterministic)
-}
-func (m *UnimplementedSyscall) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_UnimplementedSyscall.Merge(m, src)
+func (x *UnimplementedSyscall) Reset() {
+	*x = UnimplementedSyscall{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_pkg_sentry_unimpl_unimplemented_syscall_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
 }
-func (m *UnimplementedSyscall) XXX_Size() int {
-	return xxx_messageInfo_UnimplementedSyscall.Size(m)
+
+func (x *UnimplementedSyscall) String() string {
+	return protoimpl.X.MessageStringOf(x)
 }
-func (m *UnimplementedSyscall) XXX_DiscardUnknown() {
-	xxx_messageInfo_UnimplementedSyscall.DiscardUnknown(m)
+
+func (*UnimplementedSyscall) ProtoMessage() {}
+
+func (x *UnimplementedSyscall) ProtoReflect() protoreflect.Message {
+	mi := &file_pkg_sentry_unimpl_unimplemented_syscall_proto_msgTypes[0]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
 }
 
-var xxx_messageInfo_UnimplementedSyscall proto.InternalMessageInfo
+// Deprecated: Use UnimplementedSyscall.ProtoReflect.Descriptor instead.
+func (*UnimplementedSyscall) Descriptor() ([]byte, []int) {
+	return file_pkg_sentry_unimpl_unimplemented_syscall_proto_rawDescGZIP(), []int{0}
+}
 
-func (m *UnimplementedSyscall) GetTid() int32 {
-	if m != nil {
-		return m.Tid
+func (x *UnimplementedSyscall) GetTid() int32 {
+	if x != nil {
+		return x.Tid
 	}
 	return 0
 }
 
-func (m *UnimplementedSyscall) GetRegisters() *registers_go_proto.Registers {
-	if m != nil {
-		return m.Registers
+func (x *UnimplementedSyscall) GetRegisters() *registers_go_proto.Registers {
+	if x != nil {
+		return x.Registers
 	}
 	return nil
 }
 
-func init() {
-	proto.RegisterType((*UnimplementedSyscall)(nil), "gvisor.UnimplementedSyscall")
+var File_pkg_sentry_unimpl_unimplemented_syscall_proto protoreflect.FileDescriptor
+
+var file_pkg_sentry_unimpl_unimplemented_syscall_proto_rawDesc = []byte{
+	0x0a, 0x2d, 0x70, 0x6b, 0x67, 0x2f, 0x73, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x2f, 0x75, 0x6e, 0x69,
+	0x6d, 0x70, 0x6c, 0x2f, 0x75, 0x6e, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x65,
+	0x64, 0x5f, 0x73, 0x79, 0x73, 0x63, 0x61, 0x6c, 0x6c, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12,
+	0x06, 0x67, 0x76, 0x69, 0x73, 0x6f, 0x72, 0x1a, 0x1f, 0x70, 0x6b, 0x67, 0x2f, 0x73, 0x65, 0x6e,
+	0x74, 0x72, 0x79, 0x2f, 0x61, 0x72, 0x63, 0x68, 0x2f, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65,
+	0x72, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x59, 0x0a, 0x14, 0x55, 0x6e, 0x69, 0x6d,
+	0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x65, 0x64, 0x53, 0x79, 0x73, 0x63, 0x61, 0x6c, 0x6c,
+	0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74,
+	0x69, 0x64, 0x12, 0x2f, 0x0a, 0x09, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x73, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x67, 0x76, 0x69, 0x73, 0x6f, 0x72, 0x2e, 0x52,
+	0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x73, 0x52, 0x09, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74,
+	0x65, 0x72, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var (
+	file_pkg_sentry_unimpl_unimplemented_syscall_proto_rawDescOnce sync.Once
+	file_pkg_sentry_unimpl_unimplemented_syscall_proto_rawDescData = file_pkg_sentry_unimpl_unimplemented_syscall_proto_rawDesc
+)
+
+func file_pkg_sentry_unimpl_unimplemented_syscall_proto_rawDescGZIP() []byte {
+	file_pkg_sentry_unimpl_unimplemented_syscall_proto_rawDescOnce.Do(func() {
+		file_pkg_sentry_unimpl_unimplemented_syscall_proto_rawDescData = protoimpl.X.CompressGZIP(file_pkg_sentry_unimpl_unimplemented_syscall_proto_rawDescData)
+	})
+	return file_pkg_sentry_unimpl_unimplemented_syscall_proto_rawDescData
 }
 
-func init() {
-	proto.RegisterFile("pkg/sentry/unimpl/unimplemented_syscall.proto", fileDescriptor_ddc2fcd2bea3c75d)
+var file_pkg_sentry_unimpl_unimplemented_syscall_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
+var file_pkg_sentry_unimpl_unimplemented_syscall_proto_goTypes = []interface{}{
+	(*UnimplementedSyscall)(nil),         // 0: gvisor.UnimplementedSyscall
+	(*registers_go_proto.Registers)(nil), // 1: gvisor.Registers
+}
+var file_pkg_sentry_unimpl_unimplemented_syscall_proto_depIdxs = []int32{
+	1, // 0: gvisor.UnimplementedSyscall.registers:type_name -> gvisor.Registers
+	1, // [1:1] is the sub-list for method output_type
+	1, // [1:1] is the sub-list for method input_type
+	1, // [1:1] is the sub-list for extension type_name
+	1, // [1:1] is the sub-list for extension extendee
+	0, // [0:1] is the sub-list for field type_name
 }
 
-var fileDescriptor_ddc2fcd2bea3c75d = []byte{
-	// 149 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0x2d, 0xc8, 0x4e, 0xd7,
-	0x2f, 0x4e, 0xcd, 0x2b, 0x29, 0xaa, 0xd4, 0x2f, 0xcd, 0xcb, 0xcc, 0x2d, 0xc8, 0x81, 0x52, 0xa9,
-	0xb9, 0xa9, 0x79, 0x25, 0xa9, 0x29, 0xf1, 0xc5, 0x95, 0xc5, 0xc9, 0x89, 0x39, 0x39, 0x7a, 0x05,
-	0x45, 0xf9, 0x25, 0xf9, 0x42, 0x6c, 0xe9, 0x65, 0x99, 0xc5, 0xf9, 0x45, 0x52, 0xf2, 0x48, 0xda,
-	0x12, 0x8b, 0x92, 0x33, 0xf4, 0x8b, 0x52, 0xd3, 0x33, 0x8b, 0x4b, 0x52, 0x8b, 0x8a, 0x21, 0x0a,
-	0x95, 0x22, 0xb9, 0x44, 0x42, 0x91, 0xcd, 0x09, 0x86, 0x18, 0x23, 0x24, 0xc0, 0xc5, 0x5c, 0x92,
-	0x99, 0x22, 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, 0x1a, 0x04, 0x62, 0x0a, 0xe9, 0x73, 0x71, 0xc2, 0x35,
-	0x4b, 0x30, 0x29, 0x30, 0x6a, 0x70, 0x1b, 0x09, 0xea, 0x41, 0xac, 0xd1, 0x0b, 0x82, 0x49, 0x04,
-	0x21, 0xd4, 0x24, 0xb1, 0x81, 0x6d, 0x30, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x51, 0x4a, 0x47,
-	0x79, 0xbb, 0x00, 0x00, 0x00,
+func init() { file_pkg_sentry_unimpl_unimplemented_syscall_proto_init() }
+func file_pkg_sentry_unimpl_unimplemented_syscall_proto_init() {
+	if File_pkg_sentry_unimpl_unimplemented_syscall_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_pkg_sentry_unimpl_unimplemented_syscall_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*UnimplementedSyscall); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_pkg_sentry_unimpl_unimplemented_syscall_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   1,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_pkg_sentry_unimpl_unimplemented_syscall_proto_goTypes,
+		DependencyIndexes: file_pkg_sentry_unimpl_unimplemented_syscall_proto_depIdxs,
+		MessageInfos:      file_pkg_sentry_unimpl_unimplemented_syscall_proto_msgTypes,
+	}.Build()
+	File_pkg_sentry_unimpl_unimplemented_syscall_proto = out.File
+	file_pkg_sentry_unimpl_unimplemented_syscall_proto_rawDesc = nil
+	file_pkg_sentry_unimpl_unimplemented_syscall_proto_goTypes = nil
+	file_pkg_sentry_unimpl_unimplemented_syscall_proto_depIdxs = nil
 }
diff --git a/pkg/shim/v2/runtimeoptions/api_go_proto/runtimeoptions.pb.go b/pkg/shim/v2/runtimeoptions/api_go_proto/runtimeoptions.pb.go
deleted file mode 100644
index ecbdd2282..000000000
--- a/pkg/shim/v2/runtimeoptions/api_go_proto/runtimeoptions.pb.go
+++ /dev/null
@@ -1,89 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: pkg/shim/v2/runtimeoptions/runtimeoptions.proto
-
-package cri_runtimeoptions_v1
-
-import (
-	fmt "fmt"
-	proto "github.com/golang/protobuf/proto"
-	math "math"
-)
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
-
-type Options struct {
-	TypeUrl              string   `protobuf:"bytes,1,opt,name=type_url,json=typeUrl,proto3" json:"type_url,omitempty"`
-	ConfigPath           string   `protobuf:"bytes,2,opt,name=config_path,json=configPath,proto3" json:"config_path,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
-}
-
-func (m *Options) Reset()         { *m = Options{} }
-func (m *Options) String() string { return proto.CompactTextString(m) }
-func (*Options) ProtoMessage()    {}
-func (*Options) Descriptor() ([]byte, []int) {
-	return fileDescriptor_66926f9a3a61f972, []int{0}
-}
-
-func (m *Options) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_Options.Unmarshal(m, b)
-}
-func (m *Options) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_Options.Marshal(b, m, deterministic)
-}
-func (m *Options) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Options.Merge(m, src)
-}
-func (m *Options) XXX_Size() int {
-	return xxx_messageInfo_Options.Size(m)
-}
-func (m *Options) XXX_DiscardUnknown() {
-	xxx_messageInfo_Options.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Options proto.InternalMessageInfo
-
-func (m *Options) GetTypeUrl() string {
-	if m != nil {
-		return m.TypeUrl
-	}
-	return ""
-}
-
-func (m *Options) GetConfigPath() string {
-	if m != nil {
-		return m.ConfigPath
-	}
-	return ""
-}
-
-func init() {
-	proto.RegisterType((*Options)(nil), "cri.runtimeoptions.v1.Options")
-}
-
-func init() {
-	proto.RegisterFile("pkg/shim/v2/runtimeoptions/runtimeoptions.proto", fileDescriptor_66926f9a3a61f972)
-}
-
-var fileDescriptor_66926f9a3a61f972 = []byte{
-	// 132 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0x2f, 0xc8, 0x4e, 0xd7,
-	0x2f, 0xce, 0xc8, 0xcc, 0xd5, 0x2f, 0x33, 0xd2, 0x2f, 0x2a, 0xcd, 0x2b, 0xc9, 0xcc, 0x4d, 0xcd,
-	0x2f, 0x28, 0xc9, 0xcc, 0xcf, 0x2b, 0x46, 0xe3, 0xea, 0x15, 0x14, 0xe5, 0x97, 0xe4, 0x0b, 0x89,
-	0x26, 0x17, 0x65, 0xea, 0xa1, 0xc9, 0x94, 0x19, 0x2a, 0xb9, 0x72, 0xb1, 0xfb, 0x43, 0x78, 0x42,
-	0x92, 0x5c, 0x1c, 0x25, 0x95, 0x05, 0xa9, 0xf1, 0xa5, 0x45, 0x39, 0x12, 0x8c, 0x0a, 0x8c, 0x1a,
-	0x9c, 0x41, 0xec, 0x20, 0x7e, 0x68, 0x51, 0x8e, 0x90, 0x3c, 0x17, 0x77, 0x72, 0x7e, 0x5e, 0x5a,
-	0x66, 0x7a, 0x7c, 0x41, 0x62, 0x49, 0x86, 0x04, 0x13, 0x58, 0x96, 0x0b, 0x22, 0x14, 0x90, 0x58,
-	0x92, 0x91, 0xc4, 0x06, 0xb6, 0xc4, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0x7e, 0xaf, 0x7b, 0x2c,
-	0x97, 0x00, 0x00, 0x00,
-}
diff --git a/pkg/shim/v2/runtimeoptions/runtimeoptions.go b/pkg/shim/v2/runtimeoptions/runtimeoptions.go
index aaf17b87a..072dd87f0 100644
--- a/pkg/shim/v2/runtimeoptions/runtimeoptions.go
+++ b/pkg/shim/v2/runtimeoptions/runtimeoptions.go
@@ -13,18 +13,5 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// Package runtimeoptions contains the runtimeoptions proto.
 package runtimeoptions
-
-import (
-	proto "github.com/gogo/protobuf/proto"
-	pb "gvisor.dev/gvisor/pkg/shim/v2/runtimeoptions/api_go_proto"
-)
-
-type Options = pb.Options
-
-func init() {
-	// The generated proto file auto registers with "golang/protobuf/proto"
-	// package. However, typeurl uses "golang/gogo/protobuf/proto". So registers
-	// the type there too.
-	proto.RegisterType((*Options)(nil), "cri.runtimeoptions.v1.Options")
-}
diff --git a/pkg/shim/v2/runtimeoptions/runtimeoptions_cri.go b/pkg/shim/v2/runtimeoptions/runtimeoptions_cri.go
new file mode 100644
index 000000000..e6102b4cf
--- /dev/null
+++ b/pkg/shim/v2/runtimeoptions/runtimeoptions_cri.go
@@ -0,0 +1,383 @@
+// Copyright 2018 The containerd Authors.
+// Copyright 2018 The gVisor Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package runtimeoptions
+
+import (
+	"fmt"
+	"io"
+	"reflect"
+	"strings"
+
+	proto "github.com/gogo/protobuf/proto"
+)
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
+
+type Options struct {
+	// TypeUrl specifies the type of the content inside the config file.
+	TypeUrl string `protobuf:"bytes,1,opt,name=type_url,json=typeUrl,proto3" json:"type_url,omitempty"`
+	// ConfigPath specifies the filesystem location of the config file
+	// used by the runtime.
+	ConfigPath string `protobuf:"bytes,2,opt,name=config_path,json=configPath,proto3" json:"config_path,omitempty"`
+}
+
+func (m *Options) Reset()                    { *m = Options{} }
+func (*Options) ProtoMessage()               {}
+func (*Options) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{0} }
+
+func (m *Options) GetTypeUrl() string {
+	if m != nil {
+		return m.TypeUrl
+	}
+	return ""
+}
+
+func (m *Options) GetConfigPath() string {
+	if m != nil {
+		return m.ConfigPath
+	}
+	return ""
+}
+
+func init() {
+	proto.RegisterType((*Options)(nil), "cri.runtimeoptions.v1.Options")
+}
+
+func (m *Options) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalTo(dAtA)
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *Options) MarshalTo(dAtA []byte) (int, error) {
+	var i int
+	_ = i
+	var l int
+	_ = l
+	if len(m.TypeUrl) > 0 {
+		dAtA[i] = 0xa
+		i++
+		i = encodeVarintApi(dAtA, i, uint64(len(m.TypeUrl)))
+		i += copy(dAtA[i:], m.TypeUrl)
+	}
+	if len(m.ConfigPath) > 0 {
+		dAtA[i] = 0x12
+		i++
+		i = encodeVarintApi(dAtA, i, uint64(len(m.ConfigPath)))
+		i += copy(dAtA[i:], m.ConfigPath)
+	}
+	return i, nil
+}
+
+func encodeVarintApi(dAtA []byte, offset int, v uint64) int {
+	for v >= 1<<7 {
+		dAtA[offset] = uint8(v&0x7f | 0x80)
+		v >>= 7
+		offset++
+	}
+	dAtA[offset] = uint8(v)
+	return offset + 1
+}
+
+func (m *Options) Size() (n int) {
+	var l int
+	_ = l
+	l = len(m.TypeUrl)
+	if l > 0 {
+		n += 1 + l + sovApi(uint64(l))
+	}
+	l = len(m.ConfigPath)
+	if l > 0 {
+		n += 1 + l + sovApi(uint64(l))
+	}
+	return n
+}
+
+func sovApi(x uint64) (n int) {
+	for {
+		n++
+		x >>= 7
+		if x == 0 {
+			break
+		}
+	}
+	return n
+}
+
+func sozApi(x uint64) (n int) {
+	return sovApi(uint64((x << 1) ^ uint64((int64(x) >> 63))))
+}
+
+func (this *Options) String() string {
+	if this == nil {
+		return "nil"
+	}
+	s := strings.Join([]string{`&Options{`,
+		`TypeUrl:` + fmt.Sprintf("%v", this.TypeUrl) + `,`,
+		`ConfigPath:` + fmt.Sprintf("%v", this.ConfigPath) + `,`,
+		`}`,
+	}, "")
+	return s
+}
+
+func valueToStringApi(v interface{}) string {
+	rv := reflect.ValueOf(v)
+	if rv.IsNil() {
+		return "nil"
+	}
+	pv := reflect.Indirect(rv).Interface()
+	return fmt.Sprintf("*%v", pv)
+}
+
+func (m *Options) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowApi
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= (uint64(b) & 0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: Options: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: Options: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field TypeUrl", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowApi
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= (uint64(b) & 0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthApi
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.TypeUrl = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 2:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field ConfigPath", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowApi
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= (uint64(b) & 0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthApi
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.ConfigPath = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		default:
+			iNdEx = preIndex
+			skippy, err := skipApi(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if skippy < 0 {
+				return ErrInvalidLengthApi
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
+
+func skipApi(dAtA []byte) (n int, err error) {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return 0, ErrIntOverflowApi
+			}
+			if iNdEx >= l {
+				return 0, io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= (uint64(b) & 0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		wireType := int(wire & 0x7)
+		switch wireType {
+		case 0:
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return 0, ErrIntOverflowApi
+				}
+				if iNdEx >= l {
+					return 0, io.ErrUnexpectedEOF
+				}
+				iNdEx++
+				if dAtA[iNdEx-1] < 0x80 {
+					break
+				}
+			}
+			return iNdEx, nil
+		case 1:
+			iNdEx += 8
+			return iNdEx, nil
+		case 2:
+			var length int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return 0, ErrIntOverflowApi
+				}
+				if iNdEx >= l {
+					return 0, io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				length |= (int(b) & 0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			iNdEx += length
+			if length < 0 {
+				return 0, ErrInvalidLengthApi
+			}
+			return iNdEx, nil
+		case 3:
+			for {
+				var innerWire uint64
+				var start int = iNdEx
+				for shift := uint(0); ; shift += 7 {
+					if shift >= 64 {
+						return 0, ErrIntOverflowApi
+					}
+					if iNdEx >= l {
+						return 0, io.ErrUnexpectedEOF
+					}
+					b := dAtA[iNdEx]
+					iNdEx++
+					innerWire |= (uint64(b) & 0x7F) << shift
+					if b < 0x80 {
+						break
+					}
+				}
+				innerWireType := int(innerWire & 0x7)
+				if innerWireType == 4 {
+					break
+				}
+				next, err := skipApi(dAtA[start:])
+				if err != nil {
+					return 0, err
+				}
+				iNdEx = start + next
+			}
+			return iNdEx, nil
+		case 4:
+			return iNdEx, nil
+		case 5:
+			iNdEx += 4
+			return iNdEx, nil
+		default:
+			return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
+		}
+	}
+	panic("unreachable")
+}
+
+var (
+	ErrInvalidLengthApi = fmt.Errorf("proto: negative length found during unmarshaling")
+	ErrIntOverflowApi   = fmt.Errorf("proto: integer overflow")
+)
+
+func init() { proto.RegisterFile("api.proto", fileDescriptorApi) }
+
+var fileDescriptorApi = []byte{
+	// 183 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x4c, 0x2c, 0xc8, 0xd4,
+	0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x4d, 0x2e, 0xca, 0xd4, 0x2b, 0x2a, 0xcd, 0x2b, 0xc9,
+	0xcc, 0x4d, 0xcd, 0x2f, 0x28, 0xc9, 0xcc, 0xcf, 0x2b, 0xd6, 0x2b, 0x33, 0x94, 0xd2, 0x4d, 0xcf,
+	0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xcf, 0x4f, 0xcf, 0xd7, 0x07, 0xab,
+	0x4e, 0x2a, 0x4d, 0x03, 0xf3, 0xc0, 0x1c, 0x30, 0x0b, 0x62, 0x8a, 0x92, 0x2b, 0x17, 0xbb, 0x3f,
+	0x44, 0xb3, 0x90, 0x24, 0x17, 0x47, 0x49, 0x65, 0x41, 0x6a, 0x7c, 0x69, 0x51, 0x8e, 0x04, 0xa3,
+	0x02, 0xa3, 0x06, 0x67, 0x10, 0x3b, 0x88, 0x1f, 0x5a, 0x94, 0x23, 0x24, 0xcf, 0xc5, 0x9d, 0x9c,
+	0x9f, 0x97, 0x96, 0x99, 0x1e, 0x5f, 0x90, 0x58, 0x92, 0x21, 0xc1, 0x04, 0x96, 0xe5, 0x82, 0x08,
+	0x05, 0x24, 0x96, 0x64, 0x38, 0xc9, 0x9c, 0x78, 0x28, 0xc7, 0x78, 0xe3, 0xa1, 0x1c, 0x43, 0xc3,
+	0x23, 0x39, 0xc6, 0x13, 0x8f, 0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63, 0x7c, 0xf0, 0x48, 0x8e, 0x71,
+	0xc2, 0x63, 0x39, 0x86, 0x24, 0x36, 0xb0, 0x5d, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x07,
+	0x00, 0xf2, 0x18, 0xbe, 0x00, 0x00, 0x00,
+}