From patchwork Tue Aug 27 18:16:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin KaFai Lau X-Patchwork-Id: 13779991 Received: from out-173.mta0.migadu.com (out-173.mta0.migadu.com [91.218.175.173]) (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 D81AC1D2F6E for ; Tue, 27 Aug 2024 18:16:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724782622; cv=none; b=k7qY3Ei9nsVdq1oPDFWvkZqKzXnSS7E8CQIoFxGrc1kPx1jPQN2PLCbtL8OYGewDnoJO8tEbp3ZZGMjLufiwf1RQEmGFXR3TK1DoSNYfARDeWwDJ9nxrt8URmCUblFEbI9iFSdxx7/fWACeXNWqGNSqdyUy3zLJ507QcemWAVc4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724782622; c=relaxed/simple; bh=5P4H2hi1RXvzn4wmfWi9XmN0QJD+FiFftBhtZE+9erU=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=LWlWEIDPHKn5nvURm8fh+uYdJdOqO5Q8kwJJXl/+jw2NSSfQUUsZdSC7aCqNa7VJFO0+3KMXv032zcKcGIoqUhjXqyz80DPuZ35V4jpayaRpjmhsUamn178cQebpoN0G3OGQVTGhjuj7QZoUQr3YRBkj+AGuuHmFGJIAJ/4xwlY= 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=OwSQ8ox6; arc=none smtp.client-ip=91.218.175.173 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="OwSQ8ox6" 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=1724782617; 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; bh=BmfQSthzRc8Ay9+VHbVsttUQHDHSLiZN5uBnRsytPVY=; b=OwSQ8ox6GZ9lYPBi1xsA9ea+0G9x9feyiKiFEcvvf0ifjoESCxmRKV4PxsGVKOs/HA1s2p criugHkH0HhJwLfk7wTbSyFalKIweXzi8wKJZSkalqQpnVDurRyvLSrlJhWagbJop5KKtM IpxHaY8Sf9NnD5Q8y0ipOlgfzcZtCoU= From: Martin KaFai Lau To: bpf@vger.kernel.org Cc: Alexei Starovoitov , Andrii Nakryiko , Daniel Borkmann , Eduard Zingerman , Yonghong Song , Amery Hung , kernel-team@meta.com Subject: [PATCH v3 bpf-next 0/9] bpf: Add gen_epilogue to bpf_verifier_ops Date: Tue, 27 Aug 2024 11:16:36 -0700 Message-ID: <20240827181647.847890-1-martin.lau@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 From: Martin KaFai Lau This set allows the subsystem to patch codes before BPF_EXIT. The verifier ops, .gen_epilogue, is added for this purpose. One of the use case will be in the bpf qdisc, the bpf qdisc subsystem can ensure the skb->dev is in the correct value. The bpf qdisc subsystem can either inline fixing it in the epilogue or call another kernel function to handle it (e.g. drop) in the epilogue. Another use case could be in bpf_tcp_ca.c to enforce snd_cwnd has valid value (e.g. positive value). v3: * Moved epilogue_buf[16] to env. Patch 1 is added to move the existing insn_buf[16] to env. * Fixed a case that the bpf prog has a BPF_JMP that goes back to the first instruction of the main prog. The jump back to 1st insn case also applies to the prologue. Patch 2 is added to handle it. * If the bpf main prog has multiple BPF_EXIT, use a BPF_JA to goto the earlier patched epilogue. Note that there are (BPF_JMP32 | BPF_JA) vs (BPF_JMP | BPF_JA) details in the patch 3 commit message. * There are subtle changes in patch 3, so I reset the Reviewed-by. * Added patch 8 and patch 9 to cover the changes in patch 2 and patch 3. * Dropped the kfunc call from pro/epilogue and its selftests. v2: * Remove the RFC tag. Keep the ordering at where .gen_epilogue is called in the verifier relative to the check_max_stack_depth(). This will be consistent with the other extra stack_depth usage like optimize_bpf_loop(). * Use __xlated check provided by the test_loader to check the patched instructions after gen_pro/epilogue (Eduard). * Added Patch 3 by Eduard (Thanks!). Eduard Zingerman (1): selftests/bpf: attach struct_ops maps before test prog runs Martin KaFai Lau (8): bpf: Move insn_buf[16] to bpf_verifier_env bpf: Adjust BPF_JMP that jumps to the 1st insn of the prologue bpf: Add gen_epilogue to bpf_verifier_ops bpf: Export bpf_base_func_proto selftests/bpf: Test gen_prologue and gen_epilogue selftests/bpf: Add tailcall epilogue test selftests/bpf: A pro/epilogue test when the main prog jumps back to the 1st insn selftests/bpf: Test epilogue patching when the main prog has multiple BPF_EXIT include/linux/bpf.h | 2 + include/linux/bpf_verifier.h | 4 + kernel/bpf/helpers.c | 1 + kernel/bpf/verifier.c | 72 +++++-- .../selftests/bpf/bpf_testmod/bpf_testmod.c | 190 ++++++++++++++++++ .../selftests/bpf/bpf_testmod/bpf_testmod.h | 11 + .../bpf/bpf_testmod/bpf_testmod_kfunc.h | 6 + .../selftests/bpf/prog_tests/pro_epilogue.c | 54 +++++ .../selftests/bpf/progs/epilogue_exit.c | 78 +++++++ .../selftests/bpf/progs/epilogue_tailcall.c | 58 ++++++ .../bpf/progs/pro_epilogue_goto_start.c | 149 ++++++++++++++ .../selftests/bpf/progs/pro_epilogue_kfunc.c | 156 ++++++++++++++ .../bpf/progs/pro_epilogue_subprog.c | 125 ++++++++++++ tools/testing/selftests/bpf/test_loader.c | 27 +++ 14 files changed, 921 insertions(+), 12 deletions(-) create mode 100644 tools/testing/selftests/bpf/prog_tests/pro_epilogue.c create mode 100644 tools/testing/selftests/bpf/progs/epilogue_exit.c create mode 100644 tools/testing/selftests/bpf/progs/epilogue_tailcall.c create mode 100644 tools/testing/selftests/bpf/progs/pro_epilogue_goto_start.c create mode 100644 tools/testing/selftests/bpf/progs/pro_epilogue_kfunc.c create mode 100644 tools/testing/selftests/bpf/progs/pro_epilogue_subprog.c