From patchwork Fri Aug 19 21:42:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexei Starovoitov X-Patchwork-Id: 12949272 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id CA54AC32771 for ; Fri, 19 Aug 2022 21:42:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 32CFC6B007D; Fri, 19 Aug 2022 17:42:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2B65B6B007E; Fri, 19 Aug 2022 17:42:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 12FBF8D0001; Fri, 19 Aug 2022 17:42:59 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 01A166B007D for ; Fri, 19 Aug 2022 17:42:58 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id CD207161B60 for ; Fri, 19 Aug 2022 21:42:58 +0000 (UTC) X-FDA: 79817667636.09.F083EA2 Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by imf24.hostedemail.com (Postfix) with ESMTP id 77C4918001D for ; Fri, 19 Aug 2022 21:42:58 +0000 (UTC) Received: by mail-pj1-f48.google.com with SMTP id bf22so5766792pjb.4 for ; Fri, 19 Aug 2022 14:42:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=1ZPsTJvD2SD8oJE2LdgDjHUXXNxOa1YZX3bUXze9YDM=; b=h6OnE731x3+bxw84Yrk5LMRet9tgUrjwY5zJZW8txa5IWmma0MDPxhZILEnikbrjg8 eVfNMIi1UAXY83whNiOXlYxS509Df73jTWadxLUfDiHPze06amQlR2r0aTXqintkqpvz n1RBrmne9LZb6nRBs75CyBwz65jYr1D6EPsw5WnJ7J7/NaXkEWvpKfX0Ce2jMEcLeP4h sz+tF9zGKIA1FTwn0AgwR5MhRFyTlbXWrTuj2YBcx4D+41FHMX15BessF5z8u6VdKCg3 IuA/DPNsV6iyZv299egKdbL/6uQPjl7a0PqUJEWAwVJs/SZJdGSTmDo/9KBT4dIDmWZS 1PZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=1ZPsTJvD2SD8oJE2LdgDjHUXXNxOa1YZX3bUXze9YDM=; b=fxc4ThiMg0uFyx+o7NlazX/CuPLnUSdph1Z/Por22nWcDFbpv6HgCn78i/oEINsqkT hTMOkx8w5HslgfLPJNG8d9G33/Agd7IUds25+s5OPAkXBcVqeqpYCOmrc0xN38MJTVu/ uAqTAjMpncdBYZYJQlLeauuCaSlV2BomEhfzJSz9maVaUN06zDtmtFDmKqs2/zMaTfDj J3ZIbKYvdEwm9WwBxA9zubnedCiMR+h/cMmez08fpJGrPejfse993T8Y6+ciTSEIQVJ1 TaSfvpIz0ka8BgljTZYXyrifEqdLr9deGjdGKxzTtzchWs1PACWY6dN68VAa9uMJTMkq TnYg== X-Gm-Message-State: ACgBeo3rnj4EqrE+CHBi/rwsmHytKem5l8/YvAfF6HoRZfDq7uMW2u4j CNHyquACwfMd2bz31ARkf58= X-Google-Smtp-Source: AA6agR54vdsWqFFAZbvuRKIsTnvg6U9ayUFsbInKCU7GqGHP0S6D0wOdeMreN6Cxi4vbQYrkfXOY5w== X-Received: by 2002:a17:902:c945:b0:16e:d24d:1b27 with SMTP id i5-20020a170902c94500b0016ed24d1b27mr9298199pla.51.1660945377401; Fri, 19 Aug 2022 14:42:57 -0700 (PDT) Received: from localhost.localdomain ([2620:10d:c090:500::1:c4b1]) by smtp.gmail.com with ESMTPSA id k10-20020aa79d0a000000b0053612ec8859sm1656032pfp.209.2022.08.19.14.42.55 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 19 Aug 2022 14:42:56 -0700 (PDT) From: Alexei Starovoitov To: davem@davemloft.net Cc: daniel@iogearbox.net, andrii@kernel.org, tj@kernel.org, memxor@gmail.com, delyank@fb.com, linux-mm@kvack.org, bpf@vger.kernel.org, kernel-team@fb.com Subject: [PATCH v3 bpf-next 06/15] bpf: Optimize element count in non-preallocated hash map. Date: Fri, 19 Aug 2022 14:42:23 -0700 Message-Id: <20220819214232.18784-7-alexei.starovoitov@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220819214232.18784-1-alexei.starovoitov@gmail.com> References: <20220819214232.18784-1-alexei.starovoitov@gmail.com> MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1660945378; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=1ZPsTJvD2SD8oJE2LdgDjHUXXNxOa1YZX3bUXze9YDM=; b=5x2Cm4glopde4u6KyBay9xkIWPlvbPBKVLGzHQ20iwQomWR1S5wPS73J9YdUq8Yp8VAFyJ 2N7UAqONB2fYGzcgabE+7Oynrl0A2IjZukhWG2sDRB1EoZTD+ZW8CSbmmdwWR0y2StsNoh 2rZCOIM7e52MK+A7FuksW8fUZtnaWSk= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=h6OnE731; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf24.hostedemail.com: domain of alexei.starovoitov@gmail.com designates 209.85.216.48 as permitted sender) smtp.mailfrom=alexei.starovoitov@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1660945378; a=rsa-sha256; cv=none; b=sHT5NHF6jtGzkQmMQe8aKKHigRuHTlLkIfmAOZ2lTzPjWvzTdFRWxBK2i/6sWvnCBmR3EU 4jXdwqE++S199W5wC9EkrvzXhCEkuiiqkyGWs4fwPdgiGCK5C+wOhsP2pbMHjxlbRz1XZc ZPGjaXq2lLm+38XVlnnFrBN6NZWJy9Q= Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=h6OnE731; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf24.hostedemail.com: domain of alexei.starovoitov@gmail.com designates 209.85.216.48 as permitted sender) smtp.mailfrom=alexei.starovoitov@gmail.com X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 77C4918001D X-Stat-Signature: iyptu3qsbyn6g138fpu9aqi35e1dgu8s X-Rspam-User: X-HE-Tag: 1660945378-560278 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Alexei Starovoitov The atomic_inc/dec might cause extreme cache line bouncing when multiple cpus access the same bpf map. Based on specified max_entries for the hash map calculate when percpu_counter becomes faster than atomic_t and use it for such maps. For example samples/bpf/map_perf_test is using hash map with max_entries 1000. On a system with 16 cpus the 'map_perf_test 4' shows 14k events per second using atomic_t. On a system with 15 cpus it shows 100k events per second using percpu. map_perf_test is an extreme case where all cpus colliding on atomic_t which causes extreme cache bouncing. Note that the slow path of percpu_counter is 5k events per secound vs 14k for atomic, so the heuristic is necessary. See comment in the code why the heuristic is based on num_online_cpus(). Signed-off-by: Alexei Starovoitov --- kernel/bpf/hashtab.c | 70 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 62 insertions(+), 8 deletions(-) diff --git a/kernel/bpf/hashtab.c b/kernel/bpf/hashtab.c index bd23c8830d49..8f68c6e13339 100644 --- a/kernel/bpf/hashtab.c +++ b/kernel/bpf/hashtab.c @@ -101,7 +101,12 @@ struct bpf_htab { struct bpf_lru lru; }; struct htab_elem *__percpu *extra_elems; - atomic_t count; /* number of elements in this hashtable */ + /* number of elements in non-preallocated hashtable are kept + * in either pcount or count + */ + struct percpu_counter pcount; + atomic_t count; + bool use_percpu_counter; u32 n_buckets; /* number of hash buckets */ u32 elem_size; /* size of each element in bytes */ u32 hashrnd; @@ -552,6 +557,29 @@ static struct bpf_map *htab_map_alloc(union bpf_attr *attr) htab_init_buckets(htab); +/* compute_batch_value() computes batch value as num_online_cpus() * 2 + * and __percpu_counter_compare() needs + * htab->max_entries - cur_number_of_elems to be more than batch * num_online_cpus() + * for percpu_counter to be faster than atomic_t. In practice the average bpf + * hash map size is 10k, which means that a system with 64 cpus will fill + * hashmap to 20% of 10k before percpu_counter becomes ineffective. Therefore + * define our own batch count as 32 then 10k hash map can be filled up to 80%: + * 10k - 8k > 32 _batch_ * 64 _cpus_ + * and __percpu_counter_compare() will still be fast. At that point hash map + * collisions will dominate its performance anyway. Assume that hash map filled + * to 50+% isn't going to be O(1) and use the following formula to choose + * between percpu_counter and atomic_t. + */ +#define PERCPU_COUNTER_BATCH 32 + if (attr->max_entries / 2 > num_online_cpus() * PERCPU_COUNTER_BATCH) + htab->use_percpu_counter = true; + + if (htab->use_percpu_counter) { + err = percpu_counter_init(&htab->pcount, 0, GFP_KERNEL); + if (err) + goto free_map_locked; + } + if (prealloc) { err = prealloc_init(htab); if (err) @@ -878,6 +906,31 @@ static void htab_put_fd_value(struct bpf_htab *htab, struct htab_elem *l) } } +static bool is_map_full(struct bpf_htab *htab) +{ + if (htab->use_percpu_counter) + return __percpu_counter_compare(&htab->pcount, htab->map.max_entries, + PERCPU_COUNTER_BATCH) >= 0; + return atomic_read(&htab->count) >= htab->map.max_entries; +} + +static void inc_elem_count(struct bpf_htab *htab) +{ + if (htab->use_percpu_counter) + percpu_counter_add_batch(&htab->pcount, 1, PERCPU_COUNTER_BATCH); + else + atomic_inc(&htab->count); +} + +static void dec_elem_count(struct bpf_htab *htab) +{ + if (htab->use_percpu_counter) + percpu_counter_add_batch(&htab->pcount, -1, PERCPU_COUNTER_BATCH); + else + atomic_dec(&htab->count); +} + + static void free_htab_elem(struct bpf_htab *htab, struct htab_elem *l) { htab_put_fd_value(htab, l); @@ -886,7 +939,7 @@ static void free_htab_elem(struct bpf_htab *htab, struct htab_elem *l) check_and_free_fields(htab, l); __pcpu_freelist_push(&htab->freelist, &l->fnode); } else { - atomic_dec(&htab->count); + dec_elem_count(htab); l->htab = htab; call_rcu(&l->rcu, htab_elem_free_rcu); } @@ -970,16 +1023,15 @@ static struct htab_elem *alloc_htab_elem(struct bpf_htab *htab, void *key, l_new = container_of(l, struct htab_elem, fnode); } } else { - if (atomic_inc_return(&htab->count) > htab->map.max_entries) - if (!old_elem) { + if (is_map_full(htab)) + if (!old_elem) /* when map is full and update() is replacing * old element, it's ok to allocate, since * old element will be freed immediately. * Otherwise return an error */ - l_new = ERR_PTR(-E2BIG); - goto dec_count; - } + return ERR_PTR(-E2BIG); + inc_elem_count(htab); l_new = bpf_mem_cache_alloc(&htab->ma); if (!l_new) { l_new = ERR_PTR(-ENOMEM); @@ -1021,7 +1073,7 @@ static struct htab_elem *alloc_htab_elem(struct bpf_htab *htab, void *key, l_new->hash = hash; return l_new; dec_count: - atomic_dec(&htab->count); + dec_elem_count(htab); return l_new; } @@ -1495,6 +1547,8 @@ static void htab_map_free(struct bpf_map *map) free_percpu(htab->extra_elems); bpf_map_area_free(htab->buckets); bpf_mem_alloc_destroy(&htab->ma); + if (htab->use_percpu_counter) + percpu_counter_destroy(&htab->pcount); for (i = 0; i < HASHTAB_MAP_LOCK_COUNT; i++) free_percpu(htab->map_locked[i]); lockdep_unregister_key(&htab->lockdep_key);