Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp93077ybl; Wed, 11 Dec 2019 14:36:03 -0800 (PST) X-Google-Smtp-Source: APXvYqy4myKtCJaAjO3Cdu2ttP+qiCcQLDWvLO6SvmF81kRyyz8QevqcYRA0D3xxbF4XjgL0rK4I X-Received: by 2002:a9d:7b4e:: with SMTP id f14mr4400874oto.355.1576103762683; Wed, 11 Dec 2019 14:36:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576103762; cv=none; d=google.com; s=arc-20160816; b=RKb+mrENgHHq2bhmvzpdg/01OIPe7u5MFwXfFGNC052mfXQPFqiOrR+ZHfnG2dKzgF hqnmTNZakhMAbun7QFKH3NimDgmHDJ47G8imwqAvnflhd21jx4zaQ6EfZn33NH6z5fTU UV1xG64Y3qvrorjnq+K93RN73DMTd7At4NwjJ2iDKWRpRL37CgMHVIlqXn2T5Ux6OatZ 3UDkwOEUiqKQXq0Z3kolfkbDnnlZSEySyeBNinZxQ9uNx4XsByT6eXkWr43gAYNRUxfM mBYvbNXy/EXvQKFxwtfUDFqYcHe+j4lohZ/kh1vOrvzpSJEAP9sNH01h1yckH0dMTPYe PZlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:from:subject:references :mime-version:message-id:in-reply-to:date:dkim-signature; bh=8o/gH5+XtBu0HLbIWnLVKRhI0lP1MZucRfi5Tmg/xRY=; b=NGTbonvYJm5vFWU1hAe4JeteOiAKzUJHQEugKhEzMrdNl450QQu/awbIVnZhLudgxT RS+67lXhi08Q7Q5AwocEnSwMAnh9ssFcdvNQ2a5m7jlAnzy0nfQ04Mm7nNiQfDH42Dxr KHbNbdHMXailR1et63o78Sx2HfjIjZHCqCXz1LB5yiCy2erxa4TbxpyfJlq5VgFmepwI WbrhEMlAYzTCy0eQh7qeL3mJlQ6XhLMh3wF/y6CMX5KCCYizFODqFTCL4H+WinkcSYBa Hx3KtE/RYN13z8LF+H4kw/UPnC1gLJXiRNq4MM6A9X3CjOUYmanVvaO67DMzAY/B+TI/ 6iAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=Eyd6oFgU; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w17si2099165otp.185.2019.12.11.14.35.50; Wed, 11 Dec 2019 14:36:02 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=Eyd6oFgU; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727223AbfLKWfA (ORCPT + 99 others); Wed, 11 Dec 2019 17:35:00 -0500 Received: from mail-pg1-f201.google.com ([209.85.215.201]:42205 "EHLO mail-pg1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727210AbfLKWe4 (ORCPT ); Wed, 11 Dec 2019 17:34:56 -0500 Received: by mail-pg1-f201.google.com with SMTP id x189so202037pgd.9 for ; Wed, 11 Dec 2019 14:34:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=8o/gH5+XtBu0HLbIWnLVKRhI0lP1MZucRfi5Tmg/xRY=; b=Eyd6oFgU0FP4KZyu8nqFCWnRZchPcb0LpmERtUx8e1gv/ydKT7FXBUchFFk5qH/fDd TUT8iNU4a5QqDEtbaZEellLni1I9USQJ6xlATerYxYrzSYIptvHfZNhdF2Ecz9l+Z4tU 5Kp4DwPpwv2SqPfTeKp20p1EM9TajUbTZdzjiHQLUfNFWNHoOrmZD7PrkigIK1JyWgyF 90a2VBoKQTotfyBC5IMlcpGcAtGCyJpFeqRMRrxHGTkirubWd0VJzxUB+sNrpRgQHlV/ Xrf981ANJGJO/S+gxji7MUi+7DPadyY8vsFjrmkPj3Ppz4SOL52BIg2v3CpEFwji4uER 16zQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=8o/gH5+XtBu0HLbIWnLVKRhI0lP1MZucRfi5Tmg/xRY=; b=m1uzw28qTT26jDh5FWXVNjc268aYZp81NdL5Sofc0+jLMFVtMPBRWtpjWEga67965D IsVgzB/WVeO1+n25p8mHQCEzrAHwvW8M92t+3ZSvq1E/Mf9nY74FUq99Q34i4mcU/+GF imlZX3xuLoa9aVovOAn9t7rSvxn+iGbJtYFJ5wX9Ma3hOiS2uC++6Zs+VbLPPt6yG2Jg bOKmfr6DldfPeOwfTp400i7hMF//C/jMTLFjlo0jrAwS6wEETv7S9AwzFrYnbg1fCQE4 YcEfmRy7feWl9UITpT3/xScJxBC5U0jW1qsl67kY7AsPBix6x2mkh2XsCQmNyYKL1wpa w4hg== X-Gm-Message-State: APjAAAWwlxelCWtU3VxgSgaMqYvXUNHZ8osRcnljg8mmASHtxUhn1VC8 Zss8GbiqwsFerCTDrPKM5TMCL7EvaqnJ X-Received: by 2002:a63:647:: with SMTP id 68mr6841026pgg.202.1576103695389; Wed, 11 Dec 2019 14:34:55 -0800 (PST) Date: Wed, 11 Dec 2019 14:33:44 -0800 In-Reply-To: <20191211223344.165549-1-brianvv@google.com> Message-Id: <20191211223344.165549-12-brianvv@google.com> Mime-Version: 1.0 References: <20191211223344.165549-1-brianvv@google.com> X-Mailer: git-send-email 2.24.1.735.g03f4e72817-goog Subject: [PATCH v3 bpf-next 11/11] selftests/bpf: add batch ops testing to lpm_trie bpf map From: Brian Vazquez To: Brian Vazquez , Brian Vazquez , Alexei Starovoitov , Daniel Borkmann , "David S . Miller" Cc: Yonghong Song , 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: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Tested bpf_map_batch_ops functionality. $ ./test_maps ... test_trie_map_batch_ops:PASS ... Signed-off-by: Brian Vazquez Signed-off-by: Yonghong Song --- .../bpf/map_tests/trie_map_batch_ops.c | 235 ++++++++++++++++++ 1 file changed, 235 insertions(+) create mode 100644 tools/testing/selftests/bpf/map_tests/trie_map_batch_ops.c diff --git a/tools/testing/selftests/bpf/map_tests/trie_map_batch_ops.c b/tools/testing/selftests/bpf/map_tests/trie_map_batch_ops.c new file mode 100644 index 0000000000000..927e898bea2d0 --- /dev/null +++ b/tools/testing/selftests/bpf/map_tests/trie_map_batch_ops.c @@ -0,0 +1,235 @@ +// SPDX-License-Identifier: GPL-2.0 +#include +#include +#include +#include + +#include +#include + +#include +#include + +static void map_batch_update(int map_fd, __u32 max_entries) +{ + int i, err; + struct bpf_lpm_trie_key *key_helper; + void *key, *values; + size_t key_size; + + key_size = sizeof(*key_helper) + sizeof(__u32); + key = alloca(max_entries * key_size); + values = alloca(max_entries * sizeof(int)); + + for (i = 0; i < max_entries; i++) { + key_helper = (struct bpf_lpm_trie_key *)(key + i * key_size); + inet_pton(AF_INET, "192.168.0.0", key_helper->data); + key_helper->data[3] = i; + key_helper->prefixlen = 16 + i; + ((int *)values)[i] = i + 1; + } + + err = bpf_map_update_batch(map_fd, key, 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, + void *keys, void *values) +{ + struct bpf_lpm_trie_key *key; + size_t key_size; + int i; + + memset(visited, 0, max_entries * sizeof(*visited)); + key_size = sizeof(*key) + sizeof(__u32); + + for (i = 0; i < max_entries; i++) { + key = keys + i * key_size; + CHECK(key->data[3] + 1 != ((int *)values)[i], + "key/value checking", + "error: i %d key %d.%d.%d.%d value %d\n", i, key->data[0], + key->data[1], key->data[2], key->data[3], + ((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_trie_map_lookup_and_delete_batch(void) +{ + struct bpf_lpm_trie_key *batch, *key_p; + size_t key_size = sizeof(*key_p) + sizeof(__u32); + struct bpf_create_map_attr xattr = { + .name = "lpm_trie_map", + .map_type = BPF_MAP_TYPE_LPM_TRIE, + .key_size = key_size, + .value_size = sizeof(int), + }; + __u32 count, total, total_success; + const __u32 max_entries = 10; + int map_fd, *visited, key; + int err, i, step; + int *values; + void *keys; + + xattr.max_entries = max_entries; + xattr.map_flags = BPF_F_NO_PREALLOC; + map_fd = bpf_create_map_xattr(&xattr); + CHECK(map_fd == -1, + "bpf_create_map_xattr()", "error:%s\n", strerror(errno)); + + keys = malloc(max_entries * key_size); + batch = malloc(key_size); + 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); + + /* test 2: lookup/delete with count = 0, success */ + 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 * key_size); + memset(values, 0, max_entries * sizeof(int)); + count = max_entries; + 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); + + /* 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 = 4; step < max_entries; step++) { + map_batch_update(map_fd, max_entries); + memset(keys, 0, max_entries * key_size); + memset(values, 0, max_entries * sizeof(int)); + total = 0; + /* iteratively lookup elements with 'step' + * elements each + */ + count = step; + while (true) { + err = bpf_map_lookup_batch(map_fd, + total ? batch : NULL, + batch, + keys + total * key_size, + values + total, + &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. + */ + CHECK((err && errno != ENOENT), "lookup with steps", + "error: %s\n", strerror(errno)); + + total += count; + if (err) + break; + } + + CHECK(total != max_entries, "lookup with steps", + "total = %u, max_entries = %u\n", total, max_entries); + map_batch_verify(visited, max_entries, keys, values); + + total = 0; + while (true) { + err = bpf_map_delete_batch(map_fd, + keys + total * key_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. + */ + CHECK((err && errno != ENOENT), "lookup with steps", + "error: %s\n", strerror(errno)); + total += count; + if (err) + break; + } + + CHECK(total != max_entries, "delete with steps", + "total = %u, max_entries = %u\n", total, max_entries); + + /* check map is empty, errno == -ENOENT */ + err = bpf_map_get_next_key(map_fd, NULL, keys); + CHECK(!err || errno != ENOENT, "bpf_map_get_next_key()", + "error: %s\n", strerror(errno)); + + map_batch_update(map_fd, max_entries); + memset(keys, 0, max_entries * key_size); + memset(values, 0, max_entries * sizeof(int)); + total = 0; + i = 0; + /* iteratively lookup/delete elements with 'step' + * elements each + */ + count = step; + while (true) { + err = bpf_map_lookup_and_delete_batch(map_fd, + total ? batch : NULL, + batch, + keys + total * key_size, + values + total, + &count, 0, 0); + + CHECK((err && errno != ENOENT), "lookup with steps", + "error: %s\n", strerror(errno)); + + total += count; + if (err) + break; + i++; + } + + 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); + 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 trie_map_batch_ops(void) +{ + __test_trie_map_lookup_and_delete_batch(); + printf("test_%s:PASS\n", __func__); +} + +void test_trie_map_batch_ops(void) +{ + trie_map_batch_ops(); +} -- 2.24.1.735.g03f4e72817-goog