From patchwork Mon Mar 16 03:26:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Po-Hsu Lin X-Patchwork-Id: 1255274 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48ghYv4mxyz9sPk; Mon, 16 Mar 2020 14:27:13 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1jDgPF-0007o8-Fb; Mon, 16 Mar 2020 03:27:09 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jDgP6-0007ip-FL for kernel-team@lists.ubuntu.com; Mon, 16 Mar 2020 03:27:00 +0000 Received: from mail-pf1-f198.google.com ([209.85.210.198]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jDgP6-0000Pv-1s for kernel-team@lists.ubuntu.com; Mon, 16 Mar 2020 03:27:00 +0000 Received: by mail-pf1-f198.google.com with SMTP id h125so11862878pfg.3 for ; Sun, 15 Mar 2020 20:26:59 -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:subject:date:message-id:in-reply-to :references; bh=L0NGbChHjZp7i0OBTnjScdXNf/zCYnWfXi/oumtpJdk=; b=REjo/ULWSraJgRuVOtt1A0ObllXCVZUKIdvk3VTNjdjjrVmXw8uD6T69C/gkSoAXTM VNu+P2cNYjkglBh97//fgZvhQvwJbJg/ddqGOPX88u3rLPvWHR4FuZpTZ/i5/nxfT3jz 1gtZuDio83+g8ElnSvkGxFwnUOjrKzZX9fqP1iXdzicDcuyWZYnFlhA3tJ1Z/uEDItVX FMBH7ChfMvOBbH5idFlb8t8rGmy8DrzmgcXumm9/qmPNEqm4uUxGNcLe7qwRuxe5bq67 4dQ1R7iMkGhS18JCtkHOTfjZjH6bavBGSefdk6vtMxcDWNwYLMKnKXmDyT12ZJHI9ihu 9dfg== X-Gm-Message-State: ANhLgQ1Ou2jWHOw9B1PnzUd9cdQ8d2qEXq+BgUugmqR6nj/ykrxvUOv5 bdB9f936BzCKD0nrp7C2cX2uZ5FfdblK8Jlu3gpAYWzpfZW9rS0bVCwkGnZiy8xL7zPHmrxjp2T YXybHywgtI6fWs93Oj5aQIChhpOu0LFJaQyezTLbj X-Received: by 2002:a17:90a:5d18:: with SMTP id s24mr22663030pji.141.1584329218283; Sun, 15 Mar 2020 20:26:58 -0700 (PDT) X-Google-Smtp-Source: ADFU+vtbneiG1DSWss6tHYsapLDsHe8+RfaiAbh/WvBX3ViRUhC3peC+QmvzmOXEBPC7QjR7WsFQrA== X-Received: by 2002:a17:90a:5d18:: with SMTP id s24mr22663001pji.141.1584329217871; Sun, 15 Mar 2020 20:26:57 -0700 (PDT) Received: from localhost.localdomain (61-228-164-57.dynamic-ip.hinet.net. [61.228.164.57]) by smtp.gmail.com with ESMTPSA id d3sm63906421pfn.113.2020.03.15.20.26.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Mar 2020 20:26:57 -0700 (PDT) From: Po-Hsu Lin To: kernel-team@lists.ubuntu.com Subject: [B][SRU][PATCH 1/1] selftests: net: reuseport_bpf_numa: don't fail if no numa support Date: Mon, 16 Mar 2020 11:26:50 +0800 Message-Id: <20200316032650.29141-2-po-hsu.lin@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200316032650.29141-1-po-hsu.lin@canonical.com> References: <20200316032650.29141-1-po-hsu.lin@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Anders Roxell BugLink: https://bugs.launchpad.net/bugs/1812638 The reuseport_bpf_numa test case fails there's no numa support. The test shouldn't fail if there's no support it should be skipped. Fixes: 3c2c3c16aaf6 ("reuseport, bpf: add test case for bpf_get_numa_node_id") Signed-off-by: Anders Roxell Signed-off-by: Daniel Borkmann (cherry picked from commit 1a2b80ecc7ad374e9ef6a3de6fdd032d94be2270) Signed-off-by: Po-Hsu Lin --- tools/testing/selftests/net/reuseport_bpf_numa.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/reuseport_bpf_numa.c b/tools/testing/selftests/net/reuseport_bpf_numa.c index 365c32e..c9f478b 100644 --- a/tools/testing/selftests/net/reuseport_bpf_numa.c +++ b/tools/testing/selftests/net/reuseport_bpf_numa.c @@ -23,6 +23,8 @@ #include #include +#include "../kselftest.h" + static const int PORT = 8888; static void build_rcv_group(int *rcv_fd, size_t len, int family, int proto) @@ -229,7 +231,7 @@ int main(void) int *rcv_fd, nodes; if (numa_available() < 0) - error(1, errno, "no numa api support"); + ksft_exit_skip("no numa api support\n"); nodes = numa_max_node() + 1;