From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) (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 3E1F83FBEBC for ; Fri, 17 Jul 2026 13:07:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.53 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784293641; cv=none; b=as4YmRaLpHMrCuyAQzqSUr6WSy4xGrI+6oK74FVuHZqwA8Lq5HdAnCrmo+//1x/l1/w5FnobdAg/0j2rv9K4o+HMJPq4i11CgE2yAhOqv4akKF7VEKXWShQ0T8ZPghXaXwnbLNqFm1Htsdzhz99yS6ikgicUNtohI7IhuoPa8jQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784293641; c=relaxed/simple; bh=1TWFwrqLLPhi4hOF+lQYiAR8gfx3VWRwxzpCtpmYYnQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LQ4321db1n7ZvI95f1YTm1I1vGctHBXuruXoDDWQ94t+YpochtRD81b36kDzgw23QnvOSdZuwUmYC6+fCr3i7o6j5t7R16HNU3pm/HYw7euV3MiBIa9Am2/osr1qyMWqTEHCku6VB7fG0FP3Pu8ubtUeE/TGDA3gw5HWtEMwJLQ= 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=CginYwjn; arc=none smtp.client-ip=209.85.216.53 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="CginYwjn" Received: by mail-pj1-f53.google.com with SMTP id 98e67ed59e1d1-38dc4553f62so6238422a91.0 for ; Fri, 17 Jul 2026 06:07:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784293640; x=1784898440; 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:content-type; bh=GlWa8mIQcYhfASTlpT5AvSeo0bnNLaBVHf432AwkEfc=; b=CginYwjn34ITNmcQnAuTKlrIxoc+eFRpVQEKNnynWaFvrgPt6LJ2+N2D6oOF4i6tXS 8Q66nvEBWkifMoBgkbBprsAXDF3vh3Ecfrk+CvR8IqZd5rfsMEZok+uwsh5BnqSxpq9M COpQnWnSC/vpMsDjiTw0pCoMwDmcXoNgsOVf08gRfL4KTTVHTBDh2OXEwX6QNy7xhcp5 /RvJs0dICzmQaF6oes1IQN6Jb/fmcYDClFTiVtPXbyB0JX1xEuHCfwiJRpwNja8/bwhJ gUqgEPSKrnTFQXnxo6/T3vAAY99CkZ43SqnNyXHjaP4p9Cy68C52yASkK1Z4ufQ0D/MG DSjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784293640; x=1784898440; 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:content-type; bh=GlWa8mIQcYhfASTlpT5AvSeo0bnNLaBVHf432AwkEfc=; b=ZHUSDac8dlWuXZI+d0IsiYqsx5u1lQdZGQXO9PzC5iLOwY8ALDdO2j+mvpEodsx2Rv iJkz8NFGJdV4X80gFWBIGz1auDMZJYrp+AzYUDWIO4v8we9pELPURkhS4qrmXXxmY+Es 7bmAmNYxmdE9/hHP/y63DdQh6liZxABGbzZBO5XpFgW7u2ZfNjDSnpPK03/gw/4HmWQB dLPOuOhAsGk8KP5+lX/Ya10rJAEwB7KbfA8Z0r72yWmKwbIMgpSlAUuhIEvx6P4FZZiA Lx7JyLXlfWV2uAh/i9th1eoSBvuD0t0CB1V0hJfV5VLLFqq3d4yWty5jSSJ0TriCW7Go aEYg== X-Forwarded-Encrypted: i=1; AHgh+Rqxwt07IoxeUmveXTS7E0k2yujuglQisIXiUxBkOdT322VhswnKzitCkeru7rQreit20q5yZez2pR4kGSq5NYDYOrg=@vger.kernel.org X-Gm-Message-State: AOJu0Yxu6fcppkK9kqSIuIvOOOfjZNF7Znstf3Cz9Ve5TaYFsGFfuzFM RkG9wRcOizM84pzTOtqH0XI0Hzgo4l81wzzD4bWv0fXy0KrOu7ndY6bE X-Gm-Gg: AfdE7ckys8I8bk5HOMQf7rDVUZyPTos7CiO8rDjtQJUkbuI1u9qFdAltEzkN584hpOZ rB+BBUCBwwATekMsq/Oac0BqQ2JmJS2y4MFTdrD0FjoWTv6Rg8732KoQjeDjSfaD4H7RNdVYVfj AV3Om5RXJMzdiTBD3HjJSxilore4wQ7MMUD77cHKRXyfJMZGA3m33YphpfdecHSwnwdeVdAUJAu wFZQ4hXeiMuMVg6FgDTTQqVQ4VpquBllywj8yPX2MhRG3I0AV68pgsqg2QJrkZdoSXrK7S2usNe SgXTIH4SfBsU+y83CnxPQ9RbD8LGiGOuenT/tI1ePgKiutt9KZY7KCIz49HNY/3IAUf/XYhtq+A g3jvMWyLk+dZ6wL9rA7NjkJr6+iZrYg56qDcDBCfb0BUu4eRjYI+QCACA1VsgpU4/dSs5IgiZPO mo0X+M9DAB88WJ X-Received: by 2002:a17:90b:2dc1:b0:37f:c97a:939f with SMTP id 98e67ed59e1d1-38e4b3e11a5mr2543730a91.7.1784293639476; Fri, 17 Jul 2026 06:07:19 -0700 (PDT) Received: from localhost ([144.24.58.22]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-31429cf22b3sm7709544eec.0.2026.07.17.06.07.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jul 2026 06:07:18 -0700 (PDT) From: Jinchao Wang To: Andrew Morton , Peter Zijlstra , Thomas Gleixner , Steven Rostedt , Masami Hiramatsu Cc: Ingo Molnar , Borislav Petkov , Dave Hansen , "H . Peter Anvin" , x86@kernel.org, Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Mathieu Desnoyers , David Hildenbrand , Jonathan Corbet , Matthew Wilcox , Alan Stern , Randy Dunlap , Alexander Potapenko , Marco Elver , Mike Rapoport , linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-trace-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-doc@vger.kernel.org, Jinchao Wang Subject: [RFC PATCH v2 12/13] mm/kwatch: add KUnit tests for the watch expression parser Date: Fri, 17 Jul 2026 09:07:02 -0400 Message-ID: <20260717130702.1903917-1-wangjinchao600@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260717125023.1895892-1-wangjinchao600@gmail.com> References: <20260717125023.1895892-1-wangjinchao600@gmail.com> Precedence: bulk X-Mailing-List: linux-trace-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Cover base anchors (stack, argN, absolute address), positive and negative offsets, dereference chains, and rejection of malformed expressions (missing offsets, bad argument index, junk offsets). Signed-off-by: Jinchao Wang --- mm/kwatch/.kunitconfig | 9 +++ mm/kwatch/Kconfig | 12 ++++ mm/kwatch/Makefile | 1 + mm/kwatch/deref_test.c | 146 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 168 insertions(+) create mode 100644 mm/kwatch/.kunitconfig create mode 100644 mm/kwatch/deref_test.c diff --git a/mm/kwatch/.kunitconfig b/mm/kwatch/.kunitconfig new file mode 100644 index 000000000000..7e977ddf0da1 --- /dev/null +++ b/mm/kwatch/.kunitconfig @@ -0,0 +1,9 @@ +CONFIG_KUNIT=y +CONFIG_KWATCH=y +CONFIG_KWATCH_KUNIT_TEST=y +CONFIG_PERF_EVENTS=y +CONFIG_HAVE_HW_BREAKPOINT=y +CONFIG_HAVE_REINSTALL_HW_BREAKPOINT=y +CONFIG_KPROBES=y +CONFIG_KRETPROBES=y +CONFIG_PRINTK=y diff --git a/mm/kwatch/Kconfig b/mm/kwatch/Kconfig index 9daf6d4463ef..6ec9aa448ece 100644 --- a/mm/kwatch/Kconfig +++ b/mm/kwatch/Kconfig @@ -14,3 +14,15 @@ config KWATCH exact instruction causing the illegal access. If unsure, say N. + +config KWATCH_KUNIT_TEST + bool "KUnit tests for KWatch" if !KUNIT_ALL_TESTS + # Built into the kwatch module, so it must be y; a bool cannot be + # enabled when KWATCH is a module (KWATCH=m would force it off). + depends on KWATCH=y && KUNIT + default KUNIT_ALL_TESTS + help + Enable KUnit tests for the KWatch kernel module. + This suite tests the core parsing logic, the pointer-chasing + finite state machine, and edge cases involving complex watchpoint + expressions. If unsure, say N. diff --git a/mm/kwatch/Makefile b/mm/kwatch/Makefile index 02d7917602f1..1d223d73b461 100644 --- a/mm/kwatch/Makefile +++ b/mm/kwatch/Makefile @@ -1,3 +1,4 @@ obj-$(CONFIG_KWATCH) += kwatch.o kwatch-y := core.o deref.o task_ctx.o hwbp.o probe.o anchor.o +kwatch-$(CONFIG_KWATCH_KUNIT_TEST) += deref_test.o diff --git a/mm/kwatch/deref_test.c b/mm/kwatch/deref_test.c new file mode 100644 index 000000000000..35919dd24d92 --- /dev/null +++ b/mm/kwatch/deref_test.c @@ -0,0 +1,146 @@ +// SPDX-License-Identifier: GPL-2.0 +#include +#include "kwatch.h" +#include + +static void kwatch_test_parse_deref_chain(struct kunit *test) +{ + struct kwatch_config cfg; + int ret; + + // Test 1: stack + memset(&cfg, 0, sizeof(cfg)); + ret = kwatch_deref_parse(&cfg, "stack"); + KUNIT_EXPECT_EQ(test, ret, 0); + KUNIT_EXPECT_EQ(test, cfg.base, KWATCH_BASE_STACK); + KUNIT_EXPECT_EQ(test, cfg.offset_count, 1); + KUNIT_EXPECT_EQ(test, cfg.offsets[0], 0); + + // Test 2: arg1 + memset(&cfg, 0, sizeof(cfg)); + ret = kwatch_deref_parse(&cfg, "arg1"); + KUNIT_EXPECT_EQ(test, ret, 0); + KUNIT_EXPECT_EQ(test, cfg.base, KWATCH_BASE_ARG1); + KUNIT_EXPECT_EQ(test, cfg.offset_count, 1); + KUNIT_EXPECT_EQ(test, cfg.offsets[0], 0); + + // Test 3: arg6+8 + memset(&cfg, 0, sizeof(cfg)); + ret = kwatch_deref_parse(&cfg, "arg6+8"); + KUNIT_EXPECT_EQ(test, ret, 0); + KUNIT_EXPECT_EQ(test, cfg.base, KWATCH_BASE_ARG6); + KUNIT_EXPECT_EQ(test, cfg.offset_count, 1); + KUNIT_EXPECT_EQ(test, cfg.offsets[0], 8); + + // Test 4: arg2-16 + memset(&cfg, 0, sizeof(cfg)); + ret = kwatch_deref_parse(&cfg, "arg2-16"); + KUNIT_EXPECT_EQ(test, ret, 0); + KUNIT_EXPECT_EQ(test, cfg.base, KWATCH_BASE_ARG2); + KUNIT_EXPECT_EQ(test, cfg.offset_count, 1); + KUNIT_EXPECT_EQ(test, cfg.offsets[0], -16); + + // Test 5: arg3->8 + memset(&cfg, 0, sizeof(cfg)); + ret = kwatch_deref_parse(&cfg, "arg3->8"); + KUNIT_EXPECT_EQ(test, ret, 0); + KUNIT_EXPECT_EQ(test, cfg.base, KWATCH_BASE_ARG3); + KUNIT_EXPECT_EQ(test, cfg.offset_count, 2); + KUNIT_EXPECT_EQ(test, cfg.offsets[0], 0); + KUNIT_EXPECT_EQ(test, cfg.offsets[1], 8); + + // Test 6: arg4+8->16 + memset(&cfg, 0, sizeof(cfg)); + ret = kwatch_deref_parse(&cfg, "arg4+8->16"); + KUNIT_EXPECT_EQ(test, ret, 0); + KUNIT_EXPECT_EQ(test, cfg.base, KWATCH_BASE_ARG4); + KUNIT_EXPECT_EQ(test, cfg.offset_count, 2); + KUNIT_EXPECT_EQ(test, cfg.offsets[0], 8); + KUNIT_EXPECT_EQ(test, cfg.offsets[1], 16); + + // Test 7: arg5-8->-16 + memset(&cfg, 0, sizeof(cfg)); + ret = kwatch_deref_parse(&cfg, "arg5-8->-16"); + KUNIT_EXPECT_EQ(test, ret, 0); + KUNIT_EXPECT_EQ(test, cfg.base, KWATCH_BASE_ARG5); + KUNIT_EXPECT_EQ(test, cfg.offset_count, 2); + KUNIT_EXPECT_EQ(test, cfg.offsets[0], -8); + KUNIT_EXPECT_EQ(test, cfg.offsets[1], -16); + + // Test 8: stack->0->8 + memset(&cfg, 0, sizeof(cfg)); + ret = kwatch_deref_parse(&cfg, "stack->0->8"); + KUNIT_EXPECT_EQ(test, ret, 0); + KUNIT_EXPECT_EQ(test, cfg.base, KWATCH_BASE_STACK); + KUNIT_EXPECT_EQ(test, cfg.offset_count, 3); + KUNIT_EXPECT_EQ(test, cfg.offsets[0], 0); + KUNIT_EXPECT_EQ(test, cfg.offsets[1], 0); + KUNIT_EXPECT_EQ(test, cfg.offsets[2], 8); + + // Test 9: arg1->+8 + memset(&cfg, 0, sizeof(cfg)); + ret = kwatch_deref_parse(&cfg, "arg1->+8"); + KUNIT_EXPECT_EQ(test, ret, 0); + KUNIT_EXPECT_EQ(test, cfg.base, KWATCH_BASE_ARG1); + KUNIT_EXPECT_EQ(test, cfg.offset_count, 2); + KUNIT_EXPECT_EQ(test, cfg.offsets[0], 0); + KUNIT_EXPECT_EQ(test, cfg.offsets[1], 8); + + // Test 9.1: arg1-> (implicit 0 should fail) + memset(&cfg, 0, sizeof(cfg)); + ret = kwatch_deref_parse(&cfg, "arg1->"); + KUNIT_EXPECT_EQ(test, ret, -EINVAL); + + // Test 9.2: stack->->8 (implicit 0 should fail) + memset(&cfg, 0, sizeof(cfg)); + ret = kwatch_deref_parse(&cfg, "stack->->8"); + KUNIT_EXPECT_EQ(test, ret, -EINVAL); + + // Test 10: Invalid base + memset(&cfg, 0, sizeof(cfg)); + ret = kwatch_deref_parse(&cfg, "invalid_base"); + KUNIT_EXPECT_EQ(test, ret, -EINVAL); + + // Test 11: Invalid offset + memset(&cfg, 0, sizeof(cfg)); + ret = kwatch_deref_parse(&cfg, "arg1+abc"); + KUNIT_EXPECT_EQ(test, ret, -EINVAL); + + // Test 12: Invalid arg + memset(&cfg, 0, sizeof(cfg)); + ret = kwatch_deref_parse(&cfg, "arg7"); + KUNIT_EXPECT_EQ(test, ret, -EINVAL); + + // Test 13: Absolute address. Use a width-appropriate literal: a 64-bit + // address would overflow unsigned long and fail kstrtoul() on 32-bit. + memset(&cfg, 0, sizeof(cfg)); +#if BITS_PER_LONG == 64 + ret = kwatch_deref_parse(&cfg, "0xffffffff81000000+8"); +#else + ret = kwatch_deref_parse(&cfg, "0xc1000000+8"); +#endif + KUNIT_EXPECT_EQ(test, ret, 0); + KUNIT_EXPECT_EQ(test, cfg.base, KWATCH_BASE_ABS_ADDR); +#if BITS_PER_LONG == 64 + KUNIT_EXPECT_EQ(test, cfg.sym_addr, 0xffffffff81000000UL); +#else + KUNIT_EXPECT_EQ(test, cfg.sym_addr, 0xc1000000UL); +#endif + KUNIT_EXPECT_EQ(test, cfg.offset_count, 1); + KUNIT_EXPECT_EQ(test, cfg.offsets[0], 8); +} + +static struct kunit_case kwatch_deref_test_cases[] = { + KUNIT_CASE(kwatch_test_parse_deref_chain), + {} +}; + +static struct kunit_suite kwatch_deref_test_suite = { + .name = "kwatch_deref", + .test_cases = kwatch_deref_test_cases, +}; + +kunit_test_suite(kwatch_deref_test_suite); + +MODULE_DESCRIPTION("KUnit tests for the KWatch watch expression parser"); +MODULE_LICENSE("GPL"); -- 2.53.0