From patchwork Mon Jan 13 17:06:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yury Khrustalev X-Patchwork-Id: 13937787 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 34F76C02183 for ; Mon, 13 Jan 2025 17:07:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C44E86B008C; Mon, 13 Jan 2025 12:07:00 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BF5316B0092; Mon, 13 Jan 2025 12:07:00 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AE40E6B0095; Mon, 13 Jan 2025 12:07:00 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 9448E6B008C for ; Mon, 13 Jan 2025 12:07:00 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 51A68A01B8 for ; Mon, 13 Jan 2025 17:07:00 +0000 (UTC) X-FDA: 83003058600.27.1041109 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf11.hostedemail.com (Postfix) with ESMTP id A7FA44000D for ; Mon, 13 Jan 2025 17:06:58 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf11.hostedemail.com: domain of yury.khrustalev@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=yury.khrustalev@arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1736788018; a=rsa-sha256; cv=none; b=rdFhH/6h+kUFiVcv6XGympEcrJ54sPfy3ac/E18CvOYopD3dfhq9QaVbAN/aFxPjLi1ACa sBz8ISiif+0hsIFS/ymtJ9rixeXjhwwrD44ivyZjb8Xw3VUd/7OMcyIRNtm70ngBw888S4 fPnjil6oyXXJhgtVt2T/HujR2Eo9sx4= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf11.hostedemail.com: domain of yury.khrustalev@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=yury.khrustalev@arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1736788018; 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; bh=NoSyfg0H2xdXV8bVJGF6NwXUo5Fiq0F8nFCklb+ts3Y=; b=jOpikeoJbDPn9uRRivJhLliu9Aj11/sFXj/NrAuhSc6OnQpcMYwbdBMEySnorocDl96iD1 +b2glzVKYvDB9gHUBLrsv9GqAiSX/R4bQcNDWAy5r5MfV2tml27rTUxMaE+5ZfILBkSPr7 ejgAB5aIEzzEn6aFDdhMk+Jr9XosEgM= Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 4A2391BB0; Mon, 13 Jan 2025 09:07:26 -0800 (PST) Received: from udebian.localdomain (unknown [10.1.25.34]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id B00D83F673; Mon, 13 Jan 2025 09:06:55 -0800 (PST) From: Yury Khrustalev To: linux-arch@vger.kernel.org Cc: Arnd Bergmann , Kevin Brodsky , Joey Gouly , Dave Hansen , Sandipan Das , Michael Ellerman , Catalin Marinas , linuxppc-dev@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org, x86@kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org, Andrew Morton , nd@arm.com, Yury Khrustalev Subject: [RESEND v4 3/3] selftests/powerpc: Use PKEY_UNRESTRICTED macro Date: Mon, 13 Jan 2025 17:06:19 +0000 Message-Id: <20250113170619.484698-4-yury.khrustalev@arm.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250113170619.484698-1-yury.khrustalev@arm.com> References: <20250113170619.484698-1-yury.khrustalev@arm.com> MIME-Version: 1.0 X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: A7FA44000D X-Stat-Signature: dz1344sku4fhh9yk69ymzmog7rs3fbg3 X-Rspam-User: X-HE-Tag: 1736788018-231906 X-HE-Meta: U2FsdGVkX1/S7S+Md7zINfxuR2luaaX5goGwX0ZtFgJXg6va+qUmk5E8mnStgmVJAfI8dMMcodOElD18gxpNRT5AZ/RtyCpi9G/o5/pXQ0M6FtBQ923MkRkJt4x31l5Q0RSKAApZhf+ClDGu8n24JdAb9lTTv8CT40sUuzMcPoytDYZRxYk1fXeCOLU1id1a30/CVFs5tAbAJrPlxepN2Ynqojb2+LAYOxXwppPAqKzEcn+ixwtFvnz5lBwvFw5uwPQf6UDHtzd9RstB073t2Ww9zaVBQTPxOZjuHa7Luy4+vC/4dhRBy5h3ehdboDke5UuQSahQ/slXGXuJzs6UcI30mDxAk8DWMvxqvvteSJ4FBhkGqwhL/ya8MQW1RZfoYj1311p12MJllvTqVUOlJUDWDYrNU5rAqqWCgyxvtggZxLnuRbBpiK/SVq3ADiR0inX3Or8ERaS+z92VoA8DnExefO6MC5Ms5Ro04r38/97V/vZbue8MIqLmysKOUDmDoHJ02FglOsxYzjbuaY7KPltPZaz+Q7mI4rzygxbs4VUuEiNXj6NRVbJOp7l3wTE2kA2ijvjvnGf334+kBqUsPtY1hNyt+c7FFvZgtyeRAzaYkHLZ3Anoy8DuGrw2kM2tAJvwo043/FhyUT2ASd9Jytd34i52n1FcADKyiHhTm8KXxCvOpeo55rmBHC+phbdLCqfPePYWBUkJ8/JG40aZ9Yv4ei/H9f3Q39cF1zDZmBq8xOrx7p4FglcrkSMrXUPXi65pWrFwn/5a/f3TZRsadGPqHGSfFfvaccLx7A3+K+ROAsKy3kDCKJqBpXrlG+n4Gm29L4D5T5bAgjYUR6HqAIlTLbxvU6ksyx2AXT4X+DX0om/H26t2XTdJPKC/nXWSV2sz5TR9PWtVZcSFvwip5PpWIvQm0Kbjg7hN7gxIkP3JH9C6W8wP3Kaa9aMLG81e2kT2JRL0/q35iY78xZj esxMzEl5 PabaUoPM8xK4xLoIqnOwbriTUtqCGQYX61bCl72XBPu7bYM893eyf+KiQ74zY9SoFDwig3+IrBDRQdny96851bdagCy3aW5ClCJgdUD5Dt51k9Q1MAmTM1j1eNbkgr7cT7cn59FRfOcmNtvpIrbHUTVdCgwPYT8ahJ2is08vzuhyZeIwkjAvMPe/7G6tqcb2AmZcTepXFK9DRsIc= 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: Replace literal 0 with macro PKEY_UNRESTRICTED where pkey_*() functions are used in mm selftests for memory protection keys for ppc target. Signed-off-by: Yury Khrustalev Suggested-by: Kevin Brodsky Reviewed-by: Kevin Brodsky --- Note that I couldn't build these tests so I would appreciate if someone could check this patch. Thank you! --- tools/testing/selftests/powerpc/include/pkeys.h | 2 +- tools/testing/selftests/powerpc/mm/pkey_exec_prot.c | 2 +- tools/testing/selftests/powerpc/mm/pkey_siginfo.c | 2 +- tools/testing/selftests/powerpc/ptrace/core-pkey.c | 6 +++--- tools/testing/selftests/powerpc/ptrace/ptrace-pkey.c | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/testing/selftests/powerpc/include/pkeys.h b/tools/testing/selftests/powerpc/include/pkeys.h index 51729d9a7111..430cb4bd7472 100644 --- a/tools/testing/selftests/powerpc/include/pkeys.h +++ b/tools/testing/selftests/powerpc/include/pkeys.h @@ -85,7 +85,7 @@ int pkeys_unsupported(void) SKIP_IF(!hash_mmu); /* Check if the system call is supported */ - pkey = sys_pkey_alloc(0, 0); + pkey = sys_pkey_alloc(0, PKEY_UNRESTRICTED); SKIP_IF(pkey < 0); sys_pkey_free(pkey); diff --git a/tools/testing/selftests/powerpc/mm/pkey_exec_prot.c b/tools/testing/selftests/powerpc/mm/pkey_exec_prot.c index 0af4f02669a1..29b91b7456eb 100644 --- a/tools/testing/selftests/powerpc/mm/pkey_exec_prot.c +++ b/tools/testing/selftests/powerpc/mm/pkey_exec_prot.c @@ -72,7 +72,7 @@ static void segv_handler(int signum, siginfo_t *sinfo, void *ctx) switch (fault_type) { case PKEY_DISABLE_ACCESS: - pkey_set_rights(fault_pkey, 0); + pkey_set_rights(fault_pkey, PKEY_UNRESTRICTED); break; case PKEY_DISABLE_EXECUTE: /* diff --git a/tools/testing/selftests/powerpc/mm/pkey_siginfo.c b/tools/testing/selftests/powerpc/mm/pkey_siginfo.c index 2db76e56d4cb..e89a164c686b 100644 --- a/tools/testing/selftests/powerpc/mm/pkey_siginfo.c +++ b/tools/testing/selftests/powerpc/mm/pkey_siginfo.c @@ -83,7 +83,7 @@ static void segv_handler(int signum, siginfo_t *sinfo, void *ctx) mprotect(pgstart, pgsize, PROT_EXEC)) _exit(1); else - pkey_set_rights(pkey, 0); + pkey_set_rights(pkey, PKEY_UNRESTRICTED); fault_count++; } diff --git a/tools/testing/selftests/powerpc/ptrace/core-pkey.c b/tools/testing/selftests/powerpc/ptrace/core-pkey.c index f6da4cb30cd6..64c985445cb7 100644 --- a/tools/testing/selftests/powerpc/ptrace/core-pkey.c +++ b/tools/testing/selftests/powerpc/ptrace/core-pkey.c @@ -124,16 +124,16 @@ static int child(struct shared_info *info) /* Get some pkeys so that we can change their bits in the AMR. */ pkey1 = sys_pkey_alloc(0, PKEY_DISABLE_EXECUTE); if (pkey1 < 0) { - pkey1 = sys_pkey_alloc(0, 0); + pkey1 = sys_pkey_alloc(0, PKEY_UNRESTRICTED); FAIL_IF(pkey1 < 0); disable_execute = false; } - pkey2 = sys_pkey_alloc(0, 0); + pkey2 = sys_pkey_alloc(0, PKEY_UNRESTRICTED); FAIL_IF(pkey2 < 0); - pkey3 = sys_pkey_alloc(0, 0); + pkey3 = sys_pkey_alloc(0, PKEY_UNRESTRICTED); FAIL_IF(pkey3 < 0); info->amr |= 3ul << pkeyshift(pkey1) | 2ul << pkeyshift(pkey2); diff --git a/tools/testing/selftests/powerpc/ptrace/ptrace-pkey.c b/tools/testing/selftests/powerpc/ptrace/ptrace-pkey.c index d89474377f11..37794f82ed66 100644 --- a/tools/testing/selftests/powerpc/ptrace/ptrace-pkey.c +++ b/tools/testing/selftests/powerpc/ptrace/ptrace-pkey.c @@ -81,16 +81,16 @@ static int child(struct shared_info *info) /* Get some pkeys so that we can change their bits in the AMR. */ pkey1 = sys_pkey_alloc(0, PKEY_DISABLE_EXECUTE); if (pkey1 < 0) { - pkey1 = sys_pkey_alloc(0, 0); + pkey1 = sys_pkey_alloc(0, PKEY_UNRESTRICTED); CHILD_FAIL_IF(pkey1 < 0, &info->child_sync); disable_execute = false; } - pkey2 = sys_pkey_alloc(0, 0); + pkey2 = sys_pkey_alloc(0, PKEY_UNRESTRICTED); CHILD_FAIL_IF(pkey2 < 0, &info->child_sync); - pkey3 = sys_pkey_alloc(0, 0); + pkey3 = sys_pkey_alloc(0, PKEY_UNRESTRICTED); CHILD_FAIL_IF(pkey3 < 0, &info->child_sync); info->amr1 |= 3ul << pkeyshift(pkey1);