From patchwork Mon Jan 13 17:06:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yury Khrustalev X-Patchwork-Id: 13937786 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 4FF9DC02180 for ; Mon, 13 Jan 2025 17:06:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DF2566B008A; Mon, 13 Jan 2025 12:06:51 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id DA30A6B008C; Mon, 13 Jan 2025 12:06:51 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C91A36B0092; Mon, 13 Jan 2025 12:06:51 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id AD01B6B008A for ; Mon, 13 Jan 2025 12:06:51 -0500 (EST) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 33F8216011C for ; Mon, 13 Jan 2025 17:06:51 +0000 (UTC) X-FDA: 83003058222.14.6DD0F64 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf19.hostedemail.com (Postfix) with ESMTP id 72F1A1A0006 for ; Mon, 13 Jan 2025 17:06:49 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf19.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=1736788009; 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=+b1vwyUt9X+x+fq4vNsQWkXSJqfTlOBMiVr4yBA8vrE=; b=xKX361fkcV6KpIczROKoS+esdtekJuD5kWX0t1vVn7yjt/9MiJ0KbLVs5LFpTQV0AeUNAf GAWTglJBfV0G7bH5OaSRa6csHvXOhfqaNDoZv+yvzKp9Tt1/5aPqr3ArHqWi1UBeRulZ1B n3AktjFU38nWJhNMAqV4eBxzMPGWwgA= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf19.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=1736788009; a=rsa-sha256; cv=none; b=2rU/q9GXBygpaVlCMLSoPME+LL0CU8HPwEjnteZPUSqm6n+1NWbyGnoFCbpW1joSA8tin0 OSbwC8/ntChLOpv0hiEHGXzEST/+BQGVaXa7OH5Y7jDP/AMQEJX0UKdls2vZqDG+wkhUjI bX+7/KEvSR+iJjksxeYjF+HTHzuCgsk= 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 EA6671A25; Mon, 13 Jan 2025 09:07:16 -0800 (PST) Received: from udebian.localdomain (unknown [10.1.25.34]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 5D4483F673; Mon, 13 Jan 2025 09:06:46 -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 2/3] selftests/mm: Use PKEY_UNRESTRICTED macro Date: Mon, 13 Jan 2025 17:06:18 +0000 Message-Id: <20250113170619.484698-3-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-Queue-Id: 72F1A1A0006 X-Rspamd-Server: rspam12 X-Stat-Signature: xs9jeubhar3phfrrcsbyxd7f7gaq6141 X-Rspam-User: X-HE-Tag: 1736788009-727958 X-HE-Meta: U2FsdGVkX19NBoGAhDNCef724nwjc/wzCnjxmXEffuVfwtaVSzbODIlpG+cz/pzrIzjw6Z7lT0uJ5H+FJJU7JbVuqzy1jqEIH4QmH4SQJA2Bl1m0qo94KDB8h4GokpNe21WXnLR8TkvoWa7oqcOhnYqpxosxmHWqOw65XYSxo5FVPEe1KpirLOoQTB4IqbaWkQh2RMgrP+XMnmiVT885eeOXrUVXxYmGfBwYd4QKkDmBYollpzZ+E/ABkCJVCjrqoNcxVU1fl4GM3IBrb00lVq7n2Pkj50kFhaDvIxqHo0+rBjDHoTkJsdYXpPsBwSeIZkEfRS6w7Ffr3TC7+K3Zzz05Ebq7m5H5CGuyvi5d6+x1QWD8o9jrYkRrPlsZtl3VLRLj3NhNDaKDi7r+k0V5jjdoUSgpcKilmI91PJW3rvZaE8sPieTIQmGMSs59AGZGbME2g1H3S70rD6dTqecMMMwpEcOVrFvyFlXG/Ie7izY6kykcMlxDir4eRz9jcb8qocw/nIiuy9Z+pxLHRXK43bFeVcb0bpmUt/4MgZYA8AQK8Qxec2JaYZPua+bMnHPkAaO8TA/cvyzA3Ipdw/x65PD0NRYDZrO7wQKPAIjLNaN+oVGqtv5ccaC95hxQ5+hwSuH85Z3seTqw3wbYAhuAaNRjVAjxNHhBeLAbAhfTRAJcMBFDhCKRpWTykPz3VVgT+oGhuHluf8KhQwDLfqjDPL8DNpFjRL6tckxXFfmBZydYZgCw6W2tlt41X/cCv905e+yyxPdrbvQkYMpUz3hdTd4Yt+Xw/DHH5p2V2d33hnCCvEkDytD//6q4zyVwYz3iXLqFLxErD5wBKxguK4v31CIT7WVYklZpQujxCouDcInAcFW7S5g96zUnQaSPIYxwNY0toMCj6OcwDYubb14Im6C4XZ3+SWM4YOggaF5FjjRCdFoJH+HlAi9GL1VyqZtTvyNYwC6pmy3oAf2EMGA sg4R+gD5 aWmOPollYG7IxPmqcgcOfYBjqA+oF8cawcR4oRnYT797V1Y1tzyGb6aQuKFueba5cNxuQnbbhJTM+tDepxIdvlYrjDsRJBqklr7u5aWgLlmJ9FKzvQFdFgnt/tjxxkGwy6eBmRiBx2YZY6fTXAC4Sc/OD6nESFwLU5cl4uENIT0uGyEftvL5B48wdFqswvvJ4Xi+qD/EHukiT+1ztlAt4mfGHfI85wPnw4eLR 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. Signed-off-by: Yury Khrustalev Suggested-by: Joey Gouly Acked-by: Dave Hansen --- tools/testing/selftests/mm/mseal_test.c | 6 +++--- tools/testing/selftests/mm/pkey-helpers.h | 3 ++- tools/testing/selftests/mm/pkey_sighandler_tests.c | 4 ++-- tools/testing/selftests/mm/protection_keys.c | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/tools/testing/selftests/mm/mseal_test.c b/tools/testing/selftests/mm/mseal_test.c index 01675c412b2a..30ea37e8ecf8 100644 --- a/tools/testing/selftests/mm/mseal_test.c +++ b/tools/testing/selftests/mm/mseal_test.c @@ -218,7 +218,7 @@ bool seal_support(void) bool pkey_supported(void) { #if defined(__i386__) || defined(__x86_64__) /* arch */ - int pkey = sys_pkey_alloc(0, 0); + int pkey = sys_pkey_alloc(0, PKEY_UNRESTRICTED); if (pkey > 0) return true; @@ -1671,7 +1671,7 @@ static void test_seal_discard_ro_anon_on_pkey(bool seal) setup_single_address_rw(size, &ptr); FAIL_TEST_IF_FALSE(ptr != (void *)-1); - pkey = sys_pkey_alloc(0, 0); + pkey = sys_pkey_alloc(0, PKEY_UNRESTRICTED); FAIL_TEST_IF_FALSE(pkey > 0); ret = sys_mprotect_pkey((void *)ptr, size, PROT_READ | PROT_WRITE, pkey); @@ -1683,7 +1683,7 @@ static void test_seal_discard_ro_anon_on_pkey(bool seal) } /* sealing doesn't take effect if PKRU allow write. */ - set_pkey(pkey, 0); + set_pkey(pkey, PKEY_UNRESTRICTED); ret = sys_madvise(ptr, size, MADV_DONTNEED); FAIL_TEST_IF_FALSE(!ret); diff --git a/tools/testing/selftests/mm/pkey-helpers.h b/tools/testing/selftests/mm/pkey-helpers.h index f7cfe163b0ff..10fa3ca9b05b 100644 --- a/tools/testing/selftests/mm/pkey-helpers.h +++ b/tools/testing/selftests/mm/pkey-helpers.h @@ -12,6 +12,7 @@ #include #include #include +#include #include "../kselftest.h" @@ -224,7 +225,7 @@ static inline u32 *siginfo_get_pkey_ptr(siginfo_t *si) static inline int kernel_has_pkeys(void) { /* try allocating a key and see if it succeeds */ - int ret = sys_pkey_alloc(0, 0); + int ret = sys_pkey_alloc(0, PKEY_UNRESTRICTED); if (ret <= 0) { return 0; } diff --git a/tools/testing/selftests/mm/pkey_sighandler_tests.c b/tools/testing/selftests/mm/pkey_sighandler_tests.c index c593a426341c..2015ed7e0928 100644 --- a/tools/testing/selftests/mm/pkey_sighandler_tests.c +++ b/tools/testing/selftests/mm/pkey_sighandler_tests.c @@ -314,7 +314,7 @@ static void test_sigsegv_handler_with_different_pkey_for_stack(void) __write_pkey_reg(pkey_reg); /* Protect the new stack with MPK 1 */ - pkey = pkey_alloc(0, 0); + pkey = pkey_alloc(0, PKEY_UNRESTRICTED); pkey_mprotect(stack, STACK_SIZE, PROT_READ | PROT_WRITE, pkey); /* Set up alternate signal stack that will use the default MPK */ @@ -487,7 +487,7 @@ static void test_pkru_sigreturn(void) __write_pkey_reg(pkey_reg); /* Protect the stack with MPK 2 */ - pkey = pkey_alloc(0, 0); + pkey = pkey_alloc(0, PKEY_UNRESTRICTED); pkey_mprotect(stack, STACK_SIZE, PROT_READ | PROT_WRITE, pkey); /* Set up alternate signal stack that will use the default MPK */ diff --git a/tools/testing/selftests/mm/protection_keys.c b/tools/testing/selftests/mm/protection_keys.c index 4990f7ab4cb7..cca7435a7bc5 100644 --- a/tools/testing/selftests/mm/protection_keys.c +++ b/tools/testing/selftests/mm/protection_keys.c @@ -491,7 +491,7 @@ int sys_pkey_alloc(unsigned long flags, unsigned long init_val) int alloc_pkey(void) { int ret; - unsigned long init_val = 0x0; + unsigned long init_val = PKEY_UNRESTRICTED; dprintf1("%s()::%d, pkey_reg: 0x%016llx shadow: %016llx\n", __func__, __LINE__, __read_pkey_reg(), shadow_pkey_reg);