Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 013D1C7618D for ; Thu, 6 Apr 2023 01:45:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234296AbjDFBpT (ORCPT ); Wed, 5 Apr 2023 21:45:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46812 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234678AbjDFBpT (ORCPT ); Wed, 5 Apr 2023 21:45:19 -0400 Received: from smtpbguseast2.qq.com (smtpbguseast2.qq.com [54.204.34.130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4E3617EE4 for ; Wed, 5 Apr 2023 18:44:56 -0700 (PDT) X-QQ-mid: bizesmtp86t1680745491t1s7az3k Received: from localhost.localdomain ( [110.191.179.216]) by bizesmtp.qq.com (ESMTP) with id ; Thu, 06 Apr 2023 09:44:49 +0800 (CST) X-QQ-SSF: 01400000000000H0W000000A0000000 X-QQ-FEAT: rZJGTgY0+YNJFpAF9JcEKeGCJimTp6SUUS+YVyPh6EjaMiyG+0woSJSySRvyL pE5L01o7Stb+uHn3Kd2eHKDQndq6am43QKwWqXHGZtNlHcMOCMaxkR8LPmbGvo6zjDJzX1h DO80MELp5ralTm09JnqI2n/EinZ2lHyJ4fwGBYbrNmQBDmSy5ZeY8+Py6kBe8r7dkI58AhA FkQwZGhQbCFdRwIubKuXxbltNBRuaHnWm0kug7QSovCt44D1Y9tZBRLxUSbJJ4hnv1vENpU EN7Al8MwQ3Q6VviVnjsEUr/sa96TJmSiNyKdJ/FQIker+T/Dkaw+HAxFpsVDWnoilxlQsPV hd6fI4N2kb/cP5Ms+nbt1MBFRNQe2299Skn/3r8dwTdmYPDxXJ2K83OdcXbzw== X-QQ-GoodBg: 1 X-BIZMAIL-ID: 3399337130066524791 From: zhongjun@uniontech.com To: bpf@vger.kernel.org Cc: zhongjun Subject: [PATCH] BPF: make verifier 'misconfigured' errors more meaningful Date: Thu, 6 Apr 2023 09:43:51 +0800 Message-Id: <20230406014351.8984-1-zhongjun@uniontech.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:uniontech.com:qybglogicsvr:qybglogicsvr2 Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org From: zhongjun There are too many so-called 'misconfigured' errors potentially feed back to user-space, that make it very hard to judge on a glance the reason a verification failure occurred. This patch make those similar error outputs more sensitive and readible. Signed-off-by: Jun Zhong base-commit: 738a96c4a8c36950803fdd27e7c30aca92dccefd --- kernel/bpf/verifier.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index d517d13878cf..f19534f919c2 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -12684,7 +12684,8 @@ static int check_ld_imm(struct bpf_verifier_env *env, struct bpf_insn *insn) dst_reg->btf_id = aux->btf_var.btf_id; break; default: - verbose(env, "bpf verifier is misconfigured\n"); + verbose(env, "bpf verifier is misconfigured: dst_reg->type = %d\n", + dst_reg->type); return -EFAULT; } return 0; @@ -12722,7 +12723,8 @@ static int check_ld_imm(struct bpf_verifier_env *env, struct bpf_insn *insn) insn->src_reg == BPF_PSEUDO_MAP_IDX) { dst_reg->type = CONST_PTR_TO_MAP; } else { - verbose(env, "bpf verifier is misconfigured\n"); + verbose(env, "bpf verifier is misconfigured: insn->src_reg = %d\n", + (int)insn->src_reg); return -EINVAL; } @@ -12769,7 +12771,7 @@ static int check_ld_abs(struct bpf_verifier_env *env, struct bpf_insn *insn) } if (!env->ops->gen_ld_abs) { - verbose(env, "bpf verifier is misconfigured\n"); + verbose(env, "bpf verifier is misconfigured: gen_ld_abs is NULL\n"); return -EINVAL; } @@ -15814,13 +15816,14 @@ static int convert_ctx_accesses(struct bpf_verifier_env *env) if (ops->gen_prologue || env->seen_direct_write) { if (!ops->gen_prologue) { - verbose(env, "bpf verifier is misconfigured\n"); + verbose(env, "bpf verifier is misconfigured: gen_prologue is NULL\n"); return -EINVAL; } cnt = ops->gen_prologue(insn_buf, env->seen_direct_write, env->prog); if (cnt >= ARRAY_SIZE(insn_buf)) { - verbose(env, "bpf verifier is misconfigured\n"); + verbose(env, "bpf verifier is misconfigured: cnt=%d exceeds limit@%lu\n", + cnt, ARRAY_SIZE(insn_buf)); return -EINVAL; } else if (cnt) { new_prog = bpf_patch_insn_data(env, 0, insn_buf, cnt); @@ -15951,7 +15954,8 @@ static int convert_ctx_accesses(struct bpf_verifier_env *env) &target_size); if (cnt == 0 || cnt >= ARRAY_SIZE(insn_buf) || (ctx_field_size && !target_size)) { - verbose(env, "bpf verifier is misconfigured\n"); + verbose(env, "bpf verifier is misconfigured: ins[%d] cnt=%d ctx_s=%u tg_s=%u\n", + i, cnt, ctx_field_size, target_size); return -EINVAL; } @@ -16400,7 +16404,8 @@ static int do_misc_fixups(struct bpf_verifier_env *env) BPF_MODE(insn->code) == BPF_IND)) { cnt = env->ops->gen_ld_abs(insn, insn_buf); if (cnt == 0 || cnt >= ARRAY_SIZE(insn_buf)) { - verbose(env, "bpf verifier is misconfigured\n"); + verbose(env, "bpf verifier is misconfigured: cnt=%d exceeds limit@%lu\n", + cnt, ARRAY_SIZE(insn_buf)); return -EINVAL; } @@ -16647,7 +16652,8 @@ static int do_misc_fixups(struct bpf_verifier_env *env) if (cnt == -EOPNOTSUPP) goto patch_map_ops_generic; if (cnt <= 0 || cnt >= ARRAY_SIZE(insn_buf)) { - verbose(env, "bpf verifier is misconfigured\n"); + verbose(env, "bpf verifier is misconfigured: cnt=%d exceeds limit@%lu\n", + cnt, ARRAY_SIZE(insn_buf)); return -EINVAL; } @@ -16848,7 +16854,7 @@ static int do_misc_fixups(struct bpf_verifier_env *env) if (!map_ptr->ops->map_poke_track || !map_ptr->ops->map_poke_untrack || !map_ptr->ops->map_poke_run) { - verbose(env, "bpf verifier is misconfigured\n"); + verbose(env, "bpf verifier is misconfigured: map_poke_xxx is NULL\n"); return -EINVAL; } -- 2.20.1