From nobody Tue Dec 2 02:58:13 2025 Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) (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 B63AF351FA9 for ; Tue, 18 Nov 2025 12:37:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.196 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763469430; cv=none; b=NTaEEHDWfM0W7zec2/Lh6hkPLaL+jv0E0s39H7Lf7bPlYpfIX7pNFo4alGObslmRxi07Rf5QIZNxW/Ji4G4lQAmql59VFyXyP3snQ/7bKucS/umpl8oul2QWPxuHMs8T3wSBWE578H806DR3iiMkV/Vf47gVTyOXJrOqRZpYatk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763469430; c=relaxed/simple; bh=CuZzfhxpaY2RwGDUn1Vx9bQnsJNO8QHP2g34k19NaVo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gwaZzlNZLJcQZmFM+58fuefVnE+tHwBB9JGpO/Tmv96MmnnNXsJy1pSAmC1LWBHUA7E033UHmF7iHaF9rnCHEXqwEmL7PpsflqD0OfBw6bnU6xuOYVmVGrvBi8H0oHteWtfg8f9ItXIFUfZ80mjbxgzTudz2WKRunAHrzr+2gM0= 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=F/FOs5sp; arc=none smtp.client-ip=209.85.210.196 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="F/FOs5sp" Received: by mail-pf1-f196.google.com with SMTP id d2e1a72fcca58-7bb710d1d1dso1629550b3a.1 for ; Tue, 18 Nov 2025 04:37:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1763469428; x=1764074228; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Gr5zFCvf3ujgW8K/MBn3EvZvT1zNiYJuY8EfOcbbjUE=; b=F/FOs5spanaAWg1eMuStZ0swyfWqGCjFh3BNVwH8MObwzotT48DICKhvWuX+Yd1mhx jBpKQxxFcWEeFYDz/F8w/zLigNcE8//nXMsAH4q8mYl7AbZ7d7eUgLAEGG91QlVt7Kyl rkZTuk8KYu639iPWBf1hxj6vl42p70b90ds9++2VgJ6ZUfR8ZQmTbPnbUL3yz6gMZm3n FTtvTKe/ReebLrdyDvvS4Dw3/hGMX3sN4P56pYi9tFK0sXIZkiAxnKrzVoYHQUdnD4Lv d516NKodA0yCA+53y/w1XXIS8MHZylmkqq1ZpVYTGHjEENLNnB4lDrqRRfbE5s37Mwso UKKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763469428; x=1764074228; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Gr5zFCvf3ujgW8K/MBn3EvZvT1zNiYJuY8EfOcbbjUE=; b=FP+YrAYYwzXGN7LTfDhvMgW/yksD8Qp810tL6KU4L7f0sd11N+DNBRfC6ARFLrwnsP o9MZpoEmNe97HDgLFc/6bLdLIap83at3rH4jwpsfrlHuNFWB9F+QkqOQmsuxMkYNGqLS rCgG8CpAnXnGbHVq/Li1AwSev7KCP7ZDDnFEF73Z7d1zzimU/cD8se+FBor1wQnYjj9S Pe7qb6EyzVifX101BQ/FGR4KxjNlbYqcHJqFO6oxCBds5gpXAhpVmBe+PpBJ3NzrX7uo KLntWQxRvPzeSGYHLDz2WcYUIgoTFflvAb5zVuc/oPq39YYjlrqEyLKQr1ji7K36XGxg 2qdQ== X-Forwarded-Encrypted: i=1; AJvYcCVfkjGhezrnqGCDdgZq/LoDmix0xaE1J8QYlJrHa/XAFAIwqG5fi+l3ZW0l87CBxifI8tkZCP0VYlSXgH0=@vger.kernel.org X-Gm-Message-State: AOJu0YxTZJT3Pr/IkH57/e05oFAmtz78vTl9IaqnCbhV/uvTqP2MXLDK ZdORv4PbvYv7IBuxyLNc3fO78H8DMQ03h1QtVm4hTSgKWVqjdkCqBjXA X-Gm-Gg: ASbGncvGYdc3uz3FOl0RilIJHybQYSkAZ7SGqY/rkGn+8+2ELNeI8yV6yQ35VJ7pn6F 35k4wYUWBCx5e3R0LY45us1rn37uYUWF78ZuhxrJPOsfEwkfKkKHmFXvOmOV3Ieojs3hYkQ8899 dP8EAuuZoGu7L29CuwBbr4o10EW3yowCvYe473jJwG8WFh6E6AMyjvbxVNco7Lp490q9NZNsPKq rkNS9SS1lPoeto68xSl6cSW8mjCbU0nP98no4GpziWp+5vuF0StXx+VU65UPY0l2qZ2kf+VbJan eyvvQHrVZpkLCniuvTWFoyjZ/Wzd/tNxahlh78655apjjmWHqz+/YSeqzm8HgFtJWGRv8DBD+XZ J2LVCbUF3kDBf+h3uQTebIefLmaClIJBJt6sU1xWyZFn6GnxdcXGWenvZzZowHef2MdwR48sTiJ seMFaNA2D12Gk= X-Google-Smtp-Source: AGHT+IH3lGATztfAevxX/+Crp6j/wkxIW4bZ1e3m6KQ8glDX3xAvYvs6wWCH2053VFn2llBG12hFJg== X-Received: by 2002:a05:6a00:2408:b0:7a9:c21a:559a with SMTP id d2e1a72fcca58-7ba39bc0c02mr18696620b3a.8.1763469428198; Tue, 18 Nov 2025 04:37:08 -0800 (PST) Received: from 7950hx ([43.129.244.20]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7b92772e7f2sm16331496b3a.57.2025.11.18.04.37.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Nov 2025 04:37:07 -0800 (PST) From: Menglong Dong X-Google-Original-From: Menglong Dong To: ast@kernel.org, rostedt@goodmis.org Cc: daniel@iogearbox.net, john.fastabend@gmail.com, andrii@kernel.org, martin.lau@linux.dev, eddyz87@gmail.com, song@kernel.org, yonghong.song@linux.dev, kpsingh@kernel.org, sdf@fomichev.me, haoluo@google.com, jolsa@kernel.org, mhiramat@kernel.org, mark.rutland@arm.com, mathieu.desnoyers@efficios.com, jiang.biao@linux.dev, bpf@vger.kernel.org, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [PATCH bpf-next v3 3/6] bpf: fix the usage of BPF_TRAMP_F_SKIP_FRAME Date: Tue, 18 Nov 2025 20:36:31 +0800 Message-ID: <20251118123639.688444-4-dongml2@chinatelecom.cn> X-Mailer: git-send-email 2.51.2 In-Reply-To: <20251118123639.688444-1-dongml2@chinatelecom.cn> References: <20251118123639.688444-1-dongml2@chinatelecom.cn> 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" Some places calculate the origin_call by checking if BPF_TRAMP_F_SKIP_FRAME is set. However, it should use BPF_TRAMP_F_ORIG_STACK for this propose. Just fix them. Signed-off-by: Menglong Dong Acked-by: Alexei Starovoitov --- arch/riscv/net/bpf_jit_comp64.c | 2 +- arch/x86/net/bpf_jit_comp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/riscv/net/bpf_jit_comp64.c b/arch/riscv/net/bpf_jit_comp6= 4.c index 45cbc7c6fe49..21c70ae3296b 100644 --- a/arch/riscv/net/bpf_jit_comp64.c +++ b/arch/riscv/net/bpf_jit_comp64.c @@ -1131,7 +1131,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_SKIP_FRAME) + if (flags & BPF_TRAMP_F_ORIG_STACK) orig_call +=3D RV_FENTRY_NINSNS * 4; =20 if (flags & BPF_TRAMP_F_CALL_ORIG) { diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c index 36a0d4db9f68..808d4343f6cf 100644 --- a/arch/x86/net/bpf_jit_comp.c +++ b/arch/x86/net/bpf_jit_comp.c @@ -3289,7 +3289,7 @@ static int __arch_prepare_bpf_trampoline(struct bpf_t= ramp_image *im, void *rw_im =20 arg_stack_off =3D stack_size; =20 - if (flags & BPF_TRAMP_F_SKIP_FRAME) { + if (flags & BPF_TRAMP_F_CALL_ORIG) { /* skip patched call instruction and point orig_call to actual * body of the kernel function. */ --=20 2.51.2