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 6B06AC282C8 for ; Mon, 28 Jan 2019 17:21:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 377F320989 for ; Mon, 28 Jan 2019 17:21:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="DHpUTUvL" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731827AbfA1RV0 (ORCPT ); Mon, 28 Jan 2019 12:21:26 -0500 Received: from mail-vs1-f73.google.com ([209.85.217.73]:49770 "EHLO mail-vs1-f73.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731501AbfA1RVZ (ORCPT ); Mon, 28 Jan 2019 12:21:25 -0500 Received: by mail-vs1-f73.google.com with SMTP id z189so7945155vsc.16 for ; Mon, 28 Jan 2019 09:21:24 -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=eUtdsLUcYkexrjJDHiAgyOrg+2ZbKdBsSH1K0lnSCeI=; b=DHpUTUvLDn/G/ximasUrmoPzoJ7zP5JLJQGk6VPG6Gg0aMVspkXJ6meQoQjoEr13oO UYE6QTeXoX06NwXqsO3H6KOhIipxJ6xxPi56BMsMgoPXKIY2/WAnafd1biwFQUMpsqXh AXo+IvzYdMNLLGw3csP1yE3ZIAmtypYjyAcXvC9lC4zy5FL/l9L30ZjPmAxP5EqsJL6F GkhzoMEBhwYoLxDdkUmgYgsZ9zf5D3PCRTrqgha9RAIeq1q4sI5p2mnsqUwPA+R22WLa VuC5/WEGRHmCYTxrNHdIVlFw5USpjmRSnsHWsKssCDS/T4K+7LXHH+FVhU9fLQl/+ixj lFNg== 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=eUtdsLUcYkexrjJDHiAgyOrg+2ZbKdBsSH1K0lnSCeI=; b=LOK52Yw7agtLsP7yF+cXnA00CMjxHYbdHUCYdETuEKoKsL9LK30670FYIzbEfDRBcU 2fnlBGJql719HmUBwvAQHlx8fF3EutRyHkMq4+r6/aLSXHYzWiCxHS+wa5fhQLL24IWS rlpeFrqjcyccYOQOJhuPpT+rjQ9+2RcO0mnQGWHCJPyg9UaReUw3SNpl6fwQ1Ct3gChZ LF9MP2vZqfflVU51AC3KqC0g1t840j1G8mJWeE2EE9tlXxyUUtBE6Dxx3u6nov3TtG1x uzVAKlZpzTf/jse3lOWGgzVoYLZ0gbBMuEzDxk0ui7+RtZS0J2ESyDgsKXlgXo5q4Fwn fLLw== X-Gm-Message-State: AHQUAubEDERYXOnGFGplhPSfV5Cc148Yvjo/A7TAzKPNuFAsnzMq0WpA TrNl/7mSUoYa7OXM3muqR3L70qD++4WO8bJzBCOzDoQXYRoOrlhfukBPLzKiyeGfUtgMqwsBy8L Andk0uS6GD7x86R3q0chzejIKgdwELkbUMDcqMZBiddQChL4uB78rnQ== X-Google-Smtp-Source: AHgI3IZdgtPfWMo9wFs6NjP+GxvtAuENoWLJ7RWZxD2pfdkiiwA8tbB2oRAy0bEi+arZ0APUiAmHoSU= X-Received: by 2002:ab0:c0d:: with SMTP id a13mr549511uak.19.1548696084104; Mon, 28 Jan 2019 09:21:24 -0800 (PST) Date: Mon, 28 Jan 2019 09:21:15 -0800 In-Reply-To: <20190128172119.12105-1-sdf@google.com> Message-Id: <20190128172119.12105-2-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 1/5] selftests/bpf: skip sockmap in test_maps if kernel doesn't have support 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_map_type() to skip test_sockmap() if map creation fails. The skipped test is indicated in the output. Example: test_sockmap SKIP (unsupported map type BPF_MAP_TYPE_SOCKMAP) Fork 1024 tasks to 'test_update_delete' ... test_sockmap SKIP (unsupported map type BPF_MAP_TYPE_SOCKMAP) Fork 1024 tasks to 'test_update_delete' ... test_maps: OK, 2 SKIPPED Signed-off-by: Stanislav Fomichev --- tools/testing/selftests/bpf/test_maps.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/bpf/test_maps.c b/tools/testing/selftests/bpf/test_maps.c index e2b9eee37187..e542c8e09073 100644 --- a/tools/testing/selftests/bpf/test_maps.c +++ b/tools/testing/selftests/bpf/test_maps.c @@ -32,6 +32,8 @@ #define ENOTSUPP 524 #endif +static int skips; + static int map_flags; #define CHECK(condition, tag, format...) ({ \ @@ -725,6 +727,15 @@ static void test_sockmap(int tasks, void *data) sizeof(key), sizeof(value), 6, 0); if (fd < 0) { + if (!bpf_probe_map_type(BPF_MAP_TYPE_SOCKMAP, 0)) { + printf("%s SKIP (unsupported map type BPF_MAP_TYPE_SOCKMAP)\n", + __func__); + skips++; + for (i = 0; i < 6; i++) + close(sfd[i]); + return; + } + printf("Failed to create sockmap %i\n", fd); goto out_sockmap; } @@ -1702,6 +1713,6 @@ int main(void) map_flags = BPF_F_NO_PREALLOC; run_all_tests(); - printf("test_maps: OK\n"); + printf("test_maps: OK, %d SKIPPED\n", skips); return 0; } -- 2.20.1.495.gaa96b0ce6b-goog