keytable: ensure we have enough memlock pages
PATCH 1/1 keytable: ensure we have enough memlock pages
Since kernel v5.2, BPF maps and programs are charged against RLIMT_MEMLOCK. By default this limit is 64KB however all of these are already taken (16 patges) by the time we've booted on Fedora. This results in a permission denied.
The error message is confusing since error happens when running as root. systemd works around this problem by setting setrlimit(RLIMIT_MEMLOCK) to 64MB. Do the the same.
Signed-off-by Sean Young <[email protected]>
--- utils/keytable/keytable.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
utils/keytable/keytable.c +14 -0
@@ -25,6 +25,7 @@#include <linux/lirc.h> #include <sys/ioctl.h> #include <sys/types.h> +#include <sys/resource.h> #include <sys/stat.h> #include <dirent.h> #include <argp.h>
@@ -1698,9 +1699,14 @@ static void device_info(int fd, char *prepend)#ifdef HAVE_BPF #define MAX_PROGS 64 +// This value is what systemd sets PID 1 to, see: +// https://github.com/systemd/systemd/blob/master/src/basic/def.h#L60 +#define HIGH_RLIMIT_MEMLOCK (1024ULL*1024ULL*64ULL) +static void attach_bpf (const char *lirc_name,const char *bpf_prog,struct protocol_param *param) {unsigned int features; +struct rlimit rl;int fd; fd =open (lirc_name,O_RDONLY );
@@ -1721,6 +1727,14 @@ static void attach_bpf(const char *lirc_name, const char *bpf_prog, struct protoreturn ; } +// BPF programs are charged against RLIMIT_MEMLOCK. We'll need pages +// for the state, program text, and any raw IR. None of these are +// particularly large. However, the kernel defaults to 64KB +// memlock, which is only 16 pages which are mostly used by the +// time we are trying to load our BPF program. + rl.rlim_cur = rl.rlim_max =HIGH_RLIMIT_MEMLOCK ; + (void )setrlimit (RLIMIT_MEMLOCK , &rl); +load_bpf_file (bpf_prog, fd, param, rawtable);close (fd); }
Signature · 1 line
2.21.0