From patchwork Mon Aug 6 13:58:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauricio Vasquez X-Patchwork-Id: 953893 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=polito.it Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41kg1W4JTHz9s0R for ; Tue, 7 Aug 2018 00:26:07 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732007AbeHFQf1 (ORCPT ); Mon, 6 Aug 2018 12:35:27 -0400 Received: from fm1nodo1.polito.it ([130.192.180.16]:50193 "EHLO antispam.polito.it" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727451AbeHFQf0 (ORCPT ); Mon, 6 Aug 2018 12:35:26 -0400 Received: from polito.it (frontmail2.polito.it [130.192.180.42]) by antispam.polito.it with ESMTP id w76DwdPn003911-w76DwdPp003911 (version=TLSv1.0 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=CAFAIL); Mon, 6 Aug 2018 15:58:39 +0200 X-ExtScanner: Niversoft's FindAttachments (free) Received: from [130.192.225.196] (account d040768@polito.it HELO [127.0.1.1]) by polito.it (CommuniGate Pro SMTP 6.2.5) with ESMTPSA id 78232791; Mon, 06 Aug 2018 15:58:39 +0200 Subject: [PATCH bpf-next 2/3] selftests/bpf: add test cases for BPF_MAP_TYPE_QUEUE From: Mauricio Vasquez B To: Alexei Starovoitov , Daniel Borkmann Cc: netdev@vger.kernel.org Date: Mon, 06 Aug 2018 15:58:38 +0200 Message-ID: <153356391611.6981.14864460244240605372.stgit@kernel> In-Reply-To: <153356387977.6981.12236150594041620482.stgit@kernel> References: <153356387977.6981.12236150594041620482.stgit@kernel> User-Agent: StGit/unknown-version MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Mauricio Vasquez B --- tools/include/uapi/linux/bpf.h | 5 ++ tools/testing/selftests/bpf/test_maps.c | 72 +++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+) diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h index 0ebaaf7f3568..2c171c40eb45 100644 --- a/tools/include/uapi/linux/bpf.h +++ b/tools/include/uapi/linux/bpf.h @@ -120,6 +120,7 @@ enum bpf_map_type { BPF_MAP_TYPE_CPUMAP, BPF_MAP_TYPE_XSKMAP, BPF_MAP_TYPE_SOCKHASH, + BPF_MAP_TYPE_QUEUE, }; enum bpf_prog_type { @@ -255,6 +256,10 @@ enum bpf_attach_type { /* Flag for stack_map, store build_id+offset instead of pointer */ #define BPF_F_STACK_BUILD_ID (1U << 5) +/* Flags for queue_map, type of queue */ +#define BPF_F_QUEUE_FIFO (1U << 16) +#define BPF_F_QUEUE_LIFO (2U << 16) + enum bpf_stack_build_id_status { /* user space need an empty entry to identify end of a trace */ BPF_STACK_BUILD_ID_EMPTY = 0, diff --git a/tools/testing/selftests/bpf/test_maps.c b/tools/testing/selftests/bpf/test_maps.c index 6c253343a6f9..34567b017dbb 100644 --- a/tools/testing/selftests/bpf/test_maps.c +++ b/tools/testing/selftests/bpf/test_maps.c @@ -457,6 +457,77 @@ static void test_devmap(int task, void *data) close(fd); } +static void test_queuemap(int task, void *data) +{ + __u32 value; + int fd, i; + + /* test FIFO */ + fd = bpf_create_map(BPF_MAP_TYPE_QUEUE, 0, sizeof(value), 32, + BPF_F_QUEUE_FIFO); + if (fd < 0) { + printf("Failed to create queuemap '%s'!\n", strerror(errno)); + exit(1); + } + + /* Push 32 elements */ + for (i = 0; i < 32; i++) { + value = 1000 - i * 3; + assert(bpf_map_update_elem(fd, NULL, &value, 0) == 0); + } + + /* Check that element cannot be pushed due to max_entries limit */ + value = 1000; + assert(bpf_map_update_elem(fd, NULL, &value, 0) == -1 && + errno == E2BIG); + + /* Pop all elements */ + for (i = 0; i < 32; i++) + assert(bpf_map_lookup_elem(fd, NULL, &value) == 0 && + value == (1000 - i * 3)); + + /* Check that there are not elements left */ + assert(bpf_map_lookup_elem(fd, NULL, &value) == -1 && errno == ENOENT); + + assert(bpf_map_delete_elem(fd, NULL) == -1 && errno == EINVAL); + assert(bpf_map_get_next_key(fd, NULL, NULL) == -1 && errno == EINVAL); + + close(fd); + + /* test LIFO */ + fd = bpf_create_map(BPF_MAP_TYPE_QUEUE, 0, sizeof(value), 32, + BPF_F_QUEUE_LIFO); + if (fd < 0) { + printf("Failed to create queuemap '%s'!\n", strerror(errno)); + exit(1); + } + + /* Push 32 elements */ + for (i = 0; i < 32; i++) { + value = 1000 - i * 3; + assert(bpf_map_update_elem(fd, NULL, &value, 0) == 0); + } + + /* Check that element cannot be pushed due to max_entries limit */ + value = 1000; + assert(bpf_map_update_elem(fd, NULL, &value, 0) == -1 && + errno == E2BIG); + + /* Pop all elements */ + for (i = 31; i >= 0; i--) + assert(bpf_map_lookup_elem(fd, NULL, &value) == 0 && + value == (1000 - i * 3)); + + /* Check that there are not elements left */ + assert(bpf_map_lookup_elem(fd, NULL, &value) == -1 && + errno == ENOENT); + + assert(bpf_map_delete_elem(fd, NULL) == -1 && errno == EINVAL); + assert(bpf_map_get_next_key(fd, NULL, NULL) == -1 && errno == EINVAL); + + close(fd); +} + #include #include #include @@ -1162,6 +1233,7 @@ static void run_all_tests(void) test_arraymap_percpu_many_keys(); test_devmap(0, NULL); + test_queuemap(0, NULL); test_sockmap(0, NULL); test_map_large();