Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 46484C43331 for ; Sun, 29 Mar 2020 13:23:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0B14F20714 for ; Sun, 29 Mar 2020 13:23:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="b/JJI2CS" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728110AbgC2NXV (ORCPT ); Sun, 29 Mar 2020 09:23:21 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:55290 "EHLO us-smtp-delivery-74.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727903AbgC2NXV (ORCPT ); Sun, 29 Mar 2020 09:23:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585488200; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2s2BdnMCPGd1g5Zqt0G0Bsb/G6cmPG9iPfUVgjjDP5I=; b=b/JJI2CSQJ2KVgyWahsK6zVnNBzvL46C7tK+1eaxd6l20C+9lJbsyteIA9oN3ua971nHDW eLtnShgLfDNAmz0sI4WVeQvOZUfSfke1h9TaWMKUlOIjmNFcu6fNZmCFgBZfSkipgUeKwX hBu2TWcAJUk8gD5TUsROln3pIJvU5pI= Received: from mail-lj1-f198.google.com (mail-lj1-f198.google.com [209.85.208.198]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-98-TJInDFbvPYmbke9_ATdKwQ-1; Sun, 29 Mar 2020 09:23:18 -0400 X-MC-Unique: TJInDFbvPYmbke9_ATdKwQ-1 Received: by mail-lj1-f198.google.com with SMTP id v22so715257ljh.18 for ; Sun, 29 Mar 2020 06:23:18 -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:mime-version:content-transfer-encoding; bh=2s2BdnMCPGd1g5Zqt0G0Bsb/G6cmPG9iPfUVgjjDP5I=; b=P4Sr9R8jX+iEzR2RWxfVbJ7GUckld6vhLSjpcAloR5NorUnj7gKlXXKRiSXzqoK06r PPTtN+bBdeDMeP4PZrdiNX/1vEuqOezHUK//z2QRc0/hz1kM3xQLhd1nsZ9vlJ0iM1qx N4jeeoPL84JizbC2NSnLx9gKUGmrdf/XnUnwEMvpzQUkegPtdETE9fmUt7+sQxxmkcKh B5k5Jrd0faANn/3CRPwxn9pymLWZLahvMnCdBRTX3IvIIqm0kYKLaYiJPTe3JpN42ylR Wya18w3SpAUcOxmCNuvDv91lodOBdA88wedC2Qiiv3g9JCKr5ECptdcoJMBgdeI95MfC d+5w== X-Gm-Message-State: AGi0PuaOpcDYzmmFJ/Mu9OwlTsEkqvlapIsLHG3Gbb5BfkHKu1hjoNuS Aple8q0hxlcrC6ts+AXSIUCkSXoniydC4PuAGtgcvo+11FFstzQ/4FYQN9N+44JBYEV/ksBmCod kxJCu/MYbsKh8 X-Received: by 2002:a2e:3a01:: with SMTP id h1mr4602893lja.161.1585488197076; Sun, 29 Mar 2020 06:23:17 -0700 (PDT) X-Google-Smtp-Source: APiQypJnAFmndO5nwxNXiRkPpOK0TLlxetboyE0xtvhjvUUI3lHhKU0hHnrqVjWfxXDOOIDZXOC9tw== X-Received: by 2002:a2e:3a01:: with SMTP id h1mr4602881lja.161.1585488196682; Sun, 29 Mar 2020 06:23:16 -0700 (PDT) Received: from alrua-x1.borgediget.toke.dk ([45.145.92.2]) by smtp.gmail.com with ESMTPSA id y124sm6187788lff.48.2020.03.29.06.23.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Mar 2020 06:23:16 -0700 (PDT) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id D131F18158B; Sun, 29 Mar 2020 15:23:14 +0200 (CEST) From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= To: daniel@iogearbox.net, ast@fb.com Cc: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= , bpf@vger.kernel.org, netdev@vger.kernel.org, Andrii Nakryiko Subject: [PATCH v4 1/2] libbpf: Add setter for initial value for internal maps Date: Sun, 29 Mar 2020 15:22:52 +0200 Message-Id: <20200329132253.232541-1-toke@redhat.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200328182834.196578-1-toke@redhat.com> References: <20200328182834.196578-1-toke@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org For internal maps (most notably the maps backing global variables), libbpf uses an internal mmaped area to store the data after opening the object. This data is subsequently copied into the kernel map when the object is loaded. This adds a function to set a new value for that data, which can be used to before it is loaded into the kernel. This is especially relevant for RODATA maps, since those are frozen on load. Signed-off-by: Toke Høiland-Jørgensen --- v4: - Make void pointer const, check if map was loaded - Reject set if map was already loaded - Split test into its own file v3: - Add a setter for the initial value instead of a getter for the pointer to it - Add selftest v2: - Add per-map getter for data area instead of a global rodata getter for bpf_obj tools/lib/bpf/libbpf.c | 11 +++++++++++ tools/lib/bpf/libbpf.h | 2 ++ tools/lib/bpf/libbpf.map | 1 + 3 files changed, 14 insertions(+) diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index 62903302935e..7deab98720ee 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -6758,6 +6758,17 @@ void *bpf_map__priv(const struct bpf_map *map) return map ? map->priv : ERR_PTR(-EINVAL); } +int bpf_map__set_initial_value(struct bpf_map *map, + const void *data, size_t size) +{ + if (!map->mmaped || map->libbpf_type == LIBBPF_MAP_KCONFIG || + size != map->def.value_size || map->fd >= 0) + return -EINVAL; + + memcpy(map->mmaped, data, size); + return 0; +} + bool bpf_map__is_offload_neutral(const struct bpf_map *map) { return map->def.type == BPF_MAP_TYPE_PERF_EVENT_ARRAY; diff --git a/tools/lib/bpf/libbpf.h b/tools/lib/bpf/libbpf.h index bf7a35a9556d..958ae71c116e 100644 --- a/tools/lib/bpf/libbpf.h +++ b/tools/lib/bpf/libbpf.h @@ -407,6 +407,8 @@ typedef void (*bpf_map_clear_priv_t)(struct bpf_map *, void *); LIBBPF_API int bpf_map__set_priv(struct bpf_map *map, void *priv, bpf_map_clear_priv_t clear_priv); LIBBPF_API void *bpf_map__priv(const struct bpf_map *map); +LIBBPF_API int bpf_map__set_initial_value(struct bpf_map *map, + const void *data, size_t size); LIBBPF_API int bpf_map__reuse_fd(struct bpf_map *map, int fd); LIBBPF_API int bpf_map__resize(struct bpf_map *map, __u32 max_entries); LIBBPF_API bool bpf_map__is_offload_neutral(const struct bpf_map *map); diff --git a/tools/lib/bpf/libbpf.map b/tools/lib/bpf/libbpf.map index dcc87db3ca8a..159826b36b38 100644 --- a/tools/lib/bpf/libbpf.map +++ b/tools/lib/bpf/libbpf.map @@ -243,6 +243,7 @@ LIBBPF_0.0.8 { bpf_link__pin; bpf_link__pin_path; bpf_link__unpin; + bpf_map__set_initial_value; bpf_program__set_attach_target; bpf_set_link_xdp_fd_opts; } LIBBPF_0.0.7; -- 2.26.0