From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mta0.migadu.com (out-214.mta0.migadu.com [91.218.175.214]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AE0FF274B4A for ; Sun, 18 Oct 2026 00:55:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.214 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792284948; cv=none; b=TPKyG8xQe1sO9Em0/VD9RH7tLvymC4+eT2hfjE2RRjWqZNCBigI6QTvafCID3/WjXOrdgMJJcC9p3mBic5aHiNejfMkx2i76EmWvHWhznLo21BRiTI4YQDOxuM8bthmW7g1ifkjioRM7TAa6ZYLoxyYbawxJ4HSc38llYXZ8Ib4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792284948; c=relaxed/simple; bh=LoMHMOtdlnxaox6Rxr22rfVmrJVa+1s0wpe4gtcjIaw=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WCtnHTiAXRb+5MFvbvVmPxs56xio85+lXSCkI1nXPHGemKv5MZKnOhP/dQ0hSdZaBRTkaVDpryWmARusAWFxShYQAEEwLP3btc8fcUBpTnDt1RUDXIdDMVvqUdiSYbUkplIaj8j4DemlwSuq6C3RNSM+DnrYcDguqLShf87jt2k= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=dFv4WgkX; arc=none smtp.client-ip=91.218.175.214 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="dFv4WgkX" X-Envelope-To: bpf@vger.kernel.org DKIM-Signature: a=rsa-sha256; bh=LoMHMOtdlnxaox6Rxr22rfVmrJVa+1s0wpe4gtcjIaw=; c=simple/simple; d=linux.dev; h=from:to:subject:date:message-id:mime-version:content-type; s=key1; t=1792284944; v=1; x=1792889744; b=dFv4WgkXcdwYD9aLX9HqFqH9ml+qz218Xq4ugyleL4M0HdVgbY/AbnP+RYs3gEuIavvizh1C wvxrLMbSh3lxNUinmV6QxWvpx04hn4RfARrVpV4SY585w3VRJwZIG4Gn0JY8Legwa+lT5FnvkRO pNXQUkjGizzZGdNhtqnvmtyg= X-Envelope-To: bpf@vger.kernel.org Received: by mta11.migadu.com with ESMTPS id 2586af6568d0662a; Sun, 18 Oct 2026 00:55:44 +0000 X-Mizu-Trace-ID: 2586af6568d0662a X-Migadu-Flow: FLOW_OUT From: KaFai Wan To: Alexei Starovoitov , Daniel Borkmann , John Fastabend , Andrii Nakryiko , Eduard Zingerman , Kumar Kartikeya Dwivedi , Martin KaFai Lau , Song Liu , Yonghong Song , Jiri Olsa , Emil Tsalapatis , Ihor Solodrai , Shuah Khan , Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , Leon Hwang , Donggeun Yoo , Menglong Dong , KaFai Wan , Mykyta Yatsenko , Feng Jiang , Vineet Gupta , Puranjay Mohan , bpf@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, llvm@lists.linux.dev Subject: [PATCH bpf-next v3 3/4] selftests/bpf: Fix stack arg pruning test JOIN log expectation Date: Sun, 18 Oct 2026 08:53:47 +0800 Message-ID: <20261018005348.2195130-4-kafai.wan@linux.dev> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20261018005348.2195130-1-kafai.wan@linux.dev> References: <20261018005348.2195130-1-kafai.wan@linux.dev> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Commit f414d20879ae ("bpf: Save DFS postorder numbers for program instructions") changed bpf_compute_postorder() to use a real DFS, which changes the postorder of this test's instructions and thus the insn edge the arg track join at insn 10 is reported on: arg JOIN insn 8 -> 10 r1: _ + fp0-8 => fp0-8|fp0+0 arg JOIN insn 8 -> 10 sa0: _ + fp0-8 => fp0-8|fp0+0 Update the r1 and sa0 expectations to the new output. Fixes: f414d20879ae ("bpf: Save DFS postorder numbers for program instructions") Signed-off-by: KaFai Wan --- tools/testing/selftests/bpf/progs/verifier_stack_arg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/bpf/progs/verifier_stack_arg.c b/tools/testing/selftests/bpf/progs/verifier_stack_arg.c index f6a4a6aa0e617..b9f799f6e4051 100644 --- a/tools/testing/selftests/bpf/progs/verifier_stack_arg.c +++ b/tools/testing/selftests/bpf/progs/verifier_stack_arg.c @@ -117,8 +117,8 @@ SEC("tc") __description("stack_arg: pruning with different stack arg types") __failure __log_level(2) __flag(BPF_F_TEST_STATE_FREQ) -__msg("arg JOIN insn 9 -> 10 r1: fp0-8 + _ => fp0-8|fp0+0") -__msg("arg JOIN insn 9 -> 10 sa0: fp0-8 + _ => fp0-8|fp0+0") +__msg("arg JOIN insn 8 -> 10 r1: _ + fp0-8 => fp0-8|fp0+0") +__msg("arg JOIN insn 8 -> 10 sa0: _ + fp0-8 => fp0-8|fp0+0") __msg("R{{[0-9]}} invalid mem access 'scalar'") __naked void stack_arg_pruning_type_mismatch(void) { -- 2.43.0