Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp1259609pxb; Wed, 10 Feb 2021 04:19:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJwVfTgZlrU1nNp9Z6uLUK/kF+iOU101Ucwq5zkq+lve3tCT0ysYp5Yz6nOdpm91chroPh/G X-Received: by 2002:a17:906:6bc5:: with SMTP id t5mr2609440ejs.253.1612959548962; Wed, 10 Feb 2021 04:19:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612959548; cv=none; d=google.com; s=arc-20160816; b=RopkAB6BjBGgN+iO+4IeG26OoM7DJIFoYXVPMzs4WnD75Kac4n0mkFX3AfaE7LYo4r SxXVbMiqZjZ9fkN2BnsUHFacIhsWmKnW9lzR4jaLqjp1AN3FFsdiIpSOEGaDtfnbmYnG frPsFTDe14KKkossxFVJQHV/yJlkFXw9MyU401oU3j7EGLpIzaB1RPNLF6Keob9VOUz4 EsYMF+P3u4U798JKl+rprilkqofKYVS7Q3gKdPAG30yT0nokbbWOVt6xSXL63F/09oRc aHom87UgTDQ7abdtCfwUUn/SHYdMkcMwLQHT8bbt49HqSAe3uPMn50zBBXyS1S5LfElm XVRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ko2o/BbXoOQINYLWQy5SvIqF+PCLP66Gm4DbDrcbqNM=; b=S9tD/qG8bjn0WFwITG60MA9imiib9/bAT95eFmm8Mxfl7eOxC9RjEYJ+IcDn0iHlf0 2Q+XLQqVHiGdT5eeSVcoBRNoz+bgMRRVqJS2z7T+cZlvCZQXxy4bF0JFKUtVF6rQq2cS Ibkv9ziOhSkQk0bsnIbKOPfTJ1VFTK7OLhxR4etuLvHdocVV0e3S3Dii2hFDUM5sVpWS 5duL5GIGZkS8BA2Duq333BuXWAyjIVglDnJp4Jd3dtNnPTHUBNCu/X2M9bSy/G+31jv0 XLVL4R66bnhfz2KyzHyYvENTDTQwHgJumbvSEapcxsArPyL9unp/2KeDmrwkEp5OMk22 6k2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cloudflare.com header.s=google header.b=INbfSkQg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cloudflare.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d1si1320110edj.181.2021.02.10.04.18.45; Wed, 10 Feb 2021 04:19:08 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@cloudflare.com header.s=google header.b=INbfSkQg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cloudflare.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231892AbhBJMSL (ORCPT + 99 others); Wed, 10 Feb 2021 07:18:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40352 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229731AbhBJMNL (ORCPT ); Wed, 10 Feb 2021 07:13:11 -0500 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B0D70C061D73 for ; Wed, 10 Feb 2021 04:04:43 -0800 (PST) Received: by mail-wr1-x433.google.com with SMTP id h12so2202659wrw.6 for ; Wed, 10 Feb 2021 04:04:43 -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=ko2o/BbXoOQINYLWQy5SvIqF+PCLP66Gm4DbDrcbqNM=; b=INbfSkQg1MSBCfmNYdHCKyxLjYiYcwGcPh5Atqoum9f5NufD6C8b+vdGduKpIoe3K0 fmruz5F2fsNNtukmEbB+Zsx0Ywyswi5lPn1ecF7Q7zmfHWFUQoYD22Li6Yg6EUxhTvzj S3alZrS2RzHl+pogD/2sqMwxUbnPhRdizvm+8= 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=ko2o/BbXoOQINYLWQy5SvIqF+PCLP66Gm4DbDrcbqNM=; b=WhrRb3GpGM6x0AUEfSWpVOSQWT7f3KR3zUz2rKRIU5nphf4o2tXu+qCehYXUuELd6X 21D4o0/a1k1f4xpaFXqFBLlRNqp+cgl5Gmnya9XMRjgSwmFk9lLebGcgb7I53tp698iY i6mC8lQB7L+WSQy86ELJ2CgHGaIAweBUIptCAGYcYtj6j3Ic4NmG6Pc0O/gnrlvIOn5t Q/z8O5dwJfzXQL39cA8vfYgkSrZhImM0ET5dIy3j5afzT28z0Geoi0fPilTaY+sNvo9c EuR9HGVwzSbwsaEscFhxZhwI3CnnZwbxVskqj/ZEDSAZlnEMOlcV8G6/q/2lO3RwFMak 7C7g== X-Gm-Message-State: AOAM5311PWIw7TVYnjyYJk69plA3KBFw1/1hEcOsO6ejaqdn1l/n3t+C HbVM4hvTRqGk09P9iniPEyBLxw== X-Received: by 2002:a05:6000:1189:: with SMTP id g9mr3287526wrx.230.1612958682501; Wed, 10 Feb 2021 04:04:42 -0800 (PST) Received: from antares.lan (c.3.c.9.d.d.c.e.0.a.6.8.a.9.e.c.f.f.6.2.a.5.a.7.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:7a5a:26ff:ce9a:86a0:ecdd:9c3c]) by smtp.gmail.com with ESMTPSA id j7sm2837854wrp.72.2021.02.10.04.04.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Feb 2021 04:04:42 -0800 (PST) From: Lorenz Bauer To: "David S. Miller" , Jakub Kicinski , Shuah Khan , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko Cc: kernel-team@cloudflare.com, Lorenz Bauer , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, bpf@vger.kernel.org Subject: [PATCH bpf 4/4] tools/testing: add a selftest for SO_NETNS_COOKIE Date: Wed, 10 Feb 2021 12:04:25 +0000 Message-Id: <20210210120425.53438-5-lmb@cloudflare.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210210120425.53438-1-lmb@cloudflare.com> References: <20210210120425.53438-1-lmb@cloudflare.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Make sure that SO_NETNS_COOKIE returns a non-zero value, and that sockets from different namespaces have a distinct cookie value. Signed-off-by: Lorenz Bauer --- tools/testing/selftests/net/.gitignore | 1 + tools/testing/selftests/net/Makefile | 2 +- tools/testing/selftests/net/so_netns_cookie.c | 61 +++++++++++++++++++ 3 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/net/so_netns_cookie.c diff --git a/tools/testing/selftests/net/.gitignore b/tools/testing/selftests/net/.gitignore index 61ae899cfc17..19deb9cdf72f 100644 --- a/tools/testing/selftests/net/.gitignore +++ b/tools/testing/selftests/net/.gitignore @@ -30,3 +30,4 @@ hwtstamp_config rxtimestamp timestamping txtimestamp +so_netns_cookie diff --git a/tools/testing/selftests/net/Makefile b/tools/testing/selftests/net/Makefile index fa5fa425d148..a0f45a71a8f1 100644 --- a/tools/testing/selftests/net/Makefile +++ b/tools/testing/selftests/net/Makefile @@ -27,7 +27,7 @@ TEST_GEN_FILES = socket nettest TEST_GEN_FILES += psock_fanout psock_tpacket msg_zerocopy reuseport_addr_any TEST_GEN_FILES += tcp_mmap tcp_inq psock_snd txring_overwrite TEST_GEN_FILES += udpgso udpgso_bench_tx udpgso_bench_rx ip_defrag -TEST_GEN_FILES += so_txtime ipv6_flowlabel ipv6_flowlabel_mgr +TEST_GEN_FILES += so_txtime ipv6_flowlabel ipv6_flowlabel_mgr so_netns_cookie TEST_GEN_FILES += tcp_fastopen_backup_key TEST_GEN_FILES += fin_ack_lat TEST_GEN_FILES += reuseaddr_ports_exhausted diff --git a/tools/testing/selftests/net/so_netns_cookie.c b/tools/testing/selftests/net/so_netns_cookie.c new file mode 100644 index 000000000000..b39e87e967cd --- /dev/null +++ b/tools/testing/selftests/net/so_netns_cookie.c @@ -0,0 +1,61 @@ +// SPDX-License-Identifier: GPL-2.0 +#define _GNU_SOURCE +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifndef SO_NETNS_COOKIE +#define SO_NETNS_COOKIE 71 +#endif + +#define pr_err(fmt, ...) \ + ({ \ + fprintf(stderr, "%s:%d:" fmt ": %m\n", \ + __func__, __LINE__, ##__VA_ARGS__); \ + 1; \ + }) + +int main(int argc, char *argvp[]) +{ + uint64_t cookie1, cookie2; + socklen_t vallen; + int sock1, sock2; + + sock1 = socket(AF_INET, SOCK_STREAM, 0); + if (sock1 < 0) + return pr_err("Unable to create TCP socket"); + + vallen = sizeof(cookie1); + if (getsockopt(sock1, SOL_SOCKET, SO_NETNS_COOKIE, &cookie1, &vallen) != 0) + return pr_err("getsockopt(SOL_SOCKET, SO_NETNS_COOKIE)"); + + if (!cookie1) + return pr_err("SO_NETNS_COOKIE returned zero cookie"); + + if (unshare(CLONE_NEWNET)) + return pr_err("unshare"); + + sock2 = socket(AF_INET, SOCK_STREAM, 0); + if (sock2 < 0) + return pr_err("Unable to create TCP socket"); + + vallen = sizeof(cookie2); + if (getsockopt(sock2, SOL_SOCKET, SO_NETNS_COOKIE, &cookie2, &vallen) != 0) + return pr_err("getsockopt(SOL_SOCKET, SO_NETNS_COOKIE)"); + + if (!cookie2) + return pr_err("SO_NETNS_COOKIE returned zero cookie"); + + if (cookie1 == cookie2) + return pr_err("SO_NETNS_COOKIE returned identical cookies for distinct ns"); + + close(sock1); + close(sock2); + return 0; +} -- 2.27.0