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=-14.3 required=3.0 tests=DKIMWL_WL_MED,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_IN_DEF_DKIM_WL 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 14C97C43215 for ; Thu, 21 Nov 2019 21:17:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DA7F020714 for ; Thu, 21 Nov 2019 21:17:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="dW/31UQR" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726704AbfKUVQm (ORCPT ); Thu, 21 Nov 2019 16:16:42 -0500 Received: from mail-qt1-f193.google.com ([209.85.160.193]:43367 "EHLO mail-qt1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726297AbfKUVQ0 (ORCPT ); Thu, 21 Nov 2019 16:16:26 -0500 Received: by mail-qt1-f193.google.com with SMTP id q8so2689370qtr.10 for ; Thu, 21 Nov 2019 13:16:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=HjVA+vfOa4cuhOG7ZZQ5ZOYhaog/Hi6+sxpMWojKdbQ=; b=dW/31UQR9TpIGK0h/XcisPIhwMkzpKxBQKFvP9I/80AGreRgtSo21q/f23Qm4fF29i Snb0rG7W/Yw6tti1jiLmA8UP7gbcoZAogGZqJXvsU9PtwMiYrNyYVzRjLSka1nf4IqdO ZpDyuLYtxk+M4IeJAnrFALGGYHFTUsmViuXfPRTXyE6kBtj74q/l7HyZxFznr4uslg5K TXuR05iyDt4V5T+OSn6U6Hi0f172P6hoSY/GiKJcN3LYcZ1c+eQWigm5M8ogznXqInn5 ROI/zSaIQVEsvJEJqiXA+vSHzJeqBeiy9xdCRKP6epYQuoqLzRZFLoTptiNcyppn+C0v n73Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=HjVA+vfOa4cuhOG7ZZQ5ZOYhaog/Hi6+sxpMWojKdbQ=; b=CZu3eDC1DB1p+TsNmlgEZzfOXDOsYKRGUYJC5tkNZvVFB2/SuctuP6kaxdYaRetDak Glt437nJHs55dwZ6EOgEs4fJHvzpvqlP2E6jf296ogt8MV7WyGyJ9fHApiUieBC1+uUD pjU5Z0M6q9rXtp3Kn7ttzCEK0sl+WMMnNXa4Pj0HEadZtXrj2TLDW9ELreDGZ63kMM8q MBx3aR5ur9avRcyNlhUQUtkdBUko5tk7mn48WPM8TGbPd+fCgzkNwF41sr76bOB1fWfB 1WXiHGdgNCvzlhhsy5tXMd8eYRP0S6UmeKJNrHPXvET4nOkV7sqQFx5JgPniJhpKCH/S BaKw== X-Gm-Message-State: APjAAAWVWsgIsI0uIVBlCpvafXA+ZdwVP6UPj9YSNRe8dAvDiy3ETQD4 uHaFQUahybMNn7zBs5Z5HqAZnwstdZCMLzpC6Bm3bw== X-Google-Smtp-Source: APXvYqxq7xEzAax5FVtLsPdRun5uqgKjwBTSdow7Rdb+nnIKX2At/wV1oBd6VwfO5SfYKpELtEaDmhqbzJSm2Jr8dkE= X-Received: by 2002:aed:31e7:: with SMTP id 94mr4875902qth.71.1574370983986; Thu, 21 Nov 2019 13:16:23 -0800 (PST) MIME-Version: 1.0 References: <20191119193036.92831-1-brianvv@google.com> <20191119193036.92831-9-brianvv@google.com> <9f80a432-9825-9a39-cc90-d1358e0fc40f@fb.com> In-Reply-To: <9f80a432-9825-9a39-cc90-d1358e0fc40f@fb.com> From: Brian Vazquez Date: Thu, 21 Nov 2019 13:16:12 -0800 Message-ID: Subject: Re: [PATCH v2 bpf-next 8/9] selftests/bpf: add batch ops testing for hmap and hmap_percpu To: Yonghong Song Cc: Brian Vazquez , Alexei Starovoitov , Daniel Borkmann , "David S . Miller" , Stanislav Fomichev , Petar Penkov , Willem de Bruijn , "linux-kernel@vger.kernel.org" , "netdev@vger.kernel.org" , "bpf@vger.kernel.org" Content-Type: text/plain; charset="UTF-8" Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org On Thu, Nov 21, 2019 at 10:36 AM Yonghong Song wrote: > > > > On 11/19/19 11:30 AM, Brian Vazquez wrote: > > From: Yonghong Song > > > > Tested bpf_map_lookup_and_delete_batch() and bpf_map_update_batch() > > functionality. > > $ ./test_maps > > ... > > test_hmap_lookup_and_delete_batch:PASS > > test_pcpu_hmap_lookup_and_delete_batch:PASS > > ... > > Maybe you can add another tests for lookup_batch() and delete_batch() > so all new APIs get tested? I did test lookup_batch() and the code is there, I will add delete_batch() testing and change the name of the tests to better reflect what is being tested. > > > > > Signed-off-by: Yonghong Song > > Signed-off-by: Brian Vazquez > > --- > > .../map_lookup_and_delete_batch_htab.c | 257 ++++++++++++++++++ > > 1 file changed, 257 insertions(+) > > create mode 100644 tools/testing/selftests/bpf/map_tests/map_lookup_and_delete_batch_htab.c > > > > diff --git a/tools/testing/selftests/bpf/map_tests/map_lookup_and_delete_batch_htab.c b/tools/testing/selftests/bpf/map_tests/map_lookup_and_delete_batch_htab.c > > new file mode 100644 > > index 0000000000000..93e024cb85c60 > > --- /dev/null > > +++ b/tools/testing/selftests/bpf/map_tests/map_lookup_and_delete_batch_htab.c > > @@ -0,0 +1,257 @@ > > +// SPDX-License-Identifier: GPL-2.0 > > +/* Copyright (c) 2019 Facebook */ > > +#include > > +#include > > +#include > > + > > +#include > > +#include > > + > > +#include > > +#include > > + > > +static void map_batch_update(int map_fd, __u32 max_entries, int *keys, > > + void *values, bool is_pcpu) > > +{ > > + typedef BPF_DECLARE_PERCPU(int, value); > > + int i, j, err; > > + value *v; > > + > > + if (is_pcpu) > > + v = (value *)values; > > + > > + for (i = 0; i < max_entries; i++) { > > + keys[i] = i + 1; > > + if (is_pcpu) > > + for (j = 0; j < bpf_num_possible_cpus(); j++) > > + bpf_percpu(v[i], j) = i + 2 + j; > > + else > > + ((int *)values)[i] = i + 2; > > + } > > + > > + err = bpf_map_update_batch(map_fd, keys, values, &max_entries, 0, 0); > > + CHECK(err, "bpf_map_update_batch()", "error:%s\n", strerror(errno)); > > +} > > + > > +static void map_batch_verify(int *visited, __u32 max_entries, > > + int *keys, void *values, bool is_pcpu) > > +{ > > + typedef BPF_DECLARE_PERCPU(int, value); > > + value *v; > > + int i, j; > > + > > + if (is_pcpu) > > + v = (value *)values; > > + > > + memset(visited, 0, max_entries * sizeof(*visited)); > > + for (i = 0; i < max_entries; i++) { > > + > > + if (is_pcpu) { > > + for (j = 0; j < bpf_num_possible_cpus(); j++) { > > + CHECK(keys[i] + 1 + j != bpf_percpu(v[i], j), > > + "key/value checking", > > + "error: i %d j %d key %d value %d\n", > > + i, j, keys[i], bpf_percpu(v[i], j)); > > + } > > + } else { > > + CHECK(keys[i] + 1 != ((int *)values)[i], > > + "key/value checking", > > + "error: i %d key %d value %d\n", i, keys[i], > > + ((int *)values)[i]); > > + } > > + > > + visited[i] = 1; > > + > > + } > > + for (i = 0; i < max_entries; i++) { > > + CHECK(visited[i] != 1, "visited checking", > > + "error: keys array at index %d missing\n", i); > > + } > > +} > > + > > +void __test_map_lookup_and_delete_batch(bool is_pcpu) > > +{ > > + int map_type = is_pcpu ? BPF_MAP_TYPE_PERCPU_HASH : BPF_MAP_TYPE_HASH; > > + struct bpf_create_map_attr xattr = { > > + .name = "hash_map", > > + .map_type = map_type, > > + .key_size = sizeof(int), > > + .value_size = sizeof(int), > > + }; > > + typedef BPF_DECLARE_PERCPU(int, value); > > + int map_fd, *keys, *visited, key; > > + __u32 batch = 0, count, total, total_success; > > + const __u32 max_entries = 10; > > + int err, i, step, value_size; > > + value pcpu_values[10]; > > + bool nospace_err; > > + void *values; > > + > > + xattr.max_entries = max_entries; > > + map_fd = bpf_create_map_xattr(&xattr); > > + CHECK(map_fd == -1, > > + "bpf_create_map_xattr()", "error:%s\n", strerror(errno)); > > + > > + value_size = is_pcpu ? sizeof(value) : sizeof(int); > > + keys = malloc(max_entries * sizeof(int)); > > + if (is_pcpu) > > + values = pcpu_values; > > + else > > + values = malloc(max_entries * sizeof(int)); > > + visited = malloc(max_entries * sizeof(int)); > > + CHECK(!keys || !values || !visited, "malloc()", > > + "error:%s\n", strerror(errno)); > > + > > + /* test 1: lookup/delete an empty hash table, -ENOENT */ > > + count = max_entries; > > + err = bpf_map_lookup_and_delete_batch(map_fd, NULL, &batch, keys, > > + values, &count, 0, 0); > > + CHECK((err && errno != ENOENT), "empty map", > > + "error: %s\n", strerror(errno)); > > + > > + /* populate elements to the map */ > > + map_batch_update(map_fd, max_entries, keys, values, is_pcpu); > > + > > + /* test 2: lookup/delete with count = 0, success */ > > + batch = 0; > > + count = 0; > > + err = bpf_map_lookup_and_delete_batch(map_fd, NULL, &batch, keys, > > + values, &count, 0, 0); > > + CHECK(err, "count = 0", "error: %s\n", strerror(errno)); > > + > > + /* test 3: lookup/delete with count = max_entries, success */ > > + memset(keys, 0, max_entries * sizeof(*keys)); > > + memset(values, 0, max_entries * value_size); > > + count = max_entries; > > + batch = 0; > > + err = bpf_map_lookup_and_delete_batch(map_fd, NULL, &batch, keys, > > + values, &count, 0, 0); > > + CHECK((err && errno != ENOENT), "count = max_entries", > > + "error: %s\n", strerror(errno)); > > + CHECK(count != max_entries, "count = max_entries", > > + "count = %u, max_entries = %u\n", count, max_entries); > > + map_batch_verify(visited, max_entries, keys, values, is_pcpu); > > + > > + /* bpf_map_get_next_key() should return -ENOENT for an empty map. */ > > + err = bpf_map_get_next_key(map_fd, NULL, &key); > > + CHECK(!err, "bpf_map_get_next_key()", "error: %s\n", strerror(errno)); > > + > > + /* test 4: lookup/delete in a loop with various steps. */ > > + total_success = 0; > > + for (step = 1; step < max_entries; step++) { > > + map_batch_update(map_fd, max_entries, keys, values, is_pcpu); > > + memset(keys, 0, max_entries * sizeof(*keys)); > > + memset(values, 0, max_entries * value_size); > > + batch = 0; > > + total = 0; > > + i = 0; > > + /* iteratively lookup/delete elements with 'step' > > + * elements each > > + */ > > + count = step; > > + nospace_err = false; > > + while (true) { > > + err = bpf_map_lookup_batch(map_fd, > > + total ? &batch : NULL, > > + &batch, keys + total, > > + values + > > + total * value_size, > > + &count, 0, 0); > > + /* It is possible that we are failing due to buffer size > > + * not big enough. In such cases, let us just exit and > > + * go with large steps. Not that a buffer size with > > + * max_entries should always work. > > + */ > > + if (err && errno == ENOSPC) { > > + nospace_err = true; > > + break; > > + } > > + > > + > > + CHECK((err && errno != ENOENT), "lookup with steps", > > + "error: %s\n", strerror(errno)); > > + > > + total += count; > > + if (err) > > + break; > > + > > + i++; > > + } > > + if (nospace_err == true) > > + continue; > > + > > + CHECK(total != max_entries, "lookup with steps", > > + "total = %u, max_entries = %u\n", total, max_entries); > > + map_batch_verify(visited, max_entries, keys, values, is_pcpu); > > + > > + memset(keys, 0, max_entries * sizeof(*keys)); > > + memset(values, 0, max_entries * value_size); > > + batch = 0; > > + total = 0; > > + i = 0; > > + /* iteratively lookup/delete elements with 'step' > > + * elements each > > + */ > > + count = step; > > + nospace_err = false; > > + while (true) { > > + err = bpf_map_lookup_and_delete_batch(map_fd, > > + total ? &batch : NULL, > > + &batch, keys + total, > > + values + > > + total * value_size, > > + &count, 0, 0); > > + /* It is possible that we are failing due to buffer size > > + * not big enough. In such cases, let us just exit and > > + * go with large steps. Not that a buffer size with > > + * max_entries should always work. > > + */ > > + if (err && errno == ENOSPC) { > > + nospace_err = true; > > + break; > > + } > > + > > + CHECK((err && errno != ENOENT), "lookup with steps", > > + "error: %s\n", strerror(errno)); > > + > > + total += count; > > + if (err) > > + break; > > + i++; > > + } > > + > > + if (nospace_err == true) > > + continue; > > + > > + CHECK(total != max_entries, "lookup/delete with steps", > > + "total = %u, max_entries = %u\n", total, max_entries); > > + > > + map_batch_verify(visited, max_entries, keys, values, is_pcpu); > > + err = bpf_map_get_next_key(map_fd, NULL, &key); > > + CHECK(!err, "bpf_map_get_next_key()", "error: %s\n", > > + strerror(errno)); > > + > > + total_success++; > > + } > > + > > + CHECK(total_success == 0, "check total_success", > > + "unexpected failure\n"); > > +} > > + > > +void test_hmap_lookup_and_delete_batch(void) > > +{ > > + __test_map_lookup_and_delete_batch(false); > > + printf("%s:PASS\n", __func__); > > +} > > + > > +void test_pcpu_hmap_lookup_and_delete_batch(void) > > +{ > > + __test_map_lookup_and_delete_batch(true); > > + printf("%s:PASS\n", __func__); > > +} > > + > > +void test_map_lookup_and_delete_batch_htab(void) > > +{ > > + test_hmap_lookup_and_delete_batch(); > > + test_pcpu_hmap_lookup_and_delete_batch(); > > +} > >