From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E3AF2C4338F for ; Fri, 30 Jul 2021 23:03:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BB09260F3A for ; Fri, 30 Jul 2021 23:03:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232934AbhG3XDq (ORCPT ); Fri, 30 Jul 2021 19:03:46 -0400 Received: from smtp-fw-80007.amazon.com ([99.78.197.218]:8018 "EHLO smtp-fw-80007.amazon.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231189AbhG3XDp (ORCPT ); Fri, 30 Jul 2021 19:03:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.co.jp; i=@amazon.co.jp; q=dns/txt; s=amazon201209; t=1627686221; x=1659222221; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=fJ2q5BbiMM2LLNqg0ouOB11wn1yR/PXdIJv7+Hx0Se4=; b=T+YjTghGSFF8zz9klw69mn1e6lHX7thOHVlY5VaEq+FTAqSSUumigWsi LdTEPMcLFlalvNXoWJovXHy+qxj3OrHSbWXJ8MFO9+6NS6bDuF6W8ZcSG B/tBGJlqBoYUS9JmWowL/PeFJk/JMTJCoIl8wJiI77XBZDU+Dw4d4QJse Q=; X-IronPort-AV: E=Sophos;i="5.84,283,1620691200"; d="scan'208";a="16081931" Received: from pdx4-co-svc-p1-lb2-vlan2.amazon.com (HELO email-inbound-relay-1e-a70de69e.us-east-1.amazon.com) ([10.25.36.210]) by smtp-border-fw-80007.pdx80.corp.amazon.com with ESMTP; 30 Jul 2021 23:03:40 +0000 Received: from EX13MTAUWB001.ant.amazon.com (iad55-ws-svc-p15-lb9-vlan3.iad.amazon.com [10.40.159.166]) by email-inbound-relay-1e-a70de69e.us-east-1.amazon.com (Postfix) with ESMTPS id DDEC4A1C86; Fri, 30 Jul 2021 23:03:37 +0000 (UTC) Received: from EX13D04ANC001.ant.amazon.com (10.43.157.89) by EX13MTAUWB001.ant.amazon.com (10.43.161.207) with Microsoft SMTP Server (TLS) id 15.0.1497.23; Fri, 30 Jul 2021 23:03:37 +0000 Received: from 88665a182662.ant.amazon.com (10.43.162.216) by EX13D04ANC001.ant.amazon.com (10.43.157.89) with Microsoft SMTP Server (TLS) id 15.0.1497.23; Fri, 30 Jul 2021 23:03:31 +0000 From: Kuniyuki Iwashima To: CC: , , , , , , , , , , , , , , Subject: Re: [PATCH bpf-next 2/2] selftest/bpf: Implement sample UNIX domain socket iterator program. Date: Sat, 31 Jul 2021 08:03:28 +0900 Message-ID: <20210730230328.23108-1-kuniyu@amazon.co.jp> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.43.162.216] X-ClientProxiedBy: EX13D19UWA004.ant.amazon.com (10.43.160.102) To EX13D04ANC001.ant.amazon.com (10.43.157.89) Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org From: Andrii Nakryiko Date: Fri, 30 Jul 2021 12:34:43 -0700 > On Thu, Jul 29, 2021 at 4:37 PM Kuniyuki Iwashima wrote: > > > > If there are no abstract sockets, this prog can output the same result > > compared to /proc/net/unix. > > > > # cat /sys/fs/bpf/unix | head -n 2 > > Num RefCount Protocol Flags Type St Inode Path > > ffff9ab7122db000: 00000002 00000000 00010000 0001 01 10623 private/defer > > > > # cat /proc/net/unix | head -n 2 > > Num RefCount Protocol Flags Type St Inode Path > > ffff9ab7122db000: 00000002 00000000 00010000 0001 01 10623 private/defer > > > > Signed-off-by: Kuniyuki Iwashima > > --- > > .../selftests/bpf/prog_tests/bpf_iter.c | 17 +++++ > > .../selftests/bpf/progs/bpf_iter_unix.c | 75 +++++++++++++++++++ > > 2 files changed, 92 insertions(+) > > create mode 100644 tools/testing/selftests/bpf/progs/bpf_iter_unix.c > > > > diff --git a/tools/testing/selftests/bpf/prog_tests/bpf_iter.c b/tools/testing/selftests/bpf/prog_tests/bpf_iter.c > > index 1f1aade56504..4746bac68d36 100644 > > --- a/tools/testing/selftests/bpf/prog_tests/bpf_iter.c > > +++ b/tools/testing/selftests/bpf/prog_tests/bpf_iter.c > > @@ -13,6 +13,7 @@ > > #include "bpf_iter_tcp6.skel.h" > > #include "bpf_iter_udp4.skel.h" > > #include "bpf_iter_udp6.skel.h" > > +#include "bpf_iter_unix.skel.h" > > #include "bpf_iter_test_kern1.skel.h" > > #include "bpf_iter_test_kern2.skel.h" > > #include "bpf_iter_test_kern3.skel.h" > > @@ -313,6 +314,20 @@ static void test_udp6(void) > > bpf_iter_udp6__destroy(skel); > > } > > > > +static void test_unix(void) > > +{ > > + struct bpf_iter_unix *skel; > > + > > + skel = bpf_iter_unix__open_and_load(); > > + if (CHECK(!skel, "bpf_iter_unix__open_and_load", > > please use new ASSERT_PTR_OK() macro instead I'll use ASSERT_PTR_OK(). > > > + "skeleton open_and_load failed\n")) > > + return; > > + > > + do_dummy_read(skel->progs.dump_unix); > > + > > + bpf_iter_unix__destroy(skel); > > +} > > + > > /* The expected string is less than 16 bytes */ > > static int do_read_with_fd(int iter_fd, const char *expected, > > bool read_one_char) > > @@ -1255,6 +1270,8 @@ void test_bpf_iter(void) > > test_udp4(); > > if (test__start_subtest("udp6")) > > test_udp6(); > > + if (test__start_subtest("unix")) > > + test_unix(); > > if (test__start_subtest("anon")) > > test_anon_iter(false); > > if (test__start_subtest("anon-read-one-char")) > > diff --git a/tools/testing/selftests/bpf/progs/bpf_iter_unix.c b/tools/testing/selftests/bpf/progs/bpf_iter_unix.c > > new file mode 100644 > > index 000000000000..285ec2f7944d > > --- /dev/null > > +++ b/tools/testing/selftests/bpf/progs/bpf_iter_unix.c > > @@ -0,0 +1,75 @@ > > +// SPDX-License-Identifier: GPL-2.0 > > +/* Copyright Amazon.com Inc. or its affiliates. */ > > +#include "bpf_iter.h" > > +#include "bpf_tracing_net.h" > > +#include > > +#include > > + > > +char _license[] SEC("license") = "GPL"; > > + > > +#define __SO_ACCEPTCON (1 << 16) > > +#define UNIX_HASH_SIZE 256 > > +#define UNIX_ABSTRACT(unix_sk) (unix_sk->addr->hash < UNIX_HASH_SIZE) > > + > > +static long sock_i_ino(const struct sock *sk) > > +{ > > + const struct socket *sk_socket = sk->sk_socket; > > + const struct inode *inode; > > + unsigned long ino; > > + > > + if (!sk_socket) > > + return 0; > > + > > + inode = &container_of(sk_socket, struct socket_alloc, socket)->vfs_inode; > > + bpf_probe_read_kernel(&ino, sizeof(ino), &inode->i_ino); > > + return ino; > > +} > > + > > +SEC("iter/unix") > > +int dump_unix(struct bpf_iter__unix *ctx) > > +{ > > + struct unix_sock *unix_sk = ctx->unix_sk; > > + struct sock *sk = (struct sock *)unix_sk; > > + struct seq_file *seq; > > + __u32 seq_num; > > + > > + if (!unix_sk) > > + return 0; > > + > > + seq = ctx->meta->seq; > > + seq_num = ctx->meta->seq_num; > > + if (seq_num == 0) > > + BPF_SEQ_PRINTF(seq, "Num RefCount Protocol Flags " > > + "Type St Inode Path\n"); > > + > > + BPF_SEQ_PRINTF(seq, "%pK: %08X %08X %08X %04X %02X %5lu", > > + unix_sk, > > + sk->sk_refcnt.refs.counter, > > + 0, > > + sk->sk_state == TCP_LISTEN ? __SO_ACCEPTCON : 0, > > + sk->sk_type, > > + sk->sk_socket ? > > + (sk->sk_state == TCP_ESTABLISHED ? > > + SS_CONNECTED : SS_UNCONNECTED) : > > + (sk->sk_state == TCP_ESTABLISHED ? > > + SS_CONNECTING : SS_DISCONNECTING), > > nit: I'd keep these ternary operators on a single line for > readability. Same for header PRINTF above. I'll make the two ternary operations of `sk->sk_socket ?` on single lines. Thanks for your review! > > > + sock_i_ino(sk)); > > + > > + if (unix_sk->addr) { > > + if (UNIX_ABSTRACT(unix_sk)) > > + /* Abstract UNIX domain socket can contain '\0' in > > + * the path, and it should be escaped. However, it > > + * requires loops and the BPF verifier rejects it. > > + * So here, print only the escaped first byte to > > + * indicate it is an abstract UNIX domain socket. > > + * (See: unix_seq_show() and commit e7947ea770d0d) > > + */ > > + BPF_SEQ_PRINTF(seq, " @"); > > + else > > + BPF_SEQ_PRINTF(seq, " %s", unix_sk->addr->name->sun_path); > > + } > > + > > + BPF_SEQ_PRINTF(seq, "\n"); > > + > > + return 0; > > +} > > -- > > 2.30.2