From patchwork Wed Mar 4 10:13:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenz Bauer X-Patchwork-Id: 11419739 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B970C14B4 for ; Wed, 4 Mar 2020 10:13:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9A7A12166E for ; Wed, 4 Mar 2020 10:13:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=cloudflare.com header.i=@cloudflare.com header.b="iPqLt7CU" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387921AbgCDKN6 (ORCPT ); Wed, 4 Mar 2020 05:13:58 -0500 Received: from mail-lf1-f66.google.com ([209.85.167.66]:42452 "EHLO mail-lf1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387912AbgCDKN6 (ORCPT ); Wed, 4 Mar 2020 05:13:58 -0500 Received: by mail-lf1-f66.google.com with SMTP id t21so1011762lfe.9 for ; Wed, 04 Mar 2020 02:13:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloudflare.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=olVifyTMleE2iedo0uCkocgafSknigkP2OP2Ek8xo9Y=; b=iPqLt7CUHivuNV8QujDV0W6QulaQWe6wT9uZYQ5ZKRMJDmO8MQGos3/IzH+Krr8TzL V1nEmvK5FFV62gRr6+sRztw3JaEsNXJHEpcLHkOLZPkC877v4r1Qx/J/EsqMr2kDeaIJ 7RQpEjKYkaijGth3oAl+LoIx5x2nAxyaiWqE0= 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:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=olVifyTMleE2iedo0uCkocgafSknigkP2OP2Ek8xo9Y=; b=JcglqhvzpzbDospXMDnR1dvzC6ZeYcYOmt7D4cz9FTlKGX7px7iGxxF6kUIGwzML7C Y3njX44bHL5s0Ay6fiXKCQwrO7yVQHHCDULiMwQLcZ+RPmdtj/DL5nvo+lrYd+e9cMur slaAHJW/hyr9mOZK4gPiqiKTMuaET2wAbsZn1+CnWXH3lewgnedh522bW72/QRzaC/Ua bz7eLQUqFkpqEf5sxCS8ZtQqbRaHqrnrIA+qMgJSdMBwVCP6GYrOVn2Ae5mPkJ/AdzVI PxkZaDX6jElZSfgUcM1zc8fWAkoBqUn6BRb44lBXwemc+8t5gn7/dZG70nKFRmOu0gyB C9jw== X-Gm-Message-State: ANhLgQ12JqbLBE7RqYvp7jQd51P5b3/RVDK11DQgmxlozmogqTd2zjEm VNtYABVQ6Ptni/m1cn5nzEEVMQ== X-Google-Smtp-Source: ADFU+vsuEdVRpVHa3R4OMO85FbKQo1R+1kABMKY1D8/UloF2u7KmlAOlqXrDgoY2Yx6iLysg/Te0XQ== X-Received: by 2002:ac2:5dd3:: with SMTP id x19mr940358lfq.168.1583316835115; Wed, 04 Mar 2020 02:13:55 -0800 (PST) Received: from localhost.localdomain ([176.221.114.230]) by smtp.gmail.com with ESMTPSA id l7sm341777lfk.65.2020.03.04.02.13.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Mar 2020 02:13:54 -0800 (PST) From: Lorenz Bauer To: john.fastabend@gmail.com, Shuah Khan , Alexei Starovoitov , Daniel Borkmann Cc: kernel-team@cloudflare.com, Lorenz Bauer , linux-kselftest@vger.kernel.org, netdev@vger.kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH bpf-next v3 11/12] selftests: bpf: enable UDP sockmap reuseport tests Date: Wed, 4 Mar 2020 11:13:16 +0100 Message-Id: <20200304101318.5225-12-lmb@cloudflare.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200304101318.5225-1-lmb@cloudflare.com> References: <20200304101318.5225-1-lmb@cloudflare.com> MIME-Version: 1.0 Sender: linux-kselftest-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org Remove the guard that disables UDP tests now that sockmap has support for them. Signed-off-by: Lorenz Bauer Reviewed-by: Jakub Sitnicki Acked-by: John Fastabend --- tools/testing/selftests/bpf/prog_tests/select_reuseport.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/select_reuseport.c b/tools/testing/selftests/bpf/prog_tests/select_reuseport.c index a1dd13b34d4b..821b4146b7b6 100644 --- a/tools/testing/selftests/bpf/prog_tests/select_reuseport.c +++ b/tools/testing/selftests/bpf/prog_tests/select_reuseport.c @@ -805,12 +805,6 @@ static void test_config(int sotype, sa_family_t family, bool inany) char s[MAX_TEST_NAME]; const struct test *t; - /* SOCKMAP/SOCKHASH don't support UDP yet */ - if (sotype == SOCK_DGRAM && - (inner_map_type == BPF_MAP_TYPE_SOCKMAP || - inner_map_type == BPF_MAP_TYPE_SOCKHASH)) - return; - for (t = tests; t < tests + ARRAY_SIZE(tests); t++) { if (t->need_sotype && t->need_sotype != sotype) continue; /* test not compatible with socket type */