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=-13.1 required=3.0 tests=BAYES_00,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, URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 E1088C433FB for ; Thu, 23 Jul 2020 18:41:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BCE3820737 for ; Thu, 23 Jul 2020 18:41:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=fb.com header.i=@fb.com header.b="Adlds/TZ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727828AbgGWSl0 (ORCPT ); Thu, 23 Jul 2020 14:41:26 -0400 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:34048 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727929AbgGWSlU (ORCPT ); Thu, 23 Jul 2020 14:41:20 -0400 Received: from pps.filterd (m0044012.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 06NIZMpZ017224 for ; Thu, 23 Jul 2020 11:41:19 -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=ghRWIAEEw73tVwkF1awAhejj2FU2wOb03HNXuz0VqSA=; b=Adlds/TZdwzEjFtBmbXg34merpja9TmH7I6lj5l5S9P/tljHSaIG1OzYWrL1UBLc2Qt2 RCit76Re/2yr2PoIKzlTQAgKIoHhdFIaVTS8lTmvEbbFZ7zXTvkeYPuwmjvq6zu6Auqr w4AfH0opmTEzsfLNE8jMqHrPEwztQLKtaQE= Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com with ESMTP id 32etbg5m8w-4 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 23 Jul 2020 11:41:19 -0700 Received: from intmgw001.03.ash8.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:83::4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Thu, 23 Jul 2020 11:41:17 -0700 Received: by devbig003.ftw2.facebook.com (Postfix, from userid 128203) id 96BDF3702DDA; Thu, 23 Jul 2020 11:41:16 -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 v4 07/13] bpf: implement bpf iterator for sock local storage map Date: Thu, 23 Jul 2020 11:41:16 -0700 Message-ID: <20200723184116.590602-1-yhs@fb.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200723184108.589857-1-yhs@fb.com> References: <20200723184108.589857-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.235,18.0.687 definitions=2020-07-23_09:2020-07-23,2020-07-23 signatures=0 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 mlxscore=0 lowpriorityscore=0 mlxlogscore=700 spamscore=0 adultscore=0 suspectscore=9 clxscore=1015 bulkscore=0 phishscore=0 malwarescore=0 priorityscore=1501 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2006250000 definitions=main-2007230134 X-FB-Internal: deliver Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The bpf iterator for bpf sock local storage map is implemented. User space interacts with sock local storage map with fd as a key and storage value. In kernel, passing fd to the bpf program does not really make sense. In this case, the sock itself is passed to bpf program. Signed-off-by: Yonghong Song --- net/core/bpf_sk_storage.c | 206 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 206 insertions(+) diff --git a/net/core/bpf_sk_storage.c b/net/core/bpf_sk_storage.c index 6f921c4ddc2c..eafcd15e7dfd 100644 --- a/net/core/bpf_sk_storage.c +++ b/net/core/bpf_sk_storage.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include @@ -1217,3 +1218,208 @@ int bpf_sk_storage_diag_put(struct bpf_sk_storage= _diag *diag, return err; } EXPORT_SYMBOL_GPL(bpf_sk_storage_diag_put); + +struct bpf_iter_seq_sk_storage_map_info { + struct bpf_map *map; + unsigned int bucket_id; + unsigned skip_elems; +}; + +static struct bpf_sk_storage_elem * +bpf_sk_storage_map_seq_find_next(struct bpf_iter_seq_sk_storage_map_info= *info, + struct bpf_sk_storage_elem *prev_selem) +{ + struct bpf_sk_storage *sk_storage; + struct bpf_sk_storage_elem *selem; + u32 skip_elems =3D info->skip_elems; + struct bpf_sk_storage_map *smap; + u32 bucket_id =3D info->bucket_id; + u32 i, count, n_buckets; + struct bucket *b; + + smap =3D (struct bpf_sk_storage_map *)info->map; + n_buckets =3D 1U << smap->bucket_log; + if (bucket_id >=3D n_buckets) + return NULL; + + /* try to find next selem in the same bucket */ + selem =3D prev_selem; + count =3D 0; + while (selem) { + selem =3D hlist_entry_safe(selem->map_node.next, + struct bpf_sk_storage_elem, map_node); + if (!selem) { + /* not found, unlock and go to the next bucket */ + b =3D &smap->buckets[bucket_id++]; + raw_spin_unlock_bh(&b->lock); + skip_elems =3D 0; + break; + } + sk_storage =3D rcu_dereference_raw(selem->sk_storage); + if (sk_storage) { + info->skip_elems =3D skip_elems + count; + return selem; + } + count++; + } + + for (i =3D bucket_id; i < (1U << smap->bucket_log); i++) { + b =3D &smap->buckets[i]; + raw_spin_lock_bh(&b->lock); + count =3D 0; + hlist_for_each_entry(selem, &b->list, map_node) { + sk_storage =3D rcu_dereference_raw(selem->sk_storage); + if (sk_storage && count >=3D skip_elems) { + info->bucket_id =3D i; + info->skip_elems =3D count; + return selem; + } + count++; + } + raw_spin_unlock_bh(&b->lock); + skip_elems =3D 0; + } + + info->bucket_id =3D i; + info->skip_elems =3D 0; + return NULL; +} + +static void *bpf_sk_storage_map_seq_start(struct seq_file *seq, loff_t *= pos) +{ + struct bpf_sk_storage_elem *selem; + + selem =3D bpf_sk_storage_map_seq_find_next(seq->private, NULL); + if (!selem) + return NULL; + + if (*pos =3D=3D 0) + ++*pos; + return selem; +} + +static void *bpf_sk_storage_map_seq_next(struct seq_file *seq, void *v, + loff_t *pos) +{ + struct bpf_iter_seq_sk_storage_map_info *info =3D seq->private; + + ++*pos; + ++info->skip_elems; + return bpf_sk_storage_map_seq_find_next(seq->private, v); +} + +struct bpf_iter__bpf_sk_storage_map { + __bpf_md_ptr(struct bpf_iter_meta *, meta); + __bpf_md_ptr(struct bpf_map *, map); + __bpf_md_ptr(struct sock *, sk); + __bpf_md_ptr(void *, value); +}; + +DEFINE_BPF_ITER_FUNC(bpf_sk_storage_map, struct bpf_iter_meta *meta, + struct bpf_map *map, struct sock *sk, + void *value) + +static int __bpf_sk_storage_map_seq_show(struct seq_file *seq, + struct bpf_sk_storage_elem *selem) +{ + struct bpf_iter_seq_sk_storage_map_info *info =3D seq->private; + struct bpf_iter__bpf_sk_storage_map ctx =3D {}; + struct bpf_sk_storage *sk_storage; + struct bpf_iter_meta meta; + struct bpf_prog *prog; + int ret =3D 0; + + meta.seq =3D seq; + prog =3D bpf_iter_get_info(&meta, selem =3D=3D NULL); + if (prog) { + ctx.meta =3D &meta; + ctx.map =3D info->map; + if (selem) { + sk_storage =3D rcu_dereference_raw(selem->sk_storage); + ctx.sk =3D sk_storage->sk; + ctx.value =3D SDATA(selem)->data; + } + ret =3D bpf_iter_run_prog(prog, &ctx); + } + + return ret; +} + +static int bpf_sk_storage_map_seq_show(struct seq_file *seq, void *v) +{ + return __bpf_sk_storage_map_seq_show(seq, v); +} + +static void bpf_sk_storage_map_seq_stop(struct seq_file *seq, void *v) +{ + struct bpf_iter_seq_sk_storage_map_info *info =3D seq->private; + struct bpf_sk_storage_map *smap; + struct bucket *b; + + if (!v) { + (void)__bpf_sk_storage_map_seq_show(seq, v); + } else { + smap =3D (struct bpf_sk_storage_map *)info->map; + b =3D &smap->buckets[info->bucket_id]; + raw_spin_unlock_bh(&b->lock); + } +} + +static int bpf_iter_init_sk_storage_map(void *priv_data, + struct bpf_iter_aux_info *aux) +{ + struct bpf_iter_seq_sk_storage_map_info *seq_info =3D priv_data; + + seq_info->map =3D aux->map; + return 0; +} + +static int bpf_iter_check_map(struct bpf_prog *prog, + struct bpf_iter_aux_info *aux) +{ + struct bpf_map *map =3D aux->map; + + if (map->map_type !=3D BPF_MAP_TYPE_SK_STORAGE) + return -EINVAL; + + if (prog->aux->max_rdonly_access > map->value_size) + return -EACCES; + + return 0; +} + +static const struct seq_operations bpf_sk_storage_map_seq_ops =3D { + .start =3D bpf_sk_storage_map_seq_start, + .next =3D bpf_sk_storage_map_seq_next, + .stop =3D bpf_sk_storage_map_seq_stop, + .show =3D bpf_sk_storage_map_seq_show, +}; + +static const struct bpf_iter_seq_info iter_seq_info =3D { + .seq_ops =3D &bpf_sk_storage_map_seq_ops, + .init_seq_private =3D bpf_iter_init_sk_storage_map, + .fini_seq_private =3D NULL, + .seq_priv_size =3D sizeof(struct bpf_iter_seq_sk_storage_map_info), +}; + +static struct bpf_iter_reg bpf_sk_storage_map_reg_info =3D { + .target =3D "bpf_sk_storage_map", + .check_target =3D bpf_iter_check_map, + .req_linfo =3D BPF_ITER_LINK_MAP_FD, + .ctx_arg_info_size =3D 2, + .ctx_arg_info =3D { + { offsetof(struct bpf_iter__bpf_sk_storage_map, sk), + PTR_TO_BTF_ID_OR_NULL }, + { offsetof(struct bpf_iter__bpf_sk_storage_map, value), + PTR_TO_RDWR_BUF_OR_NULL }, + }, + .seq_info =3D &iter_seq_info, +}; + +static int __init bpf_sk_storage_map_iter_init(void) +{ + bpf_sk_storage_map_reg_info.ctx_arg_info[0].btf_id =3D + btf_sock_ids[BTF_SOCK_TYPE_SOCK]; + return bpf_iter_reg_target(&bpf_sk_storage_map_reg_info); +} +late_initcall(bpf_sk_storage_map_iter_init); --=20 2.24.1