From mboxrd@z Thu Jan 1 00:00:00 1970 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 6D528C27C79 for ; Thu, 20 Jun 2024 21:13:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E59BF8D00E5; Thu, 20 Jun 2024 17:13:51 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E091E8D00D5; Thu, 20 Jun 2024 17:13:51 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C82E88D00E5; Thu, 20 Jun 2024 17:13:51 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id A9FEB8D00D5 for ; Thu, 20 Jun 2024 17:13:51 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 4E12E1405C0 for ; Thu, 20 Jun 2024 21:13:51 +0000 (UTC) X-FDA: 82252519062.08.1A4211C Received: from mail-lf1-f50.google.com (mail-lf1-f50.google.com [209.85.167.50]) by imf29.hostedemail.com (Postfix) with ESMTP id 6FCBC12000C for ; Thu, 20 Jun 2024 21:13:49 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=4eUcYDT2; spf=pass (imf29.hostedemail.com: domain of rmoar@google.com designates 209.85.167.50 as permitted sender) smtp.mailfrom=rmoar@google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1718918024; 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=3J5efzHbrBSBEUK5Mw1SAdOtVm61ZWMUI1FF8AD69eY=; b=IJrWNq8XRowPVLAN/SNH3ZO41ygYf2nCeRzrg/ZKfyiZj/LyAvfKKWpocVb0MqzJn0+SlW msuv0tJ5F2NqvPKuCxOVWod6PrS/i6pScGSHE3o7lyNy39i95w8NisW+kBhWn2t7PS4iXS Uwq+M2mX4+917rhBGxjY38v3HPFhPnU= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=4eUcYDT2; spf=pass (imf29.hostedemail.com: domain of rmoar@google.com designates 209.85.167.50 as permitted sender) smtp.mailfrom=rmoar@google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1718918024; a=rsa-sha256; cv=none; b=FzjXOD4WaWhnet/Xc7Ke/BH9fWL63odd39jzeWmFnyvmJ9GpJhpNDmR00xi/z1nnjdrpyl FLVizukHzqLBcz6gTyDrZQMf5sluQoyahp8s/JPgm990E2YPvzgGS1IXj4SUVIBpT4yo62 tbCF3yOoVtV17zsyxIADjIJ202kwoFE= Received: by mail-lf1-f50.google.com with SMTP id 2adb3069b0e04-52ca342d6f4so2280e87.1 for ; Thu, 20 Jun 2024 14:13:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1718918028; x=1719522828; darn=kvack.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=3J5efzHbrBSBEUK5Mw1SAdOtVm61ZWMUI1FF8AD69eY=; b=4eUcYDT2WQ9jf2N/ok04Dcv4ssH1ZXfrc0pmtnhTNZGH5gcOncONV/pmaeDFb0c/On ghFe82BaNnCGt3T9+6w9Pdda67vzrmwmkouFvV8W0VxKqfVJxFbX7aOrAznKDVzHEKFV OpzMg2D6sLIMgktvbID+PI2W7yls08iZx29StRdSKzTirvSr+0mreCV86bSCtT+vC2Yw sibAn9KcuNpxAWzb2/oRnZWjwutii7iHGKpY2bdB1JLdHdkSLypZ3rBMoELDHEja0Hrp v7cwurXibu3HU/j9/H72NY+VcaW5K1CNr6qpTBKL2SDjdHmqsj4EoguaBSGjb/gPgpzl kPwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718918028; x=1719522828; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3J5efzHbrBSBEUK5Mw1SAdOtVm61ZWMUI1FF8AD69eY=; b=jvzUSFOcoHd9VLFZDsUQfZElLHnzWaHbmJ+sSqzAaB90njxK4ZQZNoHdU4v9jTiIqh C/EHXDdc3aqYNTG6MjmptUxscB693cjAPBKp/sruAzRuscb8JWyp1cKoL3pCStDyFwue negbzWKfspegnhXns422K7F7t3IMz5PfOIhl5Qn4Sa9vFaebkoTxRsevX3MhWYyXp8Lh DXDKspzwU4B9lzBL96696jJvv8e2NXT/DYeHxZfqI1T/lAS6qSDSfJS+Y5RHRJbg5ZlQ OOAqKXVzABy1JF2WSzDW42TBkbLTYOoCWA1U0xANE1rl1wzaYC03LYXy/cMdsNP9BD5I 1x6w== X-Forwarded-Encrypted: i=1; AJvYcCXjrSdtaVx4F/Cn/5WPJe7gHklNUG0pkXOOBbaoE+FXCJWOFwQkbswYtHs6G/wSgOH+0uxeVQFrkxYIxyP8CmczAJI= X-Gm-Message-State: AOJu0YydDwEdlU32OgVcIvtjJ6hK+v8yxpNwF7QyIot748Lc0DD9Y7TX XvJM85VMystKO7jlynlpF9oqsp1Kw4lPzNu/5daM3gmkzknknO7M6/Z2tmTt8Vl//mweIP8bdBD dQvEaoCXr/o1Zs0YBI/149HpT4dMNbqLT+CqJ X-Google-Smtp-Source: AGHT+IEn8AqNmJKcntBraToyOLUgVbU+xEWQhtkU0QjCiHRU8X5rQAoXIzT/mO+rjYRWXps3yrWu2Ehhip3ibGm/BdE= X-Received: by 2002:a05:6512:acc:b0:52c:cbdf:f9ed with SMTP id 2adb3069b0e04-52cd46a7379mr147587e87.0.1718918027535; Thu, 20 Jun 2024 14:13:47 -0700 (PDT) MIME-Version: 1.0 References: <20240619202511.it.861-kees@kernel.org> In-Reply-To: <20240619202511.it.861-kees@kernel.org> From: Rae Moar Date: Thu, 20 Jun 2024 17:13:35 -0400 Message-ID: Subject: Re: [PATCH v2] kunit/usercopy: Disable testing on !CONFIG_MMU To: Kees Cook Cc: Shuah Khan , kernel test robot , Brendan Higgins , David Gow , "Gustavo A. R. Silva" , Andrew Morton , linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, linux-hardening@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 6FCBC12000C X-Stat-Signature: o17xkp6st68q8w8hg6as9yheumm4ortm X-Rspam-User: X-HE-Tag: 1718918029-148568 X-HE-Meta: U2FsdGVkX1+EL/haDY5U7cB4Wwvnvv6t0zQaqDH9+mZIFePTrS4hnvJ2J3X7x8GwfjpDHXflhJo+BY3e8IlEb6NI3EFU5994OWL1vbUOaoWTB8XiCf/NMzr+BcalTtYypD5C5aCJPJostHy/IaUwMUoN9fxSGT6Wz6N/DXQdu2jNgqwza68LNaO62mdvY206Iw08eOi81NbEoJczcEjzbodInwM64myu52bW/AHgF+AzSY1uXzABK6VlEND0pqd4d8YWfo1nkNPk9i+FLFhHvM4MhhblIeJyIEHchguU9yyNgmDFc8uNw2hB3sWj2/UV/WhJ0xewph5n8UDG4bavtPxHCs2blFzoWn8KwrYph0A90GN/JMOnSvje0Uf3cewggglC0XEe3JBCckgmTkOJY1AqYp5Do6xYwJljCp8md3s2GyKW10fgJ+C6fYnIp6NlNZddn3uJr/DEzPW0QqL8Td7WBM5i0BRq0WYswC9tXjcaXRotvUgDsqLV6OA4XXOZlKwDV6tlaMcQHG+cSD//LAkIsRJMu/OwONdTYMt6vz38kuaDbEHz/xh2WtEN2ze3wlOxBm8rawu1ux6EF0nn0cVO8q7dvnKSnRlT/PE2z/RWk18jgjEm6xkfBMhkjtkGYKzLqdgIS9VBnmREnoWSPrgVYZ4VWla/qtTrFU7zy8ODzPBhNsHER2rHUupCTjCbfBNKcA2neTJ+EKKHoyNPNgrfBHQWlFlP3X75RWAcNkxN6ZmB35cp5EK2HE6I84ICSWFFY2KkZCx14urqBy/UJygeYvO+a7f7FCcgAFbQtDJFuEe0Co/GffW3jZD9OJGnIb3NgFfHPUINWo8bPnt9weBGF6Mh2aBkS4b3JpE+d+3cqR5PM8Dz60ZopLHoZX6QNRrcd/5rFF7rbJm/sRK50mMukZnNREHBzjs+pR818n+PLTxn6S7tJWcIAKkIOg30ad62e8g9ODzPHZzXCco ocb51gxG h8o6WlyloByJNQuAGjcq4mXotUk7kTDZcXc7mmiYyL1B/l1+2Zdi4h1MJsZT3DAy2csDv99efrpZG4WPBjOyY3JRvcQOf6cTSAWhk1Nbbb+ChEdjMZSGC9QGA4I2J9HVSNaBT3VKRXfPIIVIkWGCESH94YMDXfDgW78NJqCrVp4A6EHoBURyrjN4vDtVbS7soiyJ+bfxjsfWrP1Sbh4klqfw59j7vCImzMwc7+TNXwN+S1OL82DgLDtSFS3BLXKN61eqdAOwKTh1AaBg1ST8pOC90yYGYPblmsa49NDTUVsedSNHtrEBpLHdt3PyIYjav5vlT4Eta2rfdU3F71iWbIiLe8gePQrQAlDk/GgPHPQ8NuHM+OnydOZgDybao88HCjKjc9FLwcuU1Ebk5E5JBKg2PNw4ZO7YsDDe3jhyceILc4J64kn6mObN5o6uftntVNAY4zYS7ep7RpdWKuiQ/Zypf/sIkHGUxfj2jEQ4J7FiB0CW7ql4fPMw1FRIiqrlCkc38sM7iJK+44eLHK5RKLo1M0zwe4JSM1ogNkrTtTfqJ56jdGZ3CfBY364/CF4j2icbZaMqs4txHmhZzhSvN9ExOh+9nphzklEFm X-Bogosity: Ham, tests=bogofilter, spamicity=0.000001, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On Wed, Jun 19, 2024 at 4:25=E2=80=AFPM Kees Cook wrote: > > Since arch_pick_mmap_layout() is an inline for non-MMU systems, disable > this test there. > > Reported-by: kernel test robot > Closes: https://lore.kernel.org/oe-kbuild-all/202406160505.uBge6TMY-lkp@i= ntel.com/ > Signed-off-by: Kees Cook Hello! This looks good to me. And seems to fix the problem. Thanks for the fix! Reviewed-by: Rae Moar -Rae > --- > Resending as v2 with Shuah in To: > --- > Cc: Shuah Khan > Cc: Brendan Higgins > Cc: David Gow > Cc: Rae Moar > Cc: "Gustavo A. R. Silva" > Cc: Andrew Morton > Cc: linux-kselftest@vger.kernel.org > Cc: kunit-dev@googlegroups.com > Cc: linux-hardening@vger.kernel.org > Cc: linux-mm@kvack.org > --- > lib/kunit/user_alloc.c | 4 ++++ > lib/usercopy_kunit.c | 5 +++++ > mm/util.c | 2 ++ > 3 files changed, 11 insertions(+) > > diff --git a/lib/kunit/user_alloc.c b/lib/kunit/user_alloc.c > index 76d3d1345ed7..ae935df09a5e 100644 > --- a/lib/kunit/user_alloc.c > +++ b/lib/kunit/user_alloc.c > @@ -30,6 +30,10 @@ static int kunit_attach_mm(void) > if (current->mm) > return 0; > > + /* arch_pick_mmap_layout() is only sane with MMU systems. */ > + if (!IS_ENABLED(CONFIG_MMU)) > + return -EINVAL; > + > mm =3D mm_alloc(); > if (!mm) > return -ENOMEM; > diff --git a/lib/usercopy_kunit.c b/lib/usercopy_kunit.c > index 45f1e558c464..e819561a540d 100644 > --- a/lib/usercopy_kunit.c > +++ b/lib/usercopy_kunit.c > @@ -290,6 +290,11 @@ static int usercopy_test_init(struct kunit *test) > struct usercopy_test_priv *priv; > unsigned long user_addr; > > + if (!IS_ENABLED(CONFIG_MMU)) { > + kunit_skip(test, "Userspace allocation testing not availa= ble on non-MMU systems"); > + return 0; > + } > + > priv =3D kunit_kzalloc(test, sizeof(*priv), GFP_KERNEL); > KUNIT_ASSERT_NOT_ERR_OR_NULL(test, priv); > test->priv =3D priv; > diff --git a/mm/util.c b/mm/util.c > index df37c47d9374..e70e8e439258 100644 > --- a/mm/util.c > +++ b/mm/util.c > @@ -484,7 +484,9 @@ void arch_pick_mmap_layout(struct mm_struct *mm, stru= ct rlimit *rlim_stack) > clear_bit(MMF_TOPDOWN, &mm->flags); > } > #endif > +#ifdef CONFIG_MMU > EXPORT_SYMBOL_IF_KUNIT(arch_pick_mmap_layout); > +#endif > > /** > * __account_locked_vm - account locked pages to an mm's locked_vm > -- > 2.34.1 >