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=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 C4C72C43381 for ; Wed, 27 Feb 2019 16:08:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 94E4721850 for ; Wed, 27 Feb 2019 16:08:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="PddlNwy2" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729980AbfB0QIL (ORCPT ); Wed, 27 Feb 2019 11:08:11 -0500 Received: from mail-qk1-f194.google.com ([209.85.222.194]:36001 "EHLO mail-qk1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726265AbfB0QIK (ORCPT ); Wed, 27 Feb 2019 11:08:10 -0500 Received: by mail-qk1-f194.google.com with SMTP id c2so9432460qkb.3 for ; Wed, 27 Feb 2019 08:08:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=2ES0Inso27t3sDmmaaRHOjbBTDh8qUvr0LEZhenTTL8=; b=PddlNwy2lSYOohFOh2Hvg9y5iER8d3XsWkfmltayMEnpfPcnNlhzJAZkGesDxY4LT5 t7DZ9rgpTw1dv090c6lrC0mBK68sY5qombsWQ1eKaPRL3EH59dHeQiS7CGuAj60Y1vwe y8EczFY2yUXsfVMM0h1pkd7jqc0UE+SNXgBzFg8t/cGrTDr+SLv6MpYEjITIofxjOPr8 QTLrU031Y5dcTjjjNkfVRysJHpsGH7fpO6917o0cD5mxPBXB1s5yZWhx/agTr2tyhfWP rrRfB5Cevg5hTio/CObtBZt+2rOusLWtzklVBGaruFgXwKsow7jn+X+EYZcFdEMDisBM Ft7A== 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=2ES0Inso27t3sDmmaaRHOjbBTDh8qUvr0LEZhenTTL8=; b=jRr4lDGThyNApynorY7OBPFlK79DS3nXiNXkJ/GTP+nRHBwoc3hysqh1Km9k3ry6yU UDMm9huVaFiMlmmRXuWjBLAuq5GToNIP6KHNsqsOQzKn5IP2vXlsfQGurBWYo66uq6HA WoUT3vFs2/lik4Pv0YZ7i34LhJvbPWQFqq75Ni5WAu8dkjHVli/hkZ7Cmt3N6BhSdp7z VTI/VpBqETiGs5NNxyUOpYI7qMvPtfd+VL+yjBrJMI7ZEKJqaPGRtlwSAEFyQrXtVpHy tt28HN0kM5ldrbope9V3uRlecZUvkxOPeTyOq+aNGBLv5Cv3hKb+PYgSlRX2c9pf+OR4 rgfQ== X-Gm-Message-State: AHQUAuYwbl9ROwKDEQ0LWry59WsHsnGxdf72a4sKXKUEFqv9XqWXZl25 gsqbmAZlAEymaGKoWrSiopK1WLd1 X-Google-Smtp-Source: AHgI3IaMkw9eaEbHaSeNOjHyVNgdFyLsglVJ71IMfvZsZo/P+CswrDJi7O1zI/goNefMbvNyQnS/Hg== X-Received: by 2002:ae9:c20f:: with SMTP id j15mr2632174qkg.132.1551283689250; Wed, 27 Feb 2019 08:08:09 -0800 (PST) Received: from willemb1.nyc.corp.google.com ([2620:0:1003:315:3fa1:a34c:1128:1d39]) by smtp.gmail.com with ESMTPSA id e184sm18091335qka.31.2019.02.27.08.08.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Feb 2019 08:08:08 -0800 (PST) From: Willem de Bruijn To: netdev@vger.kernel.org Cc: ast@kernel.org, daniel@iogearbox.net, kafai@fb.com, sdf@fomichev.me, Willem de Bruijn Subject: [PATCH bpf-next] bpf: add missing entries to bpf_helpers.h Date: Wed, 27 Feb 2019 11:08:06 -0500 Message-Id: <20190227160806.195218-1-willemdebruijn.kernel@gmail.com> X-Mailer: git-send-email 2.21.0.rc2.261.ga7da99ff1b-goog MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Willem de Bruijn This header defines the BPF functions enumerated in uapi/linux.bpf.h in a callable format. Expand to include all registered functions. Signed-off-by: Willem de Bruijn --- changes pre->v1: - add brief commit message (not copying Acks as they do not necessarily agree with that) - change return type from ull to uint for bpf_get_cgroup_classid, bpf_get_route_realm, bpf_get_hash_recalc - change size arg from int to __u32 for bpf_probe_read_str --- tools/testing/selftests/bpf/bpf_helpers.h | 30 +++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/tools/testing/selftests/bpf/bpf_helpers.h b/tools/testing/selftests/bpf/bpf_helpers.h index d9999f1ed1d2a..026bea831e039 100644 --- a/tools/testing/selftests/bpf/bpf_helpers.h +++ b/tools/testing/selftests/bpf/bpf_helpers.h @@ -232,6 +232,36 @@ static int (*bpf_skb_change_head)(void *, int len, int flags) = (void *) BPF_FUNC_skb_change_head; static int (*bpf_skb_pull_data)(void *, int len) = (void *) BPF_FUNC_skb_pull_data; +static unsigned int (*bpf_get_cgroup_classid)(void *ctx) = + (void *) BPF_FUNC_get_cgroup_classid; +static unsigned int (*bpf_get_route_realm)(void *ctx) = + (void *) BPF_FUNC_get_route_realm; +static int (*bpf_skb_change_proto)(void *ctx, __be16 proto, __u64 flags) = + (void *) BPF_FUNC_skb_change_proto; +static int (*bpf_skb_change_type)(void *ctx, __u32 type) = + (void *) BPF_FUNC_skb_change_type; +static unsigned int (*bpf_get_hash_recalc)(void *ctx) = + (void *) BPF_FUNC_get_hash_recalc; +static unsigned long long (*bpf_get_current_task)(void *ctx) = + (void *) BPF_FUNC_get_current_task; +static int (*bpf_skb_change_tail)(void *ctx, __u32 len, __u64 flags) = + (void *) BPF_FUNC_skb_change_tail; +static long long (*bpf_csum_update)(void *ctx, __u32 csum) = + (void *) BPF_FUNC_csum_update; +static void (*bpf_set_hash_invalid)(void *ctx) = + (void *) BPF_FUNC_set_hash_invalid; +static int (*bpf_get_numa_node_id)(void) = + (void *) BPF_FUNC_get_numa_node_id; +static int (*bpf_probe_read_str)(void *ctx, __u32 size, + const void *unsafe_ptr) = + (void *) BPF_FUNC_probe_read_str; +static unsigned int (*bpf_get_socket_uid)(void *ctx) = + (void *) BPF_FUNC_get_socket_uid; +static unsigned int (*bpf_set_hash)(void *ctx, __u32 hash) = + (void *) BPF_FUNC_set_hash; +static int (*bpf_skb_adjust_room)(void *ctx, __s32 len_diff, __u32 mode, + unsigned long long flags) = + (void *) BPF_FUNC_skb_adjust_room; /* Scan the ARCH passed in from ARCH env variable (see Makefile) */ #if defined(__TARGET_ARCH_x86) -- 2.21.0.rc2.261.ga7da99ff1b-goog