From patchwork Mon Dec 25 09:55:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Laight X-Patchwork-Id: 13504561 X-Patchwork-Delegate: kuba@kernel.org Received: from eu-smtp-delivery-151.mimecast.com (eu-smtp-delivery-151.mimecast.com [185.58.85.151]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A442615AF4 for ; Mon, 25 Dec 2023 09:56:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=ACULAB.COM Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=aculab.com Received: from AcuMS.aculab.com (156.67.243.121 [156.67.243.121]) by relay.mimecast.com with ESMTP with both STARTTLS and AUTH (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id uk-mta-306-WCM6dNnBMGW3qQ_7HAT4Qw-1; Mon, 25 Dec 2023 09:56:09 +0000 X-MC-Unique: WCM6dNnBMGW3qQ_7HAT4Qw-1 Received: from AcuMS.Aculab.com (10.202.163.6) by AcuMS.aculab.com (10.202.163.6) with Microsoft SMTP Server (TLS) id 15.0.1497.48; Mon, 25 Dec 2023 09:55:47 +0000 Received: from AcuMS.Aculab.com ([::1]) by AcuMS.aculab.com ([::1]) with mapi id 15.00.1497.048; Mon, 25 Dec 2023 09:55:47 +0000 From: David Laight To: "'netdev@vger.kernel.org'" , "'David S . Miller'" , "'kuba@kernel.org'" CC: "'eric.dumazet@gmail.com'" , "'martin.lau@linux.dev'" , 'Alexei Starovoitov' , 'Stephen Hemminger' , "'Jens Axboe'" , 'Daniel Borkmann' , "'Andrii Nakryiko'" Subject: [PATCH net-next 2/4] bpf: Use bpfptr_is_kernel() instead of checking the is_kernel member. Thread-Topic: [PATCH net-next 2/4] bpf: Use bpfptr_is_kernel() instead of checking the is_kernel member. Thread-Index: Ado3GDGG2wrg4MoTTqOrs9yxe27GgA== Date: Mon, 25 Dec 2023 09:55:47 +0000 Message-ID: <96098101c3904e3d94c756fa9af392b4@AcuMS.aculab.com> References: <199c9af56a5741feaf4b1768bf7356be@AcuMS.aculab.com> In-Reply-To: <199c9af56a5741feaf4b1768bf7356be@AcuMS.aculab.com> Accept-Language: en-GB, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-transport-fromentityheader: Hosted Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: aculab.com Content-Language: en-US X-Patchwork-Delegate: kuba@kernel.org In some places the bpf code directly access the is_kernel member of bpfptr_t. Change to use the bpfptr_is_kernel() helper. No functional change. Signed-off-by: David Laight --- I'm not at all sure that the pattern: urecord = make_bpfptr(attr->func_info, bpfptr_is_kernel(uattr)); isn't bending the rules somewhat - but that is a different issue. kernel/bpf/bpf_iter.c | 2 +- kernel/bpf/btf.c | 2 +- kernel/bpf/syscall.c | 12 ++++++------ kernel/bpf/verifier.c | 10 +++++----- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/kernel/bpf/bpf_iter.c b/kernel/bpf/bpf_iter.c index 0fae79164187..eb2c858dbf81 100644 --- a/kernel/bpf/bpf_iter.c +++ b/kernel/bpf/bpf_iter.c @@ -520,7 +520,7 @@ int bpf_iter_link_attach(const union bpf_attr *attr, bpfptr_t uattr, memset(&linfo, 0, sizeof(union bpf_iter_link_info)); - ulinfo = make_bpfptr(attr->link_create.iter_info, uattr.is_kernel); + ulinfo = make_bpfptr(attr->link_create.iter_info, bpfptr_is_kernel(uattr)); linfo_len = attr->link_create.iter_info_len; if (bpfptr_is_null(ulinfo) ^ !linfo_len) return -EINVAL; diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c index 15d71d2986d3..34720a1f586e 100644 --- a/kernel/bpf/btf.c +++ b/kernel/bpf/btf.c @@ -5483,7 +5483,7 @@ static int finalize_log(struct bpf_verifier_log *log, bpfptr_t uattr, u32 uattr_ static struct btf *btf_parse(const union bpf_attr *attr, bpfptr_t uattr, u32 uattr_size) { - bpfptr_t btf_data = make_bpfptr(attr->btf, uattr.is_kernel); + bpfptr_t btf_data = make_bpfptr(attr->btf, bpfptr_is_kernel(uattr)); char __user *log_ubuf = u64_to_user_ptr(attr->btf_log_buf); struct btf_struct_metas *struct_meta_tab; struct btf_verifier_env *env = NULL; diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c index 0ed286b8a0f0..ba59fa8d02db 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -93,7 +93,7 @@ int bpf_check_uarg_tail_zero(bpfptr_t uaddr, if (actual_size <= expected_size) return 0; - if (uaddr.is_kernel) + if (bpfptr_is_kernel(uaddr)) res = memchr_inv(uaddr.kernel + expected_size, 0, actual_size - expected_size) == NULL; else @@ -1482,8 +1482,8 @@ static int map_lookup_elem(union bpf_attr *attr) static int map_update_elem(union bpf_attr *attr, bpfptr_t uattr) { - bpfptr_t ukey = make_bpfptr(attr->key, uattr.is_kernel); - bpfptr_t uvalue = make_bpfptr(attr->value, uattr.is_kernel); + bpfptr_t ukey = make_bpfptr(attr->key, bpfptr_is_kernel(uattr)); + bpfptr_t uvalue = make_bpfptr(attr->value, bpfptr_is_kernel(uattr)); int ufd = attr->map_fd; struct bpf_map *map; void *key, *value; @@ -1538,7 +1538,7 @@ static int map_update_elem(union bpf_attr *attr, bpfptr_t uattr) static int map_delete_elem(union bpf_attr *attr, bpfptr_t uattr) { - bpfptr_t ukey = make_bpfptr(attr->key, uattr.is_kernel); + bpfptr_t ukey = make_bpfptr(attr->key, bpfptr_is_kernel(uattr)); int ufd = attr->map_fd; struct bpf_map *map; struct fd f; @@ -2670,12 +2670,12 @@ static int bpf_prog_load(union bpf_attr *attr, bpfptr_t uattr, u32 uattr_size) err = -EFAULT; if (copy_from_bpfptr(prog->insns, - make_bpfptr(attr->insns, uattr.is_kernel), + make_bpfptr(attr->insns, bpfptr_is_kernel(uattr)), bpf_prog_insn_size(prog)) != 0) goto free_prog_sec; /* copy eBPF program license from user space */ if (strncpy_from_bpfptr(license, - make_bpfptr(attr->license, uattr.is_kernel), + make_bpfptr(attr->license, bpfptr_is_kernel(uattr)), sizeof(license) - 1) < 0) goto free_prog_sec; license[sizeof(license) - 1] = 0; diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index af2819d5c8ee..42fea4966175 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -15838,7 +15838,7 @@ static int check_btf_func_early(struct bpf_verifier_env *env, prog = env->prog; btf = prog->aux->btf; - urecord = make_bpfptr(attr->func_info, uattr.is_kernel); + urecord = make_bpfptr(attr->func_info, bpfptr_is_kernel(uattr)); min_size = min_t(u32, krec_size, urec_size); krecord = kvcalloc(nfuncs, krec_size, GFP_KERNEL | __GFP_NOWARN); @@ -15938,7 +15938,7 @@ static int check_btf_func(struct bpf_verifier_env *env, prog = env->prog; btf = prog->aux->btf; - urecord = make_bpfptr(attr->func_info, uattr.is_kernel); + urecord = make_bpfptr(attr->func_info, bpfptr_is_kernel(uattr)); krecord = prog->aux->func_info; info_aux = kcalloc(nfuncs, sizeof(*info_aux), GFP_KERNEL | __GFP_NOWARN); @@ -16036,7 +16036,7 @@ static int check_btf_line(struct bpf_verifier_env *env, s = 0; sub = env->subprog_info; - ulinfo = make_bpfptr(attr->line_info, uattr.is_kernel); + ulinfo = make_bpfptr(attr->line_info, bpfptr_is_kernel(uattr)); expected_size = sizeof(struct bpf_line_info); ncopy = min_t(u32, expected_size, rec_size); for (i = 0; i < nr_linfo; i++) { @@ -16154,7 +16154,7 @@ static int check_core_relo(struct bpf_verifier_env *env, rec_size % sizeof(u32)) return -EINVAL; - u_core_relo = make_bpfptr(attr->core_relos, uattr.is_kernel); + u_core_relo = make_bpfptr(attr->core_relos, bpfptr_is_kernel(uattr)); expected_size = sizeof(struct bpf_core_relo); ncopy = min_t(u32, expected_size, rec_size); @@ -20790,7 +20790,7 @@ int bpf_check(struct bpf_prog **prog, union bpf_attr *attr, bpfptr_t uattr, __u3 env->insn_aux_data[i].orig_idx = i; env->prog = *prog; env->ops = bpf_verifier_ops[env->prog->type]; - env->fd_array = make_bpfptr(attr->fd_array, uattr.is_kernel); + env->fd_array = make_bpfptr(attr->fd_array, bpfptr_is_kernel(uattr)); is_priv = bpf_capable(); bpf_get_btf_vmlinux();