From patchwork Thu Jul 27 00:32:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Fastabend X-Patchwork-Id: 794157 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@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; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="q2EH4rFm"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xHtGd5S7kz9s8J for ; Thu, 27 Jul 2017 10:32:25 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751423AbdG0AcU (ORCPT ); Wed, 26 Jul 2017 20:32:20 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:33568 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751078AbdG0AcT (ORCPT ); Wed, 26 Jul 2017 20:32:19 -0400 Received: by mail-pf0-f194.google.com with SMTP id k72so13276756pfj.0 for ; Wed, 26 Jul 2017 17:32:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:date:message-id:user-agent:mime-version :content-transfer-encoding; bh=TAk4riype4FX3C/DIofxg5ZjjJAUcLtlhc+zj3imWBE=; b=q2EH4rFm7CAmoNMWoun3b6ch6R5ugfuGkiwo9/eq9AN1pyKmjRjLwRUYUhjLi+SytF H+Icl+kpm99xSZPByFnkU2XjcIInxsx2wcnAj6/2O5Vk9UC7ufjgKH4me+CH8D0d1mBu iCwY7QyPM5ajmrbRn0PW10l4Y/vZyNYNImy4gHcTvrSC4jeH40/oZUnX+AcgG5g0x0vE NgxlsrMFyIWDoChyUcSuiQJPu9q4KS36KM9h5tkDHS2UzypOL19JC/0SNifB5Wq3cUO2 GL14xxx8vJqEi7AdK7kW56qA0DF6RvwWp74Njag326+FyV0xGya2WkaM9Kmyj0rhqyLO iujg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:date:message-id:user-agent :mime-version:content-transfer-encoding; bh=TAk4riype4FX3C/DIofxg5ZjjJAUcLtlhc+zj3imWBE=; b=RbS7XqUluFxVHBLttKv9WgJKTpJHe+Yy0X10r5vdSInHSCE/DZpO5tgky0Yt0uPVpm WgG/VrFrclwS2HG1zAzYwEQwmP0KU3yk61p4/EKankwHWQfETsbdTMiXZVDAOshTy8W7 e9ltwHTmc5r//DaOmDTPEC+fnliTibYX7j9RCLZLQha0YwjntK+eu+0UhpdH0vcllxik zzRXvqV4tPpcmHDsQuT7hBaaE2lOciVmEmtBeazhMf0DlM7UtJxVfrqfTjJpIlWkB3Gg eovSwz0LoebHYZ+6vGDDUxBg2mvb/fHd52dA40J+ojh5up9gWsZ9uLmPWzvBeAq67Js5 LwKA== X-Gm-Message-State: AIVw1131IomT2oxIv9b42d6SaXs6qsce0cwA+YnWkAp/jlE+JMT9jIa0 XE0xt0JKjk2KRw== X-Received: by 10.98.147.6 with SMTP id b6mr2409178pfe.150.1501115539129; Wed, 26 Jul 2017 17:32:19 -0700 (PDT) Received: from [127.0.1.1] ([72.168.144.42]) by smtp.gmail.com with ESMTPSA id y11sm33264988pfd.144.2017.07.26.17.32.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 26 Jul 2017 17:32:18 -0700 (PDT) Subject: [PATCH] bpf: testing: fix devmap tests From: John Fastabend To: netdev@vger.kernel.org Cc: john.r.fastabend@intel.com, jakub.kicinski@netronome.com, daniel@iogearbox.net Date: Wed, 26 Jul 2017 17:32:07 -0700 Message-ID: <20170727003206.16649.50637.stgit@john-Precision-Tower-5810> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Apparently through one of my revisions of the initial patches series I lost the devmap test. We can add more testing later but for now lets fix the simple one we have. Fixes: 546ac1ffb70d "bpf: add devmap, a map for storing net device references" Reported-by: Jakub Kicinski Signed-off-by: John Fastabend Acked-by: Daniel Borkmann --- tools/testing/selftests/bpf/test_maps.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h index ce2988b..1579cab 100644 --- a/tools/include/uapi/linux/bpf.h +++ b/tools/include/uapi/linux/bpf.h @@ -104,6 +104,7 @@ enum bpf_map_type { BPF_MAP_TYPE_LPM_TRIE, BPF_MAP_TYPE_ARRAY_OF_MAPS, BPF_MAP_TYPE_HASH_OF_MAPS, + BPF_MAP_TYPE_DEVMAP, }; enum bpf_prog_type { diff --git a/tools/testing/selftests/bpf/test_maps.c b/tools/testing/selftests/bpf/test_maps.c index 36d6ac3..c991ab6 100644 --- a/tools/testing/selftests/bpf/test_maps.c +++ b/tools/testing/selftests/bpf/test_maps.c @@ -440,7 +440,7 @@ static void test_arraymap_percpu_many_keys(void) static void test_devmap(int task, void *data) { - int next_key, fd; + int fd; __u32 key, value; fd = bpf_create_map(BPF_MAP_TYPE_DEVMAP, sizeof(key), sizeof(value), @@ -620,6 +620,8 @@ static void run_all_tests(void) test_arraymap_percpu_many_keys(); + test_devmap(0, NULL); + test_map_large(); test_map_parallel(); test_map_stress();