From patchwork Fri Feb 28 11:53:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenz Bauer X-Patchwork-Id: 11412113 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 E14091395 for ; Fri, 28 Feb 2020 11:55:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C083A246AE for ; Fri, 28 Feb 2020 11:55:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=cloudflare.com header.i=@cloudflare.com header.b="lsd7u/wb" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725730AbgB1LzD (ORCPT ); Fri, 28 Feb 2020 06:55:03 -0500 Received: from mail-wr1-f67.google.com ([209.85.221.67]:38859 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726925AbgB1Lyt (ORCPT ); Fri, 28 Feb 2020 06:54:49 -0500 Received: by mail-wr1-f67.google.com with SMTP id e8so2642673wrm.5 for ; Fri, 28 Feb 2020 03:54:48 -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=lsd7u/wbZ+WEtU7Zu/blNg6YCQE6j6PcKMK7Ynz/VrYdm9MpeXcL47A6XPJZSubLI8 B72tsfM8iIGm2DikmdXwYByhjVNC7eaK7VTQmdfXwCVqaK4gJn8e0jfHBD0Jjp3mi6Hb pOR5x6Xgg2B22tFcttYzzEEMY9hb0e6CI7Vg4= 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=TsXY5qTA87TeyfICmF7VplEopOpt5SrvgsTBmcyFPahuFBhBsMbsYIRGxututQkP1U vrtl8RNXoj3o64WShaKqqpFGux+lZkHmg8+1hFS8fx3nnKYx4LQ7SoMkAEOx+awlhPwe qnj6cZBeXYUdUkS7wQ8iMp8lDdsKjMj292cW38Lcpw4HJwQ54xw8iFjcUa5ho3U+12eM 5Pi7xIATpX73PjL1TbktauJ17QLlIcqMqJE7OVHWhl/xuzlbFsZUXeY6AXK9Se3djRi3 YCsUvcNLGLK24baBgdAHk/0nJopoVAuNSenqjs0BbRzRAUKvfJDp/3rYT+qbBBzErfsQ KR3A== X-Gm-Message-State: APjAAAVIk4Hyqf6Sc/8Pbak1iqvaITDX6NS+F6p2LrJAnfkRNWNBRwnC 8fpxCc/+TQb9aYNNBRAhRtjQtA== X-Google-Smtp-Source: APXvYqxJOCIBurk6Jls7sZVmorMG3mSVBtjX2iT3L6h2322sJJpOuLtQdNYKQUfCqV/GYafskYxluA== X-Received: by 2002:adf:ebca:: with SMTP id v10mr4553098wrn.307.1582890887425; Fri, 28 Feb 2020 03:54:47 -0800 (PST) Received: from antares.lan (b.2.d.a.1.b.1.b.2.c.5.e.0.3.d.4.f.f.6.2.a.5.a.7.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:7a5a:26ff:4d30:e5c2:b1b1:ad2b]) by smtp.gmail.com with ESMTPSA id q125sm2044284wme.19.2020.02.28.03.54.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Feb 2020 03:54:46 -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 v2 8/9] selftests: bpf: enable UDP sockmap reuseport tests Date: Fri, 28 Feb 2020 11:53:43 +0000 Message-Id: <20200228115344.17742-9-lmb@cloudflare.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200228115344.17742-1-lmb@cloudflare.com> References: <20200228115344.17742-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 --- 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 */