From nobody Sun Feb 8 11:21:45 2026 Received: from mail-qv1-f65.google.com (mail-qv1-f65.google.com [209.85.219.65]) (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 ED6E432AAA1 for ; Fri, 19 Dec 2025 15:21:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.65 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766157689; cv=none; b=TVYru1Of7DXE0tuHbQghCd0M2QTuwkOU+VlkOabGtctcBRT9QpsJq/0ZNGS6XIOzKgEPojIfALSKU2JMrimhe3agMbM0goB8g3BWuWrJidl8M+3GTIWvLJ6ycSGFZ73MNdAfXPRGAI75PvdiVlZTOPHmkZFmXbbf3l7nb47M9pM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766157689; c=relaxed/simple; bh=hGjYfTPZVpLjfYpJDfuQ8wmqEFOpDaT5M488rWNUYoM=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=oIW3Nrx/0lObtCh4zhrNvMO7+GJ5HhY9ezsxR9GZD7rAra8oR+tJB3ee9pJiWEdl0NrLHRmSs2MjKiUrk2DDRJz1Wx4nudoEWnAxWP5f4BGM5jCUhzXdiFwu7OHLERfgm7qmCDY8TKZruO89SPRswczoWmlThccC9TrzXpi6A4o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=JaLkxSD5; arc=none smtp.client-ip=209.85.219.65 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="JaLkxSD5" Received: by mail-qv1-f65.google.com with SMTP id 6a1803df08f44-88a367a1dbbso28318046d6.0 for ; Fri, 19 Dec 2025 07:21:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1766157687; x=1766762487; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=d8S9arpnQbQKRrRPutZ5MVC6WeUVyaLDfqwrd6H6Lag=; b=JaLkxSD5NopY1nT1c8NsOFTINV4G7yohCtdnrMGPHZg3Q+2elmWKBmrm6AesuYk/eS ZJzpyWj7qBmz8ogK/ht86W29qdYCstfeCuJWmWgXHiw4Lr4clWAWhO8yvCQ+7MH0oqnk x898O5G3qdbJLzGDnXMEfgcOIteRKpzJ2hN3azBfJPvtHVSuYOUhDYEmdjP5IPSZE2NO BnlwHzOC4VGlWFkzlz+I9hcEbfBrHWiq4a7QIhH3lPNU+0VJyzk6JWOQXtZTk6m0WGWu V0peEHCHRrmLOyw5YxUta/XLoF5lR2+aCuPQbQ/opg1NsQrEOuveNDhWk9XjL/zYeOL7 SArw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766157687; x=1766762487; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=d8S9arpnQbQKRrRPutZ5MVC6WeUVyaLDfqwrd6H6Lag=; b=BUNz0kzCzoiihHKDLBi5s3+B/M1Qm8EDWvsBQOu+N3x82DVUYbMHj3gG7qN1+n5TO6 r+MxVD6+0gKhvZmS8NbAEk2Zo5+3YdYazCnKSMGHjOjLEmoOq/Dcy1BH6m6uT4Wa8AH3 UeDUSfz77wAGAQO8Sjk5ZXZxk88TqMNx7O1uWGHKEs24ESu7OuunEkvIiE529ZgM+Gat NAIWHgzYccBjrPrnua6+PcICUXaHEOIa/GKZWR34rS5LcTF033fJdjJlumcqh3bccZXS OBsDdvmsSFZo7sAZbcByziswhVt9HSvkBegG0G9UpMpNWiHnxur1XUAztbU2kY6DOEwo SlqQ== X-Forwarded-Encrypted: i=1; AJvYcCUdV/SDEIp7i6GYg8W6xU5W+rQBWu8kt4TT2O0fIFdTPvVK2bEsCUwO1PtgTPeu6D+0xHEsf2/t5eAYXPo=@vger.kernel.org X-Gm-Message-State: AOJu0YxegFIHsF5YNw09LUZTLo4ADRxuLKChN0xSI6jQw1IAqc6rZ2zf Qm4WkbKUoE4kPNQEcj/tGaRHgtmpYtl6EKU2aI7H918heJ4/7GkTSGmGByEpX1iADJ4= X-Gm-Gg: AY/fxX7ZQWUK1drdOV3Yh3XwsgKXNqViuGgTnZUtPFyKSfU43Beplknyr41UOxRS8xb vJEk3JoGpZERYchIFKrBvCzCrgQJYFEsvPhtkJMxMWNSaWfSOXIjOH6v1cjQyJgzgC7yooeUdDj cCBjOgm2w9xyJb0ujF7CxiKGgvAhApecmFd8Ew3H1gPOsv4l1o5JFQMia2UBaNd7ulP0L4CeTrn z0dNbCcmj+H/pLFWbj3VpP3FXn3zdzVYPbKzDAHrBoPy/sdPqyl62r/4J+sfgwQtqrjcfG5RfC+ AW34prcmVPovxjU6BQsTEZL+WQbF/hJ/9pZpiW4oXKGtq8BlGTp5YOXy7Wh8c7S5ibhCUmibtRk yb2XnTPKLGq3IY2cPv1/ClDjN4lXBzbc6j8KiWS6l/xWOcaPK4kH7bD6jJOMcsvNg63EB7v1OzA ZK8zZkrfxGNozTxVrE/nXUXw== X-Google-Smtp-Source: AGHT+IGA2/j7Dp0GcCqLOtCuhTofXascKJCOpzP4V5d1jVIW4N3VAzOMwjEDO8OdEOpYvh5aBfsBIA== X-Received: by 2002:a05:6a20:3d0a:b0:34e:eb6a:c765 with SMTP id adf61e73a8af0-376aa5008bamr2997142637.37.1766150181401; Fri, 19 Dec 2025 05:16:21 -0800 (PST) Received: from 7950hx ([43.129.244.20]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-34e9224d9e5sm2346819a91.17.2025.12.19.05.16.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Dec 2025 05:16:20 -0800 (PST) From: Menglong Dong X-Google-Original-From: Menglong Dong To: ast@kernel.org Cc: daniel@iogearbox.net, andrii@kernel.org, martin.lau@linux.dev, eddyz87@gmail.com, song@kernel.org, yonghong.song@linux.dev, john.fastabend@gmail.com, kpsingh@kernel.org, sdf@fomichev.me, haoluo@google.com, jolsa@kernel.org, bjorn@kernel.org, pulehui@huawei.com, puranjay@kernel.org, pjw@kernel.org, palmer@dabbelt.com, aou@eecs.berkeley.edu, alex@ghiti.fr, menglong8.dong@gmail.com, jiang.biao@linux.dev, bpf@vger.kernel.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH RESEND bpf] riscv, bpf: fix incorrect usage of BPF_TRAMP_F_ORIG_STACK Date: Fri, 19 Dec 2025 21:16:09 +0800 Message-ID: <20251219131609.176911-1-dongml2@chinatelecom.cn> X-Mailer: git-send-email 2.52.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The usage of BPF_TRAMP_F_ORIG_STACK in __arch_prepare_bpf_trampoline() is wrong, and it should be BPF_TRAMP_F_CALL_ORIG, which caused crash as Andreas reported: Insufficient stack space to handle exception! Task stack: [0xff20000000010000..0xff20000000014000] Overflow stack: [0xff600000ffdad070..0xff600000ffdae070] CPU: 1 UID: 0 PID: 1 Comm: systemd Not tainted 6.18.0-rc5+ #15 PREEMPT(vo= luntary) Hardware name: riscv-virtio qemu/qemu, BIOS 2025.10 10/01/2025 epc : copy_from_kernel_nofault+0xa/0x198 ra : bpf_probe_read_kernel+0x20/0x60 epc : ffffffff802b732a ra : ffffffff801e6070 sp : ff2000000000ffe0 gp : ffffffff82262ed0 tp : 0000000000000000 t0 : ffffffff80022320 t1 : ffffffff801e6056 t2 : 0000000000000000 s0 : ff20000000010040 s1 : 0000000000000008 a0 : ff20000000010050 a1 : ff60000083b3d320 a2 : 0000000000000008 a3 : 0000000000000097 a4 : 0000000000000000 a5 : 0000000000000000 a6 : 0000000000000021 a7 : 0000000000000003 s2 : ff20000000010050 s3 : ff6000008459fc18 s4 : ff60000083b3d340 s5 : ff20000000010060 s6 : 0000000000000000 s7 : ff20000000013aa8 s8 : 0000000000000000 s9 : 0000000000008000 s10: 000000000058dcb0 s11: 000000000058dca7 t3 : 000000006925116d t4 : ff6000008090f026 t5 : 00007fff9b0cbaa8 t6 : 0000000000000016 status: 0000000200000120 badaddr: 0000000000000000 cause: 8000000000000005 Kernel panic - not syncing: Kernel stack overflow CPU: 1 UID: 0 PID: 1 Comm: systemd Not tainted 6.18.0-rc5+ #15 PREEMPT(vo= luntary) Hardware name: riscv-virtio qemu/qemu, BIOS 2025.10 10/01/2025 Call Trace: [] dump_backtrace+0x28/0x38 [] show_stack+0x3a/0x50 [] dump_stack_lvl+0x56/0x80 [] dump_stack+0x18/0x22 [] vpanic+0xf6/0x328 [] panic+0x3e/0x40 [] handle_bad_stack+0x98/0xa0 [] bpf_probe_read_kernel+0x20/0x60 Just fix it. Fixes: 47c9214dcbea ("bpf: fix the usage of BPF_TRAMP_F_SKIP_FRAME") Reported-by: Andreas Schwab Closes: https://lore.kernel.org/bpf/874ipnkfvt.fsf@igel.home/ Signed-off-by: Menglong Dong --- arch/riscv/net/bpf_jit_comp64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/riscv/net/bpf_jit_comp64.c b/arch/riscv/net/bpf_jit_comp6= 4.c index 5f9457e910e8..09b70bf362d3 100644 --- a/arch/riscv/net/bpf_jit_comp64.c +++ b/arch/riscv/net/bpf_jit_comp64.c @@ -1134,7 +1134,7 @@ static int __arch_prepare_bpf_trampoline(struct bpf_t= ramp_image *im, store_args(nr_arg_slots, args_off, ctx); =20 /* skip to actual body of traced function */ - if (flags & BPF_TRAMP_F_ORIG_STACK) + if (flags & BPF_TRAMP_F_CALL_ORIG) orig_call +=3D RV_FENTRY_NINSNS * 4; =20 if (flags & BPF_TRAMP_F_CALL_ORIG) { --=20 2.52.0