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 905B0C43331 for ; Thu, 26 Mar 2020 15:18:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6638120748 for ; Thu, 26 Mar 2020 15:18:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="N+UXD64s" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727954AbgCZPSD (ORCPT ); Thu, 26 Mar 2020 11:18:03 -0400 Received: from us-smtp-delivery-74.mimecast.com ([216.205.24.74]:44527 "EHLO us-smtp-delivery-74.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726270AbgCZPSD (ORCPT ); Thu, 26 Mar 2020 11:18:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585235881; 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; bh=lvxhivEZKDcTt1poeB5iwHQWHnaT/0gmsJdrcgOX2mc=; b=N+UXD64sq0auuHiJcLB/5pviV6gpCTAL1Tg07nHRq6i9Q5uhuTbtXwADJgYjeF9liOcoRh aOuJZ4adNFqj5dXCjKjcEM6MqTCE1GGwhLJCh3gXsL9mqKC8W63WA58aKk5Xq5OfugJ7Q9 sp7HKTC0vDgrYczzO+H5Wtf3ydspMnY= Received: from mail-lj1-f199.google.com (mail-lj1-f199.google.com [209.85.208.199]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-383-KLXTlt8_NF-0KoyM9pcbYQ-1; Thu, 26 Mar 2020 11:17:59 -0400 X-MC-Unique: KLXTlt8_NF-0KoyM9pcbYQ-1 Received: by mail-lj1-f199.google.com with SMTP id e8so752265ljk.23 for ; Thu, 26 Mar 2020 08:17:59 -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:mime-version :content-transfer-encoding; bh=lvxhivEZKDcTt1poeB5iwHQWHnaT/0gmsJdrcgOX2mc=; b=V8ENVy+2Lql3FKLyrw2Wd6oRKOjy8hzHXcnBvJgv72/44pbqauhG+wmsVDIkGmlb7l 5vswM+tk0I7IBCL0gApKzTpQ4csSiI+Ugjh7VdRtWYHDQy+Lz0rB0m81feYx7xQqcr4/ gyb97yqNzwZqdPRyYtTuci1MUxnqWJGhbN6EW8sqEBfDPZ/228dQkp5VC4xf58jtqEvq 6Hj8/tryZ8E/UYBiEXakCdlOIHvseGpCg9D83Y4EUoejX0BXIBEUiWr3b6uomh3g2bwG JrM4oMVqQIwMDcy2HfC08AZo7NmUDKilpnU1ZA1f6CccCWXpaR1YnZ0mIHFEYiOEMTaK pJKg== X-Gm-Message-State: ANhLgQ3MhI4CHixCtHY8kzE1pLrcOHmw+LsjaOwEJKd+GI/EleDrGh0Z 4HOvSZ/dA5eSCADe/yvUHHKak22zHVps9nYcc0Q0CXw9DvAjj3u4ajb1Eja8A1req8yrJE6f82k dAow2ivHxv+St85kK X-Received: by 2002:a2e:a173:: with SMTP id u19mr5742108ljl.67.1585235877930; Thu, 26 Mar 2020 08:17:57 -0700 (PDT) X-Google-Smtp-Source: ADFU+vsj7MerWWTlCWLvfp9Knj7RahTvIrsuIKrnRtePYCUeFUYHw465ZRV4s+GtGsN18WaxZVMntA== X-Received: by 2002:a2e:a173:: with SMTP id u19mr5742056ljl.67.1585235876746; Thu, 26 Mar 2020 08:17:56 -0700 (PDT) Received: from alrua-x1.borgediget.toke.dk ([2a0c:4d80:42:443::2]) by smtp.gmail.com with ESMTPSA id l11sm1726889lfg.87.2020.03.26.08.17.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Mar 2020 08:17:56 -0700 (PDT) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id 33D2918158B; Thu, 26 Mar 2020 16:17:53 +0100 (CET) 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 Subject: [PATCH bpf-next] libbpf: Add bpf_object__rodata getter function Date: Thu, 26 Mar 2020 16:17:41 +0100 Message-Id: <20200326151741.125427-1-toke@redhat.com> X-Mailer: git-send-email 2.26.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This adds a new getter function to libbpf to get the rodata area of a bpf object. This is useful if a program wants to modify the rodata before loading the object. Any such modification needs to be done before loading, since libbpf freezes the backing map after populating it (to allow the kernel to do dead code elimination based on its contents). Signed-off-by: Toke Høiland-Jørgensen --- tools/lib/bpf/libbpf.c | 13 +++++++++++++ tools/lib/bpf/libbpf.h | 1 + tools/lib/bpf/libbpf.map | 1 + 3 files changed, 15 insertions(+) diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index 085e41f9b68e..d3e3bbe12f78 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -1352,6 +1352,19 @@ bpf_object__init_internal_map(struct bpf_object *obj, enum libbpf_map_type type, return 0; } +void *bpf_object__rodata(const struct bpf_object *obj, size_t *size) +{ + struct bpf_map *map; + + bpf_object__for_each_map(map, obj) { + if (map->libbpf_type == LIBBPF_MAP_RODATA && map->mmaped) { + *size = map->def.value_size; + return map->mmaped; + } + } + return NULL; +} + static int bpf_object__init_global_data_maps(struct bpf_object *obj) { int err; diff --git a/tools/lib/bpf/libbpf.h b/tools/lib/bpf/libbpf.h index d38d7a629417..d2a9beed7b8a 100644 --- a/tools/lib/bpf/libbpf.h +++ b/tools/lib/bpf/libbpf.h @@ -166,6 +166,7 @@ typedef void (*bpf_object_clear_priv_t)(struct bpf_object *, void *); LIBBPF_API int bpf_object__set_priv(struct bpf_object *obj, void *priv, bpf_object_clear_priv_t clear_priv); LIBBPF_API void *bpf_object__priv(const struct bpf_object *prog); +LIBBPF_API void *bpf_object__rodata(const struct bpf_object *obj, size_t *size); LIBBPF_API int libbpf_prog_type_by_name(const char *name, enum bpf_prog_type *prog_type, diff --git a/tools/lib/bpf/libbpf.map b/tools/lib/bpf/libbpf.map index 5129283c0284..a248f4ff3a40 100644 --- a/tools/lib/bpf/libbpf.map +++ b/tools/lib/bpf/libbpf.map @@ -243,5 +243,6 @@ LIBBPF_0.0.8 { bpf_link__pin; bpf_link__pin_path; bpf_link__unpin; + bpf_object__rodata; bpf_program__set_attach_target; } LIBBPF_0.0.7; -- 2.26.0