From nobody Mon Feb 9 11:47:26 2026 Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.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 8F2F13090CB for ; Fri, 14 Nov 2025 09:25:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.196 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763112317; cv=none; b=kNXD6p7/f70eg9DNcF2sRG8EEtRDYSrclA5w53Jfxfba6Hclg6hzGByb0MgvSBZbyLhgkDfqxoVzaT+5WsmvbQnlpRGY3bDq6UtCDXjx53k4m96Eicf0Maalgn+pO3rJIa/1S6bVY93FP095K6hE8CTzji9HBSlFbp/+zgxhTcY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763112317; c=relaxed/simple; bh=13rTaiSsL0NTZ1YOaRxf6oSc1Dy8agBuYumvqKAnvQk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fyXsEJfxMomUKwGk8T5FF4xXB1Wb4md2F/ZZO5uN3uPsZ8/1CAbbZihDZAtjDlS8ha6drm5oJAlt2yvm95zvW3UuDHHPjRSuLQKRsMfQua5EgGCcOOJMJwL5TC/QB+zNxJQtNWVUhXvcuXE5//yDDOYshmRWbw0wV2vdUeMTedE= 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=KrHL9VWt; arc=none smtp.client-ip=209.85.214.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="KrHL9VWt" Received: by mail-pl1-f196.google.com with SMTP id d9443c01a7336-297ef378069so16911735ad.3 for ; Fri, 14 Nov 2025 01:25:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1763112314; x=1763717114; 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=CR4G2sTlGki2siCN1jOZFPTFr3TbudN4PF6c7ryHzjk=; b=KrHL9VWtE4O82KxpyXvhAlHSQMbpyLBZwKUcaF4AbRQCceK+D0jWXXwEcDe9XZa/o9 wyE8FYRpIctdMJ7CAHP+l3qIBfo1b5cHCqcRWDzELndSENhLcw0ooW7g6Og4T6roba4r CaX90a2FMRbyAVPFARRBcCC4rrTFqE6SSBJYk88oUK1Fb5MHM8rGR66D8kUNsIyRIfkZ xQvX/uUFXgjuYlLocgrzDZKyzj4aoC4pg4yYkE3h/+lRVy4GZjpmNwsM7bYVTPbJN3wq PY1FDC2TnuVuNIEfteqFI9zr5zHORNi1i+y+IeQMf0yV5Hss7tyqxGcwlsQHGLud3r0s wSSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763112314; x=1763717114; 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=CR4G2sTlGki2siCN1jOZFPTFr3TbudN4PF6c7ryHzjk=; b=P3GhVI0wUpdmiqc1YEWGi9jGpBwuW2B9U9zVxHmJ88JLF7iG4spg/n1h3jkYH+3JlG GH9EREsYWwwD6ng6s6+dtGhzzv462PMKhZU3WZiaw5a+3QwkUhgDyCQZuxkCVuV4Hmv1 IA3nAz24t1yVD8pUO9ufkPKLuycjXL9NXMwKxFZ+OyOalZmtEs8QvbSKxSmvs5Jhshyn 4fWmzYau9cOixzkV8c4yQu2kKrwIt22Rv2TDjDd5e0+lzumNiXsjRiwZbwGQtFACd311 L7WJxesndCPEPsgD0jTjvPcJGpzrhsiEIaKjzRQMfkZwMJFEyLeG6ybO73O8ezJNJ9jy 1gfQ== X-Forwarded-Encrypted: i=1; AJvYcCWn+P60LL0Qm4R2PkFx/Zo0IJ5X+849COhDHTbZRxlEVAuCBb4/QrNXpYX2AcRulWPU/HXcWiwT7Sz+pMU=@vger.kernel.org X-Gm-Message-State: AOJu0YxVMFSSYBCvLR+W1vgx93pR+qmQejBOsyx0SsXI0WOdYUaBnhRL Y4ynATblRu1OPFNEq9CB79MAjAJ7KG4lWlOYnadVQpWKRiQoOhzqujv4 X-Gm-Gg: ASbGncv6JQUFhUEHf/kIilIVA+ViC3TyRApk7BBtoE2flMKZBwUUIHsbQ1ZM232PmOh lfN5QEjCx+ifKfXwJAGHpZKOH4uXgIapPPFhr8k5mtrYw/v8X3aBd8rm2q8ma0Viuxl83fYXgL4 bPJTEEYKVRb/qquuceN6/WjMX9lXlRCSAImXvfLTahEIvW1x4RlOrAdT6q0n8tOWKlMPUbdD714 EjooCsDMI3HYz11dsp2R03u4UxvCD/du4074Jh2zwROwzZhsggeTJzYuwZYLTXfrzDDNdRFztBw A3+UyapP1JJkqrSgK7YTWu+iOG119SWL2zxi10wl0gR5dUUye7+paPIarh0NVIBgMN10uWzTk8e xdZPDjb0PL/D20awETVV8DE44hu5jNKQ5bKEl8cvM0M9iN00U1Gg1e72Wlk0PCg23nqkig1frA6 e6oyN+HPD6jZI= X-Google-Smtp-Source: AGHT+IHcncu3fCVBTRgs6cuHPXbsXwtrJ/13HcgbxbxqCj94e5Leoiq1IYCMd5ZzNeVgfN5DkjRaag== X-Received: by 2002:a17:903:22c5:b0:295:2c8e:8e44 with SMTP id d9443c01a7336-2986a76bc1dmr29990775ad.59.1763112313782; Fri, 14 Nov 2025 01:25:13 -0800 (PST) Received: from 7950hx ([43.129.244.20]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2985c2346dasm50451525ad.7.2025.11.14.01.25.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Nov 2025 01:25:13 -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, bpf@vger.kernel.org, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [PATCH RFC bpf-next 3/7] bpf: fix the usage of BPF_TRAMP_F_SKIP_FRAME Date: Fri, 14 Nov 2025 17:24:46 +0800 Message-ID: <20251114092450.172024-4-dongml2@chinatelecom.cn> X-Mailer: git-send-email 2.51.2 In-Reply-To: <20251114092450.172024-1-dongml2@chinatelecom.cn> References: <20251114092450.172024-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 --- 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 de5083cb1d37..2d300ab37cdd 100644 --- a/arch/x86/net/bpf_jit_comp.c +++ b/arch/x86/net/bpf_jit_comp.c @@ -3272,7 +3272,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