From patchwork Mon Oct 28 13:40:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leon Hwang X-Patchwork-Id: 13853471 X-Patchwork-Delegate: bpf@iogearbox.net Received: from out-178.mta0.migadu.com (out-178.mta0.migadu.com [91.218.175.178]) (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 911431DA636 for ; Mon, 28 Oct 2024 13:40:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730122857; cv=none; b=QuTxT6E1iSggwyyuf4nPvK1rhwfPDwbI3SSEursMHQUl8JYMHiW9H5rmo/vK7zkIVmNsWbxMQQ8d/ZoBS1+iuU78YaZx2+S4aRu+WxdfI4qVsG6Etel3UFJyM5647XwMjI7quSyK/TJwmImvrspcn83vi0HRHbjygxNxiG5w1vQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730122857; c=relaxed/simple; bh=nG4czWWM1v4K9sX5y1DM6zg7yaLlGQvj3r8D9MhjkPU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Kc/JTrHGj3plzN0Uc2uWnXh44R0FICXyqpT/fdtCAAEkjX7tFqeXHdEdvw6nS1R3B+6PQ72t5e8Bfz4lUdXJvx/6NyHF6WXTPX8I133IiGgrBFxDyE8ASk5BcRrXCBaJwQ45kGFTD5jLVv1RiV3EiiGSJd01FlcN4Dy9abkdk44= 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=acYuZt1T; arc=none smtp.client-ip=91.218.175.178 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="acYuZt1T" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1730122853; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0OvRQz0mxYIFFyhd7wDrB8+fsS89iDjr0TgX/mpua0s=; b=acYuZt1TnivcOIK6NjKAJK2npGPgkBuWyByszLnR2H7dU7gwyH8AL9KgzlcG1+0LnCUPg6 BMD2amG6Vo7BsU6inNpHtweN+OWBmZkBXrLPKWsTHn6aVcL4U6a2yEuZvUZVUWJhaz8jjC fIW8FEC1M4x8fgZjuapKCRMEW9OftP4= From: Leon Hwang To: bpf@vger.kernel.org Cc: ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, yonghong.song@linux.dev, jolsa@kernel.org, eddyz87@gmail.com, leon.hwang@linux.dev, kernel-patches-bot@fb.com Subject: [PATCH bpf-next 1/2] bpf, x64: Propagate tailcall info only for subprogs Date: Mon, 28 Oct 2024 21:40:40 +0800 Message-ID: <20241028134041.94098-2-leon.hwang@linux.dev> In-Reply-To: <20241028134041.94098-1-leon.hwang@linux.dev> References: <20241028134041.94098-1-leon.hwang@linux.dev> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Patchwork-Delegate: bpf@iogearbox.net In x64 JIT, propagate tailcall info only for subprogs, not for helpers or kfuncs. Signed-off-by: Leon Hwang Acked-by: Yonghong Song --- arch/x86/net/bpf_jit_comp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c index 06b080b61aa57..eb08cc6d66401 100644 --- a/arch/x86/net/bpf_jit_comp.c +++ b/arch/x86/net/bpf_jit_comp.c @@ -2124,10 +2124,11 @@ st: if (is_imm8(insn->off)) /* call */ case BPF_JMP | BPF_CALL: { + bool pseudo_call = src_reg == BPF_PSEUDO_CALL; u8 *ip = image + addrs[i - 1]; func = (u8 *) __bpf_call_base + imm32; - if (tail_call_reachable) { + if (pseudo_call && tail_call_reachable) { LOAD_TAIL_CALL_CNT_PTR(bpf_prog->aux->stack_depth); ip += 7; } From patchwork Mon Oct 28 13:40:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leon Hwang X-Patchwork-Id: 13853472 X-Patchwork-Delegate: bpf@iogearbox.net Received: from out-181.mta0.migadu.com (out-181.mta0.migadu.com [91.218.175.181]) (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 1B2771DA636 for ; Mon, 28 Oct 2024 13:40:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730122861; cv=none; b=UEo/VqrCI3GvFo0H23pi1CVjTXVkHXqL4jZONK/MW6JKqWJD8gAgjWbPt5TCAiKAoEEAxMltcVN1Lvken0QEUgvt8+i65h/9b0DpYm1zVWLjh7caDIkIkuHvSs8tIr3Lie/nD50Iv1S0dmlW19anNQYJqoVg+40TnUTe71lG+eQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730122861; c=relaxed/simple; bh=V6zHtq9mop+qm1qA0wIlrInjPq6pOZUIXph54OQEDT4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Isqe6NQqD2Va9/ty5MX21W9WP/uC4yJr6w3ZhEZQrDOiWmFqHjMDQbPCtOA90yTcZHknVft6HVCWFbXEhQC3UP2sK9MGW9bwP5pBQeWc+iz2tmqjRiRwTuEz/9xVdekREk0kvNlK1NNlsBO+gg3vpNUM+2mGRa1/IbfCEhyY5/o= 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=VOaEv2PQ; arc=none smtp.client-ip=91.218.175.181 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="VOaEv2PQ" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1730122856; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JxZsp+juY5eKmUQaTTp4fwAs/SdSr/IsGBvHa5tNrkQ=; b=VOaEv2PQzCS+Rl7gQhYcbkceHupwMqOsUFGXct8zVkKXpqYKFFrwacDzx/kn8quLhJ5q4r nbT6wfpvo9y413X13CNqUVlCzHTlKkxRe0i9b1s1DK7B68m94Vn2DbLXLZDJyI8XUq1CjK +1zHe9VOcENWyn4NqLlpwaWqJeWa0Pc= From: Leon Hwang To: bpf@vger.kernel.org Cc: ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, yonghong.song@linux.dev, jolsa@kernel.org, eddyz87@gmail.com, leon.hwang@linux.dev, kernel-patches-bot@fb.com Subject: [PATCH bpf-next 2/2] bpf, verifier: Check trampoline target is tail_call_reachable subprog Date: Mon, 28 Oct 2024 21:40:41 +0800 Message-ID: <20241028134041.94098-3-leon.hwang@linux.dev> In-Reply-To: <20241028134041.94098-1-leon.hwang@linux.dev> References: <20241028134041.94098-1-leon.hwang@linux.dev> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Patchwork-Delegate: bpf@iogearbox.net In the x86_64 JIT, tailcall info is propagated through the trampoline when the target program is tail_call_reachable. However, this propagation is unnecessary if the target is a main prog, or a subprog that is not tail_call_reachable. Since the verifier can determine if a subprog is tail_call_reachable, it should only propagate tailcall info when the target is subprog and the subprog is actually tail_call_reachable. Acked-by: Yonghong Song Signed-off-by: Leon Hwang --- include/linux/bpf.h | 1 + kernel/bpf/verifier.c | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/include/linux/bpf.h b/include/linux/bpf.h index c3ba4d4751747..0c3b147c84af9 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@ -1253,6 +1253,7 @@ struct bpf_attach_target_info { struct module *tgt_mod; const char *tgt_name; const struct btf_type *tgt_type; + bool tgt_tail_call_reachable; }; #define BPF_DISPATCHER_MAX 48 /* Fits in 2048B */ diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index 797cf3ed32e0f..2e2f027b86375 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -21946,6 +21946,8 @@ int bpf_check_attach_target(struct bpf_verifier_log *log, bpf_log(log, "Subprog %s doesn't exist\n", tname); return -EINVAL; } + tgt_info->tgt_tail_call_reachable = subprog && + aux->func[subprog]->aux->tail_call_reachable; if (aux->func && aux->func[subprog]->aux->exception_cb) { bpf_log(log, "%s programs cannot attach to exception callback\n", @@ -22315,7 +22317,7 @@ static int check_attach_btf_id(struct bpf_verifier_env *env) if (!tr) return -ENOMEM; - if (tgt_prog && tgt_prog->aux->tail_call_reachable) + if (tgt_prog && tgt_info.tgt_tail_call_reachable) tr->flags = BPF_TRAMP_F_TAIL_CALL_CTX; prog->aux->dst_trampoline = tr;