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.1 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 C27BBC433E0 for ; Thu, 4 Feb 2021 23:49:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 834F864FA9 for ; Thu, 4 Feb 2021 23:49:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231206AbhBDXtR (ORCPT ); Thu, 4 Feb 2021 18:49:17 -0500 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:10422 "EHLO mx0b-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231180AbhBDXtQ (ORCPT ); Thu, 4 Feb 2021 18:49:16 -0500 Received: from pps.filterd (m0148460.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 114Nl77C018936 for ; Thu, 4 Feb 2021 15:48:35 -0800 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=ryO9PLtyzTldhDObcQuwvAm9GAzv3bY3eh47Phix4Cg=; b=SH4RoOgW2bmpBcYflMD9UkCQS1IRAfsMznUw4NDYsSWWcNr7sE7XrHss/zMbP1yIOBRB 8772IMHFvedlESJP7nldX6wVfQrzAyE+WGnzaieVW4aehZ2gflWgtcgez4guvsm3+oQs uxq+NHkyQvv8RvCKYN8skp5hgSbBEl4neqA= Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com with ESMTP id 36fcrbe2nk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 04 Feb 2021 15:48:35 -0800 Received: from intmgw001.06.ash9.facebook.com (2620:10d:c085:208::11) by mail.thefacebook.com (2620:10d:c085:21d::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Thu, 4 Feb 2021 15:48:33 -0800 Received: by devbig003.ftw2.facebook.com (Postfix, from userid 128203) id 6F1853704E75; Thu, 4 Feb 2021 15:48:30 -0800 (PST) From: Yonghong Song To: CC: Alexei Starovoitov , Cong Wang , Daniel Borkmann , Subject: [PATCH bpf-next 3/8] bpf: add hashtab support for bpf_for_each_map_elem() helper Date: Thu, 4 Feb 2021 15:48:30 -0800 Message-ID: <20210204234830.1629223-1-yhs@fb.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20210204234827.1628857-1-yhs@fb.com> References: <20210204234827.1628857-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.369,18.0.737 definitions=2021-02-04_13:2021-02-04,2021-02-04 signatures=0 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 lowpriorityscore=0 impostorscore=0 malwarescore=0 phishscore=0 mlxlogscore=463 clxscore=1015 bulkscore=0 suspectscore=0 priorityscore=1501 spamscore=0 mlxscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2102040144 X-FB-Internal: deliver Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org This patch added support for hashmap, percpu hashmap, lru hashmap and percpu lru hashmap. Signed-off-by: Yonghong Song --- include/linux/bpf.h | 4 +++ kernel/bpf/hashtab.c | 57 +++++++++++++++++++++++++++++++++++++++++++ kernel/bpf/verifier.c | 23 +++++++++++++++++ 3 files changed, 84 insertions(+) diff --git a/include/linux/bpf.h b/include/linux/bpf.h index c8b72ae16cc5..31e0447cadd8 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@ -1396,6 +1396,10 @@ void bpf_iter_map_show_fdinfo(const struct bpf_ite= r_aux_info *aux, int bpf_iter_map_fill_link_info(const struct bpf_iter_aux_info *aux, struct bpf_link_info *info); =20 +int map_set_for_each_callback_args(struct bpf_verifier_env *env, + struct bpf_func_state *caller, + struct bpf_func_state *callee); + int bpf_percpu_hash_copy(struct bpf_map *map, void *key, void *value); int bpf_percpu_array_copy(struct bpf_map *map, void *key, void *value); int bpf_percpu_hash_update(struct bpf_map *map, void *key, void *value, diff --git a/kernel/bpf/hashtab.c b/kernel/bpf/hashtab.c index c1ac7f964bc9..40f5404cfb01 100644 --- a/kernel/bpf/hashtab.c +++ b/kernel/bpf/hashtab.c @@ -1869,6 +1869,55 @@ static const struct bpf_iter_seq_info iter_seq_inf= o =3D { .seq_priv_size =3D sizeof(struct bpf_iter_seq_hash_map_info), }; =20 +static int bpf_for_each_hash_elem(struct bpf_map *map, void *callback_fn= , + void *callback_ctx, u64 flags) +{ + struct bpf_htab *htab =3D container_of(map, struct bpf_htab, map); + struct hlist_nulls_head *head; + struct hlist_nulls_node *n; + struct htab_elem *elem; + u32 roundup_key_size; + void __percpu *pptr; + struct bucket *b; + void *key, *val; + bool is_percpu; + long ret =3D 0; + int i; + + if (flags !=3D 0) + return -EINVAL; + + is_percpu =3D htab_is_percpu(htab); + + roundup_key_size =3D round_up(map->key_size, 8); + for (i =3D 0; i < htab->n_buckets; i++) { + b =3D &htab->buckets[i]; + rcu_read_lock(); + head =3D &b->head; + hlist_nulls_for_each_entry_rcu(elem, n, head, hash_node) { + key =3D elem->key; + if (!is_percpu) { + val =3D elem->key + roundup_key_size; + } else { + /* current cpu value for percpu map */ + pptr =3D htab_elem_get_ptr(elem, map->key_size); + val =3D this_cpu_ptr(pptr); + } + ret =3D BPF_CAST_CALL(callback_fn)((u64)(long)map, + (u64)(long)key, (u64)(long)val, + (u64)(long)callback_ctx, 0); + if (ret) { + rcu_read_unlock(); + ret =3D (ret =3D=3D 1) ? 0 : -EINVAL; + goto out; + } + } + rcu_read_unlock(); + } +out: + return ret; +} + static int htab_map_btf_id; const struct bpf_map_ops htab_map_ops =3D { .map_meta_equal =3D bpf_map_meta_equal, @@ -1881,6 +1930,8 @@ const struct bpf_map_ops htab_map_ops =3D { .map_delete_elem =3D htab_map_delete_elem, .map_gen_lookup =3D htab_map_gen_lookup, .map_seq_show_elem =3D htab_map_seq_show_elem, + .map_set_for_each_callback_args =3D map_set_for_each_callback_args, + .map_for_each_callback =3D bpf_for_each_hash_elem, BATCH_OPS(htab), .map_btf_name =3D "bpf_htab", .map_btf_id =3D &htab_map_btf_id, @@ -1900,6 +1951,8 @@ const struct bpf_map_ops htab_lru_map_ops =3D { .map_delete_elem =3D htab_lru_map_delete_elem, .map_gen_lookup =3D htab_lru_map_gen_lookup, .map_seq_show_elem =3D htab_map_seq_show_elem, + .map_set_for_each_callback_args =3D map_set_for_each_callback_args, + .map_for_each_callback =3D bpf_for_each_hash_elem, BATCH_OPS(htab_lru), .map_btf_name =3D "bpf_htab", .map_btf_id =3D &htab_lru_map_btf_id, @@ -2019,6 +2072,8 @@ const struct bpf_map_ops htab_percpu_map_ops =3D { .map_update_elem =3D htab_percpu_map_update_elem, .map_delete_elem =3D htab_map_delete_elem, .map_seq_show_elem =3D htab_percpu_map_seq_show_elem, + .map_set_for_each_callback_args =3D map_set_for_each_callback_args, + .map_for_each_callback =3D bpf_for_each_hash_elem, BATCH_OPS(htab_percpu), .map_btf_name =3D "bpf_htab", .map_btf_id =3D &htab_percpu_map_btf_id, @@ -2036,6 +2091,8 @@ const struct bpf_map_ops htab_lru_percpu_map_ops =3D= { .map_update_elem =3D htab_lru_percpu_map_update_elem, .map_delete_elem =3D htab_lru_map_delete_elem, .map_seq_show_elem =3D htab_percpu_map_seq_show_elem, + .map_set_for_each_callback_args =3D map_set_for_each_callback_args, + .map_for_each_callback =3D bpf_for_each_hash_elem, BATCH_OPS(htab_lru_percpu), .map_btf_name =3D "bpf_htab", .map_btf_id =3D &htab_lru_percpu_map_btf_id, diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index 050b067a0be6..32c8dcc27da8 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -4987,6 +4987,29 @@ static int check_func_call(struct bpf_verifier_env= *env, struct bpf_insn *insn, return 0; } =20 +int map_set_for_each_callback_args(struct bpf_verifier_env *env, + struct bpf_func_state *caller, + struct bpf_func_state *callee) +{ + /* pointer to map */ + callee->regs[BPF_REG_1] =3D caller->regs[BPF_REG_1]; + + callee->regs[BPF_REG_2].type =3D PTR_TO_MAP_KEY; + __mark_reg_known_zero(&callee->regs[BPF_REG_2]); + callee->regs[BPF_REG_2].map_ptr =3D caller->regs[BPF_REG_1].map_ptr; + + callee->regs[BPF_REG_3].type =3D PTR_TO_MAP_VALUE; + __mark_reg_known_zero(&callee->regs[BPF_REG_3]); + callee->regs[BPF_REG_3].map_ptr =3D caller->regs[BPF_REG_1].map_ptr; + + /* pointer to stack or null */ + callee->regs[BPF_REG_4] =3D caller->regs[BPF_REG_3]; + + /* unused */ + __mark_reg_unknown(env, &callee->regs[BPF_REG_5]); + return 0; +} + static int check_map_elem_callback(struct bpf_verifier_env *env, int *in= sn_idx) { struct bpf_verifier_state *state =3D env->cur_state; --=20 2.24.1