From mboxrd@z Thu Jan 1 00:00:00 1970 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=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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 F0169C5DF60 for ; Thu, 7 Nov 2019 16:52:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CD9582077C for ; Thu, 7 Nov 2019 16:52:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389608AbfKGQwb (ORCPT ); Thu, 7 Nov 2019 11:52:31 -0500 Received: from mx1.redhat.com ([209.132.183.28]:35442 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389577AbfKGQw2 (ORCPT ); Thu, 7 Nov 2019 11:52:28 -0500 Received: from mail-lf1-f72.google.com (mail-lf1-f72.google.com [209.85.167.72]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9333CC0568FD for ; Thu, 7 Nov 2019 16:52:27 +0000 (UTC) Received: by mail-lf1-f72.google.com with SMTP id v7so616773lfi.2 for ; Thu, 07 Nov 2019 08:52:27 -0800 (PST) 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:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=eS9AG5GhdVciImy8yLqbjNDEvN85ekU2j3TOoMU0fV4=; b=aHNZvWwVhDKQuolA3hvGlqQKv8Vz6JTOAm8hnh5dN1O7Evb77edRHsZkPjv8jnygz8 mgRUOzBlG0HCxg8POdAX2SL9xKMvsVp+oLVxrrNydJAnjaZaVm/2xEqj1CICZFOzcxzn sOtP3RLb9iSnfx3a+L79DX7JurSdJ1N5J0yrBO7ZO+P3DMJFQn1r1v1ojgm53Mx5pUQT IIeeNvFe9X+66Aj0XPMOTkPsP1pU4m5lX0j3AjpXHXy27opbqXnrzRpNR4uQyRJKaY2G wc7MdAPBjWQ1vZQF79GIkuV2bayQ4RUi2erAXO6qD9r9yUhvrGchX5ceFUjguFlo0tN2 /ipQ== X-Gm-Message-State: APjAAAVT60NSrYIi4FOqIKskER6hQPXz0RT/IVYRqM48BiExfGdZResv CIDc+xaYVp7Cy0xrrUurFSAxI0PIYY5TmySeKWmkSYmV6IOHxGJAZcCTyWmlqFCuDNznufDmaO0 T6C1cQx7wrcSd X-Received: by 2002:a2e:b5d4:: with SMTP id g20mr3196167ljn.140.1573145546135; Thu, 07 Nov 2019 08:52:26 -0800 (PST) X-Google-Smtp-Source: APXvYqw8cjQUoLmErsn0B9yhisNaE+K0XRTl3kMBuqPdPTNQvVlZi+wOYJQtSwzvDdf8DUCG0YhP1A== X-Received: by 2002:a2e:b5d4:: with SMTP id g20mr3196157ljn.140.1573145545981; Thu, 07 Nov 2019 08:52:25 -0800 (PST) Received: from alrua-x1.borgediget.toke.dk ([2a00:7660:6da:443::2]) by smtp.gmail.com with ESMTPSA id v15sm2800402lfd.36.2019.11.07.08.52.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Nov 2019 08:52:25 -0800 (PST) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id E77B31818B6; Thu, 7 Nov 2019 17:52:24 +0100 (CET) Subject: [PATCH bpf-next 6/6] libbpf: Add getter for program size From: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= To: Daniel Borkmann Cc: Alexei Starovoitov , Martin KaFai Lau , Song Liu , Yonghong Song , Jesper Dangaard Brouer , Andrii Nakryiko , David Miller , netdev@vger.kernel.org, bpf@vger.kernel.org Date: Thu, 07 Nov 2019 17:52:24 +0100 Message-ID: <157314554482.693412.362818059218610123.stgit@toke.dk> In-Reply-To: <157314553801.693412.15522462897300280861.stgit@toke.dk> References: <157314553801.693412.15522462897300280861.stgit@toke.dk> User-Agent: StGit/0.20 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 From: Toke Høiland-Jørgensen This adds a new getter for the BPF program size (in bytes). This is useful for a caller that is trying to predict how much memory will be locked by loading a BPF object into the kernel. Signed-off-by: Toke Høiland-Jørgensen --- tools/lib/bpf/libbpf.c | 5 +++++ tools/lib/bpf/libbpf.h | 1 + tools/lib/bpf/libbpf.map | 1 + 3 files changed, 7 insertions(+) diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index 582c0fd16697..facd5e1a3a0b 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -4790,6 +4790,11 @@ int bpf_program__fd(const struct bpf_program *prog) return bpf_program__nth_fd(prog, 0); } +size_t bpf_program__size(const struct bpf_program *prog) +{ + return prog->insns_cnt * sizeof(struct bpf_insn); +} + int bpf_program__set_prep(struct bpf_program *prog, int nr_instances, bpf_program_prep_t prep) { diff --git a/tools/lib/bpf/libbpf.h b/tools/lib/bpf/libbpf.h index f0947cc949d2..10875dc68ec8 100644 --- a/tools/lib/bpf/libbpf.h +++ b/tools/lib/bpf/libbpf.h @@ -213,6 +213,7 @@ LIBBPF_API void bpf_program__set_ifindex(struct bpf_program *prog, LIBBPF_API const char *bpf_program__title(const struct bpf_program *prog, bool needs_copy); +LIBBPF_API size_t bpf_program__size(const struct bpf_program *prog); LIBBPF_API int bpf_program__load(struct bpf_program *prog, char *license, __u32 kern_version); diff --git a/tools/lib/bpf/libbpf.map b/tools/lib/bpf/libbpf.map index 45f229af2766..f37d949917d2 100644 --- a/tools/lib/bpf/libbpf.map +++ b/tools/lib/bpf/libbpf.map @@ -202,5 +202,6 @@ LIBBPF_0.0.6 { bpf_program__get_type; bpf_program__is_tracing; bpf_program__set_tracing; + bpf_program__size; bpf_get_link_xdp_info; } LIBBPF_0.0.5;