From patchwork Sun Oct 13 18:20:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sabyrzhan Tasbolatov X-Patchwork-Id: 13833407 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5E510CF2576 for ; Sun, 13 Oct 2024 18:19:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7ECFD6B0082; Sun, 13 Oct 2024 14:19:22 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 79CFB6B0083; Sun, 13 Oct 2024 14:19:22 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 63D066B0085; Sun, 13 Oct 2024 14:19:22 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 45F506B0082 for ; Sun, 13 Oct 2024 14:19:22 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id CD4AC8080B for ; Sun, 13 Oct 2024 18:19:15 +0000 (UTC) X-FDA: 82669391238.04.B8EAE92 Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.53]) by imf30.hostedemail.com (Postfix) with ESMTP id 2EBEC80008 for ; Sun, 13 Oct 2024 18:19:09 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b="Z0JZdU/I"; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf30.hostedemail.com: domain of snovitoll@gmail.com designates 209.85.218.53 as permitted sender) smtp.mailfrom=snovitoll@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1728843456; a=rsa-sha256; cv=none; b=V5t0LBtMPges4Y6GBB2l1+4ZD4zIxVgmKmeR0/sSfhJiVMKgSxYgyndqtBXvY+j+uc9/Ot F+uCvXBSEbXAUbrFZda8Mp9a0yYmjqVMS/rbjvjFetZqxUTAvHu7ysWoYb/E8lSctfygy3 1i/RMLqNtIHeewWUdxoI3sgu7fYiIZg= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b="Z0JZdU/I"; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf30.hostedemail.com: domain of snovitoll@gmail.com designates 209.85.218.53 as permitted sender) smtp.mailfrom=snovitoll@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1728843456; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=X56ki4zUkTbfkScVrmia1mDMQKgiUsSq+BtzwCXhyN8=; b=6lLMDTl8PsbHuEq8PMghDVqNU3EM7MRuhMRJS8KxOTYE8pJqmtkqpYb83EtX7ZeEqgu+C8 BfUbsFZCz9IN5snOijhnkZQGeNevzWT7YrpFN8RZ/7jbO0NfLLPALlV9BsjRs691pD4qzt S1+njeq70NKmCASF1h+Z1dbZsoRjxTk= Received: by mail-ej1-f53.google.com with SMTP id a640c23a62f3a-a99d1b7b5f5so238535466b.0 for ; Sun, 13 Oct 2024 11:19:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728843558; x=1729448358; darn=kvack.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=X56ki4zUkTbfkScVrmia1mDMQKgiUsSq+BtzwCXhyN8=; b=Z0JZdU/Icyv/j/5gzbjYeqR7oV9YDsCU6YqAFBpqDZdPGabnExdAWLb4/RJLXR1YHG N24+gaLsA8RQqCnPNO//vsrasXlPYouIQMihzXaprs9WzDqbkGesjvmP/OStkBz++tI4 Cyn43Cg1FaZv6/xHnKS8ll9IKm1ldfkGLelBNKHash18Cjbyht1AGHFjCI2tOHOKWcEi s3DGtIC1d8WLC+mppZX0DPCV81hf2XifgNfBUB/d8v8jvCwf9H+cWZQlm2scIfJDf+jc q9pftLS5+97xm4N91bCvG5wSR45ZulAM6pej49TO6bmT6QmKkru+orhHEe7WDtvi6N8i JKSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728843558; x=1729448358; 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=X56ki4zUkTbfkScVrmia1mDMQKgiUsSq+BtzwCXhyN8=; b=Egto3fg0k3MvfjC7z54xuxZBsSEE9VME/AE967xEth+Pe+dsmvhpnV6Cutzdc2WvFs 4qlcS9XTZctVXS5OoIuDpJl1/l22XEmU+MP1TliTRMZIFrIK06KhTg+Apcza0mEs1DC1 ByiNKhBbRe0dDqVmBGmO/5JRsrz8/bTPOPv6WbYzeefHSpqVA8PTX4HdYVCoE2bDQe/J EfyLr9hUWRzYQtsolgnyr11b6k5jmOfmompN69m6/gkQPEsvwrHOry0gOrRMLzbhW0qz +0JmsHnpQWfJ+J48n22Y2v0eRe05Ne06AbqhZ/XumL7kYCnlPsoN3c0rchs6WRw1MSRW as/Q== X-Forwarded-Encrypted: i=1; AJvYcCW0CeaWKZDoUWtunO62M4Czy52BB/i4EHAowq5ZYlejFigxf1DOds4DI3EdSO/bf0Y3L0kTebdd+A==@kvack.org X-Gm-Message-State: AOJu0YzFY7Kgud8Jqg9xu9W3FWGK+9S2K3dXSwpFkphhM2/DkEwRRmca 7kyR1vUrPow1WslQcGZBFgT/NOCmIDKky/Pc29p3ITHf2UPR4Fn1 X-Google-Smtp-Source: AGHT+IEPuqRk1fF+DzXKNYdEqvVLvn9/MKGMqgO/l9jzR0cpo8qxe+FtFoILPmStmwoQA5yi91dqsQ== X-Received: by 2002:a17:906:fe41:b0:a99:c075:6592 with SMTP id a640c23a62f3a-a99c075952emr779610666b.56.1728843557929; Sun, 13 Oct 2024 11:19:17 -0700 (PDT) Received: from work.. (2.133.25.254.dynamic.telecom.kz. [2.133.25.254]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a99e57f763bsm249937066b.85.2024.10.13.11.19.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Oct 2024 11:19:17 -0700 (PDT) From: Sabyrzhan Tasbolatov To: andreyknvl@gmail.com Cc: 2023002089@link.tyut.edu.cn, akpm@linux-foundation.org, alexs@kernel.org, corbet@lwn.net, dvyukov@google.com, elver@google.com, glider@google.com, kasan-dev@googlegroups.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, ryabinin.a.a@gmail.com, siyanteng@loongson.cn, snovitoll@gmail.com, vincenzo.frascino@arm.com, workflows@vger.kernel.org Subject: [PATCH v3 2/3] kasan: migrate copy_user_test to kunit Date: Sun, 13 Oct 2024 23:20:16 +0500 Message-Id: <20241013182016.3074875-1-snovitoll@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Queue-Id: 2EBEC80008 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: 1qn5tk99p5yn3cwhwmkf1d6s6npatxf8 X-HE-Tag: 1728843549-205528 X-HE-Meta: U2FsdGVkX1+B2sG3vvPW+N6ofnMmCIBMMulo4DvSikbNZFKtlSJZqAH/+6gsWPhtAodSzM2DM6BIprG7lvTatGZYlpLohNHJRYsoTW9K+uyae4rvc2KR6JqMIf8Zen/rvMlh8TbHBYSxNO1wsMMSlVhsxt4o5BOPcw3YIaiftrtSaNMIs4YnNs8TM+I3WSFRaC2jnWmrYsCXpQw6al4Unqjz3gBJI5RUWfOCZrxgxaF7uzij/qzTjCDF9OK66JyxNGXXCrWUBolkG4PuHNfpy4mDrZsW5ZpOtz9/rd/oi287Vj2spYxX+Enk7TplKDOg4KPH7LsGohFgRXRYZMxJpEpRbWbNpDlxNqWUEqn0sGM5ng+Jht8jZ8hf1I5Jg7pMjjvBgj4hd5J27bGpJyfZ7LXtjcHS8B5OccqajNqx4cvH1o2QHjo7aFIxmbM8Y+hMx1A718l437wgcl8c/XvzJLA7D/bEFm3drsPSsWIu0IVY5ATzH2IfCgPnk6VC7d+m5lTPPc2O7y9BUda/AO4CMXoxo37YvhS2/u7GSwWOm/fl51Ui57pa/iQt4cbAJk1CTdVLI3cTmZCT4fgenU86OpqQwof9SzDC2Kvt86ZlkHPxvBHpYQqQgZERRkD0BNYtPdyo20tpytFViswP51TmmfSoNJJZIFtYGk1HE3PgY71J3TbPd6b0LMA89XM08IQ8UtE5YV3yaJvbEQiHrjiJ1H6xOf8AkD8wU5IVrE0Gv8aqgXfLlqMwmEZNPnoMH7cuLrtrBSFWB0jmeO2VukETCiCsv0NwjUw5Mr+iz6Rl0Jx7dWafyiwempEb+oy2Iqas9rJn4x35PQ+zgKbny3qupEshM4Blc9pTPiNRzdWzCMVJNIJBPGVgE/6iJsSL3YsF/u1fu9PNk8o4g0rvTFi64HaKbHdeR107YQSYgALRyDw+ZAo8kqS8F3EfT5FAPcxmV4HslzX0M8r9NtEMVAj RhmzvTUW /7luBnyai+MrWdp0u2y5hSUvm3xDXlhUE5kKk5h+eQ/4PQnthTd4cg11A0yPL/+YeUW/2DA7nHrgNF3xZbnFE8HJ2DS8b7q79TntD/YZOkie6f6ZuljjgK90eYI1Qp0i6uaV8OIyE5eJrXYZoObkWEFJDgJqPol7KFN2AHhX4JDBZVB0IzmaG+pJjzDT+9nZn4AgGJu35/98DGr2CpMYkk4a+gXHuvTC2+LKx6/XDvmpUpnLqBJUddXLcLILbf1+6dpo3rqNzIbcbhYFEG8VIiqLPPUP856GAeWSj7j6pnMJuReKMqe+dpBaFy1ffG/gX4PwCbqag3fmYIK62OxRlV+41DtxfSiGOOPgSyKchuKQGBRMKjeGplbrOHC4Hcp7tEEliwnL4N72OYzcOjL8dF3UnrZnngqPb72MbwBdPOLQy7QCMN9mAkgk5MKe1f8L7HWLXc5KUCS+ROxETzPRs5E6Nzu5yErFSKMe2j+ibqQLjneIca+hJAlMTlbnel/pP1zsvZc/TbcDep6Q= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Migrate the copy_user_test to the KUnit framework to verify out-of-bound detection via KASAN reports in copy_from_user(), copy_to_user() and their static functions. This is the last migrated test in kasan_test_module.c, therefore delete the file. Signed-off-by: Sabyrzhan Tasbolatov Reviewed-by: Andrey Konovalov --- Changes v2 -> v3: - added a long string in usermem for strncpy_from_user. Suggested by Andrey. --- mm/kasan/Makefile | 2 - mm/kasan/kasan_test_c.c | 47 +++++++++++++++++++++ mm/kasan/kasan_test_module.c | 81 ------------------------------------ 3 files changed, 47 insertions(+), 83 deletions(-) delete mode 100644 mm/kasan/kasan_test_module.c diff --git a/mm/kasan/Makefile b/mm/kasan/Makefile index b88543e5c0c..1a958e7c8a4 100644 --- a/mm/kasan/Makefile +++ b/mm/kasan/Makefile @@ -46,7 +46,6 @@ endif CFLAGS_kasan_test_c.o := $(CFLAGS_KASAN_TEST) RUSTFLAGS_kasan_test_rust.o := $(RUSTFLAGS_KASAN) -CFLAGS_kasan_test_module.o := $(CFLAGS_KASAN_TEST) obj-y := common.o report.o obj-$(CONFIG_KASAN_GENERIC) += init.o generic.o report_generic.o shadow.o quarantine.o @@ -59,4 +58,3 @@ ifdef CONFIG_RUST endif obj-$(CONFIG_KASAN_KUNIT_TEST) += kasan_test.o -obj-$(CONFIG_KASAN_MODULE_TEST) += kasan_test_module.o diff --git a/mm/kasan/kasan_test_c.c b/mm/kasan/kasan_test_c.c index a181e4780d9..382bc64e42d 100644 --- a/mm/kasan/kasan_test_c.c +++ b/mm/kasan/kasan_test_c.c @@ -1954,6 +1954,52 @@ static void rust_uaf(struct kunit *test) KUNIT_EXPECT_KASAN_FAIL(test, kasan_test_rust_uaf()); } +static void copy_user_test_oob(struct kunit *test) +{ + char *kmem; + char __user *usermem; + unsigned long useraddr; + size_t size = 128 - KASAN_GRANULE_SIZE; + int __maybe_unused unused; + + kmem = kunit_kmalloc(test, size, GFP_KERNEL); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, kmem); + + useraddr = kunit_vm_mmap(test, NULL, 0, PAGE_SIZE, + PROT_READ | PROT_WRITE | PROT_EXEC, + MAP_ANONYMOUS | MAP_PRIVATE, 0); + KUNIT_ASSERT_NE_MSG(test, useraddr, 0, + "Could not create userspace mm"); + KUNIT_ASSERT_LT_MSG(test, useraddr, (unsigned long)TASK_SIZE, + "Failed to allocate user memory"); + + OPTIMIZER_HIDE_VAR(size); + usermem = (char __user *)useraddr; + + KUNIT_EXPECT_KASAN_FAIL(test, + unused = copy_from_user(kmem, usermem, size + 1)); + KUNIT_EXPECT_KASAN_FAIL(test, + unused = copy_to_user(usermem, kmem, size + 1)); + KUNIT_EXPECT_KASAN_FAIL(test, + unused = __copy_from_user(kmem, usermem, size + 1)); + KUNIT_EXPECT_KASAN_FAIL(test, + unused = __copy_to_user(usermem, kmem, size + 1)); + KUNIT_EXPECT_KASAN_FAIL(test, + unused = __copy_from_user_inatomic(kmem, usermem, size + 1)); + KUNIT_EXPECT_KASAN_FAIL(test, + unused = __copy_to_user_inatomic(usermem, kmem, size + 1)); + + /* + * Prepare a long string in usermem to avoid the strncpy_from_user test + * bailing out on '\0' before it reaches out-of-bounds. + */ + memset(kmem, 'a', size); + KUNIT_EXPECT_EQ(test, copy_to_user(usermem, kmem, size), 0); + + KUNIT_EXPECT_KASAN_FAIL(test, + unused = strncpy_from_user(kmem, usermem, size + 1)); +} + static struct kunit_case kasan_kunit_test_cases[] = { KUNIT_CASE(kmalloc_oob_right), KUNIT_CASE(kmalloc_oob_left), @@ -2028,6 +2074,7 @@ static struct kunit_case kasan_kunit_test_cases[] = { KUNIT_CASE(match_all_ptr_tag), KUNIT_CASE(match_all_mem_tag), KUNIT_CASE(rust_uaf), + KUNIT_CASE(copy_user_test_oob), {} }; diff --git a/mm/kasan/kasan_test_module.c b/mm/kasan/kasan_test_module.c deleted file mode 100644 index 27ec22767e4..00000000000 --- a/mm/kasan/kasan_test_module.c +++ /dev/null @@ -1,81 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* - * - * Copyright (c) 2014 Samsung Electronics Co., Ltd. - * Author: Andrey Ryabinin - */ - -#define pr_fmt(fmt) "kasan: test: " fmt - -#include -#include -#include -#include -#include - -#include "kasan.h" - -static noinline void __init copy_user_test(void) -{ - char *kmem; - char __user *usermem; - size_t size = 128 - KASAN_GRANULE_SIZE; - int __maybe_unused unused; - - kmem = kmalloc(size, GFP_KERNEL); - if (!kmem) - return; - - usermem = (char __user *)vm_mmap(NULL, 0, PAGE_SIZE, - PROT_READ | PROT_WRITE | PROT_EXEC, - MAP_ANONYMOUS | MAP_PRIVATE, 0); - if (IS_ERR(usermem)) { - pr_err("Failed to allocate user memory\n"); - kfree(kmem); - return; - } - - OPTIMIZER_HIDE_VAR(size); - - pr_info("out-of-bounds in copy_from_user()\n"); - unused = copy_from_user(kmem, usermem, size + 1); - - pr_info("out-of-bounds in copy_to_user()\n"); - unused = copy_to_user(usermem, kmem, size + 1); - - pr_info("out-of-bounds in __copy_from_user()\n"); - unused = __copy_from_user(kmem, usermem, size + 1); - - pr_info("out-of-bounds in __copy_to_user()\n"); - unused = __copy_to_user(usermem, kmem, size + 1); - - pr_info("out-of-bounds in __copy_from_user_inatomic()\n"); - unused = __copy_from_user_inatomic(kmem, usermem, size + 1); - - pr_info("out-of-bounds in __copy_to_user_inatomic()\n"); - unused = __copy_to_user_inatomic(usermem, kmem, size + 1); - - pr_info("out-of-bounds in strncpy_from_user()\n"); - unused = strncpy_from_user(kmem, usermem, size + 1); - - vm_munmap((unsigned long)usermem, PAGE_SIZE); - kfree(kmem); -} - -static int __init kasan_test_module_init(void) -{ - /* - * Temporarily enable multi-shot mode. Otherwise, KASAN would only - * report the first detected bug and panic the kernel if panic_on_warn - * is enabled. - */ - bool multishot = kasan_save_enable_multi_shot(); - - copy_user_test(); - - kasan_restore_multi_shot(multishot); - return -EAGAIN; -} - -module_init(kasan_test_module_init); -MODULE_LICENSE("GPL"); From patchwork Sun Oct 13 18:21:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sabyrzhan Tasbolatov X-Patchwork-Id: 13833408 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8C6BDCF2576 for ; Sun, 13 Oct 2024 18:20:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 221546B0089; Sun, 13 Oct 2024 14:20:22 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1D1F06B008A; Sun, 13 Oct 2024 14:20:22 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 072626B008C; Sun, 13 Oct 2024 14:20:22 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id D7D196B0089 for ; Sun, 13 Oct 2024 14:20:21 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 2F43F1208F1 for ; Sun, 13 Oct 2024 18:20:15 +0000 (UTC) X-FDA: 82669393632.03.EF56420 Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) by imf29.hostedemail.com (Postfix) with ESMTP id 9DEDC120004 for ; Sun, 13 Oct 2024 18:20:12 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=gJ6X6GFY; spf=pass (imf29.hostedemail.com: domain of snovitoll@gmail.com designates 209.85.218.44 as permitted sender) smtp.mailfrom=snovitoll@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1728843547; a=rsa-sha256; cv=none; b=TGISu0uhXSTiS49E2uozHehkUCkPPoT2QQK2QL2pSZHyADK2biETyQjwuSSr8YnRtGK921 kLst/3+JUu0Y9dV4PQ42DIzJG1lSW4vDe6huofmVSPy7oDguaheMWh7r2ej97ITiXMe1ZS o10z6E74uR/bptZFN1YihC5SN4eiTtA= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=gJ6X6GFY; spf=pass (imf29.hostedemail.com: domain of snovitoll@gmail.com designates 209.85.218.44 as permitted sender) smtp.mailfrom=snovitoll@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1728843547; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=5VgeQWb7V5/+9wCZWeTdyxdjveQfvOSR+bqrKttB7Oo=; b=OEqe6od6lq7qP17vFqpNUlHksv0WFHUeymXqxcgGkz7Ed/IoFckg7lT3p2B7ga4vxBvKEF 3NN/IGW57+1jzefgPnZWNHGPVj24FkAkEdI3FzRt+A2nM21J64XWTfG5UjgDVibDl6EghW R6bRzy2qumfPAGR8ctjDpyWVXJ5Z4SI= Received: by mail-ej1-f44.google.com with SMTP id a640c23a62f3a-a9932aa108cso539763966b.2 for ; Sun, 13 Oct 2024 11:20:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728843618; x=1729448418; darn=kvack.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=5VgeQWb7V5/+9wCZWeTdyxdjveQfvOSR+bqrKttB7Oo=; b=gJ6X6GFYD1KgXKFFui5dyuAlfjd/iGg6QBu3MNkopXpvrgQ/FK2gEjSEvsdrcU22dc A694Hiq6T31NZQA7CjMvWBA9ANFByv5OpAmYBcoUqMKFO9vp9+UC6EkB4N208W/2Gk4T xHWbC8d8wg/+lBzDe8f4QaRcnvmYFmF/fajq/QF3chuH0G5SJB46eni7oXPsEuEVsJxg OnmX6DAx2ap0e1k8aBy7501AW3mQ5Wc8mE4xLjLYpndTfD5eV5a7L5+YN8wn8IgujAqS Fb+5MLTjFcVqCHQuL2vDWM5W2doNuVUNs5oo0Rlwc5QYcTYxa9XGMxvC7//mIzK/kPhT VO/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728843618; x=1729448418; 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=5VgeQWb7V5/+9wCZWeTdyxdjveQfvOSR+bqrKttB7Oo=; b=WAs+MzipDIw+yfZVKSuUIV5kjyCo/JEk+t9VV5hjZcWSZ+twRZmE6jcM7OyKBqC9au PcP619w0vnGasIUkxnedJQ+1i5dpwkiw7UsXgotS8+JrRyvbAvJV3X7NeXmmorovN6Ji x++P6ExSeRxqDBl9vaZF0zu34YSHZHupjrbjix89XUbTdMU3dQVie634AwFDXCdYtzDb jrb8x8+xiQFeTeRLTt/FFuZdwCgSWMW7cJ8h6pcWAxXgBz3Gs7opynAMKHyQeuh8EZR0 MTh6X5LPM2l+lcTDw9PLgMUfLtjdt05nMdZNHjX+6uMxMkkw/TqQZkqGnNY1Frp5NYyM k3cQ== X-Forwarded-Encrypted: i=1; AJvYcCV407/eo5lzj4x97O3+01bWBHTIB5M9GPlb15pPp6iQfUHm33fF6Jvle8pgu0lc8o27yyDjVwOZHQ==@kvack.org X-Gm-Message-State: AOJu0Yx5OrO125meXv4hYNKQsgZ1zTB7iQ2ZyeBxBnXkeRNZ86sFVhvp CaZjltJvFRCEhguXHHXM78uwd6Lbbyozq0OJ99oZgrzqvl6x+ZSi X-Google-Smtp-Source: AGHT+IF7pbjTDROzH2KHhlOJsp9KJeCOny31b0St94NeP+vXq9zHLg+SS19H/V8aHcAArf6zKioehA== X-Received: by 2002:a17:906:7950:b0:a99:fe8c:5c6b with SMTP id a640c23a62f3a-a99fe8c889dmr280898466b.23.1728843617673; Sun, 13 Oct 2024 11:20:17 -0700 (PDT) Received: from work.. (2.133.25.254.dynamic.telecom.kz. [2.133.25.254]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5c9372ae701sm3992930a12.85.2024.10.13.11.20.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Oct 2024 11:20:17 -0700 (PDT) From: Sabyrzhan Tasbolatov To: andreyknvl@gmail.com Cc: 2023002089@link.tyut.edu.cn, akpm@linux-foundation.org, alexs@kernel.org, corbet@lwn.net, dvyukov@google.com, elver@google.com, glider@google.com, kasan-dev@googlegroups.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, ryabinin.a.a@gmail.com, siyanteng@loongson.cn, snovitoll@gmail.com, vincenzo.frascino@arm.com, workflows@vger.kernel.org Subject: [PATCH v3 3/3] kasan: delete CONFIG_KASAN_MODULE_TEST Date: Sun, 13 Oct 2024 23:21:17 +0500 Message-Id: <20241013182117.3074894-1-snovitoll@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-Stat-Signature: rmuph1sf6bjx7fxhc9x6hpum5jsj5ajr X-Rspamd-Queue-Id: 9DEDC120004 X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1728843612-99493 X-HE-Meta: U2FsdGVkX19EwdloDpr1gUOGzixpgOWiWnsbF+2HvcmUSPHS9Myq6KVWADRoAwQhGVXWc6HLEPfkxTB1QFfwexNlPolrq5w5/HV84d2idihz0kAZt/EO04J2n4Odf23w8NbBRN3h9XR+61GhAuoQiOi6mFiomHTFLbCmvXju3Z6vVhy+XrTc5GVYk2DvvXptj1hkAxMYRlNmzwiZliSCbLOr7Dnf2gzX4W+US1WDb4k0AompRs7ej7LuAYa/j2QKuIkeXCpt5Ey8xxCG9hdDDbDjx9KLEbQJRhR+Fi/YPsu8GTD1XaYrrb11NyZzUi0SpdG+eZ43OukUjZdqwmUtM2psY4fQ/ia1FqriNfQH2flbOmSDMAcQa9AbZ1Md6k5OjXfp/ZUINDNrLVVpJgvGchqORDMmgz/hGSKUpTV9xpXlUEFmQPdlYT8552RwuKxJvZ2jbDt7bLkXHlwKtLbqMfLO1Y/43SvM7X5Kfqc3ewOHzHBCysthWr3dN2FpwqCBRoUOWAIdCeF2IJXXK3TCgXxH2jj/yo/Ihc4luNAu0ki8UweK41DPIbYrzxyQazIBFiG1cwcCbl4R3AD92NMcE17YuPHFRGgnGPKhMefQKdqfCWcvFhImW5v0oVZG9DyqaPf8mIudiTFY7PKoJmbOywDiSphgXipyF4K7RBFsnIaNOhIUsdo8pRGqvMM9SZb9DAxUyD2zwdKuLOn6Ipd2D6VjYGoETGMriVOEuZrXxZaH0p3k1tsN3lAB8QQzs/rY8yhQsRqcahybr3/vWKOXFM47Ggez8DsPodREjzxUFvgx9rDthkmNn7dObBvNVazmKRSggR2D0eorXNuX+o+FxGj9hjot7m90M7FcyvRvPLhXFI8wve9vy7Efx+RGsEBW53cUeEIzLAJXIfBbCCTTvF0irbWhPBI5tuzYWM9cl6TFKAtFpCo4NrIXhnSyTxQpwqkAloV28gGkEHr/RQ3 CsmMvlr2 znagXEubSufnbJwInYsfN8IKgsjqTjNBj+02pPPHXYkeahKAy3Ym/L+vk03WQeSIOJZnNom93r/BQwm5gsxQSuuXYOYoPt4n9V26+4DIAFj15pHeaKg7btSuIZian+2KTl/WinVi6tsfSlG5AqtjUr8NugxjgoW/lHIjA1WxpISpGZliklfo2D0zNawkMhuQogAcZ4jNZZXln5qlT2PNaFiAmqCfDUcVBNj7Qk5haLAwi4lHjpEfO+WiCvx7Ccm3DWkuUUfoC39E+uNoGxBAWrqpLp5rpsAbUGJoYCtldnOMqsd9H/fRjJ5HsOp8Mm92bUuwJY/tdS75m5ZrKOsW9yLFRXW0YSy/S6jGBUc0PbwieDzqhibWH/L/ziZ7nFw3I76k41akkaBYtJFE+4e70HSlAnUdqXjgl9+5Y1gJukofrX1hWc2WpA4Gu0Wu3780MnP/iQHJIpWJBJA7mOUsJOCKwK1QFs/4azoq5/6Dx56XnqzggL4JzIXq9kvGd+CwvveqUeW5bUe9bQ0ovyCBJUkQGtg== X-Bogosity: Ham, tests=bogofilter, spamicity=0.001863, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Since we've migrated all tests to the KUnit framework, we can delete CONFIG_KASAN_MODULE_TEST and mentioning of it in the documentation as well. I've used the online translator to modify the non-English documentation. Signed-off-by: Sabyrzhan Tasbolatov Reviewed-by: Andrey Konovalov --- Changes v2 -> v3: - applied Andrey's patch to modify further kasan.rst. --- Documentation/dev-tools/kasan.rst | 23 ++++++++----------- .../translations/zh_CN/dev-tools/kasan.rst | 20 +++++++--------- .../translations/zh_TW/dev-tools/kasan.rst | 21 ++++++++--------- lib/Kconfig.kasan | 7 ------ mm/kasan/kasan.h | 2 +- mm/kasan/report.c | 2 +- 6 files changed, 28 insertions(+), 47 deletions(-) diff --git a/Documentation/dev-tools/kasan.rst b/Documentation/dev-tools/kasan.rst index d7de44f5339..0a1418ab72f 100644 --- a/Documentation/dev-tools/kasan.rst +++ b/Documentation/dev-tools/kasan.rst @@ -511,19 +511,14 @@ Tests ~~~~~ There are KASAN tests that allow verifying that KASAN works and can detect -certain types of memory corruptions. The tests consist of two parts: +certain types of memory corruptions. -1. Tests that are integrated with the KUnit Test Framework. Enabled with -``CONFIG_KASAN_KUNIT_TEST``. These tests can be run and partially verified +All KASAN tests are integrated with the KUnit Test Framework and can be enabled +via ``CONFIG_KASAN_KUNIT_TEST``. The tests can be run and partially verified automatically in a few different ways; see the instructions below. -2. Tests that are currently incompatible with KUnit. Enabled with -``CONFIG_KASAN_MODULE_TEST`` and can only be run as a module. These tests can -only be verified manually by loading the kernel module and inspecting the -kernel log for KASAN reports. - -Each KUnit-compatible KASAN test prints one of multiple KASAN reports if an -error is detected. Then the test prints its number and status. +Each KASAN test prints one of multiple KASAN reports if an error is detected. +Then the test prints its number and status. When a test passes:: @@ -550,16 +545,16 @@ Or, if one of the tests failed:: not ok 1 - kasan -There are a few ways to run KUnit-compatible KASAN tests. +There are a few ways to run the KASAN tests. 1. Loadable module - With ``CONFIG_KUNIT`` enabled, KASAN-KUnit tests can be built as a loadable - module and run by loading ``kasan_test.ko`` with ``insmod`` or ``modprobe``. + With ``CONFIG_KUNIT`` enabled, the tests can be built as a loadable module + and run by loading ``kasan_test.ko`` with ``insmod`` or ``modprobe``. 2. Built-In - With ``CONFIG_KUNIT`` built-in, KASAN-KUnit tests can be built-in as well. + With ``CONFIG_KUNIT`` built-in, the tests can be built-in as well. In this case, the tests will run at boot as a late-init call. 3. Using kunit_tool diff --git a/Documentation/translations/zh_CN/dev-tools/kasan.rst b/Documentation/translations/zh_CN/dev-tools/kasan.rst index 4491ad2830e..fd2e3afbdfa 100644 --- a/Documentation/translations/zh_CN/dev-tools/kasan.rst +++ b/Documentation/translations/zh_CN/dev-tools/kasan.rst @@ -422,16 +422,12 @@ KASAN连接到vmap基础架构以懒清理未使用的影子内存。 ~~~~ 有一些KASAN测试可以验证KASAN是否正常工作并可以检测某些类型的内存损坏。 -测试由两部分组成: -1. 与KUnit测试框架集成的测试。使用 ``CONFIG_KASAN_KUNIT_TEST`` 启用。 -这些测试可以通过几种不同的方式自动运行和部分验证；请参阅下面的说明。 +所有 KASAN 测试都与 KUnit 测试框架集成，可通过 ``CONFIG_KASAN_KUNIT_TEST`` 启用。 +测试可以通过几种不同的方式自动运行和部分验证；请参阅以下说明。 -2. 与KUnit不兼容的测试。使用 ``CONFIG_KASAN_MODULE_TEST`` 启用并且只能作为模块 -运行。这些测试只能通过加载内核模块并检查内核日志以获取KASAN报告来手动验证。 - -如果检测到错误，每个KUnit兼容的KASAN测试都会打印多个KASAN报告之一，然后测试打印 -其编号和状态。 +如果检测到错误，每个 KASAN 测试都会打印多份 KASAN 报告中的一份。 +然后测试会打印其编号和状态。 当测试通过:: @@ -458,16 +454,16 @@ KASAN连接到vmap基础架构以懒清理未使用的影子内存。 not ok 1 - kasan -有几种方法可以运行与KUnit兼容的KASAN测试。 +有几种方法可以运行 KASAN 测试。 1. 可加载模块 - 启用 ``CONFIG_KUNIT`` 后，KASAN-KUnit测试可以构建为可加载模块，并通过使用 - ``insmod`` 或 ``modprobe`` 加载 ``kasan_test.ko`` 来运行。 + 启用 ``CONFIG_KUNIT`` 后，可以将测试构建为可加载模块 + 并通过使用 ``insmod`` 或 ``modprobe`` 加载 ``kasan_test.ko`` 来运行。 2. 内置 - 通过内置 ``CONFIG_KUNIT`` ，也可以内置KASAN-KUnit测试。在这种情况下， + 通过内置 ``CONFIG_KUNIT``，测试也可以内置。 测试将在启动时作为后期初始化调用运行。 3. 使用kunit_tool diff --git a/Documentation/translations/zh_TW/dev-tools/kasan.rst b/Documentation/translations/zh_TW/dev-tools/kasan.rst index ed342e67d8e..35b7fd18aa4 100644 --- a/Documentation/translations/zh_TW/dev-tools/kasan.rst +++ b/Documentation/translations/zh_TW/dev-tools/kasan.rst @@ -404,16 +404,13 @@ KASAN連接到vmap基礎架構以懶清理未使用的影子內存。 ~~~~ 有一些KASAN測試可以驗證KASAN是否正常工作並可以檢測某些類型的內存損壞。 -測試由兩部分組成: -1. 與KUnit測試框架集成的測試。使用 ``CONFIG_KASAN_KUNIT_TEST`` 啓用。 -這些測試可以通過幾種不同的方式自動運行和部分驗證；請參閱下面的說明。 +所有 KASAN 測試均與 KUnit 測試框架集成，並且可以啟用 +透過 ``CONFIG_KASAN_KUNIT_TEST``。可以運行測試並進行部分驗證 + 以幾種不同的方式自動進行；請參閱下面的說明。 -2. 與KUnit不兼容的測試。使用 ``CONFIG_KASAN_MODULE_TEST`` 啓用並且只能作爲模塊 -運行。這些測試只能通過加載內核模塊並檢查內核日誌以獲取KASAN報告來手動驗證。 - -如果檢測到錯誤，每個KUnit兼容的KASAN測試都會打印多個KASAN報告之一，然後測試打印 -其編號和狀態。 +如果偵測到錯誤，每個 KASAN 測試都會列印多個 KASAN 報告之一。 +然後測試列印其編號和狀態。 當測試通過:: @@ -440,16 +437,16 @@ KASAN連接到vmap基礎架構以懶清理未使用的影子內存。 not ok 1 - kasan -有幾種方法可以運行與KUnit兼容的KASAN測試。 +有幾種方法可以執行 KASAN 測試。 1. 可加載模塊 - 啓用 ``CONFIG_KUNIT`` 後，KASAN-KUnit測試可以構建爲可加載模塊，並通過使用 - ``insmod`` 或 ``modprobe`` 加載 ``kasan_test.ko`` 來運行。 + 啟用 ``CONFIG_KUNIT`` 後，測試可以建置為可載入模組 + 並且透過使用 ``insmod`` 或 ``modprobe`` 來載入 ``kasan_test.ko`` 來運作。 2. 內置 - 通過內置 ``CONFIG_KUNIT`` ，也可以內置KASAN-KUnit測試。在這種情況下， + 透過內建 ``CONFIG_KUNIT``，測試也可以內建。 測試將在啓動時作爲後期初始化調用運行。 3. 使用kunit_tool diff --git a/lib/Kconfig.kasan b/lib/Kconfig.kasan index 98016e137b7..f82889a830f 100644 --- a/lib/Kconfig.kasan +++ b/lib/Kconfig.kasan @@ -195,13 +195,6 @@ config KASAN_KUNIT_TEST For more information on KUnit and unit tests in general, please refer to the KUnit documentation in Documentation/dev-tools/kunit/. -config KASAN_MODULE_TEST - tristate "KUnit-incompatible tests of KASAN bug detection capabilities" - depends on m && KASAN && !KASAN_HW_TAGS - help - A part of the KASAN test suite that is not integrated with KUnit. - Incompatible with Hardware Tag-Based KASAN. - config KASAN_EXTRA_INFO bool "Record and report more information" depends on KASAN diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h index f438a6cdc96..b7e4b81421b 100644 --- a/mm/kasan/kasan.h +++ b/mm/kasan/kasan.h @@ -568,7 +568,7 @@ static inline void kasan_kunit_test_suite_end(void) { } #endif /* CONFIG_KASAN_KUNIT_TEST */ -#if IS_ENABLED(CONFIG_KASAN_KUNIT_TEST) || IS_ENABLED(CONFIG_KASAN_MODULE_TEST) +#if IS_ENABLED(CONFIG_KASAN_KUNIT_TEST) bool kasan_save_enable_multi_shot(void); void kasan_restore_multi_shot(bool enabled); diff --git a/mm/kasan/report.c b/mm/kasan/report.c index b48c768acc8..3e48668c3e4 100644 --- a/mm/kasan/report.c +++ b/mm/kasan/report.c @@ -132,7 +132,7 @@ static bool report_enabled(void) return !test_and_set_bit(KASAN_BIT_REPORTED, &kasan_flags); } -#if IS_ENABLED(CONFIG_KASAN_KUNIT_TEST) || IS_ENABLED(CONFIG_KASAN_MODULE_TEST) +#if IS_ENABLED(CONFIG_KASAN_KUNIT_TEST) bool kasan_save_enable_multi_shot(void) {