From patchwork Thu Oct 5 14:41:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Craig Gallek X-Patchwork-Id: 821848 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=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3y7Fpp1Tgrz9sNw for ; Fri, 6 Oct 2017 01:42:10 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751381AbdJEOmI (ORCPT ); Thu, 5 Oct 2017 10:42:08 -0400 Received: from mail-qk0-f182.google.com ([209.85.220.182]:49338 "EHLO mail-qk0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751123AbdJEOmF (ORCPT ); Thu, 5 Oct 2017 10:42:05 -0400 Received: by mail-qk0-f182.google.com with SMTP id s14so1671244qks.6 for ; Thu, 05 Oct 2017 07:42:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=MH4W9sWyShzsrks3jwOoMhrZYItXzE0AnYao7eRbQgo=; b=hmq619w78j2cwi6XZMi0S+gTWd/Gq/1V1b5VZhVDh1lnyhpyS01VXOz0GGfu1XobM8 vJ3ulUrHSZaYuTehQf53DtgcePLYix8GxrJvCTL/0SlmWkPi5T88JHLbC2M+2OM6oYhm 9+g9UAi1Pful6ADDvXB5i28OfHvKZZ+uWw3T45k/STEEQE7J5WrLyYXtVjlJBN58ZN9F g6WG/HMCBbHfVDJ5AacGwBNNZLqsMGK9rPaGyuwz/cpRShijsCZEFLnK127Lw6Z7dTey 2OdOBjf2UfmOBhTjjNX8FurYwm4ZLIYpCGE94eKIWzDbjWHMgVzeYGKlusTsO681g+Mb CPOA== X-Gm-Message-State: AMCzsaWSB1fYm9vtRRwRcFjuS4Lmxtuj9t/ZnbBBG22LsmjmUzZEmCGt XMjZhskjMSS33AMonRhTeXtK9g== X-Google-Smtp-Source: AOwi7QBwn2wV4wCSDEkyQrzm7f5HjlJg/K4ctGsYHhS9mPK0HMpo2SiBT2mpBZOQ9lhojfEk8eo3WQ== X-Received: by 10.55.210.71 with SMTP id f68mr28886680qkj.150.1507214524600; Thu, 05 Oct 2017 07:42:04 -0700 (PDT) Received: from monkey.nyc.corp.google.com ([100.101.213.10]) by smtp.gmail.com with ESMTPSA id u40sm3527086qtu.9.2017.10.05.07.42.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 05 Oct 2017 07:42:03 -0700 (PDT) From: Craig Gallek To: Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , "David S . Miller" Cc: Chonggang Li , netdev@vger.kernel.org Subject: [PATCH net-next v3 2/2] libbpf: use map_flags when creating maps Date: Thu, 5 Oct 2017 10:41:58 -0400 Message-Id: <20171005144158.14860-3-kraigatgoog@gmail.com> X-Mailer: git-send-email 2.14.2.920.gcf0c67979c-goog In-Reply-To: <20171005144158.14860-1-kraigatgoog@gmail.com> References: <20171005144158.14860-1-kraigatgoog@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Craig Gallek This is required to use BPF_MAP_TYPE_LPM_TRIE or any other map type which requires flags. Signed-off-by: Craig Gallek Acked-by: Daniel Borkmann --- tools/lib/bpf/libbpf.c | 2 +- tools/lib/bpf/libbpf.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index 23152890ec60..5aa45f89da93 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -942,7 +942,7 @@ bpf_object__create_maps(struct bpf_object *obj) def->key_size, def->value_size, def->max_entries, - 0); + def->map_flags); if (*pfd < 0) { size_t j; int err = *pfd; diff --git a/tools/lib/bpf/libbpf.h b/tools/lib/bpf/libbpf.h index 7959086eb9c9..6e20003109e0 100644 --- a/tools/lib/bpf/libbpf.h +++ b/tools/lib/bpf/libbpf.h @@ -207,6 +207,7 @@ struct bpf_map_def { unsigned int key_size; unsigned int value_size; unsigned int max_entries; + unsigned int map_flags; }; /*