From patchwork Fri Aug 26 02:44:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexei Starovoitov X-Patchwork-Id: 12955495 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 535F4ECAAA2 for ; Fri, 26 Aug 2022 02:44:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9BA8394000B; Thu, 25 Aug 2022 22:44:47 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 96969940007; Thu, 25 Aug 2022 22:44:47 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7BD3894000B; Thu, 25 Aug 2022 22:44:47 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 6DE0E940007 for ; Thu, 25 Aug 2022 22:44:47 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 2ED7FC061F for ; Fri, 26 Aug 2022 02:44:47 +0000 (UTC) X-FDA: 79840201014.04.0DAE4C2 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by imf21.hostedemail.com (Postfix) with ESMTP id D6FA01C000C for ; Fri, 26 Aug 2022 02:44:46 +0000 (UTC) Received: by mail-pl1-f182.google.com with SMTP id v23so432278plo.9 for ; Thu, 25 Aug 2022 19:44:46 -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=hvVDteQ6MmazqwXbIHyqt6el95iRuYgeBC1SCE7DUYk=; b=M8K7ILJxVqeQg1MNWt9822zwi7fMIWuDdpVgOocafAiiLoLbcfstRLY0MLeFUhQRIT L4p+HUSDVhaEu3gqQ8OWhW9R1dlQaj+8k7kfi7wmYoByiBdiiPvOAwBa47f+/2uFiMB1 len7kLW/SS1nsWlvRC7EPKReBAe4UhWO28hFV96Ll8EnCfGzfWW7zeoC0eWKqeNRLbWf Sj2A8W1VBupzMDIXFuW1XLsqnSdIE9t3bcKF/JecI9dEiOE1wkfDo+YnTSJHfmXn/MR5 piSeRlV5/uWMAzeR9acxkNJlo7VjNYvkWR93krewmRZ+/8d/v0Qi/biTlWvl4zDxiew9 VZng== 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=hvVDteQ6MmazqwXbIHyqt6el95iRuYgeBC1SCE7DUYk=; b=U5csVwHr6jLbh7AmcTrHeu4gRgGc0Vo2D1lkU5yvngWEmKemaqXqJIjMvF3Z6E/qIX fEHIZfjLQlt5PQE6oecmIal0KF6J3XGf1t8bWltdhBZZCEgRowM/5o2pdEvjaeHhvO8e QbdwEipFeOGtwrQQEaQSW/cE1Kt5tOrAZnKBud2fIQwqmmXKnjObHTX4rZI2o4pzwkIz G6SFhc/vV5rdJ9QofcjW/lSmglWDAUzlFDq/uNqfChkXnqR5mzf+YAKgEVmy0w9Ob0Db /cRaa5UUxi4T07Q+Aqsexa8VT/ifDh5lzS4YhEjKG3ZBtsTXFdx6diGGrvG3750tOlnm s1BA== X-Gm-Message-State: ACgBeo3su9yKhpxnl+OFcoDtvXvV9yM599YcwdM6YCmSUf46c8v4Bqtl zMSzJ8nHGs7erd+VLNi8FCk= X-Google-Smtp-Source: AA6agR6z2bSWVECy8ZaxZXZnjCl/5iGEY2CA3BNQSzUPMZae9sItw74m+5WO67D7+KCzP5ecC+N2sQ== X-Received: by 2002:a17:902:7b87:b0:172:8ae9:2015 with SMTP id w7-20020a1709027b8700b001728ae92015mr1885670pll.112.1661481885939; Thu, 25 Aug 2022 19:44:45 -0700 (PDT) Received: from macbook-pro-3.dhcp.thefacebook.com ([2620:10d:c090:400::5:15dc]) by smtp.gmail.com with ESMTPSA id s3-20020a170902ea0300b0016f02fceff4sm290150plg.57.2022.08.25.19.44.44 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 25 Aug 2022 19:44:45 -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 v4 bpf-next 03/15] selftests/bpf: Improve test coverage of test_maps Date: Thu, 25 Aug 2022 19:44:18 -0700 Message-Id: <20220826024430.84565-4-alexei.starovoitov@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220826024430.84565-1-alexei.starovoitov@gmail.com> References: <20220826024430.84565-1-alexei.starovoitov@gmail.com> MIME-Version: 1.0 ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1661481886; a=rsa-sha256; cv=none; b=g1dh/hBuJ/wBe+lnCKaJ2wKxrbNUmP1262MYdVzTuRd6da2MlCmJUH1oAp69TGFFVZfvH+ Xb8MjnbyOINkTqBlRiQV7NFY4VkAdrB/ns/nE8UZuIRkVela2Uh7IGOulNeVh2IEhuBkCC 20qJR5qlg8eLOsfp7WLK2xWXei1wcvw= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=M8K7ILJx; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf21.hostedemail.com: domain of alexei.starovoitov@gmail.com designates 209.85.214.182 as permitted sender) smtp.mailfrom=alexei.starovoitov@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1661481886; 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=hvVDteQ6MmazqwXbIHyqt6el95iRuYgeBC1SCE7DUYk=; b=CnoAQasqTRAU3zc/Xq0Puze2D9q+3L+Rt4LuFZ4JNbplheDFeP3AgMCr3iyMoL2WtYwivJ fy9+h0t5ODMaQJmmge+7cwStWwEYdup6pKB5bYW+OMQDrx8XiLdjcOaei7czYmK3hfzhP8 X0Xkk0h9U8VvbTCmdjvJllOxn90BTxI= X-Stat-Signature: 6grpj36xckcoiakokbh47o1th8zc3oyo X-Rspamd-Queue-Id: D6FA01C000C X-Rspam-User: X-Rspamd-Server: rspam11 Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=M8K7ILJx; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf21.hostedemail.com: domain of alexei.starovoitov@gmail.com designates 209.85.214.182 as permitted sender) smtp.mailfrom=alexei.starovoitov@gmail.com X-HE-Tag: 1661481886-971630 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 Make test_maps more stressful with more parallelism in update/delete/lookup/walk including different value sizes. Acked-by: Kumar Kartikeya Dwivedi Signed-off-by: Alexei Starovoitov --- tools/testing/selftests/bpf/test_maps.c | 38 ++++++++++++++++--------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/tools/testing/selftests/bpf/test_maps.c b/tools/testing/selftests/bpf/test_maps.c index cbebfaa7c1e8..d1ffc76814d9 100644 --- a/tools/testing/selftests/bpf/test_maps.c +++ b/tools/testing/selftests/bpf/test_maps.c @@ -264,10 +264,11 @@ static void test_hashmap_percpu(unsigned int task, void *data) close(fd); } +#define VALUE_SIZE 3 static int helper_fill_hashmap(int max_entries) { int i, fd, ret; - long long key, value; + long long key, value[VALUE_SIZE] = {}; fd = bpf_map_create(BPF_MAP_TYPE_HASH, NULL, sizeof(key), sizeof(value), max_entries, &map_opts); @@ -276,8 +277,8 @@ static int helper_fill_hashmap(int max_entries) "err: %s, flags: 0x%x\n", strerror(errno), map_opts.map_flags); for (i = 0; i < max_entries; i++) { - key = i; value = key; - ret = bpf_map_update_elem(fd, &key, &value, BPF_NOEXIST); + key = i; value[0] = key; + ret = bpf_map_update_elem(fd, &key, value, BPF_NOEXIST); CHECK(ret != 0, "can't update hashmap", "err: %s\n", strerror(ret)); @@ -288,8 +289,8 @@ static int helper_fill_hashmap(int max_entries) static void test_hashmap_walk(unsigned int task, void *data) { - int fd, i, max_entries = 1000; - long long key, value, next_key; + int fd, i, max_entries = 10000; + long long key, value[VALUE_SIZE], next_key; bool next_key_valid = true; fd = helper_fill_hashmap(max_entries); @@ -297,7 +298,7 @@ static void test_hashmap_walk(unsigned int task, void *data) for (i = 0; bpf_map_get_next_key(fd, !i ? NULL : &key, &next_key) == 0; i++) { key = next_key; - assert(bpf_map_lookup_elem(fd, &key, &value) == 0); + assert(bpf_map_lookup_elem(fd, &key, value) == 0); } assert(i == max_entries); @@ -305,9 +306,9 @@ static void test_hashmap_walk(unsigned int task, void *data) assert(bpf_map_get_next_key(fd, NULL, &key) == 0); for (i = 0; next_key_valid; i++) { next_key_valid = bpf_map_get_next_key(fd, &key, &next_key) == 0; - assert(bpf_map_lookup_elem(fd, &key, &value) == 0); - value++; - assert(bpf_map_update_elem(fd, &key, &value, BPF_EXIST) == 0); + assert(bpf_map_lookup_elem(fd, &key, value) == 0); + value[0]++; + assert(bpf_map_update_elem(fd, &key, value, BPF_EXIST) == 0); key = next_key; } @@ -316,8 +317,8 @@ static void test_hashmap_walk(unsigned int task, void *data) for (i = 0; bpf_map_get_next_key(fd, !i ? NULL : &key, &next_key) == 0; i++) { key = next_key; - assert(bpf_map_lookup_elem(fd, &key, &value) == 0); - assert(value - 1 == key); + assert(bpf_map_lookup_elem(fd, &key, value) == 0); + assert(value[0] - 1 == key); } assert(i == max_entries); @@ -1371,16 +1372,16 @@ static void __run_parallel(unsigned int tasks, static void test_map_stress(void) { + run_parallel(100, test_hashmap_walk, NULL); run_parallel(100, test_hashmap, NULL); run_parallel(100, test_hashmap_percpu, NULL); run_parallel(100, test_hashmap_sizes, NULL); - run_parallel(100, test_hashmap_walk, NULL); run_parallel(100, test_arraymap, NULL); run_parallel(100, test_arraymap_percpu, NULL); } -#define TASKS 1024 +#define TASKS 100 #define DO_UPDATE 1 #define DO_DELETE 0 @@ -1432,6 +1433,8 @@ static void test_update_delete(unsigned int fn, void *data) int fd = ((int *)data)[0]; int i, key, value, err; + if (fn & 1) + test_hashmap_walk(fn, NULL); for (i = fn; i < MAP_SIZE; i += TASKS) { key = value = i; @@ -1455,7 +1458,7 @@ static void test_update_delete(unsigned int fn, void *data) static void test_map_parallel(void) { - int i, fd, key = 0, value = 0; + int i, fd, key = 0, value = 0, j = 0; int data[2]; fd = bpf_map_create(BPF_MAP_TYPE_HASH, NULL, sizeof(key), sizeof(value), @@ -1466,6 +1469,7 @@ static void test_map_parallel(void) exit(1); } +again: /* Use the same fd in children to add elements to this map: * child_0 adds key=0, key=1024, key=2048, ... * child_1 adds key=1, key=1025, key=2049, ... @@ -1502,6 +1506,12 @@ static void test_map_parallel(void) key = -1; assert(bpf_map_get_next_key(fd, NULL, &key) < 0 && errno == ENOENT); assert(bpf_map_get_next_key(fd, &key, &key) < 0 && errno == ENOENT); + + key = 0; + bpf_map_delete_elem(fd, &key); + if (j++ < 5) + goto again; + close(fd); } static void test_map_rdonly(void)