From patchwork Fri Jun 21 23:16:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Vazquez X-Patchwork-Id: 1120540 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: incoming-bpf@patchwork.ozlabs.org Delivered-To: patchwork-incoming-bpf@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=bpf-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="ejwl+xG1"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 45VvjJ4kcqz9s9y for ; Sat, 22 Jun 2019 09:17:24 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726245AbfFUXRM (ORCPT ); Fri, 21 Jun 2019 19:17:12 -0400 Received: from mail-yb1-f202.google.com ([209.85.219.202]:45722 "EHLO mail-yb1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726230AbfFUXRL (ORCPT ); Fri, 21 Jun 2019 19:17:11 -0400 Received: by mail-yb1-f202.google.com with SMTP id y3so7342856ybg.12 for ; Fri, 21 Jun 2019 16:17:11 -0700 (PDT) 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=rj82FQVe1sxehS1oKg3PuFxZ1lm7MWUrxe2hdxNBH9E=; b=ejwl+xG1axIiX3s05MG5iOCBdiQJwCRP/hHzUbUllzw29ytDqE0pElJwSom0wYfra5 5MjJoFegVuAk+nZ+WyyCb71ze2pMC/TRJ/yaPQoExGYuQt73bUOo2qzqrLCjSbZ9QeUs tNhEJ+I+L7smjvdoVUqOaTJWHTryAq4t1n6bGYN4pk6vL9lkBW7uwFAn1/BafF6fsSQ7 1oMc0vxtdOeh7BS+RnQxScDeREIzxslQIhUVwQzTFrzGrV05ok6Ctx2+dCbswF8vSUvO /3WICH5e7MoPGRoXCWn6Vfsi9QxwkjH37852nSbRIT6TEeJGIyJKnDktMvggJfpn8OZe 5a3g== 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=rj82FQVe1sxehS1oKg3PuFxZ1lm7MWUrxe2hdxNBH9E=; b=POmYayOSimhHmiFTYaFI+uArkPd5lwBKjfmxUCE1jSdjJSt44P2XTplA3WNoRc7vIL prLB0R2xtL7qTXi78UVb1yJk5TQezM6XCymURaA5UGCN5bqOl/huyn2pXp2pV2SpFGRZ 50oHG7nsAGFJxbXYOTDyqjLZYrBSTKZDADx5JARoYrMzapnEDBW1BPXhcksbMsgkZKrd d3i7Ag85u8W/7BDCPZcPqJS7CfW2p84Ernxu6lXczI1YM1MxiOK9KnPI8LF8aRF64/P7 y9rhBKQnB+hiIMdvCzLuWBT73qcKWW0R90FpWrPSp4kdAhI4rR97iZsTGXmOT8GZBeCN 04Zw== X-Gm-Message-State: APjAAAWY5g583jyeXNTqzt8yc8Lb+qZsbYe/hdhZpjN1shoGfRYPD+VB hYwBUeKm6iNtufVJCY3wAx4EbfgMO3Kl X-Google-Smtp-Source: APXvYqwnZIYW8EbMmvFA3ezPe/btCstszKmgy97/QK5tX6I3VWoMKPPbHx4CxRSv6t2Xwc8Z0LcuzBuSxgCt X-Received: by 2002:a0d:e1c1:: with SMTP id k184mr67567296ywe.153.1561159030572; Fri, 21 Jun 2019 16:17:10 -0700 (PDT) Date: Fri, 21 Jun 2019 16:16:49 -0700 In-Reply-To: <20190621231650.32073-1-brianvv@google.com> Message-Id: <20190621231650.32073-6-brianvv@google.com> Mime-Version: 1.0 References: <20190621231650.32073-1-brianvv@google.com> X-Mailer: git-send-email 2.22.0.410.gd8fdbe21b5-goog Subject: [RFC PATCH 5/6] selftests/bpf: test BPF_MAP_DUMP command on a bpf hashmap From: Brian Vazquez To: Brian Vazquez , Alexei Starovoitov , Daniel Borkmann , "David S . Miller" Cc: Stanislav Fomichev , Willem de Bruijn , Petar Penkov , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, bpf@vger.kernel.org, Brian Vazquez Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org This tests exercise the new command on a bpf hashmap and make sure it works as expected. Signed-off-by: Brian Vazquez --- tools/testing/selftests/bpf/test_maps.c | 70 ++++++++++++++++++++++++- 1 file changed, 68 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/bpf/test_maps.c b/tools/testing/selftests/bpf/test_maps.c index a3fbc571280a9..3df72b46fd1d9 100644 --- a/tools/testing/selftests/bpf/test_maps.c +++ b/tools/testing/selftests/bpf/test_maps.c @@ -309,6 +309,73 @@ static void test_hashmap_walk(unsigned int task, void *data) close(fd); } +static void test_hashmap_dump(void) +{ + int fd, i, max_entries = 3; + uint64_t keys[max_entries], values[max_entries]; + uint64_t key, value, next_key; + bool next_key_valid = true; + void *buf, *elem, *prev_key; + u32 buf_len; + const int elem_size = sizeof(key) + sizeof(value); + + fd = helper_fill_hashmap(max_entries); + + // Get the elements in the hashmap, and store them in that order + assert(bpf_map_get_next_key(fd, NULL, &key) == 0); + i = 0; + keys[i] = key; + for (i = 1; next_key_valid; i++) { + next_key_valid = bpf_map_get_next_key(fd, &key, &next_key) == 0; + assert(bpf_map_lookup_elem(fd, &key, &values[i - 1]) == 0); + keys[i-1] = key; + key = next_key; + } + + // Alloc memory for the whole table + buf = malloc(elem_size * max_entries); + assert(buf != NULL); + + // Check that buf_len < elem_size returns EINVAL + buf_len = elem_size-1; + errno = 0; + assert(bpf_map_dump(fd, NULL, buf, &buf_len) == -1 && errno == EINVAL); + + // Check that it returns the first two elements + errno = 0; + buf_len = elem_size * 2; + prev_key = NULL; + i = 0; + assert(bpf_map_dump(fd, prev_key, buf, &buf_len) == 0 && + buf_len == 2*elem_size); + elem = buf; + assert((*(uint64_t *)elem) == keys[i] && + (*(uint64_t *)(elem + sizeof(key))) == values[i]); + elem = buf + elem_size; + i++; + assert((*(uint64_t *)elem) == keys[i] && + (*(uint64_t *)(elem + sizeof(key))) == values[i]); + i++; + + /* Continue reading from map and verify buf_len only contains 1 element + * even though buf_len is 2 elem_size. + */ + prev_key = elem; + assert(bpf_map_dump(fd, prev_key, buf, &buf_len) == 0 && + buf_len == elem_size); + elem = buf; + assert((*(uint64_t *)elem) == keys[i] && + (*(uint64_t *)(elem + sizeof(key))) == values[i]); + + // Check that there are no more entries after last_key + prev_key = &keys[i]; + assert(bpf_map_dump(fd, prev_key, buf, &buf_len) == -1 && + errno == ENOENT); + + free(buf); + close(fd); +} + static void test_hashmap_zero_seed(void) { int i, first, second, old_flags; @@ -1668,6 +1735,7 @@ static void run_all_tests(void) test_hashmap_percpu(0, NULL); test_hashmap_walk(0, NULL); test_hashmap_zero_seed(); + test_hashmap_dump(); test_arraymap(0, NULL); test_arraymap_percpu(0, NULL); @@ -1705,11 +1773,9 @@ int main(void) map_flags = BPF_F_NO_PREALLOC; run_all_tests(); - #define CALL #include #undef CALL - printf("test_maps: OK, %d SKIPPED\n", skips); return 0; }