From patchwork Fri Dec 9 14:26:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= X-Patchwork-Id: 13069649 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 31BFFC04FDE for ; Fri, 9 Dec 2022 14:27:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229738AbiLIO1t (ORCPT ); Fri, 9 Dec 2022 09:27:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53008 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229478AbiLIO1r (ORCPT ); Fri, 9 Dec 2022 09:27:47 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D37426DCE5 for ; Fri, 9 Dec 2022 06:26:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1670596008; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kOF+S3PHOW3IehcjpPDFE2HwwX4y4ZzChTg/OVZXIQ8=; b=V1z76BfoVN3pZ+wcVIsgJEWou5opBoO0mHGIgpT2Az3lOVViqPTUGam9gQjpx1HvsHHCyn lf7wwIZFMhyMqml7IYV6h0HkupEevdT2MN54k5r3/yd6nUpB8SzO3kCaYmJ3VGkSVN0c9U 8A8WBkze0ep2QwxtQpaJ526WwdFrqdo= Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-206-xIDDBJsKMnCMZSZMSlFiWA-1; Fri, 09 Dec 2022 09:26:45 -0500 X-MC-Unique: xIDDBJsKMnCMZSZMSlFiWA-1 Received: by mail-ed1-f69.google.com with SMTP id j6-20020a05640211c600b0046d6960b266so1465462edw.6 for ; Fri, 09 Dec 2022 06:26:45 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kOF+S3PHOW3IehcjpPDFE2HwwX4y4ZzChTg/OVZXIQ8=; b=3OcoLeYRQTHGX9QbFj/2IGUszhl0i99wYb3XkhbcH/5FoQpfp6jwhIOvrq40401T/H YRRNJCnOAO+VJvxQ74TmcC9G9SEKsuYZrcSiR1Bqs5tlmc7virgMOaLgQaqYHe0Ca3D9 r0u6Ix1hdacOrEnM0QJhP4jzPBPME6Tr1gn/HUZI71OOEtoiCEbNVM/p31y/2/ZpRgxk 9WMtOi88fkVvMEiAPabmNheVgXVwHR6jE12Yj/CMldO7apFPyH4WxzFYkayFupxUli2J 8aTgD7T2XGPmZYMo5KmlbOfSk1HRuqnQjRNWUg4pGRfa9hJPOGJ50ADIKJ+YElT0N/Rs lwxQ== X-Gm-Message-State: ANoB5pk81nRQLVuBLpopH5CwvqISP2JXZNSzPRvr/nD157xjNULUCIOY mAOAuslCkHiBxq3hihNhA0ORH+jTPKUhfG8ULBBNelxLFvAUvXXKwJnV4V2PJq7IDMTCat8w4zo mtVWlRLdhUNQyFf1F X-Received: by 2002:a17:907:2985:b0:7c0:f907:89a2 with SMTP id eu5-20020a170907298500b007c0f90789a2mr4852292ejc.61.1670596002704; Fri, 09 Dec 2022 06:26:42 -0800 (PST) X-Google-Smtp-Source: AA0mqf58kecm7GH89VsCVvR2KVQImLWpqMuMRJvCxyhdIn7HOLX36PJxFX0mpqP1eZGplH5iuFTCTg== X-Received: by 2002:a17:907:2985:b0:7c0:f907:89a2 with SMTP id eu5-20020a170907298500b007c0f90789a2mr4852228ejc.61.1670596001541; Fri, 09 Dec 2022 06:26:41 -0800 (PST) Received: from alrua-x1.borgediget.toke.dk ([2a0c:4d80:42:443::2]) by smtp.gmail.com with ESMTPSA id 10-20020a170906218a00b007815ca7ae57sm603417eju.212.2022.12.09.06.26.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Dec 2022 06:26:40 -0800 (PST) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id D0DCD82EB35; Fri, 9 Dec 2022 15:26:38 +0100 (CET) From: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= To: Andrii Nakryiko , Mykola Lysenko , Alexei Starovoitov , Daniel Borkmann , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , "David S. Miller" , Jakub Kicinski , Jesper Dangaard Brouer Cc: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= , Shuah Khan , bpf@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH bpf v2 2/2] selftests/bpf: Add a test for using a cpumap from an freplace-to-XDP program Date: Fri, 9 Dec 2022 15:26:22 +0100 Message-Id: <20221209142622.154126-2-toke@redhat.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221209142622.154126-1-toke@redhat.com> References: <20221209142622.154126-1-toke@redhat.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: bpf@iogearbox.net This adds a simple test for inserting an XDP program into a cpumap that is "owned" by an XDP program that was loaded as PROG_TYPE_EXT (as libxdp does). Prior to the kernel fix this would fail because the map type ownership would be set to PROG_TYPE_EXT instead of being resolved to PROG_TYPE_XDP. Signed-off-by: Toke Høiland-Jørgensen Acked-by: Yonghong Song --- .../selftests/bpf/prog_tests/fexit_bpf2bpf.c | 53 +++++++++++++++++++ .../selftests/bpf/progs/freplace_progmap.c | 24 +++++++++ tools/testing/selftests/bpf/testing_helpers.c | 24 ++++++++- tools/testing/selftests/bpf/testing_helpers.h | 2 + 4 files changed, 101 insertions(+), 2 deletions(-) create mode 100644 tools/testing/selftests/bpf/progs/freplace_progmap.c diff --git a/tools/testing/selftests/bpf/prog_tests/fexit_bpf2bpf.c b/tools/testing/selftests/bpf/prog_tests/fexit_bpf2bpf.c index d1e32e792536..dac088217f0f 100644 --- a/tools/testing/selftests/bpf/prog_tests/fexit_bpf2bpf.c +++ b/tools/testing/selftests/bpf/prog_tests/fexit_bpf2bpf.c @@ -500,6 +500,57 @@ static void test_fentry_to_cgroup_bpf(void) bind4_prog__destroy(skel); } +static void test_func_replace_progmap(void) +{ + struct bpf_cpumap_val value = { .qsize = 1 }; + struct bpf_object *obj, *tgt_obj = NULL; + struct bpf_program *drop, *redirect; + struct bpf_map *cpumap; + int err, tgt_fd; + __u32 key = 0; + + err = bpf_prog_test_open("freplace_progmap.bpf.o", BPF_PROG_TYPE_UNSPEC, &obj); + if (!ASSERT_OK(err, "prog_open")) + return; + + err = bpf_prog_test_load("xdp_dummy.bpf.o", BPF_PROG_TYPE_UNSPEC, &tgt_obj, &tgt_fd); + if (!ASSERT_OK(err, "tgt_prog_load")) + goto out; + + drop = bpf_object__find_program_by_name(obj, "xdp_drop_prog"); + redirect = bpf_object__find_program_by_name(obj, "xdp_cpumap_prog"); + cpumap = bpf_object__find_map_by_name(obj, "cpu_map"); + + if (!ASSERT_OK_PTR(drop, "drop") || !ASSERT_OK_PTR(redirect, "redirect") || + !ASSERT_OK_PTR(cpumap, "cpumap")) + goto out; + + /* Change the 'redirect' program type to be a PROG_TYPE_EXT + * with an XDP target + */ + bpf_program__set_type(redirect, BPF_PROG_TYPE_EXT); + bpf_program__set_expected_attach_type(redirect, 0); + err = bpf_program__set_attach_target(redirect, tgt_fd, "xdp_dummy_prog"); + if (!ASSERT_OK(err, "set_attach_target")) + goto out; + + err = bpf_object__load(obj); + if (!ASSERT_OK(err, "obj_load")) + goto out; + + /* This will fail if the map is "owned" by a PROG_TYPE_EXT program, + * which, prior to fixing the kernel, it will be since the map is used + * from the 'redirect' prog above + */ + value.bpf_prog.fd = bpf_program__fd(drop); + err = bpf_map_update_elem(bpf_map__fd(cpumap), &key, &value, 0); + ASSERT_OK(err, "map_update"); + +out: + bpf_object__close(tgt_obj); + bpf_object__close(obj); +} + /* NOTE: affect other tests, must run in serial mode */ void serial_test_fexit_bpf2bpf(void) { @@ -525,4 +576,6 @@ void serial_test_fexit_bpf2bpf(void) test_func_replace_global_func(); if (test__start_subtest("fentry_to_cgroup_bpf")) test_fentry_to_cgroup_bpf(); + if (test__start_subtest("func_replace_progmap")) + test_func_replace_progmap(); } diff --git a/tools/testing/selftests/bpf/progs/freplace_progmap.c b/tools/testing/selftests/bpf/progs/freplace_progmap.c new file mode 100644 index 000000000000..68174c3d7b37 --- /dev/null +++ b/tools/testing/selftests/bpf/progs/freplace_progmap.c @@ -0,0 +1,24 @@ +// SPDX-License-Identifier: GPL-2.0 +#include +#include + +struct { + __uint(type, BPF_MAP_TYPE_CPUMAP); + __uint(key_size, sizeof(__u32)); + __uint(value_size, sizeof(struct bpf_cpumap_val)); + __uint(max_entries, 1); +} cpu_map SEC(".maps"); + +SEC("xdp/cpumap") +int xdp_drop_prog(struct xdp_md *ctx) +{ + return XDP_DROP; +} + +SEC("xdp") +int xdp_cpumap_prog(struct xdp_md *ctx) +{ + return bpf_redirect_map(&cpu_map, 0, XDP_PASS); +} + +char _license[] SEC("license") = "GPL"; diff --git a/tools/testing/selftests/bpf/testing_helpers.c b/tools/testing/selftests/bpf/testing_helpers.c index 9695318e8132..2050244e6f24 100644 --- a/tools/testing/selftests/bpf/testing_helpers.c +++ b/tools/testing/selftests/bpf/testing_helpers.c @@ -174,8 +174,8 @@ __u32 link_info_prog_id(const struct bpf_link *link, struct bpf_link_info *info) int extra_prog_load_log_flags = 0; -int bpf_prog_test_load(const char *file, enum bpf_prog_type type, - struct bpf_object **pobj, int *prog_fd) +int bpf_prog_test_open(const char *file, enum bpf_prog_type type, + struct bpf_object **pobj) { LIBBPF_OPTS(bpf_object_open_opts, opts, .kernel_log_level = extra_prog_load_log_flags, @@ -201,6 +201,26 @@ int bpf_prog_test_load(const char *file, enum bpf_prog_type type, flags = bpf_program__flags(prog) | BPF_F_TEST_RND_HI32; bpf_program__set_flags(prog, flags); + *pobj = obj; + return 0; +err_out: + bpf_object__close(obj); + return err; +} + +int bpf_prog_test_load(const char *file, enum bpf_prog_type type, + struct bpf_object **pobj, int *prog_fd) +{ + struct bpf_program *prog; + struct bpf_object *obj; + int err; + + err = bpf_prog_test_open(file, type, &obj); + if (err) + return err; + + prog = bpf_object__next_program(obj, NULL); + err = bpf_object__load(obj); if (err) goto err_out; diff --git a/tools/testing/selftests/bpf/testing_helpers.h b/tools/testing/selftests/bpf/testing_helpers.h index 6ec00bf79cb5..977eb520d119 100644 --- a/tools/testing/selftests/bpf/testing_helpers.h +++ b/tools/testing/selftests/bpf/testing_helpers.h @@ -6,6 +6,8 @@ int parse_num_list(const char *s, bool **set, int *set_len); __u32 link_info_prog_id(const struct bpf_link *link, struct bpf_link_info *info); +int bpf_prog_test_open(const char *file, enum bpf_prog_type type, + struct bpf_object **pobj); int bpf_prog_test_load(const char *file, enum bpf_prog_type type, struct bpf_object **pobj, int *prog_fd); int bpf_test_load_program(enum bpf_prog_type type, const struct bpf_insn *insns,