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=-9.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,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 863FEC433E0 for ; Wed, 17 Jun 2020 21:16:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6384D21841 for ; Wed, 17 Jun 2020 21:16:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=fb.com header.i=@fb.com header.b="FuH5QKLE" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727024AbgFQVQ1 (ORCPT ); Wed, 17 Jun 2020 17:16:27 -0400 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:50186 "EHLO mx0b-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726999AbgFQVQX (ORCPT ); Wed, 17 Jun 2020 17:16:23 -0400 Received: from pps.filterd (m0109332.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 05HLGEQ7026949 for ; Wed, 17 Jun 2020 14:16:22 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=facebook; bh=Y3J8EbuGgmJ6+yeF41eAEww2Kg2rG58i/h09XRBWEl8=; b=FuH5QKLEGyTCDyn6Nx47d3TapLBVOPoxcYpGvGHa35UrLjPxUfS60J97zpjjxh13llqC U0khu2kjCr/QSuvI9Y0sn2nqW3pMTnlgxYskhnbDJFFizealak4HbgByL32XbJDj1s2g I4kr9iEjz3UkqBv0YMx2d0Xjug0I073KVm4= Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com with ESMTP id 31q656g134-8 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 17 Jun 2020 14:16:22 -0700 Received: from intmgw001.08.frc2.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:82::c) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Wed, 17 Jun 2020 14:15:50 -0700 Received: by devbig003.ftw2.facebook.com (Postfix, from userid 128203) id 68D253704B9E; Wed, 17 Jun 2020 14:15:46 -0700 (PDT) Smtp-Origin-Hostprefix: devbig From: Yonghong Song Smtp-Origin-Hostname: devbig003.ftw2.facebook.com To: CC: Alexei Starovoitov , Daniel Borkmann , , Martin KaFai Lau Smtp-Origin-Cluster: ftw2c04 Subject: [PATCH bpf-next 08/13] net: bpf: implement bpf iterator for udp Date: Wed, 17 Jun 2020 14:15:46 -0700 Message-ID: <20200617211546.1856347-1-yhs@fb.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200617211536.1854348-1-yhs@fb.com> References: <20200617211536.1854348-1-yhs@fb.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-FB-Internal: Safe Content-Type: text/plain X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.216,18.0.687 definitions=2020-06-17_11:2020-06-17,2020-06-17 signatures=0 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 suspectscore=13 bulkscore=0 phishscore=0 lowpriorityscore=0 priorityscore=1501 mlxlogscore=827 clxscore=1015 cotscore=-2147483648 malwarescore=0 spamscore=0 mlxscore=0 adultscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2004280000 definitions=main-2006170159 X-FB-Internal: deliver Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org The bpf iterator for udp is implemented. Both udp4 and udp6 sockets will be traversed. It is up to bpf program to filter for udp4 or udp6 only, or both families of sockets. Signed-off-by: Yonghong Song --- net/ipv4/udp.c | 117 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 117 insertions(+) diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 90355301b266..727a5664f1d1 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -2968,6 +2968,67 @@ int udp4_seq_show(struct seq_file *seq, void *v) return 0; } =20 +#ifdef CONFIG_BPF_SYSCALL +struct bpf_iter__udp { + __bpf_md_ptr(struct bpf_iter_meta *, meta); + __bpf_md_ptr(struct udp_sock *, udp_sk); + uid_t uid __aligned(8); + int bucket __aligned(8); +}; + +static int udp_prog_seq_show(struct bpf_prog *prog, struct bpf_iter_meta= *meta, + struct udp_sock *udp_sk, uid_t uid, int bucket) +{ + struct bpf_iter__udp ctx; + + meta->seq_num--; /* skip SEQ_START_TOKEN */ + ctx.meta =3D meta; + ctx.udp_sk =3D udp_sk; + ctx.uid =3D uid; + ctx.bucket =3D bucket; + return bpf_iter_run_prog(prog, &ctx); +} + +static int bpf_iter_udp_seq_show(struct seq_file *seq, void *v) +{ + struct udp_iter_state *state =3D seq->private; + struct bpf_iter_meta meta; + struct bpf_prog *prog; + struct sock *sk =3D v; + uid_t uid; + + if (v =3D=3D SEQ_START_TOKEN) + return 0; + + uid =3D from_kuid_munged(seq_user_ns(seq), sock_i_uid(sk)); + meta.seq =3D seq; + prog =3D bpf_iter_get_info(&meta, false); + return udp_prog_seq_show(prog, &meta, v, uid, state->bucket); +} + +static void bpf_iter_udp_seq_stop(struct seq_file *seq, void *v) +{ + struct bpf_iter_meta meta; + struct bpf_prog *prog; + + if (!v) { + meta.seq =3D seq; + prog =3D bpf_iter_get_info(&meta, true); + if (prog) + (void)udp_prog_seq_show(prog, &meta, v, 0, 0); + } + + udp_seq_stop(seq, v); +} + +static const struct seq_operations bpf_iter_udp_seq_ops =3D { + .start =3D udp_seq_start, + .next =3D udp_seq_next, + .stop =3D bpf_iter_udp_seq_stop, + .show =3D bpf_iter_udp_seq_show, +}; +#endif + const struct seq_operations udp_seq_ops =3D { .start =3D udp_seq_start, .next =3D udp_seq_next, @@ -3085,6 +3146,58 @@ static struct pernet_operations __net_initdata udp= _sysctl_ops =3D { .init =3D udp_sysctl_init, }; =20 +#if defined(CONFIG_BPF_SYSCALL) && defined(CONFIG_PROC_FS) +DEFINE_BPF_ITER_FUNC(udp, struct bpf_iter_meta *meta, + struct udp_sock *udp_sk, uid_t uid, int bucket) + +static int bpf_iter_init_udp(void *priv_data) +{ + struct udp_iter_state *st =3D priv_data; + struct udp_seq_afinfo *afinfo; + int ret; + + afinfo =3D kmalloc(sizeof(*afinfo), GFP_USER | __GFP_NOWARN); + if (!afinfo) + return -ENOMEM; + + afinfo->family =3D AF_UNSPEC; + afinfo->udp_table =3D &udp_table; + st->bpf_seq_afinfo =3D afinfo; + ret =3D bpf_iter_init_seq_net(priv_data); + if (ret) + kfree(afinfo); + return ret; +} + +static void bpf_iter_fini_udp(void *priv_data) +{ + struct udp_iter_state *st =3D priv_data; + + kfree(st->bpf_seq_afinfo); + bpf_iter_fini_seq_net(priv_data); +} + +static const struct bpf_iter_reg udp_reg_info =3D { + .target =3D "udp", + .seq_ops =3D &bpf_iter_udp_seq_ops, + .init_seq_private =3D bpf_iter_init_udp, + .fini_seq_private =3D bpf_iter_fini_udp, + .seq_priv_size =3D sizeof(struct udp_iter_state), + .ctx_arg_info_size =3D 1, + .ctx_arg_info =3D { + { offsetof(struct bpf_iter__udp, udp_sk), + PTR_TO_BTF_ID_OR_NULL }, + }, +}; + +static void __init bpf_iter_register(void) +{ + if (bpf_iter_reg_target(&udp_reg_info)) + pr_warn("Warning: could not register bpf iterator udp\n"); +} + +#endif + void __init udp_init(void) { unsigned long limit; @@ -3110,4 +3223,8 @@ void __init udp_init(void) =20 if (register_pernet_subsys(&udp_sysctl_ops)) panic("UDP: failed to init sysctl parameters.\n"); + +#if defined(CONFIG_BPF_SYSCALL) && defined(CONFIG_PROC_FS) + bpf_iter_register(); +#endif } --=20 2.24.1