From patchwork Thu Feb 20 15:03:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Jackman X-Patchwork-Id: 13984116 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 1CD2BC021B2 for ; Thu, 20 Feb 2025 15:03:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 898E32802EB; Thu, 20 Feb 2025 10:03:46 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 848F82802E7; Thu, 20 Feb 2025 10:03:46 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6EA7B2802EB; Thu, 20 Feb 2025 10:03:46 -0500 (EST) 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 4F0AE2802E7 for ; Thu, 20 Feb 2025 10:03:46 -0500 (EST) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 0CC10B7DDD for ; Thu, 20 Feb 2025 15:03:46 +0000 (UTC) X-FDA: 83140642452.12.ECA8958 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) by imf14.hostedemail.com (Postfix) with ESMTP id 29BA4100009 for ; Thu, 20 Feb 2025 15:03:43 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=fym9CAOj; spf=pass (imf14.hostedemail.com: domain of 3TkS3ZwgKCPciZbjlZmafnnfkd.bnlkhmtw-lljuZbj.nqf@flex--jackmanb.bounces.google.com designates 209.85.128.73 as permitted sender) smtp.mailfrom=3TkS3ZwgKCPciZbjlZmafnnfkd.bnlkhmtw-lljuZbj.nqf@flex--jackmanb.bounces.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=1740063824; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=wiDbMltjmyaz+TufXV5xdn+s6ZmLgnlpLnjEPTqGgXg=; b=OoPauNYmcOrNCJbHDISKqFTnUyYZeYm46U7dA9p0Nzdiqh8a70v/rv6krdZPjxJPMDWY3Q xALAsZ8aj6e7LV7nl3w+vKTxMPBf0fG1QHgXBzHOXpPs2ipLX72HwHKbwleqnufi25IstQ VCudROy99X+hzmA95jMFUr5yMm+iCNo= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=fym9CAOj; spf=pass (imf14.hostedemail.com: domain of 3TkS3ZwgKCPciZbjlZmafnnfkd.bnlkhmtw-lljuZbj.nqf@flex--jackmanb.bounces.google.com designates 209.85.128.73 as permitted sender) smtp.mailfrom=3TkS3ZwgKCPciZbjlZmafnnfkd.bnlkhmtw-lljuZbj.nqf@flex--jackmanb.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740063824; a=rsa-sha256; cv=none; b=OpXtc3yfl0vR4OlbfbRzRWXCEv8btLZRbEOIlv5nEUsU5/IBaorMn2j8VpbhHnMDFW5LTB YZ32KySVNkoCSO183zrVeU/V4cbjG2vSFoqvzEAPKsqSzR8Gmfo32ld2ONEGtKxFc+nmCo M+PjdOz/IskWHMytbFzokh/XRHFxevY= Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-43988b9ecfbso5561075e9.0 for ; Thu, 20 Feb 2025 07:03:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1740063823; x=1740668623; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=wiDbMltjmyaz+TufXV5xdn+s6ZmLgnlpLnjEPTqGgXg=; b=fym9CAOjqpwkRWGL7cVOPNs5jH8FLIZjg7X4lKUywgcTvWKXWONfnJOybc+G54mzuO E1yT98yQJ2T8HQoDa/QVQdTIeAJMYYfc4p8/mPL2QcQgkJ6YA8tfoxuEVFmZpzeBaQp+ +vGQkIzJ+gL2RPY+F7Y5U+S+35XRu2kJWNZ6tjhoGeyADJ0OvvIPqWK+gNeK2g0vH9A/ yB1NZqI52dBDjgdWgc4G+RE7W2xkqnYqGJPVhMJDSd/sAVtrj64+tZuimdf7p0gqGKzu AR0MlHgUSGJcSNOO0aBl7Rvm5E77hM7yr6wrzGnpiHWGdt+0fcPGFbGhl0cZFXk3YkiZ foGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740063823; x=1740668623; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=wiDbMltjmyaz+TufXV5xdn+s6ZmLgnlpLnjEPTqGgXg=; b=aZ5IeOkqYTfTGnhn9VIS1aolCNBFmatJMy51a5W5rPmh4WDqKSAyD6uCcR8lpta6g2 prdQiJyA9sL4qsQKW1GOEZgTN+9f0OcEyBvy83PiP9G7/MEO0GyEabi9YgJXX2wrdBwI b7YgTSMMrAFgZlWuGbE0DESRPxsd2ZAPsXjkxcX5S/UyXoofBTkDfCev6F//ZSdLWNcK bMpfdYRQYEdxDi7zRVvdJNAJ6EABF9Lx+wqYn6vKTESqw4pgGBbsDP7MXoKMoxJxehAr YjdY1Q7Dx/uSgXEN/fPQ5TdC7PaYjd1QAU8WqLEbIxwEBuHqrQX2/nwvlDP9kLfsEnyC z6OQ== X-Forwarded-Encrypted: i=1; AJvYcCU17NVs/sZg3epOTQUNbS6Jv65PbvaOcxECCPlfQOZMAI3jqqI5PM2xFy67Gmpm5pS0L2RE6DLGsA==@kvack.org X-Gm-Message-State: AOJu0YxKf7gXX/ALyTyxZ7SKsYddAHRIbG7JSV50mm9QeRkbF1709Tks yrkMClvJnfYVZDkrQR8O7iNRe01J9Xc1fnnoR3AppFOSTMcpV98HLMLZUUUn1B3eseYMbwGMdta fwhvIAQkbsQ== X-Google-Smtp-Source: AGHT+IGMX6sUMZFB6kcF1FLDPNy7JKgv9mVpVnHmQkgAM/qSvu5gFbpVA6vpmtah98EUgiAhA5SqxJEjJc185A== X-Received: from wmbg23.prod.google.com ([2002:a05:600c:a417:b0:439:95b9:9200]) (user=jackmanb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:450b:b0:439:9225:2f50 with SMTP id 5b1f17b1804b1-43999db0139mr80231185e9.16.1740063822867; Thu, 20 Feb 2025 07:03:42 -0800 (PST) Date: Thu, 20 Feb 2025 15:03:14 +0000 In-Reply-To: <20250220-mm-selftests-v1-0-9bbf57d64463@google.com> Mime-Version: 1.0 References: <20250220-mm-selftests-v1-0-9bbf57d64463@google.com> X-Mailer: b4 0.15-dev Message-ID: <20250220-mm-selftests-v1-2-9bbf57d64463@google.com> Subject: [PATCH 2/6] selftests/mm: Fix assumption that sudo is present From: Brendan Jackman To: Lorenzo Stoakes , Andrew Morton , Shuah Khan Cc: Mateusz Guzik , linux-mm@kvack.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Brendan Jackman X-Rspam-User: X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 29BA4100009 X-Stat-Signature: ca69adwipdh5c944zymyxndujdjrawqh X-HE-Tag: 1740063823-42585 X-HE-Meta: U2FsdGVkX19Xkx3PmsklF+0gMD85GusAvTTlZEF4d855mHB2IaKZH7Rp5gqbKZkd8FbDoC7bNvNYRzs0Ep6OABC3EtsDUhTOAnOq51d797cLi0XwlMiE+lmx1t7VzUQ6sGmfA3vKKIehQEv4CW68CfkNLP7vKiYu9ckqzcr7A0+dy1A0Q4z8arhHk/H6Hx0xaMgcqpDvAz54ML/MG4OU98EFidQA1lNmpEfoZwIO0OiOSaCciTrmOlLlgR+Q8X1lxDs+jbo3w3iYXTobXFW3dRDrhHAEBURXWhmIKxwfI2LA96DS07ELMp5McK9yGlvTXi5aTblzx14lwWN3V7Ydwh6FdihZhHrXrk5fYh6sinUt21R24Jk8VxWPjTgd9cF+F/fNiOiNAOxtTiwqIq12tgt1q0+oWcl/B9O/1L5aUyZdvZrKi42OxweK2KToPX466p4L1zNNN/swSfWTxLh4T6OMslnOJy6CmPXkHKNC4dP6qYRlXcvqvoxzRgmKZi2Kfua6/QeFMoPDrVzmPOdUq0s94IDsHPWuXZmRo17xfHMvLMK+9EA6Y7mgIBfliix0wV0+KB/X2lYxa29TrJ78IRhZ736GyeaJsp2tEqw63X+bM+pumYMcIkO7apNOxV8uEfNPU0aEI/I80wFdIsxCzOfRfyJ68Wlq2/mviYOj8otfuwwDNEsollEI3cwQVxyT8qNhF8tkZBgsphukELXhewxGSSNplABsQV6Z28btMLwmGqDHW+v4gW53iepNEiJ3+ZPTcD7qkxrpu1YYglrNEMroE/lx98Pm8T+xSepyQTn7vSvpLmL6WP6xMO/5Ht0eIubdHm6OpJPb/1frqLWM98unUvdbo32u610Ea2vBdoTFWMl1h+1AxsKmWKWZWayvHwJrM5duYtsyd3ZPRxlY7eE4rDnPi+kagig4Tio9Pld23BvhhnaB8USiXUNh97r4LkcIofzkCrhC0+I2lF8 VuOyQTAv EuL7qBOmv9753ReP0209YnDYKAi5O0c9Kmv5hjfirTfMhhKJkDlVoJW3z09d89u9Fhg9zmyivYsQ3bJ2bPAxRIaxBFPHeAxqdCrqk+4peJ0pMsftbMa5eurKW73VX6bFnzPSZK95XMwhV/h4KYwbpXYDs/ENUraPxute0NMJ8XTheigw5WQDLCUY61x/GcZhP64nOZi35IA7FsXnuOsWIwmxzchJHBgyiHYxegGBBKXH1ECuDDfYxOuxhvk+8/pGdzIJdLFoFds0MF1ReE1u9AVxIXtBRUDPiJsep5aEtIi/kl2urz1ibAF8FGRpDgFLFU04b4g72R5TiOA4OwLQNSrbihKzFbq5K6rN1Ks+ycWlnuqy8j2tpnCS4/QQYhAse/eQOPG3FeF7NlFUWdarqC5heY7tC6jOJ1ge9pnPqRIXlbaHB2mSZzWlhMbxR4ajR7r52B/ABBttypjFggJZ7+Alsj0nhjkZfxjagGsTpL+VQhs47OPVY9leVo47JDu6iaBY1GNvco49R+lOY+HAs2nnE1mFDOVSLT6yabRk3CTTT+yLLK/q0mZA1fQ== X-Bogosity: Ham, tests=bogofilter, spamicity=0.026742, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: If we are root, sudo isn't needed. If we are not root, we need sudo, so skip the test if it isn't present. We already do this for on-fault-limit, but this uses separate infrastructure since that is specifically for sudo-ing to the nobody user. Note this ptrace_skip configuration still fails if that file doesn't exist, but in that case the test is still fine, so this just prints an error but doesn't break anything. I suspect that's probably deliberate. Signed-off-by: Brendan Jackman --- tools/testing/selftests/mm/run_vmtests.sh | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/mm/run_vmtests.sh b/tools/testing/selftests/mm/run_vmtests.sh index da7e266681031d2772fb0c4139648904a18e0bf9..9c963f50927ab2b10c3f942cedd087087d4d0def 100755 --- a/tools/testing/selftests/mm/run_vmtests.sh +++ b/tools/testing/selftests/mm/run_vmtests.sh @@ -89,6 +89,17 @@ RUN_ALL=false RUN_DESTRUCTIVE=false TAP_PREFIX="# " +# We can do stuff as root either if we are already root, or if sudo exists. +if [ "$(id -u)" == 0 ]; then + HAVE_SUDO_ROOT=true + SUDO_ROOT= +elif command -v sudo >/dev/null 2>&1; then + HAVE_SUDO_ROOT=true + SUDO_ROOT=sudo +else + HAVE_SUDO_ROOT=false +fi + while getopts "aht:n" OPT; do case ${OPT} in "a") RUN_ALL=true ;; @@ -384,10 +395,13 @@ CATEGORY="madv_guard" run_test ./guard-pages # MADV_POPULATE_READ and MADV_POPULATE_WRITE tests CATEGORY="madv_populate" run_test ./madv_populate -if [ -x ./memfd_secret ] -then -(echo 0 | sudo tee /proc/sys/kernel/yama/ptrace_scope 2>&1) | tap_prefix -CATEGORY="memfd_secret" run_test ./memfd_secret +if [ -x ./memfd_secret ]; then + if $HAVE_SUDO_ROOT; then + (echo 0 | $SUDO_ROOT tee /proc/sys/kernel/yama/ptrace_scope 2>&1) | tap_prefix + CATEGORY="memfd_secret" run_test ./memfd_secret + else + echo "# SKIP ./memfd_secret" + fi fi # KSM KSM_MERGE_TIME_HUGE_PAGES test with size of 100