bpf: fix precision propagation verbose logging

[ Upstream commit 34f0677e7afd3a292bc1aadda7ce8e35faedb204 ]

Fix wrong order of frame index vs register/slot index in precision
propagation verbose (level 2) output. It's wrong and very confusing as is.

Fixes: 529409ea92d5 ("bpf: propagate precision across all frames, not just the last one")
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/r/20230313184017.4083374-1-andrii@kernel.org
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
index a53ba87a1cd2a60f858097d6beafe18745b2a70d..df353ba844f41e37ce639c0810e388b8fbd79a6b 100644 (file)
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@ -13678,7 +13678,7 @@ static int propagate_precision(struct bpf_verifier_env *env,
                            !(state_reg->live & REG_LIVE_READ))
                                continue;
                        if (env->log.level & BPF_LOG_LEVEL2)
-                               verbose(env, "frame %d: propagating r%d\n", i, fr);
+                               verbose(env, "frame %d: propagating r%d\n", fr, i);
                        err = mark_chain_precision_frame(env, fr, i);
                        if (err < 0)
                                return err;
@@ -13694,7 +13694,7 @@ static int propagate_precision(struct bpf_verifier_env *env,
                                continue;
                        if (env->log.level & BPF_LOG_LEVEL2)
                                verbose(env, "frame %d: propagating fp%d\n",
-                                       (-i - 1) * BPF_REG_SIZE, fr);
+                                       fr, (-i - 1) * BPF_REG_SIZE);
                        err = mark_chain_precision_stack_frame(env, fr, i);
                        if (err < 0)
                                return err;