From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 23D71C433E0 for ; Fri, 26 Mar 2021 09:44:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DB8B061A49 for ; Fri, 26 Mar 2021 09:44:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229580AbhCZJnl (ORCPT ); Fri, 26 Mar 2021 05:43:41 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:28750 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229812AbhCZJnj (ORCPT ); Fri, 26 Mar 2021 05:43:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616751819; 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=yaPxAtTlYxw0i9BFM/qU8qS7O6tnfcWIERywcqe7zaM=; b=GNIVnXQjsxMexLnOcNiXeDYfp8Hs2gs1AKhIf0hEd2SEhD88esesBmIXhN8yok0vxWHuAl vzWCWQaTGsWjB+kVYthXY9XOm2AR249IRHh+z0ip9CUT0rYDd81movWowgLI4VKNSM2Sh2 nEF9eE/OH60yM+NlFMBxKQ4QsIktOX4= Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-517-IpfnaaM0MGegTXyAxinu1A-1; Fri, 26 Mar 2021 05:43:36 -0400 X-MC-Unique: IpfnaaM0MGegTXyAxinu1A-1 Received: by mail-ed1-f70.google.com with SMTP id v27so4113950edx.1 for ; Fri, 26 Mar 2021 02:43:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references:date :message-id:mime-version:content-transfer-encoding; bh=yaPxAtTlYxw0i9BFM/qU8qS7O6tnfcWIERywcqe7zaM=; b=qHA9CDtsE7JMU/lLT667eI93GnPqMiPIHgBgcu+fVQ6kbpwcfKdWLYPTa+7n92jSz3 21coLlch2nLZZP4BSBYP91rZO/g3cAgiHDMB7j4swaAQwqs4usPxl+AGQQSAbZYOkNTy FLMEWCweyHslb7Zblo8cT+tC0jeLQgEDMU/E5dRAd+/aIZjV2Qx89GfgbqK54rx9/vZy fTlqsdgyc/9g5JazKGUG0gztUKA446vUaMfzm8E/J5SpQgLWpfxgnQimO5HQb4kZKEzc 5FynHjctgoSqih6kX+JBoCMkhGKnS1YFqmgA4QN5IfdxpB09koG/SaDUVyN6J5jj9Lt3 19LQ== X-Gm-Message-State: AOAM5323e3Z/zHQpoUM6ZBmxb8fc1dMyYP1jNj9D5TAvC0gUDkkxhRGT /dWISDcQBOOMRCqwYBksjCuvsJZGlB0mT62RKGXz8z82EDyF84W/z9Dqj6+/a41WDNKC+b+dqXm +O0ZSKnwBAB6r X-Received: by 2002:aa7:c941:: with SMTP id h1mr13739175edt.85.1616751815563; Fri, 26 Mar 2021 02:43:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyW0egnm8sR6kaqK8lS5WUkeH6ar+nWajJS0DKxKFG/qcb37iNSYyisVn6OH1H2dwMXIserfQ== X-Received: by 2002:aa7:c941:: with SMTP id h1mr13739140edt.85.1616751815208; Fri, 26 Mar 2021 02:43:35 -0700 (PDT) Received: from alrua-x1.borgediget.toke.dk ([2a0c:4d80:42:443::2]) by smtp.gmail.com with ESMTPSA id j1sm3600230ejt.18.2021.03.26.02.43.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Mar 2021 02:43:34 -0700 (PDT) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id 1C1521801A3; Fri, 26 Mar 2021 10:43:34 +0100 (CET) From: Toke =?utf-8?Q?H=C3=B8iland-J=C3=B8rgensen?= To: Andrii Nakryiko Cc: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , "David S. Miller" , Jesper Dangaard Brouer , Andrea Arcangeli , Clark Williams , bpf , Networking Subject: Re: [PATCH bpf v2 2/2] bpf/selftests: test that kernel rejects a TCP CC with an invalid license In-Reply-To: References: <20210325211122.98620-1-toke@redhat.com> <20210325211122.98620-2-toke@redhat.com> X-Clacks-Overhead: GNU Terry Pratchett Date: Fri, 26 Mar 2021 10:43:34 +0100 Message-ID: <87lfaacks9.fsf@toke.dk> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org Andrii Nakryiko writes: > On Thu, Mar 25, 2021 at 2:11 PM Toke H=C3=B8iland-J=C3=B8rgensen wrote: >> >> This adds a selftest to check that the verifier rejects a TCP CC struct_= ops >> with a non-GPL license. >> >> v2: >> - Use a minimal struct_ops BPF program instead of rewriting bpf_dctcp's >> license in memory. >> - Check for the verifier reject message instead of just the return code. >> >> Signed-off-by: Toke H=C3=B8iland-J=C3=B8rgensen >> --- >> .../selftests/bpf/prog_tests/bpf_tcp_ca.c | 44 +++++++++++++++++++ >> .../selftests/bpf/progs/bpf_nogpltcp.c | 19 ++++++++ >> 2 files changed, 63 insertions(+) >> create mode 100644 tools/testing/selftests/bpf/progs/bpf_nogpltcp.c >> >> diff --git a/tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c b/tools= /testing/selftests/bpf/prog_tests/bpf_tcp_ca.c >> index 37c5494a0381..a09c716528e1 100644 >> --- a/tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c >> +++ b/tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c >> @@ -6,6 +6,7 @@ >> #include >> #include "bpf_dctcp.skel.h" >> #include "bpf_cubic.skel.h" >> +#include "bpf_nogpltcp.skel.h" > > total nit, but my eyes can't read "nogpltcp"... wouldn't > "bpf_tcp_nogpl" be a bit easier? Haha, yeah, good point - my eyes also just lump it into a blob... >> >> #define min(a, b) ((a) < (b) ? (a) : (b)) >> >> @@ -227,10 +228,53 @@ static void test_dctcp(void) >> bpf_dctcp__destroy(dctcp_skel); >> } >> >> +static char *err_str =3D NULL; >> +static bool found =3D false; >> + >> +static int libbpf_debug_print(enum libbpf_print_level level, >> + const char *format, va_list args) >> +{ >> + char *log_buf; >> + >> + if (level !=3D LIBBPF_WARN || >> + strcmp(format, "libbpf: \n%s\n")) { >> + vprintf(format, args); >> + return 0; >> + } >> + >> + log_buf =3D va_arg(args, char *); >> + if (!log_buf) >> + goto out; >> + if (err_str && strstr(log_buf, err_str) !=3D NULL) >> + found =3D true; >> +out: >> + printf(format, log_buf); >> + return 0; >> +} >> + >> +static void test_invalid_license(void) >> +{ >> + libbpf_print_fn_t old_print_fn =3D NULL; >> + struct bpf_nogpltcp *skel; >> + >> + err_str =3D "struct ops programs must have a GPL compatible lice= nse"; >> + old_print_fn =3D libbpf_set_print(libbpf_debug_print); >> + >> + skel =3D bpf_nogpltcp__open_and_load(); >> + if (CHECK(skel, "bpf_nogplgtcp__open_and_load()", "didn't fail\n= ")) > > ASSERT_OK_PTR() > >> + bpf_nogpltcp__destroy(skel); > > you should destroy unconditionally > >> + >> + CHECK(!found, "errmsg check", "expected string '%s'", err_str); > > ASSERT_EQ(found, true, "expected_err_msg"); > > I can never be sure which way CHECK() is checking Ah, thanks! I always get confused about CHECK() as well! Maybe it should be renamed to ASSERT()? But that would require flipping all the if() statements around them as well :/ -Toke