From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) (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 9FF1F3043B9 for ; Wed, 24 Sep 2025 11:52:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.169 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758714734; cv=none; b=lUEQWoIHd/muryGokF87VYptfHOv1qKlPuSPM2v7ic3fr5c1cwhYAKOOY6T5mwZUmhcZ75+/INfG5oGFNT1MTCGc4pOCFfFQLOnnwiBMKEPqA0E0iNYWlkKiZLg20BN/MgNWjxlNKxokF25lS/Q9FCTDT1kF4FGsAZ9+Q8LVXh4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758714734; c=relaxed/simple; bh=0RaB9b3mDxARpzNAU+b9+OM/53UguV9OX02ut00avNs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=brMTRldJTiVPP7qXe1dPKjqLlukHZACxHC1ugCiA/yN+Q3Bqf8L+/ZKCk1WoV0dm7AeDUEfFtUgKVeG7N4Xe/5/GzQQCa8GThfkJA61s+K4RNS+kxORt6sAuffN6dV6lWa8P3UgXo42WzKKDBXWctnaf+XyvSXmadrYADmnMf1M= 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=iVTG8pXv; arc=none smtp.client-ip=209.85.210.169 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="iVTG8pXv" Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-77f22902b46so4234118b3a.0 for ; Wed, 24 Sep 2025 04:52:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1758714728; x=1759319528; darn=lists.linux.dev; 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=8p2Xfne7CGpLjN/MkaU3Ee28S3aCNgQ2oxnJpFebIbs=; b=iVTG8pXvEyKkGPFPncAC73wygv4V0YduuhRmx+akDueDqv1SxmqnkszoGowJ8G21vT s1reF/ghw3N6pvwtbUSQ9Mwwns2trE8nQJQiqf3OD4hz56c4moaCCt8hwq5WsIrCPFla cv+PpSaTf9NywTRe8hzJb+e3AQ6RkFoylPqofUNTl5AtfyPR618Ld1ghnFWkgAA1+VIV C28mMxV5e7W+wDcvykQsIFbO7mQp2Bxz2F+b+Zl/kd0kVEUBGpM4XZM1Y4541g345SDZ O3g5HMzrIZHrs8PUjXxcNx4Eafa7IlXhVHKS7ouuNioj3PQHohZyVnza98oJQLMgJN9Y 7lug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758714728; x=1759319528; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8p2Xfne7CGpLjN/MkaU3Ee28S3aCNgQ2oxnJpFebIbs=; b=vyG5KRyx8P6r16AEmY7U/mndBZICFti3xX7Htx4svva42Z5sJ9iePl9ethH9fkeeat oVEZPPAzwslDddemxQnBZUfH1C5Cn6fHNWsX1hglL9XIg8DcsHgr2SAw46fMp/L9mgPE p54NsvQ4c7mGEVKg1bTz0yWCheZrJ4ixgn2LWtwFbymJvj5kI1SJ9fVN1GcuVOxDLvPa hLD9qaj4Tf7904SPnT0NVL2Ac9tIAb9iMXi1mETgYbfdp5AycLlFtUduU1lnBuQjCzM9 Jd3nnvoj9mC/giCJCS3RGsH8/ex3sitOOOEZO1LHdT6CvvrufVcXouRiRNs5nPWSwE/d Cnig== X-Forwarded-Encrypted: i=1; AJvYcCV5IHUfSIx5n2fqs8J+fH5CP+PJDIIuTUa9LmSm/bb1fqOiyl+nSJwDNaiXCMn2Nl+8Pqn6@lists.linux.dev X-Gm-Message-State: AOJu0YwZCaE+Ob2mkIXpZGhbfgMbkimm5dJZQpj+Kz3pFwbVfgtCNYGp u17IRNrQrSXretN95H4ddnt0b4uYYKrxsTGePJVGCQh1sHiGRVubWwLI X-Gm-Gg: ASbGnctqAVVphrIlLrI/B5mLQokFHJg+Ub+1iqe5Ytro+OniincvUT+303vpRAgVawh ChUErgbaUG7md0W0dthzv+3RWR8pOktRJ8KpBcn6xoYpQjTRWghR0EGEU8R5uiGO2Gv0ZhhWeMl ZEDUWvC4Zc+T4M7ilhRj93ismyNGIBfU786L31wssmkoSCMKKsPQlt/nH00gD1FydfQUxUao3G5 +sG4hCet/sMCEqBEbl0V3gZbBkWziC092lB+NQUxM6Cx7IQyUArKcB7P2SQs7Rakm6sdZM0MrnZ sPAl4XZBAbD6EdjpbZULoQs17QYehw4Y0ZqpUnigWiitIxzVGQPT0/+GxY4P8ix4cicOVpkOY9l kSs9uMGXRIshL0ot71G3UIvCuGQ== X-Google-Smtp-Source: AGHT+IFvFtl/EyZ7iXrxXzX/exhl4mgRDo22qwkFSgnKL3W11UaAqeIdwbc9uDs1HMk5jHchDAVYeQ== X-Received: by 2002:a05:6a21:99a7:b0:2b5:9c2:c596 with SMTP id adf61e73a8af0-2d0009e2f3bmr8556644637.6.1758714727810; Wed, 24 Sep 2025 04:52:07 -0700 (PDT) Received: from localhost ([23.142.224.65]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-77cfbb7aad7sm18582634b3a.12.2025.09.24.04.52.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Sep 2025 04:52:07 -0700 (PDT) From: Jinchao Wang To: Andrew Morton , Masami Hiramatsu , Peter Zijlstra , Mike Rapoport , Alexander Potapenko , Randy Dunlap , Jonathan Corbet , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Valentin Schneider , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , "Liang, Kan" , David Hildenbrand , Lorenzo Stoakes , "Liam R. Howlett" , Vlastimil Babka , Suren Baghdasaryan , Michal Hocko , Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , Kees Cook , Alice Ryhl , Sami Tolvanen , Miguel Ojeda , Masahiro Yamada , Rong Xu , Naveen N Rao , David Kaplan , Andrii Nakryiko , Jinjie Ruan , Nam Cao , workflows@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-mm@kvack.org, llvm@lists.linux.dev, Andrey Ryabinin , Andrey Konovalov , Dmitry Vyukov , Vincenzo Frascino , kasan-dev@googlegroups.com, "David S. Miller" , Mathieu Desnoyers , linux-trace-kernel@vger.kernel.org Cc: Jinchao Wang Subject: [PATCH v5 09/23] mm/ksw: ignore false positives from exit trampolines Date: Wed, 24 Sep 2025 19:50:52 +0800 Message-ID: <20250924115124.194940-10-wangjinchao600@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250924115124.194940-1-wangjinchao600@gmail.com> References: <20250924115124.194940-1-wangjinchao600@gmail.com> Precedence: bulk X-Mailing-List: llvm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Because trampolines run after the watched function returns but before the exit_handler is called, and in the original stack frame, so the trampoline code may overwrite the watched stack address. These false positives should be ignored. is_ftrace_trampoline() does not cover all trampolines, so add a local check to handle the remaining cases. Signed-off-by: Jinchao Wang --- mm/kstackwatch/watch.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/mm/kstackwatch/watch.c b/mm/kstackwatch/watch.c index 887cc13292dc..722ffd9fda7c 100644 --- a/mm/kstackwatch/watch.c +++ b/mm/kstackwatch/watch.c @@ -2,6 +2,7 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #include +#include #include #include #include @@ -18,10 +19,46 @@ bool panic_on_catch; module_param(panic_on_catch, bool, 0644); MODULE_PARM_DESC(panic_on_catch, "panic immediately on corruption catch"); +#define TRAMPOLINE_NAME "return_to_handler" +#define TRAMPOLINE_DEPTH 16 + +/* Resolved once, then reused */ +static unsigned long tramp_start, tramp_end; + +static void ksw_watch_resolve_trampoline(void) +{ + unsigned long sz, off; + + if (likely(tramp_start && tramp_end)) + return; + + tramp_start = kallsyms_lookup_name(TRAMPOLINE_NAME); + if (tramp_start && kallsyms_lookup_size_offset(tramp_start, &sz, &off)) + tramp_end = tramp_start + sz; +} + +static bool ksw_watch_in_trampoline(unsigned long ip) +{ + if (tramp_start && tramp_end && ip >= tramp_start && ip < tramp_end) + return true; + return false; +} static void ksw_watch_handler(struct perf_event *bp, struct perf_sample_data *data, struct pt_regs *regs) { + unsigned long entries[TRAMPOLINE_DEPTH]; + int i, nr = 0; + + nr = stack_trace_save_regs(regs, entries, TRAMPOLINE_DEPTH, 0); + for (i = 0; i < nr; i++) { + //ignore trampoline + if (is_ftrace_trampoline(entries[i])) + return; + if (ksw_watch_in_trampoline(entries[i])) + return; + } + pr_err("========== KStackWatch: Caught stack corruption =======\n"); pr_err("config %s\n", ksw_get_config()->user_input); dump_stack(); @@ -168,6 +205,7 @@ int ksw_watch_init(void) { int ret; + ksw_watch_resolve_trampoline(); ret = ksw_watch_alloc(); if (ret <= 0) return -EBUSY; -- 2.43.0