main: use rlimit.RemoveMemlock()

cilium/ebpf provides a helper which removes the memlock limit if necessary. Use it instead of unconditionally bumping RLIMIT_MEMLOCK.
cilium · Jun 28, 2023 · 0578811 · 0578811
1 parent 2b720fb
commit 0578811
Show file tree

Hide file tree

Showing 3 changed files with 126 additions and 4 deletions.
diff --git a/main.go b/main.go
@@ -18,6 +18,7 @@ import (
 	"github.com/cilium/ebpf"
 	"github.com/cilium/ebpf/btf"
 	"github.com/cilium/ebpf/link"
+	"github.com/cilium/ebpf/rlimit"
 	flag "github.com/spf13/pflag"
 	"golang.org/x/sys/unix"
 
@@ -40,10 +41,7 @@ func main() {
 	}); err != nil {
 		log.Fatalf("failed to set temporary rlimit: %s", err)
 	}
-	if err := unix.Setrlimit(unix.RLIMIT_MEMLOCK, &unix.Rlimit{
-		Cur: unix.RLIM_INFINITY,
-		Max: unix.RLIM_INFINITY,
-	}); err != nil {
+	if err := rlimit.RemoveMemlock(); err != nil {
 		log.Fatalf("Failed to set temporary rlimit: %s", err)
 	}
 

diff --git a/vendor/github.com/cilium/ebpf/rlimit/rlimit.go b/vendor/github.com/cilium/ebpf/rlimit/rlimit.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -15,6 +15,7 @@ github.com/cilium/ebpf/internal
 github.com/cilium/ebpf/internal/sys
 github.com/cilium/ebpf/internal/unix
 github.com/cilium/ebpf/link
+github.com/cilium/ebpf/rlimit
 # github.com/fatih/color v1.14.1
 ## explicit; go 1.17
 github.com/fatih/color