Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp1632883pxb; Fri, 6 Nov 2020 15:09:19 -0800 (PST) X-Google-Smtp-Source: ABdhPJzkGmwXmyw8xa+x9Tm1D4UwnXouiDA7obrg8u/SJln29nWn/5RYMeAGcW4FPgphaB1/Pf03 X-Received: by 2002:aa7:d787:: with SMTP id s7mr4369694edq.205.1604704159347; Fri, 06 Nov 2020 15:09:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1604704159; cv=none; d=google.com; s=arc-20160816; b=hPENafGVxYrPXliY+oHq1NtVPoYteZ7ZtISj0Yt2TG43AGw60JGn/seRs+aQGMgrFM nZYVCi2OGyD16+qgWYvLk9fE9iAcP42qj8CP13af7Omlo5pT5BPh7CXBLta/nAGJ1MfZ /XP62b5H02RDD0Z8CL19sGlYS3IqlLZnubEcQp+Z/3+NjLto9INBQgd7tJ5XgzFIYxOh LXLHInIViByyCA6BJwI/H5xyRf2E5EPD3OIOf6VWKFim21E7Jv+ENX3RiLhJ3KJ0S5Da hv3ypUvCrYuDwAPG0hqtsgluq0oFEw3dAYoBU8phHjW1pqcoXh2S/mlGTCoiNzOZeGkc 3YxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=VFEweTh5bG+qlZNAr0NWfWaJVC9kuhuId9prG+WD8bk=; b=XdpoPfRT8CG1yWJBFy7x2sjh//NTxndOUGmZdUVZWu4DiII/9y1ShjBDJ0mRXK/TwJ 3jYU5EsFsZ17hWHAxBlZ0UGEeN/MgA4RYdza+7m5qBnv5IrnaB8BM2ESsUo68XdgUIqb 377Ybe7OfEfiPqEzPrwq2nhFUWn+Zyoq1OK2uUmfGlVNe5E6YIpnYu0krfwBS+3uUSDX 1riyXPbbgXuBH09kBr6sPAYGvHH1GlQqt/5zKKyZhj70YTxaWSUMHSDWnEgViraxSxN6 0u1VM82mtDsVJxymFR7F9D1DcykLZONqkJkZfxbczRpuu3oHwrZr86ba6ljELPoTcgOG qGRg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ar8si1930024ejc.496.2020.11.06.15.08.56; Fri, 06 Nov 2020 15:09:19 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729039AbgKFXFR convert rfc822-to-8bit (ORCPT + 99 others); Fri, 6 Nov 2020 18:05:17 -0500 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:27482 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728624AbgKFXFL (ORCPT ); Fri, 6 Nov 2020 18:05:11 -0500 Received: from pps.filterd (m0148461.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 0A6N4nNc026393 for ; Fri, 6 Nov 2020 15:05:10 -0800 Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com with ESMTP id 34mr9bex00-9 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 06 Nov 2020 15:05:10 -0800 Received: from intmgw004.08.frc2.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:83::4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Fri, 6 Nov 2020 15:05:06 -0800 Received: by devbig012.ftw2.facebook.com (Postfix, from userid 137359) id 3EB952EC8FA4; Fri, 6 Nov 2020 15:02:35 -0800 (PST) From: Andrii Nakryiko To: , , , CC: , , , , Andrii Nakryiko , Arnaldo Carvalho de Melo , Greg Kroah-Hartman Subject: [PATCH v2 bpf-next 2/5] bpf: assign ID to vmlinux BTF and return extra info for BTF in GET_OBJ_INFO Date: Fri, 6 Nov 2020 15:02:25 -0800 Message-ID: <20201106230228.2202-3-andrii@kernel.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20201106230228.2202-1-andrii@kernel.org> References: <20201106230228.2202-1-andrii@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8BIT X-FB-Internal: Safe Content-Type: text/plain X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.312,18.0.737 definitions=2020-11-06_06:2020-11-05,2020-11-06 signatures=0 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 malwarescore=0 phishscore=0 clxscore=1034 lowpriorityscore=0 mlxlogscore=718 suspectscore=75 mlxscore=0 priorityscore=1501 impostorscore=0 bulkscore=0 adultscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2011060154 X-FB-Internal: deliver Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Allocate ID for vmlinux BTF. This makes it visible when iterating over all BTF objects in the system. To allow distinguishing vmlinux BTF (and later kernel module BTF) from user-provided BTFs, expose extra kernel_btf flag, as well as BTF name ("vmlinux" for vmlinux BTF, will equal to module's name for module BTF). We might want to later allow specifying BTF name for user-provided BTFs as well, if that makes sense. But currently this is reserved only for in-kernel BTFs. Having in-kernel BTFs exposed IDs will allow to extend BPF APIs that require in-kernel BTF type with ability to specify BTF types from kernel modules, not just vmlinux BTF. This will be implemented in a follow up patch set for fentry/fexit/fmod_ret/lsm/etc. Signed-off-by: Andrii Nakryiko --- include/uapi/linux/bpf.h | 3 +++ kernel/bpf/btf.c | 39 ++++++++++++++++++++++++++++++++-- tools/include/uapi/linux/bpf.h | 3 +++ 3 files changed, 43 insertions(+), 2 deletions(-) diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h index 9879d6793e90..162999b12790 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@ -4466,6 +4466,9 @@ struct bpf_btf_info { __aligned_u64 btf; __u32 btf_size; __u32 id; + __aligned_u64 name; + __u32 name_len; + __u32 kernel_btf; } __attribute__((aligned(8))); struct bpf_link_info { diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c index f61944a3873b..09f1483934d2 100644 --- a/kernel/bpf/btf.c +++ b/kernel/bpf/btf.c @@ -215,6 +215,8 @@ struct btf { struct btf *base_btf; u32 start_id; /* first type ID in this BTF (0 for base BTF) */ u32 start_str_off; /* first string offset (0 for base BTF) */ + char name[MODULE_NAME_LEN]; + bool kernel_btf; }; enum verifier_phase { @@ -4441,6 +4443,8 @@ struct btf *btf_parse_vmlinux(void) btf->data = __start_BTF; btf->data_size = __stop_BTF - __start_BTF; + btf->kernel_btf = true; + snprintf(btf->name, sizeof(btf->name), "vmlinux"); err = btf_parse_hdr(env); if (err) @@ -4466,8 +4470,13 @@ struct btf *btf_parse_vmlinux(void) bpf_struct_ops_init(btf, log); - btf_verifier_env_free(env); refcount_set(&btf->refcnt, 1); + + err = btf_alloc_id(btf); + if (err) + goto errout; + + btf_verifier_env_free(env); return btf; errout: @@ -5565,7 +5574,8 @@ int btf_get_info_by_fd(const struct btf *btf, struct bpf_btf_info info; u32 info_copy, btf_copy; void __user *ubtf; - u32 uinfo_len; + char __user *uname; + u32 uinfo_len, uname_len, name_len; uinfo = u64_to_user_ptr(attr->info.info); uinfo_len = attr->info.info_len; @@ -5582,6 +5592,31 @@ int btf_get_info_by_fd(const struct btf *btf, return -EFAULT; info.btf_size = btf->data_size; + info.kernel_btf = btf->kernel_btf; + + uname = u64_to_user_ptr(info.name); + uname_len = info.name_len; + if (!uname ^ !uname_len) + return -EINVAL; + + name_len = strlen(btf->name); + info.name_len = name_len; + + if (uname) { + if (uname_len >= name_len + 1) { + if (copy_to_user(uname, btf->name, name_len + 1)) + return -EFAULT; + } else { + char zero = '\0'; + + if (copy_to_user(uname, btf->name, uname_len - 1)) + return -EFAULT; + if (put_user(zero, uname + uname_len - 1)) + return -EFAULT; + return -ENOSPC; + } + } + if (copy_to_user(uinfo, &info, info_copy) || put_user(info_copy, &uattr->info.info_len)) return -EFAULT; diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h index 9879d6793e90..162999b12790 100644 --- a/tools/include/uapi/linux/bpf.h +++ b/tools/include/uapi/linux/bpf.h @@ -4466,6 +4466,9 @@ struct bpf_btf_info { __aligned_u64 btf; __u32 btf_size; __u32 id; + __aligned_u64 name; + __u32 name_len; + __u32 kernel_btf; } __attribute__((aligned(8))); struct bpf_link_info { -- 2.24.1