grpc: support rlimits

specconv.CreateLibcontainerConfig returns a configuration without rlimits, because it can't convert posixRlimits to Rlimits. Convert posixRlimits to Rlimits and set rlimits in libcontainer configuration before finishing container creation. fixes #430 fixes github.com/#913 Signed-off-by: Julio Montes <[email protected]>
kata-containers · Dec 7, 2018 · df822eb · df822eb
1 parent e7633c7
commit df822eb
Show file tree

Hide file tree

Showing 2 changed files with 91 additions and 0 deletions.
diff --git a/grpc.go b/grpc.go
@@ -652,6 +652,9 @@ func (a *agentGRPC) CreateContainer(ctx context.Context, req *pb.CreateContainer
 		return emptyResp, err
 	}
 
+	// apply rlimits
+	config.Rlimits = posixRlimitsToRlimits(ociSpec.Process.Rlimits)
+
 	// Update libcontainer configuration for specific cases not handled
 	// by the specconv converter.
 	if err = a.updateContainerConfig(ociSpec, config, ctr); err != nil {
@@ -661,6 +664,46 @@ func (a *agentGRPC) CreateContainer(ctx context.Context, req *pb.CreateContainer
 	return a.finishCreateContainer(ctr, req, config)
 }
 
+func posixRlimitsToRlimits(posixRlimits []specs.POSIXRlimit) []configs.Rlimit {
+	var rlimits []configs.Rlimit
+
+	rlimitsMap := map[string]int{
+		"RLIMIT_CPU":        unix.RLIMIT_CPU,        // 0x0
+		"RLIMIT_FSIZE":      unix.RLIMIT_FSIZE,      // 0x1
+		"RLIMIT_DATA":       unix.RLIMIT_DATA,       // 0x2
+		"RLIMIT_STACK":      unix.RLIMIT_STACK,      // 0x3
+		"RLIMIT_CORE":       unix.RLIMIT_CORE,       // 0x4
+		"RLIMIT_RSS":        unix.RLIMIT_RSS,        // 0x5
+		"RLIMIT_NPROC":      unix.RLIMIT_NPROC,      // 0x6
+		"RLIMIT_NOFILE":     unix.RLIMIT_NOFILE,     // 0x7
+		"RLIMIT_MEMLOCK":    unix.RLIMIT_MEMLOCK,    // 0x8
+		"RLIMIT_AS":         unix.RLIMIT_AS,         // 0x9
+		"RLIMIT_LOCKS":      unix.RLIMIT_LOCKS,      // 0xa
+		"RLIMIT_SIGPENDING": unix.RLIMIT_SIGPENDING, // 0xb
+		"RLIMIT_MSGQUEUE":   unix.RLIMIT_MSGQUEUE,   // 0xc
+		"RLIMIT_NICE":       unix.RLIMIT_NICE,       // 0xd
+		"RLIMIT_RTPRIO":     unix.RLIMIT_RTPRIO,     // 0xe
+		"RLIMIT_RTTIME":     unix.RLIMIT_RTTIME,     // 0xf
+	}
+
+	for _, l := range posixRlimits {
+		limit, ok := rlimitsMap[l.Type]
+		if !ok {
+			agentLog.WithField("rlimit", l.Type).Warnf("Unknown rlimit")
+			continue
+		}
+
+		rl := configs.Rlimit{
+			Type: limit,
+			Hard: l.Hard,
+			Soft: l.Soft,
+		}
+		rlimits = append(rlimits, rl)
+	}
+
+	return rlimits
+}
+
 func (a *agentGRPC) createContainerChecks(req *pb.CreateContainerRequest) (err error) {
 	if a.sandbox.running == false {
 		return grpcStatus.Error(codes.FailedPrecondition, "Sandbox not started, impossible to run a new container")

diff --git a/grpc_test.go b/grpc_test.go
@@ -26,6 +26,7 @@ import (
 	"github.com/opencontainers/runc/libcontainer/seccomp"
 	"github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/stretchr/testify/assert"
+	"golang.org/x/sys/unix"
 )
 
 var testSharedPidNs = "testSharedPidNs"
@@ -738,3 +739,50 @@ func TestHaveSeccomp(t *testing.T) {
 		}
 	}
 }
+
+func TestPosixRlimitsToRlimits(t *testing.T) {
+	assert := assert.New(t)
+
+	expectedRlimits := []configs.Rlimit{
+		{unix.RLIMIT_CPU, 100, 120},
+		{unix.RLIMIT_FSIZE, 100, 120},
+		{unix.RLIMIT_DATA, 100, 120},
+		{unix.RLIMIT_STACK, 100, 120},
+		{unix.RLIMIT_CORE, 100, 120},
+		{unix.RLIMIT_RSS, 100, 120},
+		{unix.RLIMIT_NPROC, 100, 120},
+		{unix.RLIMIT_NOFILE, 100, 120},
+		{unix.RLIMIT_MEMLOCK, 100, 120},
+		{unix.RLIMIT_AS, 100, 120},
+		{unix.RLIMIT_LOCKS, 100, 120},
+		{unix.RLIMIT_SIGPENDING, 100, 120},
+		{unix.RLIMIT_MSGQUEUE, 100, 120},
+		{unix.RLIMIT_NICE, 100, 120},
+		{unix.RLIMIT_RTPRIO, 100, 120},
+		{unix.RLIMIT_RTTIME, 100, 120},
+	}
+
+	posixRlimits := []specs.POSIXRlimit{
+		{"RLIMIT_CPU", 100, 120},
+		{"RLIMIT_FSIZE", 100, 120},
+		{"RLIMIT_DATA", 100, 120},
+		{"RLIMIT_STACK", 100, 120},
+		{"RLIMIT_CORE", 100, 120},
+		{"RLIMIT_RSS", 100, 120},
+		{"RLIMIT_NPROC", 100, 120},
+		{"RLIMIT_NOFILE", 100, 120},
+		{"RLIMIT_MEMLOCK", 100, 120},
+		{"RLIMIT_AS", 100, 120},
+		{"RLIMIT_LOCKS", 100, 120},
+		{"RLIMIT_SIGPENDING", 100, 120},
+		{"RLIMIT_MSGQUEUE", 100, 120},
+		{"RLIMIT_NICE", 100, 120},
+		{"RLIMIT_RTPRIO", 100, 120},
+		{"RLIMIT_RTTIME", 100, 120},
+		{"RLIMIT_UNSUPPORTED", 0, 0},
+	}
+
+	rlimits := posixRlimitsToRlimits(posixRlimits)
+
+	assert.Equal(rlimits, expectedRlimits)
+}