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.6 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT,USER_IN_DEF_DKIM_WL 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 E4FBDC282C8 for ; Mon, 28 Jan 2019 17:21:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B7FEA20989 for ; Mon, 28 Jan 2019 17:21:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="PZT5L/fg" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731826AbfA1RV3 (ORCPT ); Mon, 28 Jan 2019 12:21:29 -0500 Received: from mail-oi1-f201.google.com ([209.85.167.201]:36484 "EHLO mail-oi1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731501AbfA1RV2 (ORCPT ); Mon, 28 Jan 2019 12:21:28 -0500 Received: by mail-oi1-f201.google.com with SMTP id w124so9483809oif.3 for ; Mon, 28 Jan 2019 09:21:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=q4macxNbtxstvIYiziu+aGAea0mbMvVMksbhi1SEMg4=; b=PZT5L/fg6Oboc5gzImg34djAHJAU8/ul7I9+laxOrOUs+OuyP7S1SKkFNFcGCX52rU fKqbLuoMuE0c3EaakrrLqnE3bc5A4KmYkVPPEFuqhON2q3IyYHpZBs6tOkH0McgFWG9b 5v4GMNrpiT40rapLUpRck/xCrQkx5KmTDfT3UA5Xg8c5v7YQP7mJX+jgrIrxP2qzbPAT DawFliOUmWHV3CG89hc+t6Stllgnc1jyHJONKEPRPYQePdu64FYGuL+pPl6ob7HVilfs tBt89iL4xtdhjBiJxzCap3UBXSNXgaTL/L9rRjVLOjsVCraH8bLMZvbz9hL/ufHzGjJ2 OyTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=q4macxNbtxstvIYiziu+aGAea0mbMvVMksbhi1SEMg4=; b=VBOnEw4srpGZRwrEGzOra5hFjwUBWKR/A+i54j6FCg754aDtlvevCA4UpD0sUKBU8R /l4LPTcB/sIPSrOzRN6JtkCArQWEJBLKDPbiV7H2DmQyDi0kQqE8osTYnz9YQb3ZQpke mg0HTCWU3Wjf4oF7B6iShnkmhwjGamtszn+GxDtwOsusjUQHn9mVjqZ5tfMyAIIBvfO9 ORn2Ff9ksfSKF+PD29HpNzqIrV3b3GjyYD9SMBHDq/VOLK7PQiXoREPzttzYuh8mJN3n qO9oRZauqRsnvPFfxkdM9bibbtnUdXCy/HUP3b7aj86oBvsubRirQeRBOwkxlBrxOpX4 gx4w== X-Gm-Message-State: AHQUAuYkLK7KrccbcdtWE+ouV5aTqdyAYOt4PFADs//1jGz1sxQbs8oj by2peu/tnNkyHkK7GmCeL5MiN0TneenjBhBnP3N9ZpWVsMG1W8wSSSimdWR1CnKaDGPInYQq+zJ 6AecHgS8mShPxn2qtopNRA3smo/xeAWB51Lipin3Qsa/T4T2tVB0bRg== X-Google-Smtp-Source: AHgI3Ia7MexzpSgTQ545V79dXn1plUf5zrRz1jYuAtWulfbUnB+Hh371Ax292pFJ0N3MjQ46XDaGALY= X-Received: by 2002:a05:6830:1411:: with SMTP id v17mr439305otp.67.1548696087213; Mon, 28 Jan 2019 09:21:27 -0800 (PST) Date: Mon, 28 Jan 2019 09:21:16 -0800 In-Reply-To: <20190128172119.12105-1-sdf@google.com> Message-Id: <20190128172119.12105-3-sdf@google.com> Mime-Version: 1.0 References: <20190128172119.12105-1-sdf@google.com> X-Mailer: git-send-email 2.20.1.495.gaa96b0ce6b-goog Subject: [PATCH bpf-next v3 2/5] selftests/bpf: skip verifier tests for unsupported program types From: Stanislav Fomichev To: netdev@vger.kernel.org Cc: davem@davemloft.net, ast@kernel.org, daniel@iogearbox.net, Stanislav Fomichev Content-Type: text/plain; charset="UTF-8" Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Use recently introduced bpf_probe_prog_type() to skip tests in the test_verifier() if bpf_verify_program() fails. The skipped test is indicated in the output. Example: ... 679/p bpf_get_stack return R0 within range SKIP (unsupported program type 5) 680/p ld_abs: invalid op 1 OK ... Summary: 863 PASSED, 165 SKIPPED, 3 FAILED Signed-off-by: Stanislav Fomichev --- tools/testing/selftests/bpf/test_verifier.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/bpf/test_verifier.c b/tools/testing/selftests/bpf/test_verifier.c index c5e22422a852..2a36f9f2ee8f 100644 --- a/tools/testing/selftests/bpf/test_verifier.c +++ b/tools/testing/selftests/bpf/test_verifier.c @@ -34,6 +34,7 @@ #include #include +#include #ifdef HAVE_GENHDR # include "autoconf.h" @@ -59,6 +60,7 @@ #define UNPRIV_SYSCTL "kernel/unprivileged_bpf_disabled" static bool unpriv_disabled = false; +static int skips; struct bpf_test { const char *descr; @@ -598,6 +600,11 @@ static void do_test_single(struct bpf_test *test, bool unpriv, pflags |= BPF_F_ANY_ALIGNMENT; fd_prog = bpf_verify_program(prog_type, prog, prog_len, pflags, "GPL", 0, bpf_vlog, sizeof(bpf_vlog), 1); + if (fd_prog < 0 && !bpf_probe_prog_type(prog_type, 0)) { + printf("SKIP (unsupported program type %d)\n", prog_type); + skips++; + goto close_fds; + } expected_ret = unpriv && test->result_unpriv != UNDEF ? test->result_unpriv : test->result; @@ -751,7 +758,7 @@ static bool test_as_unpriv(struct bpf_test *test) static int do_test(bool unpriv, unsigned int from, unsigned int to) { - int i, passes = 0, errors = 0, skips = 0; + int i, passes = 0, errors = 0; for (i = from; i < to; i++) { struct bpf_test *test = &tests[i]; -- 2.20.1.495.gaa96b0ce6b-goog