From patchwork Thu Feb 20 07:10:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Forrest Chen X-Patchwork-Id: 1241277 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: incoming-bpf@patchwork.ozlabs.org Delivered-To: patchwork-incoming-bpf@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=bpf-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=Q0yrzo/h; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48NQkR2qr9z9sRN for ; Thu, 20 Feb 2020 18:11:43 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726379AbgBTHLm (ORCPT ); Thu, 20 Feb 2020 02:11:42 -0500 Received: from mail-pf1-f196.google.com ([209.85.210.196]:39927 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725942AbgBTHLm (ORCPT ); Thu, 20 Feb 2020 02:11:42 -0500 Received: by mail-pf1-f196.google.com with SMTP id 84so1454190pfy.6; Wed, 19 Feb 2020 23:11:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wjulShMOO0gDrLH+lKcbEkeCD+HRPpuA+2aEjQjkYOY=; b=Q0yrzo/hmN5bLMcb0f0D9QqLvDPQ5aNllIqvyp9ngR44aOWGMejlrqsQI23nKt/Ekr hQ3ijWgYjYYF4gE/Vgs+BbRmSqvI0X3m6ipJm8z1SBybClNyEqyE2M8V8994lNx3A5PA GBLnbbG2DWFkfm/1ZSSo79ETBi57uDiNHdltKEqJDT0l4H1skJLyZzpd6TBRpt2J4BhB sin+3LCQahRNs3G1BDy8DpUMgNemBMYCiQ1L0CSlHp9g1ywd9HYGf2t+lULaHP9O/POg 960zSXHppcQ7QMFDzNE3ihQLsin+POoAx77bGlx4u6TerM9s6Wllx+ENlPdrEPi9WQNW UmyQ== 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=wjulShMOO0gDrLH+lKcbEkeCD+HRPpuA+2aEjQjkYOY=; b=XvzT2YMBL+5oaJMQD9CNEeaQjvrOAuAR1XIJgTwaN8V0Hfij8NjQ6dCZsP6DRLk3VS liHdRwAXR0jI9kku0GHkC2+JSN49+TZclYndRHZkPa4vsZbJ8Hlscr4G5VigPSXkxd/i 1plwr0L6YxGZwEMibopPpcoAZhe4JDo1vxkfwinpR4jXXiyujFSESwc6fOHbI3Ha1FY7 BRobwtgM09Q+26gbA87RMi23eEGcCsy6RwjOSVsOZG2AGTuNikLGx+f/fNuFyampu7Om PBoeetSyU88jy4VrWS6WBErSgO2yBiQeREmM1QAjt3w2n8hwq4dZkF3Sq741gpaEZ5A0 9qig== X-Gm-Message-State: APjAAAUoZXtWz/RHJcN8fMRfyxomjBLAAYCp4fZsHNvbhKAWPQEbn7Hq 4F7MjvgdObtuGApsCwKwnszSmx1q4Nw= X-Google-Smtp-Source: APXvYqx8/ljD6//aC/PUGORJkuM7Yn99q+no7TA7jcB126kqCj0XiR3gNuXoxHCC1hS3SxfD1iYP2A== X-Received: by 2002:a62:ac03:: with SMTP id v3mr30486191pfe.17.1582182701754; Wed, 19 Feb 2020 23:11:41 -0800 (PST) Received: from kernel.rdqbwbcbjylexclmhxlbqg5jve.hx.internal.cloudapp.net ([65.52.171.215]) by smtp.gmail.com with ESMTPSA id p4sm2148325pgh.14.2020.02.19.23.11.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Feb 2020 23:11:41 -0800 (PST) From: Lingpeng Chen To: bpf Cc: Alexei Starovoitov , Daniel Borkmann , John Fastabend , "David S . Miller" , netdev@vger.kernel.org, Petar Penkov , Lingpeng Chen Subject: [PATCH v3 bpf-next 1/3] bpf: Add get_netns_id helper function for sock_ops Date: Thu, 20 Feb 2020 07:10:52 +0000 Message-Id: <20200220071054.12499-2-forrest0579@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200220071054.12499-1-forrest0579@gmail.com> References: <07e2568e-0256-29f5-1656-1ac80a69f229@iogearbox.net> <20200220071054.12499-1-forrest0579@gmail.com> MIME-Version: 1.0 Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org Currently 5-tuple(sip+dip+sport+dport+proto) can't identify a uniq connection because there may be multi net namespace. For example, there may be a chance that netns a and netns b all listen on 127.0.0.1:8080 and the client with same port 40782 connect to them. Without netns number, sock ops program can't distinguish them. Using bpf_get_netns_id helper to get current connection netns id to distinguish connections. Signed-off-by: Lingpeng Chen --- include/uapi/linux/bpf.h | 9 ++++++++- net/core/filter.c | 20 ++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h index f1d74a2bd234..e79082f78b74 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@ -2892,6 +2892,12 @@ union bpf_attr { * Obtain the 64bit jiffies * Return * The 64 bit jiffies + * + * u64 bpf_get_netns_id(struct bpf_sock_ops *bpf_socket) + * Description + * Obtain netns id of sock + * Return + * The current netns inum */ #define __BPF_FUNC_MAPPER(FN) \ FN(unspec), \ @@ -3012,7 +3018,8 @@ union bpf_attr { FN(probe_read_kernel_str), \ FN(tcp_send_ack), \ FN(send_signal_thread), \ - FN(jiffies64), + FN(jiffies64), \ + FN(get_netns_id), /* integer value in 'imm' field of BPF_CALL instruction selects which helper * function eBPF program intends to call diff --git a/net/core/filter.c b/net/core/filter.c index c180871e606d..5302ec9f7c0d 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -4421,6 +4421,24 @@ static const struct bpf_func_proto bpf_sock_ops_cb_flags_set_proto = { .arg2_type = ARG_ANYTHING, }; +BPF_CALL_1(bpf_get_netns_id_sock_ops, struct bpf_sock_ops_kern *, bpf_sock) +{ +#ifdef CONFIG_NET_NS + struct sock *sk = bpf_sock->sk; + + return (u64)sk->sk_net.net->ns.inum; +#else + return 0; +#endif +} + +static const struct bpf_func_proto bpf_get_netns_id_sock_ops_proto = { + .func = bpf_get_netns_id_sock_ops, + .gpl_only = false, + .ret_type = RET_INTEGER, + .arg1_type = ARG_PTR_TO_CTX, +}; + const struct ipv6_bpf_stub *ipv6_bpf_stub __read_mostly; EXPORT_SYMBOL_GPL(ipv6_bpf_stub); @@ -6218,6 +6236,8 @@ sock_ops_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog) case BPF_FUNC_tcp_sock: return &bpf_tcp_sock_proto; #endif /* CONFIG_INET */ + case BPF_FUNC_get_netns_id: + return &bpf_get_netns_id_sock_ops_proto; default: return bpf_base_func_proto(func_id); } From patchwork Thu Feb 20 07:10:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Forrest Chen X-Patchwork-Id: 1241279 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: incoming-bpf@patchwork.ozlabs.org Delivered-To: patchwork-incoming-bpf@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=bpf-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=dHAupF++; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48NQkZ1NQtz9sRN for ; Thu, 20 Feb 2020 18:11:50 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726756AbgBTHLt (ORCPT ); Thu, 20 Feb 2020 02:11:49 -0500 Received: from mail-pl1-f195.google.com ([209.85.214.195]:39072 "EHLO mail-pl1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725942AbgBTHLt (ORCPT ); Thu, 20 Feb 2020 02:11:49 -0500 Received: by mail-pl1-f195.google.com with SMTP id g6so1184080plp.6; Wed, 19 Feb 2020 23:11:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jflsua1e1ee8c4j1MYBaabhNN/9jv7GwX7hINElKrCY=; b=dHAupF++tw8cYwpgmGg7HuSumt0vP7gRhIo922LaDoo/oj4jSQKVk+IeV+D1QLAUqR Ib3qmzOgVETyUCAu1XZLq5l3Pn4p20OmqXJmKkU1ee/IyhNwAhFZzCM0bx39mDyQCgiH EzYMBSQyEf3Eny6mDvOM9LtvnfaBJ4ixPCHHToLGLJLowfBaorGYE/JoxKS62ARk2g9X FbfXLly6FYy2knWG5CuGtv8WpTcjWH86IbH0OyQ+9feohmaN39jgA3E2diUdtpvA29AU Fm+c1qDdDFmDnCTnHOpKFOfkgIY7xeVRdKbeM9YigzplVyGtv/D38yq7D869ecT6ey4D 1jpQ== 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=jflsua1e1ee8c4j1MYBaabhNN/9jv7GwX7hINElKrCY=; b=i9vuTQ3p3n3LIHnf5PKSN1hMSl8j30zaSB1xmQ0J0ZwNIn0qU5wrtv5WTSET5w5zhe Hg075U74pUc0wl08BSew1q+GI4JrswmqpyiltDVMHarDy4P/GlUZp6dl1P/ILQtxhyUk RujeOZEj4Z4seQjVXUkFTWps2zaCqQaDbAEtof48o5TshB8jEAQUM9QuWq3ZlY947fr6 eS4KVyunfoQZruXxlt881UX737+ySadpn0jUrEWQDx5TgtiqVhypiz8KSMajdYqMK2uG UmwO/9noYVchKL0LCYNKeTH7WUY+oOcv1zuy7AqbIIjtulU0lew9yZQ+LWpyiRaqHTKh /rqA== X-Gm-Message-State: APjAAAUVHXsm1GWv4PMt8AnIhDDkwRkqlkp5ppZ+D2XpYj7FH+amtgYX 80ep/dZcTCwQ2jt2jgNun+CKGriIZKU= X-Google-Smtp-Source: APXvYqw8/rX4YtdSqpt0g+QMr58bHWAfz+EEQV/u4dQqzCOSjzl5JP1JeDQgS6aarojorrflj4DxVw== X-Received: by 2002:a17:90b:3cc:: with SMTP id go12mr1916022pjb.89.1582182708796; Wed, 19 Feb 2020 23:11:48 -0800 (PST) Received: from kernel.rdqbwbcbjylexclmhxlbqg5jve.hx.internal.cloudapp.net ([65.52.171.215]) by smtp.gmail.com with ESMTPSA id p4sm2148325pgh.14.2020.02.19.23.11.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Feb 2020 23:11:48 -0800 (PST) From: Lingpeng Chen To: bpf Cc: Alexei Starovoitov , Daniel Borkmann , John Fastabend , "David S . Miller" , netdev@vger.kernel.org, Petar Penkov , Lingpeng Chen Subject: [PATCH v3 bpf-next 2/3] bpf: Sync uapi bpf.h to tools/ Date: Thu, 20 Feb 2020 07:10:53 +0000 Message-Id: <20200220071054.12499-3-forrest0579@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200220071054.12499-1-forrest0579@gmail.com> References: <07e2568e-0256-29f5-1656-1ac80a69f229@iogearbox.net> <20200220071054.12499-1-forrest0579@gmail.com> MIME-Version: 1.0 Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org This patch sync uapi bpf.h to tools/. Signed-off-by: Lingpeng Chen Acked-by: Song Liu --- tools/include/uapi/linux/bpf.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h index f1d74a2bd234..e79082f78b74 100644 --- a/tools/include/uapi/linux/bpf.h +++ b/tools/include/uapi/linux/bpf.h @@ -2892,6 +2892,12 @@ union bpf_attr { * Obtain the 64bit jiffies * Return * The 64 bit jiffies + * + * u64 bpf_get_netns_id(struct bpf_sock_ops *bpf_socket) + * Description + * Obtain netns id of sock + * Return + * The current netns inum */ #define __BPF_FUNC_MAPPER(FN) \ FN(unspec), \ @@ -3012,7 +3018,8 @@ union bpf_attr { FN(probe_read_kernel_str), \ FN(tcp_send_ack), \ FN(send_signal_thread), \ - FN(jiffies64), + FN(jiffies64), \ + FN(get_netns_id), /* integer value in 'imm' field of BPF_CALL instruction selects which helper * function eBPF program intends to call From patchwork Thu Feb 20 07:10:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Forrest Chen X-Patchwork-Id: 1241282 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=O6vXk2/U; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48NQkp68lZz9sRN for ; Thu, 20 Feb 2020 18:12:02 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726803AbgBTHMC (ORCPT ); Thu, 20 Feb 2020 02:12:02 -0500 Received: from mail-pf1-f196.google.com ([209.85.210.196]:36297 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725942AbgBTHMB (ORCPT ); Thu, 20 Feb 2020 02:12:01 -0500 Received: by mail-pf1-f196.google.com with SMTP id 185so1462319pfv.3; Wed, 19 Feb 2020 23:12:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dqVrh2Kk9feIWA6ZWXVLUQnsuwnyrHDZQbWtZXKQmmQ=; b=O6vXk2/UVkR/osi6fv6tEGO46n00EMpHwdQSzwGN8ducWn7350WOqTmVdjQY3pv9yr xika+UdIsSGOmQzolMa3sVcMcyQ7dlBlJlRy7N9CMyohSGE8YxR6lrw5gmXZynKmVlyz sakDaIup0hRbgIodvfNWxFKarqWCuu4sdC/a9vi9o+yWbsgdSlUi4KF/0dre47b6rpM5 IuqWImhTkyang94KXq1Vz5LItOrtt8Uj0c323askH9p9CaZpBHAYF9F8gS83ovhbGwn/ QnO8EZEQ1viY+J9A2EnCnRj4feTnQPrNkcBcjW/SJhqdA+vJM2jhNlj5oPQmszPK5Cc3 C1QQ== 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=dqVrh2Kk9feIWA6ZWXVLUQnsuwnyrHDZQbWtZXKQmmQ=; b=TthEHUtutRDKNNzLfm/izWcuxFfwkY335uC9P7xhE+IyTXOYxG1UYfcP9Ghf61fDf6 3WmS0JsqmGoXpOrB94XTnsWOPQ33V7J0M4nERxoP3saFEEk+07LPk35ggicIBOCxdwt5 9kHLsp5GP0lW+jGz51HfyukuUjneleK+8VD/gfDN9xuzzocg0Na18AeavqITLXY82YBU h5a3tww9ZaAcC4Lb8D8MSxRSnZ6Eh68UJw2AOJPemcT6b3+jDftnyd2uFVDgHlRkaGjY 14NzPOoKOvxnSnyUH45SwMu/d6JAf7IBb/fxt5ju5k3ynaB2sCk8Dt+svAr+PGLC5DJZ oaBQ== X-Gm-Message-State: APjAAAV1oankBULvFqy86bcyWo7OKr01pr3dc41cc/gWvPpmvaiLMher rR+J8sE97m3P1fjIOgk3BVsBITICgNo= X-Google-Smtp-Source: APXvYqy9Aa9QSR1RhWaKUFkajo8filr6XU2mR2UtzQZVK6rvj8GllrR1rEjnnBS2egXi2TWb8oAk5A== X-Received: by 2002:a63:5848:: with SMTP id i8mr31037928pgm.438.1582182720949; Wed, 19 Feb 2020 23:12:00 -0800 (PST) Received: from kernel.rdqbwbcbjylexclmhxlbqg5jve.hx.internal.cloudapp.net ([65.52.171.215]) by smtp.gmail.com with ESMTPSA id p4sm2148325pgh.14.2020.02.19.23.11.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Feb 2020 23:12:00 -0800 (PST) From: Lingpeng Chen To: bpf Cc: Alexei Starovoitov , Daniel Borkmann , John Fastabend , "David S . Miller" , netdev@vger.kernel.org, Petar Penkov , Lingpeng Chen Subject: [PATCH v3 bpf-next 3/3] selftests/bpf: add selftest for get_netns_id helper Date: Thu, 20 Feb 2020 07:10:54 +0000 Message-Id: <20200220071054.12499-4-forrest0579@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200220071054.12499-1-forrest0579@gmail.com> References: <07e2568e-0256-29f5-1656-1ac80a69f229@iogearbox.net> <20200220071054.12499-1-forrest0579@gmail.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org adding selftest for new bpf helper function get_netns_id Signed-off-by: Lingpeng Chen Acked-by: Song Liu --- .../selftests/bpf/progs/test_tcpbpf_kern.c | 11 +++++ .../testing/selftests/bpf/test_tcpbpf_user.c | 46 ++++++++++++++++++- 2 files changed, 56 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/bpf/progs/test_tcpbpf_kern.c b/tools/testing/selftests/bpf/progs/test_tcpbpf_kern.c index 1f1966e86e9f..d7d851ddd2cc 100644 --- a/tools/testing/selftests/bpf/progs/test_tcpbpf_kern.c +++ b/tools/testing/selftests/bpf/progs/test_tcpbpf_kern.c @@ -28,6 +28,13 @@ struct { __type(value, int); } sockopt_results SEC(".maps"); +struct { + __uint(type, BPF_MAP_TYPE_ARRAY); + __uint(max_entries, 1); + __type(key, __u32); + __type(value, __u64); +} netns_number SEC(".maps"); + static inline void update_event_map(int event) { __u32 key = 0; @@ -61,6 +68,7 @@ int bpf_testcb(struct bpf_sock_ops *skops) int rv = -1; int v = 0; int op; + __u64 netns_id; op = (int) skops->op; @@ -144,6 +152,9 @@ int bpf_testcb(struct bpf_sock_ops *skops) __u32 key = 0; bpf_map_update_elem(&sockopt_results, &key, &v, BPF_ANY); + + netns_id = bpf_get_netns_id(skops); + bpf_map_update_elem(&netns_number, &key, &netns_id, BPF_ANY); break; default: rv = -1; diff --git a/tools/testing/selftests/bpf/test_tcpbpf_user.c b/tools/testing/selftests/bpf/test_tcpbpf_user.c index 3ae127620463..fef2f4d77ecc 100644 --- a/tools/testing/selftests/bpf/test_tcpbpf_user.c +++ b/tools/testing/selftests/bpf/test_tcpbpf_user.c @@ -76,6 +76,41 @@ int verify_sockopt_result(int sock_map_fd) return ret; } +int verify_netns(__u64 netns_id) +{ + char buf1[40]; + char buf2[40]; + int ret = 0; + ssize_t len = 0; + + len = readlink("/proc/self/ns/net", buf1, 39); + sprintf(buf2, "net:[%llu]", netns_id); + + if (len <= 0) { + printf("FAILED: readlink /proc/self/ns/net"); + return ret; + } + + if (strncmp(buf1, buf2, len)) { + printf("FAILED: netns don't match"); + ret = 1; + } + return ret; +} + +int verify_netns_result(int netns_map_fd) +{ + __u32 key = 0; + __u64 res = 0; + int ret = 0; + int rv; + + rv = bpf_map_lookup_elem(netns_map_fd, &key, &res); + EXPECT_EQ(0, rv, "d"); + + return verify_netns(res); +} + static int bpf_find_map(const char *test, struct bpf_object *obj, const char *name) { @@ -92,7 +127,7 @@ static int bpf_find_map(const char *test, struct bpf_object *obj, int main(int argc, char **argv) { const char *file = "test_tcpbpf_kern.o"; - int prog_fd, map_fd, sock_map_fd; + int prog_fd, map_fd, sock_map_fd, netns_map_fd; struct tcpbpf_globals g = {0}; const char *cg_path = "/foo"; int error = EXIT_FAILURE; @@ -137,6 +172,10 @@ int main(int argc, char **argv) if (sock_map_fd < 0) goto err; + netns_map_fd = bpf_find_map(__func__, obj, "netns_number"); + if (netns_map_fd < 0) + goto err; + retry_lookup: rv = bpf_map_lookup_elem(map_fd, &key, &g); if (rv != 0) { @@ -161,6 +200,11 @@ int main(int argc, char **argv) goto err; } + if (verify_netns_result(netns_map_fd)) { + printf("FAILED: Wrong netns stats\n"); + goto err; + } + printf("PASSED!\n"); error = 0; err: