From patchwork Mon May 6 18:31:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Fernandes X-Patchwork-Id: 1095999 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: incoming-bpf@patchwork.ozlabs.org Delivered-To: patchwork-incoming-bpf@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=bpf-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=joelfernandes.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=joelfernandes.org header.i=@joelfernandes.org header.b="wHqNHSAs"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44yWXb1lvWz9s00 for ; Tue, 7 May 2019 04:31:27 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726517AbfEFSb0 (ORCPT ); Mon, 6 May 2019 14:31:26 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:39514 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726370AbfEFSb0 (ORCPT ); Mon, 6 May 2019 14:31:26 -0400 Received: by mail-pg1-f194.google.com with SMTP id w22so5562058pgi.6 for ; Mon, 06 May 2019 11:31:25 -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:mime-version :content-transfer-encoding; bh=u2WJ5ZOtTqRCq2Bj3IyfnxMM9vIhsCBOCI54Jc0LH2Q=; b=wHqNHSAsS23xI3ZnU/TXNpgHK+naa0sZTuUJTkw5wNoYxgD4TWaLI1PobG9xOoyzxQ MlZh0VSWy8sGnbihqFf6QyghvhKC4Eqwjii6zk3RM5qxGJe67sI14zqOgLtNgMNcmq8G ES2qaktt/Ae3srP88KrdZfDDVTvJNi1fLaaxo= 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=u2WJ5ZOtTqRCq2Bj3IyfnxMM9vIhsCBOCI54Jc0LH2Q=; b=DrScB6jtxweNfVbaTWfZj8x9h5hBYyE5Ze+kXJw5GWK9tRei0m1yw8u89JQTBck8zZ ZZTxWoCrTQLFcijXbsON0kKduKfHj9q5yTuC8BD+2hY8zm31wQlPFiF6Q8zLdE187Dz0 bFB60BWnEIgaYAcgyD8kzySO1buq8fKn4tVTnQT3ejOp5VuatL73ohFWit9YzFr/eqaC zWn6nizLgL0LdxSFYVli6GXu4CKeffeRlL/I86VqJQuKZoqSLtQH2KeBYT7eNYjuIj9d 5N/iwSz3AAkhuOuFiGCRyOjyEr5+keS+yzG27Uce+cTlq8nNRdGvvcEeH93Of0TsANAj Ehvg== X-Gm-Message-State: APjAAAWMj/NrJxri7A+MfDMkgrvATOK+sucnO2b1Ttb2YqF3GCJ/QvWf NkuHyZwaQ2/3FAAxvg1jxvVPHA== X-Google-Smtp-Source: APXvYqzCtja3Z7+DUcUlq2ExNEHUs7lMAhzHKGQIy9/x0+a2YCuTRp0jHZFxvINK29euToRW4QLdjA== X-Received: by 2002:a63:5c1b:: with SMTP id q27mr34566094pgb.127.1557167484501; Mon, 06 May 2019 11:31:24 -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.20 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 06 May 2019 11:31:23 -0700 (PDT) From: "Joel Fernandes (Google)" To: linux-kernel@vger.kernel.org Cc: "Joel Fernandes (Google)" , Michal Gregorczyk , Adrian Ratiu , Mohammad Husain , Qais Yousef , Srinivas Ramana , duyuchao , Manjo Raja Rao , Karim Yaghmour , Tamir Carmeli , Yonghong Song , Alexei Starovoitov , Brendan Gregg , Masami Hiramatsu , Peter Ziljstra , Andrii Nakryiko , Steven Rostedt , Kees Cook , kernel-team@android.com, bpf@vger.kernel.org, Daniel Borkmann , Ingo Molnar , Martin KaFai Lau , netdev@vger.kernel.org, Song Liu Subject: [PATCH v2 1/4] bpf: Add support for reading user pointers Date: Mon, 6 May 2019 14:31:13 -0400 Message-Id: <20190506183116.33014-1-joel@joelfernandes.org> X-Mailer: git-send-email 2.21.0.1020.gf2820cf01a-goog MIME-Version: 1.0 Sender: bpf-owner@vger.kernel.org Precedence: bulk List-Id: netdev.vger.kernel.org The eBPF based opensnoop tool fails to read the file path string passed to the do_sys_open function. This is because it is a pointer to userspace address and causes an -EFAULT when read with probe_kernel_read. This is not an issue when running the tool on x86 but is an issue on arm64. This patch adds a new bpf function call based which calls the recently proposed probe_user_read function [1]. Using this function call from opensnoop fixes the issue on arm64. [1] https://lore.kernel.org/patchwork/patch/1051588/ Cc: Michal Gregorczyk Cc: Adrian Ratiu Cc: Mohammad Husain Cc: Qais Yousef Cc: Srinivas Ramana Cc: duyuchao Cc: Manjo Raja Rao Cc: Karim Yaghmour Cc: Tamir Carmeli Cc: Yonghong Song Cc: Alexei Starovoitov Cc: Brendan Gregg Cc: Masami Hiramatsu Cc: Peter Ziljstra Cc: Andrii Nakryiko Cc: Steven Rostedt Cc: Kees Cook Cc: kernel-team@android.com Signed-off-by: Joel Fernandes (Google) --- Masami, could you carry these patches in the series where are you add probe_user_read function? Previous submissions is here: https://lore.kernel.org/patchwork/patch/1069552/ v1->v2: split tools uapi sync into separate commit, added deprecation warning for old bpf_probe_read function. include/uapi/linux/bpf.h | 9 ++++++++- kernel/trace/bpf_trace.c | 22 ++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h index 929c8e537a14..8146784b9fe3 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@ -2431,6 +2431,12 @@ 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 */ #define __BPF_FUNC_MAPPER(FN) \ FN(unspec), \ @@ -2531,7 +2537,8 @@ 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), /* integer value in 'imm' field of BPF_CALL instruction selects which helper * function eBPF program intends to call diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c index d64c00afceb5..7485deb0777f 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -153,6 +153,26 @@ static const struct bpf_func_proto bpf_probe_read_proto = { .arg3_type = ARG_ANYTHING, }; +BPF_CALL_3(bpf_probe_read_user, void *, dst, u32, size, const void *, unsafe_ptr) +{ + int ret; + + ret = probe_user_read(dst, unsafe_ptr, size); + if (unlikely(ret < 0)) + memset(dst, 0, size); + + return ret; +} + +static const struct bpf_func_proto bpf_probe_read_user_proto = { + .func = bpf_probe_read_user, + .gpl_only = true, + .ret_type = RET_INTEGER, + .arg1_type = ARG_PTR_TO_UNINIT_MEM, + .arg2_type = ARG_CONST_SIZE_OR_ZERO, + .arg3_type = ARG_ANYTHING, +}; + BPF_CALL_3(bpf_probe_write_user, void *, unsafe_ptr, const void *, src, u32, size) { @@ -571,6 +591,8 @@ tracing_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog) return &bpf_map_delete_elem_proto; case BPF_FUNC_probe_read: return &bpf_probe_read_proto; + case BPF_FUNC_probe_read_user: + return &bpf_probe_read_user_proto; case BPF_FUNC_ktime_get_ns: return &bpf_ktime_get_ns_proto; case BPF_FUNC_tail_call: From patchwork Mon May 6 18:31:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Fernandes X-Patchwork-Id: 1096005 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=joelfernandes.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=joelfernandes.org header.i=@joelfernandes.org header.b="xbBnkKUC"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44yWY21fqQz9s7T for ; Tue, 7 May 2019 04:31:50 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726914AbfEFSbb (ORCPT ); Mon, 6 May 2019 14:31:31 -0400 Received: from mail-pg1-f196.google.com ([209.85.215.196]:35803 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726837AbfEFSb2 (ORCPT ); Mon, 6 May 2019 14:31:28 -0400 Received: by mail-pg1-f196.google.com with SMTP id h1so6883738pgs.2 for ; Mon, 06 May 2019 11:31:28 -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=xhmLyaLAyu6ZncCjM6Pqxqgn8DvO3yzF5Ng7O6wfqzc=; b=xbBnkKUCkXZY8xbWHpA3tGU2J7SUUx7/NLgLAt3tyGUz03dKifE0RSHJtvpC+RPCPv IBlhboZr1JR6xw9oxPJLxTvvJ748640oM2RDzJFONho4jUOlkEZD8ihYogfdw8deWRWT /FwK3KlFafEFliWQl5Icqlt4W/GFxdGVylpIs= 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=xhmLyaLAyu6ZncCjM6Pqxqgn8DvO3yzF5Ng7O6wfqzc=; b=kvj9JX1buEW44c/5JmcwcHcRVAUAGQxZMv8c1+a15FPVSVHzH9rB+N6vmL08EgUJEq Y0Mhd4eLwN7XYgU+wZy0p7qfZDHbj+L4UdEkSSSGI8/dcRufYmUKH2u4zxvlQ5GvJOcW 03WS9bpB9vJ4sr5vOiPWqC99pQJPbfUqd1yLqzXXB17SKV6pMxVQ2EJx6Si4ppZpSp/3 CX6jlZfIZUsPOaI/PnQ14o5b+M6HQV0BZa5QBiSSeaJ3Yv9ZoGRhBC1+U+bGnxT2ajki z30p8dWnCG3HcJTavDiOcIi6R1ovp9mUuCVEtZ/v5irfb9ByThmRv/iZJlozeUAkgbSw 5CaA== X-Gm-Message-State: APjAAAWGOy005iJSXFGhk0c3HmG+KWIBZhWWp1ctuBpLK/8+mvu5ktjY B85uhi4so6DewHog54r44s0pHw== X-Google-Smtp-Source: APXvYqwcC5Kplq4r8tbbGJ9eiRVDoJAXyJYR3TAcvVzM6mKAQaUCaRbQ9kZ6/gmln3JqJYWTMS9nww== X-Received: by 2002:a63:d345:: with SMTP id u5mr32124227pgi.83.1557167487924; Mon, 06 May 2019 11:31:27 -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.24 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 06 May 2019 11:31:27 -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 2/4] bpf: Add support for reading kernel pointers Date: Mon, 6 May 2019 14:31:14 -0400 Message-Id: <20190506183116.33014-2-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 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The bpf_probe_read function is ambiguous in whether the pointer being read is a kernel or user one. Add a specific function for kernel pointer in this patch. Previous patches add it for userspace pointers. Signed-off-by: Joel Fernandes (Google) --- include/uapi/linux/bpf.h | 9 ++++++++- kernel/trace/bpf_trace.c | 22 ++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h index 8146784b9fe3..05af4e1151d3 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@ -2437,6 +2437,12 @@ union bpf_attr { * 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), \ @@ -2538,7 +2544,8 @@ union bpf_attr { FN(tcp_sock), \ FN(skb_ecn_set_ce), \ FN(get_listener_sock), \ - FN(probe_read_user), + 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 diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c index 7485deb0777f..99dc354fd62b 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -153,6 +153,26 @@ static const struct bpf_func_proto bpf_probe_read_proto = { .arg3_type = ARG_ANYTHING, }; +BPF_CALL_3(bpf_probe_read_kernel, void *, dst, u32, size, const void *, unsafe_ptr) +{ + int ret; + + ret = probe_kernel_read(dst, unsafe_ptr, size); + if (unlikely(ret < 0)) + memset(dst, 0, size); + + return ret; +} + +static const struct bpf_func_proto bpf_probe_read_kernel_proto = { + .func = bpf_probe_read_kernel, + .gpl_only = true, + .ret_type = RET_INTEGER, + .arg1_type = ARG_PTR_TO_UNINIT_MEM, + .arg2_type = ARG_CONST_SIZE_OR_ZERO, + .arg3_type = ARG_ANYTHING, +}; + BPF_CALL_3(bpf_probe_read_user, void *, dst, u32, size, const void *, unsafe_ptr) { int ret; @@ -593,6 +613,8 @@ tracing_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog) return &bpf_probe_read_proto; case BPF_FUNC_probe_read_user: return &bpf_probe_read_user_proto; + case BPF_FUNC_probe_read_kernel: + return &bpf_probe_read_kernel_proto; case BPF_FUNC_ktime_get_ns: return &bpf_ktime_get_ns_proto; case BPF_FUNC_tail_call: From patchwork Mon May 6 18:31:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Fernandes X-Patchwork-Id: 1096003 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=joelfernandes.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=joelfernandes.org header.i=@joelfernandes.org header.b="EIe86cQ7"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44yWXz0NSRz9s00 for ; Tue, 7 May 2019 04:31:47 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726967AbfEFSbe (ORCPT ); Mon, 6 May 2019 14:31:34 -0400 Received: from mail-pf1-f196.google.com ([209.85.210.196]:36228 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726927AbfEFSbc (ORCPT ); Mon, 6 May 2019 14:31:32 -0400 Received: by mail-pf1-f196.google.com with SMTP id v80so7216509pfa.3 for ; Mon, 06 May 2019 11:31:31 -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=IfCUWTvSpe/ObcPM/LvXdQ0XKYCGSq77k0PD73RxjWI=; b=EIe86cQ7K8TderF8T7VdJ9IfpOXHbQ4Dzy2wT0wXDDyf6obptddgHxnwhoZi+ehABK yOmUlKW35Oo/Alh8q2aCAPAxQyxZ/AoBBlb1QCOj3Df7DId59pn45lc+9Tf4jXpF0Yd4 PloBwXKn79IsNG6avU6/JP0r8IicZzIyVLyOU= 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=IfCUWTvSpe/ObcPM/LvXdQ0XKYCGSq77k0PD73RxjWI=; b=Fjy6iDX6Ycif6XqfwML+oL49dL7xBjfseC6TPT4UZcu2Bv/Odkgwwr5imx9seyeYBz U++DoPjdXd/ITIL8Pf15e4VQIpQAHR65ClAb35Sr4apG+bddswNXZo3XjgD2dkV9zNo4 /Z0mND4c8zaIJge+jrz2fq0pKhGeQ3OZYROtb56YtOJKECPKjds3XwTMdQV1hFIvsEW8 44AdU/FxxhrKWi4mG16WLAYOPr7vI/z4t4ho8/dyQhYS47ELnHdstiuAv3NI3Y+atssf TlgfQSqi/y3d03vR/Q0PGPJVgg0V/DvMjrNBOPnvoO56CQUijrnulmL5hj6dzJOH3fvv dV1w== X-Gm-Message-State: APjAAAVHS+Yy89BIJlJ2RlkB/h7YNkt/hw2w8X8DpzQEI6V1e7/fy/JU 4rhoBU/Q96yDERXvzzNdlGpv4Q== X-Google-Smtp-Source: APXvYqw87aBaFaX0JfldiFHxy8FnYx3ibxSNeKODs8Fn08SOhD4IlfvMrdf+aewDAAvL101n3sCA7A== X-Received: by 2002:a63:a18:: with SMTP id 24mr33507004pgk.332.1557167491372; Mon, 06 May 2019 11:31:31 -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.28 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 06 May 2019 11:31:30 -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 3/4] bpf: Add warning when program uses deprecated bpf_probe_read Date: Mon, 6 May 2019 14:31:15 -0400 Message-Id: <20190506183116.33014-3-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 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org bpf_probe_read is deprecated and ambiguous. Add a warning if programs still use it, so that they may be moved to not use it. After sufficient time, the warning can be removed. Signed-off-by: Joel Fernandes (Google) --- kernel/bpf/verifier.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index 09d5d972c9ff..f8cc77e85b48 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -7656,6 +7656,10 @@ static int fixup_bpf_calls(struct bpf_verifier_env *env) if (insn->src_reg == BPF_PSEUDO_CALL) continue; + if (insn->imm == BPF_FUNC_probe_read) + pr_warn_once("bpf_probe_read is deprecated, please use " + "bpf_probe_read_{kernel,user} in eBPF programs.\n"); + if (insn->imm == BPF_FUNC_get_route_realm) prog->dst_needed = 1; if (insn->imm == BPF_FUNC_get_prandom_u32) From patchwork Mon May 6 18:31:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Fernandes X-Patchwork-Id: 1096001 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=joelfernandes.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=joelfernandes.org header.i=@joelfernandes.org header.b="pR/MhP0a"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44yWXq2lPVz9sB8 for ; Tue, 7 May 2019 04:31:39 +1000 (AEST) 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 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