lkml.org 
[lkml]   [2020]   [Nov]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH bpf-next v7 34/34] bpf: samples: do not touch RLIMIT_MEMLOCK
    Date
    Since bpf is not using rlimit memlock for the memory accounting
    and control, do not change the limit in sample applications.

    Signed-off-by: Roman Gushchin <guro@fb.com>
    Acked-by: Song Liu <songliubraving@fb.com>
    ---
    samples/bpf/map_perf_test_user.c | 6 ------
    samples/bpf/offwaketime_user.c | 6 ------
    samples/bpf/sockex2_user.c | 2 --
    samples/bpf/sockex3_user.c | 2 --
    samples/bpf/spintest_user.c | 6 ------
    samples/bpf/syscall_tp_user.c | 2 --
    samples/bpf/task_fd_query_user.c | 5 -----
    samples/bpf/test_lru_dist.c | 3 ---
    samples/bpf/test_map_in_map_user.c | 6 ------
    samples/bpf/test_overhead_user.c | 2 --
    samples/bpf/trace_event_user.c | 2 --
    samples/bpf/tracex2_user.c | 6 ------
    samples/bpf/tracex3_user.c | 6 ------
    samples/bpf/tracex4_user.c | 6 ------
    samples/bpf/tracex5_user.c | 3 ---
    samples/bpf/tracex6_user.c | 3 ---
    samples/bpf/xdp1_user.c | 6 ------
    samples/bpf/xdp_adjust_tail_user.c | 6 ------
    samples/bpf/xdp_monitor_user.c | 5 -----
    samples/bpf/xdp_redirect_cpu_user.c | 6 ------
    samples/bpf/xdp_redirect_map_user.c | 6 ------
    samples/bpf/xdp_redirect_user.c | 6 ------
    samples/bpf/xdp_router_ipv4_user.c | 6 ------
    samples/bpf/xdp_rxq_info_user.c | 6 ------
    samples/bpf/xdp_sample_pkts_user.c | 6 ------
    samples/bpf/xdp_tx_iptunnel_user.c | 6 ------
    samples/bpf/xdpsock_user.c | 7 -------
    27 files changed, 132 deletions(-)

    diff --git a/samples/bpf/map_perf_test_user.c b/samples/bpf/map_perf_test_user.c
    index 8b13230b4c46..9db949290a78 100644
    --- a/samples/bpf/map_perf_test_user.c
    +++ b/samples/bpf/map_perf_test_user.c
    @@ -421,7 +421,6 @@ static void fixup_map(struct bpf_object *obj)

    int main(int argc, char **argv)
    {
    - struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};
    int nr_cpus = sysconf(_SC_NPROCESSORS_ONLN);
    struct bpf_link *links[8];
    struct bpf_program *prog;
    @@ -430,11 +429,6 @@ int main(int argc, char **argv)
    char filename[256];
    int i = 0;

    - if (setrlimit(RLIMIT_MEMLOCK, &r)) {
    - perror("setrlimit(RLIMIT_MEMLOCK)");
    - return 1;
    - }
    -
    if (argc > 1)
    test_flags = atoi(argv[1]) ? : test_flags;

    diff --git a/samples/bpf/offwaketime_user.c b/samples/bpf/offwaketime_user.c
    index 5734cfdaaacb..73a986876c1a 100644
    --- a/samples/bpf/offwaketime_user.c
    +++ b/samples/bpf/offwaketime_user.c
    @@ -95,18 +95,12 @@ static void int_exit(int sig)

    int main(int argc, char **argv)
    {
    - struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};
    struct bpf_object *obj = NULL;
    struct bpf_link *links[2];
    struct bpf_program *prog;
    int delay = 1, i = 0;
    char filename[256];

    - if (setrlimit(RLIMIT_MEMLOCK, &r)) {
    - perror("setrlimit(RLIMIT_MEMLOCK)");
    - return 1;
    - }
    -
    if (load_kallsyms()) {
    printf("failed to process /proc/kallsyms\n");
    return 2;
    diff --git a/samples/bpf/sockex2_user.c b/samples/bpf/sockex2_user.c
    index af925a5afd1d..bafa567b840c 100644
    --- a/samples/bpf/sockex2_user.c
    +++ b/samples/bpf/sockex2_user.c
    @@ -16,7 +16,6 @@ struct pair {

    int main(int ac, char **argv)
    {
    - struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};
    struct bpf_object *obj;
    int map_fd, prog_fd;
    char filename[256];
    @@ -24,7 +23,6 @@ int main(int ac, char **argv)
    FILE *f;

    snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]);
    - setrlimit(RLIMIT_MEMLOCK, &r);

    if (bpf_prog_load(filename, BPF_PROG_TYPE_SOCKET_FILTER,
    &obj, &prog_fd))
    diff --git a/samples/bpf/sockex3_user.c b/samples/bpf/sockex3_user.c
    index 7793f6a6ae7e..6ae99ecc766c 100644
    --- a/samples/bpf/sockex3_user.c
    +++ b/samples/bpf/sockex3_user.c
    @@ -26,7 +26,6 @@ struct pair {
    int main(int argc, char **argv)
    {
    int i, sock, key, fd, main_prog_fd, jmp_table_fd, hash_map_fd;
    - struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};
    struct bpf_program *prog;
    struct bpf_object *obj;
    const char *section;
    @@ -34,7 +33,6 @@ int main(int argc, char **argv)
    FILE *f;

    snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]);
    - setrlimit(RLIMIT_MEMLOCK, &r);

    obj = bpf_object__open_file(filename, NULL);
    if (libbpf_get_error(obj)) {
    diff --git a/samples/bpf/spintest_user.c b/samples/bpf/spintest_user.c
    index f090d0dc60d6..0d7e1e5a8658 100644
    --- a/samples/bpf/spintest_user.c
    +++ b/samples/bpf/spintest_user.c
    @@ -10,7 +10,6 @@

    int main(int ac, char **argv)
    {
    - struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};
    char filename[256], symbol[256];
    struct bpf_object *obj = NULL;
    struct bpf_link *links[20];
    @@ -20,11 +19,6 @@ int main(int ac, char **argv)
    const char *section;
    struct ksym *sym;

    - if (setrlimit(RLIMIT_MEMLOCK, &r)) {
    - perror("setrlimit(RLIMIT_MEMLOCK)");
    - return 1;
    - }
    -
    if (load_kallsyms()) {
    printf("failed to process /proc/kallsyms\n");
    return 2;
    diff --git a/samples/bpf/syscall_tp_user.c b/samples/bpf/syscall_tp_user.c
    index 76a1d00128fb..a0ebf1833ed3 100644
    --- a/samples/bpf/syscall_tp_user.c
    +++ b/samples/bpf/syscall_tp_user.c
    @@ -115,7 +115,6 @@ static int test(char *filename, int num_progs)

    int main(int argc, char **argv)
    {
    - struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};
    int opt, num_progs = 1;
    char filename[256];

    @@ -131,7 +130,6 @@ int main(int argc, char **argv)
    }
    }

    - setrlimit(RLIMIT_MEMLOCK, &r);
    snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]);

    return test(filename, num_progs);
    diff --git a/samples/bpf/task_fd_query_user.c b/samples/bpf/task_fd_query_user.c
    index b68bd2f8fdc9..0f2050ff54f9 100644
    --- a/samples/bpf/task_fd_query_user.c
    +++ b/samples/bpf/task_fd_query_user.c
    @@ -290,16 +290,11 @@ static int test_debug_fs_uprobe(char *binary_path, long offset, bool is_return)

    int main(int argc, char **argv)
    {
    - struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};
    extern char __executable_start;
    char filename[256], buf[256];
    __u64 uprobe_file_offset;

    snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]);
    - if (setrlimit(RLIMIT_MEMLOCK, &r)) {
    - perror("setrlimit(RLIMIT_MEMLOCK)");
    - return 1;
    - }

    if (load_kallsyms()) {
    printf("failed to process /proc/kallsyms\n");
    diff --git a/samples/bpf/test_lru_dist.c b/samples/bpf/test_lru_dist.c
    index b313dba4111b..c92c5c06b965 100644
    --- a/samples/bpf/test_lru_dist.c
    +++ b/samples/bpf/test_lru_dist.c
    @@ -489,7 +489,6 @@ static void test_parallel_lru_loss(int map_type, int map_flags, int nr_tasks)

    int main(int argc, char **argv)
    {
    - struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};
    int map_flags[] = {0, BPF_F_NO_COMMON_LRU};
    const char *dist_file;
    int nr_tasks = 1;
    @@ -508,8 +507,6 @@ int main(int argc, char **argv)

    setbuf(stdout, NULL);

    - assert(!setrlimit(RLIMIT_MEMLOCK, &r));
    -
    srand(time(NULL));

    nr_cpus = bpf_num_possible_cpus();
    diff --git a/samples/bpf/test_map_in_map_user.c b/samples/bpf/test_map_in_map_user.c
    index 98656de56b83..472d65c70354 100644
    --- a/samples/bpf/test_map_in_map_user.c
    +++ b/samples/bpf/test_map_in_map_user.c
    @@ -114,17 +114,11 @@ static void test_map_in_map(void)

    int main(int argc, char **argv)
    {
    - struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};
    struct bpf_link *link = NULL;
    struct bpf_program *prog;
    struct bpf_object *obj;
    char filename[256];

    - if (setrlimit(RLIMIT_MEMLOCK, &r)) {
    - perror("setrlimit(RLIMIT_MEMLOCK)");
    - return 1;
    - }
    -
    snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]);
    obj = bpf_object__open_file(filename, NULL);
    if (libbpf_get_error(obj)) {
    diff --git a/samples/bpf/test_overhead_user.c b/samples/bpf/test_overhead_user.c
    index 94f74112a20e..c100fd46cd8a 100644
    --- a/samples/bpf/test_overhead_user.c
    +++ b/samples/bpf/test_overhead_user.c
    @@ -125,12 +125,10 @@ static void unload_progs(void)

    int main(int argc, char **argv)
    {
    - struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};
    char filename[256];
    int num_cpu = 8;
    int test_flags = ~0;

    - setrlimit(RLIMIT_MEMLOCK, &r);

    if (argc > 1)
    test_flags = atoi(argv[1]) ? : test_flags;
    diff --git a/samples/bpf/trace_event_user.c b/samples/bpf/trace_event_user.c
    index ac1ba368195c..9664749bf618 100644
    --- a/samples/bpf/trace_event_user.c
    +++ b/samples/bpf/trace_event_user.c
    @@ -294,13 +294,11 @@ static void test_bpf_perf_event(void)

    int main(int argc, char **argv)
    {
    - struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};
    struct bpf_object *obj = NULL;
    char filename[256];
    int error = 1;

    snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]);
    - setrlimit(RLIMIT_MEMLOCK, &r);

    signal(SIGINT, err_exit);
    signal(SIGTERM, err_exit);
    diff --git a/samples/bpf/tracex2_user.c b/samples/bpf/tracex2_user.c
    index 3d6eab711d23..1626d51dfffd 100644
    --- a/samples/bpf/tracex2_user.c
    +++ b/samples/bpf/tracex2_user.c
    @@ -116,7 +116,6 @@ static void int_exit(int sig)

    int main(int ac, char **argv)
    {
    - struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};
    long key, next_key, value;
    struct bpf_link *links[2];
    struct bpf_program *prog;
    @@ -125,11 +124,6 @@ int main(int ac, char **argv)
    int i, j = 0;
    FILE *f;

    - if (setrlimit(RLIMIT_MEMLOCK, &r)) {
    - perror("setrlimit(RLIMIT_MEMLOCK)");
    - return 1;
    - }
    -
    snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]);
    obj = bpf_object__open_file(filename, NULL);
    if (libbpf_get_error(obj)) {
    diff --git a/samples/bpf/tracex3_user.c b/samples/bpf/tracex3_user.c
    index 83e0fecbb01a..33e16ba39f25 100644
    --- a/samples/bpf/tracex3_user.c
    +++ b/samples/bpf/tracex3_user.c
    @@ -107,7 +107,6 @@ static void print_hist(int fd)

    int main(int ac, char **argv)
    {
    - struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};
    struct bpf_link *links[2];
    struct bpf_program *prog;
    struct bpf_object *obj;
    @@ -127,11 +126,6 @@ int main(int ac, char **argv)
    }
    }

    - if (setrlimit(RLIMIT_MEMLOCK, &r)) {
    - perror("setrlimit(RLIMIT_MEMLOCK)");
    - return 1;
    - }
    -
    snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]);
    obj = bpf_object__open_file(filename, NULL);
    if (libbpf_get_error(obj)) {
    diff --git a/samples/bpf/tracex4_user.c b/samples/bpf/tracex4_user.c
    index e8faf8f184ae..cea399424bca 100644
    --- a/samples/bpf/tracex4_user.c
    +++ b/samples/bpf/tracex4_user.c
    @@ -48,18 +48,12 @@ static void print_old_objects(int fd)

    int main(int ac, char **argv)
    {
    - struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};
    struct bpf_link *links[2];
    struct bpf_program *prog;
    struct bpf_object *obj;
    char filename[256];
    int map_fd, i, j = 0;

    - if (setrlimit(RLIMIT_MEMLOCK, &r)) {
    - perror("setrlimit(RLIMIT_MEMLOCK, RLIM_INFINITY)");
    - return 1;
    - }
    -
    snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]);
    obj = bpf_object__open_file(filename, NULL);
    if (libbpf_get_error(obj)) {
    diff --git a/samples/bpf/tracex5_user.c b/samples/bpf/tracex5_user.c
    index c17d3fb5fd64..08dfdc77ad2a 100644
    --- a/samples/bpf/tracex5_user.c
    +++ b/samples/bpf/tracex5_user.c
    @@ -34,7 +34,6 @@ static void install_accept_all_seccomp(void)

    int main(int ac, char **argv)
    {
    - struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};
    struct bpf_link *link = NULL;
    struct bpf_program *prog;
    struct bpf_object *obj;
    @@ -43,8 +42,6 @@ int main(int ac, char **argv)
    char filename[256];
    FILE *f;

    - setrlimit(RLIMIT_MEMLOCK, &r);
    -
    snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]);
    obj = bpf_object__open_file(filename, NULL);
    if (libbpf_get_error(obj)) {
    diff --git a/samples/bpf/tracex6_user.c b/samples/bpf/tracex6_user.c
    index 33df9784775d..28296f40c133 100644
    --- a/samples/bpf/tracex6_user.c
    +++ b/samples/bpf/tracex6_user.c
    @@ -175,15 +175,12 @@ static void test_bpf_perf_event(void)

    int main(int argc, char **argv)
    {
    - struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};
    struct bpf_link *links[2];
    struct bpf_program *prog;
    struct bpf_object *obj;
    char filename[256];
    int i = 0;

    - setrlimit(RLIMIT_MEMLOCK, &r);
    -
    snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]);
    obj = bpf_object__open_file(filename, NULL);
    if (libbpf_get_error(obj)) {
    diff --git a/samples/bpf/xdp1_user.c b/samples/bpf/xdp1_user.c
    index c447ad9e3a1d..116e39f6b666 100644
    --- a/samples/bpf/xdp1_user.c
    +++ b/samples/bpf/xdp1_user.c
    @@ -79,7 +79,6 @@ static void usage(const char *prog)

    int main(int argc, char **argv)
    {
    - struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};
    struct bpf_prog_load_attr prog_load_attr = {
    .prog_type = BPF_PROG_TYPE_XDP,
    };
    @@ -117,11 +116,6 @@ int main(int argc, char **argv)
    return 1;
    }

    - if (setrlimit(RLIMIT_MEMLOCK, &r)) {
    - perror("setrlimit(RLIMIT_MEMLOCK)");
    - return 1;
    - }
    -
    ifindex = if_nametoindex(argv[optind]);
    if (!ifindex) {
    perror("if_nametoindex");
    diff --git a/samples/bpf/xdp_adjust_tail_user.c b/samples/bpf/xdp_adjust_tail_user.c
    index ba482dc3da33..a70b094c8ec5 100644
    --- a/samples/bpf/xdp_adjust_tail_user.c
    +++ b/samples/bpf/xdp_adjust_tail_user.c
    @@ -82,7 +82,6 @@ static void usage(const char *cmd)

    int main(int argc, char **argv)
    {
    - struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};
    struct bpf_prog_load_attr prog_load_attr = {
    .prog_type = BPF_PROG_TYPE_XDP,
    };
    @@ -143,11 +142,6 @@ int main(int argc, char **argv)
    }
    }

    - if (setrlimit(RLIMIT_MEMLOCK, &r)) {
    - perror("setrlimit(RLIMIT_MEMLOCK, RLIM_INFINITY)");
    - return 1;
    - }
    -
    if (!ifindex) {
    fprintf(stderr, "Invalid ifname\n");
    return 1;
    diff --git a/samples/bpf/xdp_monitor_user.c b/samples/bpf/xdp_monitor_user.c
    index 03d0a182913f..49ebc49aefc3 100644
    --- a/samples/bpf/xdp_monitor_user.c
    +++ b/samples/bpf/xdp_monitor_user.c
    @@ -687,7 +687,6 @@ static void print_bpf_prog_info(void)

    int main(int argc, char **argv)
    {
    - struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};
    struct bpf_program *prog;
    int longindex = 0, opt;
    int ret = EXIT_FAILURE;
    @@ -719,10 +718,6 @@ int main(int argc, char **argv)
    }

    snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]);
    - if (setrlimit(RLIMIT_MEMLOCK, &r)) {
    - perror("setrlimit(RLIMIT_MEMLOCK)");
    - return ret;
    - }

    /* Remove tracepoint program when program is interrupted or killed */
    signal(SIGINT, int_exit);
    diff --git a/samples/bpf/xdp_redirect_cpu_user.c b/samples/bpf/xdp_redirect_cpu_user.c
    index f78cb18319aa..576411612523 100644
    --- a/samples/bpf/xdp_redirect_cpu_user.c
    +++ b/samples/bpf/xdp_redirect_cpu_user.c
    @@ -765,7 +765,6 @@ static int load_cpumap_prog(char *file_name, char *prog_name,

    int main(int argc, char **argv)
    {
    - struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};
    char *prog_name = "xdp_cpu_map5_lb_hash_ip_pairs";
    char *mprog_filename = "xdp_redirect_kern.o";
    char *redir_interface = NULL, *redir_map = NULL;
    @@ -804,11 +803,6 @@ int main(int argc, char **argv)
    snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]);
    prog_load_attr.file = filename;

    - if (setrlimit(RLIMIT_MEMLOCK, &r)) {
    - perror("setrlimit(RLIMIT_MEMLOCK)");
    - return 1;
    - }
    -
    if (bpf_prog_load_xattr(&prog_load_attr, &obj, &prog_fd))
    return err;

    diff --git a/samples/bpf/xdp_redirect_map_user.c b/samples/bpf/xdp_redirect_map_user.c
    index 35e16dee613e..31131b6e7782 100644
    --- a/samples/bpf/xdp_redirect_map_user.c
    +++ b/samples/bpf/xdp_redirect_map_user.c
    @@ -96,7 +96,6 @@ static void usage(const char *prog)

    int main(int argc, char **argv)
    {
    - struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};
    struct bpf_prog_load_attr prog_load_attr = {
    .prog_type = BPF_PROG_TYPE_XDP,
    };
    @@ -135,11 +134,6 @@ int main(int argc, char **argv)
    return 1;
    }

    - if (setrlimit(RLIMIT_MEMLOCK, &r)) {
    - perror("setrlimit(RLIMIT_MEMLOCK)");
    - return 1;
    - }
    -
    ifindex_in = if_nametoindex(argv[optind]);
    if (!ifindex_in)
    ifindex_in = strtoul(argv[optind], NULL, 0);
    diff --git a/samples/bpf/xdp_redirect_user.c b/samples/bpf/xdp_redirect_user.c
    index 9ca2bf457cda..41d705c3a1f7 100644
    --- a/samples/bpf/xdp_redirect_user.c
    +++ b/samples/bpf/xdp_redirect_user.c
    @@ -97,7 +97,6 @@ static void usage(const char *prog)

    int main(int argc, char **argv)
    {
    - struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};
    struct bpf_prog_load_attr prog_load_attr = {
    .prog_type = BPF_PROG_TYPE_XDP,
    };
    @@ -136,11 +135,6 @@ int main(int argc, char **argv)
    return 1;
    }

    - if (setrlimit(RLIMIT_MEMLOCK, &r)) {
    - perror("setrlimit(RLIMIT_MEMLOCK)");
    - return 1;
    - }
    -
    ifindex_in = if_nametoindex(argv[optind]);
    if (!ifindex_in)
    ifindex_in = strtoul(argv[optind], NULL, 0);
    diff --git a/samples/bpf/xdp_router_ipv4_user.c b/samples/bpf/xdp_router_ipv4_user.c
    index c2da1b51ff95..b5f03cb17a3c 100644
    --- a/samples/bpf/xdp_router_ipv4_user.c
    +++ b/samples/bpf/xdp_router_ipv4_user.c
    @@ -625,7 +625,6 @@ static void usage(const char *prog)

    int main(int ac, char **argv)
    {
    - struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};
    struct bpf_prog_load_attr prog_load_attr = {
    .prog_type = BPF_PROG_TYPE_XDP,
    };
    @@ -670,11 +669,6 @@ int main(int ac, char **argv)
    return 1;
    }

    - if (setrlimit(RLIMIT_MEMLOCK, &r)) {
    - perror("setrlimit(RLIMIT_MEMLOCK)");
    - return 1;
    - }
    -
    if (bpf_prog_load_xattr(&prog_load_attr, &obj, &prog_fd))
    return 1;

    diff --git a/samples/bpf/xdp_rxq_info_user.c b/samples/bpf/xdp_rxq_info_user.c
    index 93fa1bc54f13..74a2926eba08 100644
    --- a/samples/bpf/xdp_rxq_info_user.c
    +++ b/samples/bpf/xdp_rxq_info_user.c
    @@ -450,7 +450,6 @@ static void stats_poll(int interval, int action, __u32 cfg_opt)
    int main(int argc, char **argv)
    {
    __u32 cfg_options= NO_TOUCH ; /* Default: Don't touch packet memory */
    - struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};
    struct bpf_prog_load_attr prog_load_attr = {
    .prog_type = BPF_PROG_TYPE_XDP,
    };
    @@ -474,11 +473,6 @@ int main(int argc, char **argv)
    snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]);
    prog_load_attr.file = filename;

    - if (setrlimit(RLIMIT_MEMLOCK, &r)) {
    - perror("setrlimit(RLIMIT_MEMLOCK)");
    - return 1;
    - }
    -
    if (bpf_prog_load_xattr(&prog_load_attr, &obj, &prog_fd))
    return EXIT_FAIL;

    diff --git a/samples/bpf/xdp_sample_pkts_user.c b/samples/bpf/xdp_sample_pkts_user.c
    index 4b2a300c750c..706475e004cb 100644
    --- a/samples/bpf/xdp_sample_pkts_user.c
    +++ b/samples/bpf/xdp_sample_pkts_user.c
    @@ -109,7 +109,6 @@ static void usage(const char *prog)

    int main(int argc, char **argv)
    {
    - struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};
    struct bpf_prog_load_attr prog_load_attr = {
    .prog_type = BPF_PROG_TYPE_XDP,
    };
    @@ -143,11 +142,6 @@ int main(int argc, char **argv)
    return 1;
    }

    - if (setrlimit(RLIMIT_MEMLOCK, &r)) {
    - perror("setrlimit(RLIMIT_MEMLOCK)");
    - return 1;
    - }
    -
    snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]);
    prog_load_attr.file = filename;

    diff --git a/samples/bpf/xdp_tx_iptunnel_user.c b/samples/bpf/xdp_tx_iptunnel_user.c
    index a419bee151a8..1d4f305d02aa 100644
    --- a/samples/bpf/xdp_tx_iptunnel_user.c
    +++ b/samples/bpf/xdp_tx_iptunnel_user.c
    @@ -155,7 +155,6 @@ int main(int argc, char **argv)
    struct bpf_prog_load_attr prog_load_attr = {
    .prog_type = BPF_PROG_TYPE_XDP,
    };
    - struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};
    int min_port = 0, max_port = 0, vip2tnl_map_fd;
    const char *optstr = "i:a:p:s:d:m:T:P:FSNh";
    unsigned char opt_flags[256] = {};
    @@ -254,11 +253,6 @@ int main(int argc, char **argv)
    }
    }

    - if (setrlimit(RLIMIT_MEMLOCK, &r)) {
    - perror("setrlimit(RLIMIT_MEMLOCK, RLIM_INFINITY)");
    - return 1;
    - }
    -
    if (!ifindex) {
    fprintf(stderr, "Invalid ifname\n");
    return 1;
    diff --git a/samples/bpf/xdpsock_user.c b/samples/bpf/xdpsock_user.c
    index 2567f0db5aca..f3ce4dac3a1f 100644
    --- a/samples/bpf/xdpsock_user.c
    +++ b/samples/bpf/xdpsock_user.c
    @@ -1463,7 +1463,6 @@ static void enter_xsks_into_map(struct bpf_object *obj)

    int main(int argc, char **argv)
    {
    - struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};
    bool rx = false, tx = false;
    struct xsk_umem_info *umem;
    struct bpf_object *obj;
    @@ -1473,12 +1472,6 @@ int main(int argc, char **argv)

    parse_command_line(argc, argv);

    - if (setrlimit(RLIMIT_MEMLOCK, &r)) {
    - fprintf(stderr, "ERROR: setrlimit(RLIMIT_MEMLOCK) \"%s\"\n",
    - strerror(errno));
    - exit(EXIT_FAILURE);
    - }
    -
    if (opt_num_xsks > 1)
    load_xdp_program(argv, &obj);

    --
    2.26.2
    \
     
     \ /
      Last update: 2020-11-19 18:39    [W:3.101 / U:0.144 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site