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.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,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 B3652C04A6B for ; Mon, 6 May 2019 18:31:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8A9B820B7C for ; Mon, 6 May 2019 18:31:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=joelfernandes.org header.i=@joelfernandes.org header.b="pR/MhP0a" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727069AbfEFSbh (ORCPT ); Mon, 6 May 2019 14:31:37 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:37800 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727023AbfEFSbf (ORCPT ); Mon, 6 May 2019 14:31:35 -0400 Received: by mail-pg1-f194.google.com with SMTP id e6so6879856pgc.4 for ; Mon, 06 May 2019 11:31:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=joelfernandes.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FstzZCVNUourlCPKszpn9bb32SRAhjzysdw+vvrIXh4=; b=pR/MhP0a8C/4rn7h7f6KtuHjujH8POlivDuB+aDU36Q/jBPgBiGAw25b/1zZc0eej7 7Ajb5YGFegbSah/Cp8WVamV5HEN4l9ncLTSHyHyMBunw5IWSkTQQO0kqrbQkws1H3O8c laukCErcKX4QcuBnE+nI1FvS2ri9wE2SScG78= 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=FstzZCVNUourlCPKszpn9bb32SRAhjzysdw+vvrIXh4=; b=YuIapl80QVYYJBRHm1lwI34udrf/CpY7FIeoQhuKcS03PMANtH6edWfbGVtdVegcnK cFAXn+U/QN0sT1VUKd23M43Cn3mxtk8pHmCjI2wZLUbYItBoEfm0QGJS0YaZJUPISzYZ P9OjcNQI0nBjk/5uhjiFGX4GSDXjDVGKAghBLRZE6rIQl0XqhN1Q5QAtelfrZxOjn6Hj 7xWnJYLBrp5nBP/Yh+3JzuifChy6UojWSrMRjc0xdV1i/+h7f3lL1Otbkc0NEu/u+lLT Kjs/LyOjBigSNXLeRpPG/LYR4z4WuSF84CPEhV2X6md82LcxZVJSBaQXnODtVC1FAf8B H+gA== X-Gm-Message-State: APjAAAXlNPQXZASGXl3yX4otDxcKSHDZBPVxKOG0bSIhiYOicTYtGTor SotfpMphMNWCp2pzIJ17JapulQ== X-Google-Smtp-Source: APXvYqxk6tRHGmBNl5Y4dp6RElXceV2g0n+bZh4+P9RLG8k4yfZ4SvrflzQxvSoywiXAsYl8f2R6Lg== X-Received: by 2002:a62:4697:: with SMTP id o23mr35488531pfi.224.1557167494792; Mon, 06 May 2019 11:31:34 -0700 (PDT) Received: from joelaf.cam.corp.google.com ([2620:15c:6:12:9c46:e0da:efbf:69cc]) by smtp.gmail.com with ESMTPSA id h30sm21412414pgi.38.2019.05.06.11.31.31 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 06 May 2019 11:31:33 -0700 (PDT) From: "Joel Fernandes (Google)" To: linux-kernel@vger.kernel.org Cc: "Joel Fernandes (Google)" , Adrian Ratiu , Alexei Starovoitov , Andrii Nakryiko , bpf@vger.kernel.org, Brendan Gregg , Daniel Borkmann , duyuchao , Ingo Molnar , Karim Yaghmour , Kees Cook , kernel-team@android.com, Manjo Raja Rao , Martin KaFai Lau , Masami Hiramatsu , Michal Gregorczyk , Mohammad Husain , netdev@vger.kernel.org, Peter Ziljstra , Qais Yousef , Song Liu , Srinivas Ramana , Steven Rostedt , Tamir Carmeli , Yonghong Song Subject: [PATCH v2 4/4] tools: Sync uapi headers with new bpf function calls Date: Mon, 6 May 2019 14:31:16 -0400 Message-Id: <20190506183116.33014-4-joel@joelfernandes.org> X-Mailer: git-send-email 2.21.0.1020.gf2820cf01a-goog In-Reply-To: <20190506183116.33014-1-joel@joelfernandes.org> References: <20190506183116.33014-1-joel@joelfernandes.org> 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 The uapi in tools/ needs an update after support for new bpf function calls were added. This commit does the same. Signed-off-by: Joel Fernandes (Google) --- tools/include/uapi/linux/bpf.h | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h index 929c8e537a14..05af4e1151d3 100644 --- a/tools/include/uapi/linux/bpf.h +++ b/tools/include/uapi/linux/bpf.h @@ -2431,6 +2431,18 @@ union bpf_attr { * Return * A **struct bpf_sock** pointer on success, or **NULL** in * case of failure. + * + * int bpf_probe_read_user(void *dst, int size, void *src) + * Description + * Read a userspace pointer safely. + * Return + * 0 on success or negative error + * + * int bpf_probe_read_kernel(void *dst, int size, void *src) + * Description + * Read a kernel pointer safely. + * Return + * 0 on success or negative error */ #define __BPF_FUNC_MAPPER(FN) \ FN(unspec), \ @@ -2531,7 +2543,9 @@ union bpf_attr { FN(sk_fullsock), \ FN(tcp_sock), \ FN(skb_ecn_set_ce), \ - FN(get_listener_sock), + FN(get_listener_sock), \ + FN(probe_read_user), \ + FN(probe_read_kernel), /* integer value in 'imm' field of BPF_CALL instruction selects which helper * function eBPF program intends to call -- 2.21.0.1020.gf2820cf01a-goog