From nobody Thu Oct 9 13:21:57 2025 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B1916283CB0 for ; Wed, 18 Jun 2025 09:30:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750239033; cv=none; b=s6dJSmpyrJGi89HG61wWefYPtc3KE6+F5wtC/8+rt2XVEz/IDrYgpLbprBRRFHNWie0s/vLjLcU8JOP/YdNxyCyqDj3J6wBUTQL0V1ggHK4z0tZDkOaY1vhtC99q67BCpNWEYyw6AR63yvRtepLyv1Y3XptifJ/tBk9S3aott1U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750239033; c=relaxed/simple; bh=TQThQFQx4m6BV3hRx3IRUB9DlYaYPEbWVYfudCwUrXw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=U50pZ5LrS9Pn6dYiuHlJ9dQk1St22W2852ddQLtfjpy4rgRyhKzxZrnlSKCVJj48Mfufx3AeOLbroIxkeiHYQn9Kstq8ucQGKBEfHmKBRu9hll2BoYbaAZAf+1SnVmpAbAXUu2egk2MsU0QeRj844sZKbWfZRdY89W5wWtcIsFk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com 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 7A44A14BF; Wed, 18 Jun 2025 02:30:10 -0700 (PDT) Received: from e129823.cambridge.arm.com (e129823.arm.com [10.1.197.6]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id AE9823F58B; Wed, 18 Jun 2025 02:30:27 -0700 (PDT) From: Yeoreum Yun To: catalin.marinas@arm.com, pcc@google.com, will@kernel.org, broonie@kernel.org, anshuman.khandual@arm.com, joey.gouly@arm.com, maz@kernel.org, oliver.upton@linux.dev, frederic@kernel.org, hardevsinh.palaniya@siliconsignals.io, samuel.holland@sifive.com, palmer@rivosinc.com, charlie@rivosinc.com, thiago.bauermann@linaro.org, bgray@linux.ibm.com, tglx@linutronix.de, puranjay@kernel.org, david@redhat.com, yang@os.amperecomputing.com, mbenes@suse.cz, joel.granados@kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Yeoreum Yun Subject: [PATCH v7 8/8] kselftest/arm64/mte: add MTE_STORE_ONLY testcases Date: Wed, 18 Jun 2025 10:29:57 +0100 Message-Id: <20250618092957.2069907-9-yeoreum.yun@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250618092957.2069907-1-yeoreum.yun@arm.com> References: <20250618092957.2069907-1-yeoreum.yun@arm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Since ARMv8.9, FEAT_MTE_STORE_ONLY can be used to restrict raise of tag check fault on store operation only. Adds new test cases using MTE_STORE_ONLY feature. Signed-off-by: Yeoreum Yun Reviewed-by: Mark Brown --- .../selftests/arm64/mte/check_mmap_options.c | 361 +++++++++++++++++- .../testing/selftests/arm64/mte/check_prctl.c | 25 +- 2 files changed, 366 insertions(+), 20 deletions(-) diff --git a/tools/testing/selftests/arm64/mte/check_mmap_options.c b/tools= /testing/selftests/arm64/mte/check_mmap_options.c index 447c0ef25f71..c100af3012cb 100644 --- a/tools/testing/selftests/arm64/mte/check_mmap_options.c +++ b/tools/testing/selftests/arm64/mte/check_mmap_options.c @@ -35,6 +35,11 @@ enum mte_mem_check_type { CHECK_CLEAR_PROT_MTE =3D 2, }; =20 +enum mte_tag_op_type { + TAG_OP_ALL =3D 0, + TAG_OP_STONLY =3D 1, +}; + struct check_mmap_testcase { int check_type; int mem_type; @@ -42,17 +47,24 @@ struct check_mmap_testcase { int mapping; int tag_check; int atag_check; + int tag_op; bool enable_tco; }; =20 +#define TAG_OP_ALL 0 +#define TAG_OP_STONLY 1 + static size_t page_size; static int sizes[] =3D { 1, 537, 989, 1269, MT_GRANULE_SIZE - 1, MT_GRANULE_SIZE, /* page size - 1*/ 0, /* page_size */ 0, /* page size + 1 */ 0 }; =20 -static int check_mte_memory(char *ptr, int size, int mode, int tag_check, = int atag_check) +static int check_mte_memory(char *ptr, int size, int mode, + int tag_check,int atag_check, int tag_op) { + char buf[MT_GRANULE_SIZE]; + if (!mtefar_support && atag_check =3D=3D ATAG_CHECK_ON) return KSFT_SKIP; =20 @@ -81,16 +93,34 @@ static int check_mte_memory(char *ptr, int size, int mo= de, int tag_check, int at if (cur_mte_cxt.fault_valid =3D=3D true && tag_check =3D=3D TAG_CHECK_OFF) return KSFT_FAIL; =20 + if (tag_op =3D=3D TAG_OP_STONLY) { + mte_initialize_current_context(mode, (uintptr_t)ptr, -UNDERFLOW); + memcpy(buf, ptr - UNDERFLOW, MT_GRANULE_SIZE); + mte_wait_after_trig(); + if (cur_mte_cxt.fault_valid =3D=3D true) + return KSFT_FAIL; + + mte_initialize_current_context(mode, (uintptr_t)ptr, size + OVERFLOW); + memcpy(buf, ptr + size, MT_GRANULE_SIZE); + mte_wait_after_trig(); + if (cur_mte_cxt.fault_valid =3D=3D true) + return KSFT_FAIL; + } + return KSFT_PASS; } =20 -static int check_anonymous_memory_mapping(int mem_type, int mode, int mapp= ing, int tag_check, int atag_check) +static int check_anonymous_memory_mapping(int mem_type, int mode, int mapp= ing, + int tag_check, int atag_check, int tag_op) { char *ptr, *map_ptr; int run, result, map_size; int item =3D ARRAY_SIZE(sizes); =20 - mte_switch_mode(mode, MTE_ALLOW_NON_ZERO_TAG, false); + if (tag_op =3D=3D TAG_OP_STONLY && !mtestonly_support) + return KSFT_SKIP; + + mte_switch_mode(mode, MTE_ALLOW_NON_ZERO_TAG, tag_op); for (run =3D 0; run < item; run++) { map_size =3D sizes[run] + OVERFLOW + UNDERFLOW; map_ptr =3D (char *)mte_allocate_memory(map_size, mem_type, mapping, fal= se); @@ -106,7 +136,7 @@ static int check_anonymous_memory_mapping(int mem_type,= int mode, int mapping, i munmap((void *)map_ptr, map_size); return KSFT_FAIL; } - result =3D check_mte_memory(ptr, sizes[run], mode, tag_check, atag_check= ); + result =3D check_mte_memory(ptr, sizes[run], mode, tag_check, atag_check= , tag_op); mte_clear_tags((void *)ptr, sizes[run]); mte_free_memory((void *)map_ptr, map_size, mem_type, false); if (result !=3D KSFT_PASS) @@ -115,14 +145,18 @@ static int check_anonymous_memory_mapping(int mem_typ= e, int mode, int mapping, i return KSFT_PASS; } =20 -static int check_file_memory_mapping(int mem_type, int mode, int mapping, = int tag_check, int atag_check) +static int check_file_memory_mapping(int mem_type, int mode, int mapping, + int tag_check, int atag_check, int tag_op) { char *ptr, *map_ptr; int run, fd, map_size; int total =3D ARRAY_SIZE(sizes); int result =3D KSFT_PASS; =20 - mte_switch_mode(mode, MTE_ALLOW_NON_ZERO_TAG, false); + if (tag_op =3D=3D TAG_OP_STONLY && !mtestonly_support) + return KSFT_SKIP; + + mte_switch_mode(mode, MTE_ALLOW_NON_ZERO_TAG, tag_op); for (run =3D 0; run < total; run++) { fd =3D create_temp_file(); if (fd =3D=3D -1) @@ -144,7 +178,7 @@ static int check_file_memory_mapping(int mem_type, int = mode, int mapping, int ta close(fd); return KSFT_FAIL; } - result =3D check_mte_memory(ptr, sizes[run], mode, tag_check, atag_check= ); + result =3D check_mte_memory(ptr, sizes[run], mode, tag_check, atag_check= , tag_op); mte_clear_tags((void *)ptr, sizes[run]); munmap((void *)map_ptr, map_size); close(fd); @@ -177,10 +211,10 @@ static int check_clear_prot_mte_flag(int mem_type, in= t mode, int mapping, int at ksft_print_msg("FAIL: mprotect not ignoring clear PROT_MTE property\n"); return KSFT_FAIL; } - result =3D check_mte_memory(ptr, sizes[run], mode, TAG_CHECK_ON, atag_ch= eck); + result =3D check_mte_memory(ptr, sizes[run], mode, TAG_CHECK_ON, atag_ch= eck, TAG_OP_ALL); mte_free_memory_tag_range((void *)ptr, sizes[run], mem_type, UNDERFLOW, = OVERFLOW); if (result !=3D KSFT_PASS) - return KSFT_FAIL; + return result; =20 fd =3D create_temp_file(); if (fd =3D=3D -1) @@ -201,7 +235,7 @@ static int check_clear_prot_mte_flag(int mem_type, int = mode, int mapping, int at close(fd); return KSFT_FAIL; } - result =3D check_mte_memory(ptr, sizes[run], mode, TAG_CHECK_ON, atag_ch= eck); + result =3D check_mte_memory(ptr, sizes[run], mode, TAG_CHECK_ON, atag_ch= eck, TAG_OP_ALL); mte_free_memory_tag_range((void *)ptr, sizes[run], mem_type, UNDERFLOW, = OVERFLOW); close(fd); if (result !=3D KSFT_PASS) @@ -219,6 +253,7 @@ const char *format_test_name(struct check_mmap_testcase= *tc) const char *mapping_str; const char *tag_check_str; const char *atag_check_str; + const char *tag_op_str; =20 switch (tc->check_type) { case CHECK_ANON_MEM: @@ -303,6 +338,23 @@ const char *format_test_name(struct check_mmap_testcas= e *tc) check_type_str, mapping_str, sync_str, mem_type_str, tag_check_str, atag_check_str); =20 + switch (tc->tag_op) { + case TAG_OP_ALL: + tag_op_str =3D ""; + break; + case TAG_OP_STONLY: + tag_op_str =3D " / store-only"; + break; + default: + assert(0); + break; + } + + snprintf(test_name, TEST_NAME_MAX, + "Check %s with %s mapping, %s mode, %s memory and %s (%s%s)\n", + check_type_str, mapping_str, sync_str, mem_type_str, + tag_check_str, atag_check_str, tag_op_str); + return test_name; } =20 @@ -318,6 +370,7 @@ int main(int argc, char *argv[]) .mapping =3D MAP_PRIVATE, .tag_check =3D TAG_CHECK_OFF, .atag_check =3D ATAG_CHECK_OFF, + .tag_op =3D TAG_OP_ALL, .enable_tco =3D true, }, { @@ -327,6 +380,7 @@ int main(int argc, char *argv[]) .mapping =3D MAP_PRIVATE, .tag_check =3D TAG_CHECK_OFF, .atag_check =3D ATAG_CHECK_OFF, + .tag_op =3D TAG_OP_ALL, .enable_tco =3D true, }, { @@ -336,6 +390,7 @@ int main(int argc, char *argv[]) .mapping =3D MAP_PRIVATE, .tag_check =3D TAG_CHECK_OFF, .atag_check =3D ATAG_CHECK_OFF, + .tag_op =3D TAG_OP_ALL, .enable_tco =3D false, }, { @@ -345,6 +400,7 @@ int main(int argc, char *argv[]) .mapping =3D MAP_PRIVATE, .tag_check =3D TAG_CHECK_OFF, .atag_check =3D ATAG_CHECK_OFF, + .tag_op =3D TAG_OP_ALL, .enable_tco =3D false, }, { @@ -354,6 +410,7 @@ int main(int argc, char *argv[]) .mapping =3D MAP_PRIVATE, .tag_check =3D TAG_CHECK_ON, .atag_check =3D ATAG_CHECK_OFF, + .tag_op =3D TAG_OP_ALL, .enable_tco =3D false, }, { @@ -363,6 +420,7 @@ int main(int argc, char *argv[]) .mapping =3D MAP_PRIVATE, .tag_check =3D TAG_CHECK_ON, .atag_check =3D ATAG_CHECK_OFF, + .tag_op =3D TAG_OP_ALL, .enable_tco =3D false, }, { @@ -372,6 +430,7 @@ int main(int argc, char *argv[]) .mapping =3D MAP_SHARED, .tag_check =3D TAG_CHECK_ON, .atag_check =3D ATAG_CHECK_OFF, + .tag_op =3D TAG_OP_ALL, .enable_tco =3D false, }, { @@ -381,6 +440,7 @@ int main(int argc, char *argv[]) .mapping =3D MAP_SHARED, .tag_check =3D TAG_CHECK_ON, .atag_check =3D ATAG_CHECK_OFF, + .tag_op =3D TAG_OP_ALL, .enable_tco =3D false, }, { @@ -390,6 +450,7 @@ int main(int argc, char *argv[]) .mapping =3D MAP_PRIVATE, .tag_check =3D TAG_CHECK_ON, .atag_check =3D ATAG_CHECK_OFF, + .tag_op =3D TAG_OP_ALL, .enable_tco =3D false, }, { @@ -399,6 +460,7 @@ int main(int argc, char *argv[]) .mapping =3D MAP_PRIVATE, .tag_check =3D TAG_CHECK_ON, .atag_check =3D ATAG_CHECK_OFF, + .tag_op =3D TAG_OP_ALL, .enable_tco =3D false, }, { @@ -408,6 +470,7 @@ int main(int argc, char *argv[]) .mapping =3D MAP_SHARED, .tag_check =3D TAG_CHECK_ON, .atag_check =3D ATAG_CHECK_OFF, + .tag_op =3D TAG_OP_ALL, .enable_tco =3D false, }, { @@ -417,6 +480,7 @@ int main(int argc, char *argv[]) .mapping =3D MAP_SHARED, .tag_check =3D TAG_CHECK_ON, .atag_check =3D ATAG_CHECK_OFF, + .tag_op =3D TAG_OP_ALL, .enable_tco =3D false, }, { @@ -426,6 +490,7 @@ int main(int argc, char *argv[]) .mapping =3D MAP_PRIVATE, .tag_check =3D TAG_CHECK_ON, .atag_check =3D ATAG_CHECK_OFF, + .tag_op =3D TAG_OP_ALL, .enable_tco =3D false, }, { @@ -435,6 +500,7 @@ int main(int argc, char *argv[]) .mapping =3D MAP_PRIVATE, .tag_check =3D TAG_CHECK_ON, .atag_check =3D ATAG_CHECK_OFF, + .tag_op =3D TAG_OP_ALL, .enable_tco =3D false, }, { @@ -444,6 +510,7 @@ int main(int argc, char *argv[]) .mapping =3D MAP_SHARED, .tag_check =3D TAG_CHECK_ON, .atag_check =3D ATAG_CHECK_OFF, + .tag_op =3D TAG_OP_ALL, .enable_tco =3D false, }, { @@ -453,6 +520,7 @@ int main(int argc, char *argv[]) .mapping =3D MAP_SHARED, .tag_check =3D TAG_CHECK_ON, .atag_check =3D ATAG_CHECK_OFF, + .tag_op =3D TAG_OP_ALL, .enable_tco =3D false, }, { @@ -462,6 +530,7 @@ int main(int argc, char *argv[]) .mapping =3D MAP_PRIVATE, .tag_check =3D TAG_CHECK_ON, .atag_check =3D ATAG_CHECK_OFF, + .tag_op =3D TAG_OP_ALL, .enable_tco =3D false, }, { @@ -471,6 +540,7 @@ int main(int argc, char *argv[]) .mapping =3D MAP_PRIVATE, .tag_check =3D TAG_CHECK_ON, .atag_check =3D ATAG_CHECK_OFF, + .tag_op =3D TAG_OP_ALL, .enable_tco =3D false, }, { @@ -480,6 +550,7 @@ int main(int argc, char *argv[]) .mapping =3D MAP_SHARED, .tag_check =3D TAG_CHECK_ON, .atag_check =3D ATAG_CHECK_OFF, + .tag_op =3D TAG_OP_ALL, .enable_tco =3D false, }, { @@ -489,6 +560,7 @@ int main(int argc, char *argv[]) .mapping =3D MAP_SHARED, .tag_check =3D TAG_CHECK_ON, .atag_check =3D ATAG_CHECK_OFF, + .tag_op =3D TAG_OP_ALL, .enable_tco =3D false, }, { @@ -498,6 +570,7 @@ int main(int argc, char *argv[]) .mapping =3D MAP_PRIVATE, .tag_check =3D TAG_CHECK_ON, .atag_check =3D ATAG_CHECK_OFF, + .tag_op =3D TAG_OP_ALL, .enable_tco =3D false, }, { @@ -507,6 +580,257 @@ int main(int argc, char *argv[]) .mapping =3D MAP_PRIVATE, .tag_check =3D TAG_CHECK_ON, .atag_check =3D ATAG_CHECK_OFF, + .tag_op =3D TAG_OP_ALL, + .enable_tco =3D false, + }, + { + .check_type =3D CHECK_ANON_MEM, + .mem_type =3D USE_MMAP, + .mte_sync =3D MTE_SYNC_ERR, + .mapping =3D MAP_PRIVATE, + .tag_check =3D TAG_CHECK_ON, + .atag_check =3D ATAG_CHECK_ON, + .tag_op =3D TAG_OP_ALL, + .enable_tco =3D false, + }, + { + .check_type =3D CHECK_ANON_MEM, + .mem_type =3D USE_MPROTECT, + .mte_sync =3D MTE_SYNC_ERR, + .mapping =3D MAP_PRIVATE, + .tag_check =3D TAG_CHECK_ON, + .atag_check =3D ATAG_CHECK_ON, + .tag_op =3D TAG_OP_ALL, + .enable_tco =3D false, + }, + { + .check_type =3D CHECK_ANON_MEM, + .mem_type =3D USE_MMAP, + .mte_sync =3D MTE_SYNC_ERR, + .mapping =3D MAP_SHARED, + .tag_check =3D TAG_CHECK_ON, + .atag_check =3D ATAG_CHECK_ON, + .tag_op =3D TAG_OP_ALL, + .enable_tco =3D false, + }, + { + .check_type =3D CHECK_ANON_MEM, + .mem_type =3D USE_MPROTECT, + .mte_sync =3D MTE_SYNC_ERR, + .mapping =3D MAP_SHARED, + .tag_check =3D TAG_CHECK_ON, + .atag_check =3D ATAG_CHECK_ON, + .tag_op =3D TAG_OP_ALL, + .enable_tco =3D false, + }, + { + .check_type =3D CHECK_FILE_MEM, + .mem_type =3D USE_MMAP, + .mte_sync =3D MTE_SYNC_ERR, + .mapping =3D MAP_PRIVATE, + .tag_check =3D TAG_CHECK_ON, + .atag_check =3D ATAG_CHECK_ON, + .tag_op =3D TAG_OP_ALL, + .enable_tco =3D false, + }, + { + .check_type =3D CHECK_FILE_MEM, + .mem_type =3D USE_MPROTECT, + .mte_sync =3D MTE_SYNC_ERR, + .mapping =3D MAP_PRIVATE, + .tag_check =3D TAG_CHECK_ON, + .atag_check =3D ATAG_CHECK_ON, + .tag_op =3D TAG_OP_ALL, + .enable_tco =3D false, + }, + { + .check_type =3D CHECK_FILE_MEM, + .mem_type =3D USE_MMAP, + .mte_sync =3D MTE_SYNC_ERR, + .mapping =3D MAP_SHARED, + .tag_check =3D TAG_CHECK_ON, + .atag_check =3D ATAG_CHECK_ON, + .tag_op =3D TAG_OP_ALL, + .enable_tco =3D false, + }, + { + .check_type =3D CHECK_FILE_MEM, + .mem_type =3D USE_MPROTECT, + .mte_sync =3D MTE_SYNC_ERR, + .mapping =3D MAP_SHARED, + .tag_check =3D TAG_CHECK_ON, + .atag_check =3D ATAG_CHECK_ON, + .tag_op =3D TAG_OP_ALL, + .enable_tco =3D false, + }, + { + .check_type =3D CHECK_FILE_MEM, + .mem_type =3D USE_MMAP, + .mte_sync =3D MTE_ASYNC_ERR, + .mapping =3D MAP_PRIVATE, + .tag_check =3D TAG_CHECK_ON, + .atag_check =3D ATAG_CHECK_ON, + .tag_op =3D TAG_OP_ALL, + .enable_tco =3D false, + }, + { + .check_type =3D CHECK_ANON_MEM, + .mem_type =3D USE_MMAP, + .mte_sync =3D MTE_SYNC_ERR, + .mapping =3D MAP_PRIVATE, + .tag_check =3D TAG_CHECK_ON, + .atag_check =3D ATAG_CHECK_OFF, + .tag_op =3D TAG_OP_STONLY, + .enable_tco =3D false, + }, + { + .check_type =3D CHECK_ANON_MEM, + .mem_type =3D USE_MPROTECT, + .mte_sync =3D MTE_SYNC_ERR, + .mapping =3D MAP_PRIVATE, + .tag_check =3D TAG_CHECK_ON, + .atag_check =3D ATAG_CHECK_OFF, + .tag_op =3D TAG_OP_STONLY, + .enable_tco =3D false, + }, + { + .check_type =3D CHECK_ANON_MEM, + .mem_type =3D USE_MMAP, + .mte_sync =3D MTE_SYNC_ERR, + .mapping =3D MAP_SHARED, + .tag_check =3D TAG_CHECK_ON, + .atag_check =3D ATAG_CHECK_OFF, + .tag_op =3D TAG_OP_STONLY, + .enable_tco =3D false, + }, + { + .check_type =3D CHECK_ANON_MEM, + .mem_type =3D USE_MPROTECT, + .mte_sync =3D MTE_SYNC_ERR, + .mapping =3D MAP_SHARED, + .tag_check =3D TAG_CHECK_ON, + .atag_check =3D ATAG_CHECK_OFF, + .tag_op =3D TAG_OP_STONLY, + .enable_tco =3D false, + }, + { + .check_type =3D CHECK_ANON_MEM, + .mem_type =3D USE_MMAP, + .mte_sync =3D MTE_ASYNC_ERR, + .mapping =3D MAP_PRIVATE, + .tag_check =3D TAG_CHECK_ON, + .atag_check =3D ATAG_CHECK_OFF, + .tag_op =3D TAG_OP_STONLY, + .enable_tco =3D false, + }, + { + .check_type =3D CHECK_ANON_MEM, + .mem_type =3D USE_MPROTECT, + .mte_sync =3D MTE_ASYNC_ERR, + .mapping =3D MAP_PRIVATE, + .tag_check =3D TAG_CHECK_ON, + .atag_check =3D ATAG_CHECK_OFF, + .tag_op =3D TAG_OP_STONLY, + .enable_tco =3D false, + }, + { + .check_type =3D CHECK_ANON_MEM, + .mem_type =3D USE_MMAP, + .mte_sync =3D MTE_ASYNC_ERR, + .mapping =3D MAP_SHARED, + .tag_check =3D TAG_CHECK_ON, + .atag_check =3D ATAG_CHECK_OFF, + .tag_op =3D TAG_OP_STONLY, + .enable_tco =3D false, + }, + { + .check_type =3D CHECK_ANON_MEM, + .mem_type =3D USE_MPROTECT, + .mte_sync =3D MTE_ASYNC_ERR, + .mapping =3D MAP_SHARED, + .tag_check =3D TAG_CHECK_ON, + .atag_check =3D ATAG_CHECK_OFF, + .tag_op =3D TAG_OP_STONLY, + .enable_tco =3D false, + }, + { + .check_type =3D CHECK_FILE_MEM, + .mem_type =3D USE_MMAP, + .mte_sync =3D MTE_SYNC_ERR, + .mapping =3D MAP_PRIVATE, + .tag_check =3D TAG_CHECK_ON, + .atag_check =3D ATAG_CHECK_OFF, + .tag_op =3D TAG_OP_STONLY, + .enable_tco =3D false, + }, + { + .check_type =3D CHECK_FILE_MEM, + .mem_type =3D USE_MPROTECT, + .mte_sync =3D MTE_SYNC_ERR, + .mapping =3D MAP_PRIVATE, + .tag_check =3D TAG_CHECK_ON, + .atag_check =3D ATAG_CHECK_OFF, + .tag_op =3D TAG_OP_STONLY, + .enable_tco =3D false, + }, + { + .check_type =3D CHECK_FILE_MEM, + .mem_type =3D USE_MMAP, + .mte_sync =3D MTE_SYNC_ERR, + .mapping =3D MAP_SHARED, + .tag_check =3D TAG_CHECK_ON, + .atag_check =3D ATAG_CHECK_OFF, + .tag_op =3D TAG_OP_STONLY, + .enable_tco =3D false, + }, + { + .check_type =3D CHECK_FILE_MEM, + .mem_type =3D USE_MPROTECT, + .mte_sync =3D MTE_SYNC_ERR, + .mapping =3D MAP_SHARED, + .tag_check =3D TAG_CHECK_ON, + .atag_check =3D ATAG_CHECK_OFF, + .tag_op =3D TAG_OP_STONLY, + .enable_tco =3D false, + }, + { + .check_type =3D CHECK_FILE_MEM, + .mem_type =3D USE_MMAP, + .mte_sync =3D MTE_ASYNC_ERR, + .mapping =3D MAP_PRIVATE, + .tag_check =3D TAG_CHECK_ON, + .atag_check =3D ATAG_CHECK_OFF, + .tag_op =3D TAG_OP_STONLY, + .enable_tco =3D false, + }, + { + .check_type =3D CHECK_FILE_MEM, + .mem_type =3D USE_MPROTECT, + .mte_sync =3D MTE_ASYNC_ERR, + .mapping =3D MAP_PRIVATE, + .tag_check =3D TAG_CHECK_ON, + .atag_check =3D ATAG_CHECK_OFF, + .tag_op =3D TAG_OP_STONLY, + .enable_tco =3D false, + }, + { + .check_type =3D CHECK_FILE_MEM, + .mem_type =3D USE_MMAP, + .mte_sync =3D MTE_ASYNC_ERR, + .mapping =3D MAP_SHARED, + .tag_check =3D TAG_CHECK_ON, + .atag_check =3D ATAG_CHECK_OFF, + .tag_op =3D TAG_OP_STONLY, + .enable_tco =3D false, + }, + { + .check_type =3D CHECK_FILE_MEM, + .mem_type =3D USE_MPROTECT, + .mte_sync =3D MTE_ASYNC_ERR, + .mapping =3D MAP_SHARED, + .tag_check =3D TAG_CHECK_ON, + .atag_check =3D ATAG_CHECK_OFF, + .tag_op =3D TAG_OP_STONLY, .enable_tco =3D false, }, { @@ -516,6 +840,7 @@ int main(int argc, char *argv[]) .mapping =3D MAP_PRIVATE, .tag_check =3D TAG_CHECK_ON, .atag_check =3D ATAG_CHECK_ON, + .tag_op =3D TAG_OP_STONLY, .enable_tco =3D false, }, { @@ -525,6 +850,7 @@ int main(int argc, char *argv[]) .mapping =3D MAP_PRIVATE, .tag_check =3D TAG_CHECK_ON, .atag_check =3D ATAG_CHECK_ON, + .tag_op =3D TAG_OP_STONLY, .enable_tco =3D false, }, { @@ -534,6 +860,7 @@ int main(int argc, char *argv[]) .mapping =3D MAP_SHARED, .tag_check =3D TAG_CHECK_ON, .atag_check =3D ATAG_CHECK_ON, + .tag_op =3D TAG_OP_STONLY, .enable_tco =3D false, }, { @@ -543,6 +870,7 @@ int main(int argc, char *argv[]) .mapping =3D MAP_SHARED, .tag_check =3D TAG_CHECK_ON, .atag_check =3D ATAG_CHECK_ON, + .tag_op =3D TAG_OP_STONLY, .enable_tco =3D false, }, { @@ -552,6 +880,7 @@ int main(int argc, char *argv[]) .mapping =3D MAP_PRIVATE, .tag_check =3D TAG_CHECK_ON, .atag_check =3D ATAG_CHECK_ON, + .tag_op =3D TAG_OP_STONLY, .enable_tco =3D false, }, { @@ -561,6 +890,7 @@ int main(int argc, char *argv[]) .mapping =3D MAP_PRIVATE, .tag_check =3D TAG_CHECK_ON, .atag_check =3D ATAG_CHECK_ON, + .tag_op =3D TAG_OP_STONLY, .enable_tco =3D false, }, { @@ -570,6 +900,7 @@ int main(int argc, char *argv[]) .mapping =3D MAP_SHARED, .tag_check =3D TAG_CHECK_ON, .atag_check =3D ATAG_CHECK_ON, + .tag_op =3D TAG_OP_STONLY, .enable_tco =3D false, }, { @@ -579,6 +910,7 @@ int main(int argc, char *argv[]) .mapping =3D MAP_SHARED, .tag_check =3D TAG_CHECK_ON, .atag_check =3D ATAG_CHECK_ON, + .tag_op =3D TAG_OP_STONLY, .enable_tco =3D false, }, { @@ -588,6 +920,7 @@ int main(int argc, char *argv[]) .mapping =3D MAP_PRIVATE, .tag_check =3D TAG_CHECK_ON, .atag_check =3D ATAG_CHECK_ON, + .tag_op =3D TAG_OP_STONLY, .enable_tco =3D false, }, { @@ -597,6 +930,7 @@ int main(int argc, char *argv[]) .mapping =3D MAP_PRIVATE, .tag_check =3D TAG_CHECK_ON, .atag_check =3D ATAG_CHECK_ON, + .tag_op =3D TAG_OP_ALL, .enable_tco =3D false, }, { @@ -606,6 +940,7 @@ int main(int argc, char *argv[]) .mapping =3D MAP_PRIVATE, .tag_check =3D TAG_CHECK_ON, .atag_check =3D ATAG_CHECK_ON, + .tag_op =3D TAG_OP_ALL, .enable_tco =3D false, }, }; @@ -643,7 +978,8 @@ int main(int argc, char *argv[]) test_cases[i].mte_sync, test_cases[i].mapping, test_cases[i].tag_check, - test_cases[i].atag_check), + test_cases[i].atag_check, + test_cases[i].tag_op), format_test_name(&test_cases[i])); break; case CHECK_FILE_MEM: @@ -651,7 +987,8 @@ int main(int argc, char *argv[]) test_cases[i].mte_sync, test_cases[i].mapping, test_cases[i].tag_check, - test_cases[i].atag_check), + test_cases[i].atag_check, + test_cases[i].tag_op), format_test_name(&test_cases[i])); break; case CHECK_CLEAR_PROT_MTE: diff --git a/tools/testing/selftests/arm64/mte/check_prctl.c b/tools/testin= g/selftests/arm64/mte/check_prctl.c index 4c89e9538ca0..e9ad8761b3fb 100644 --- a/tools/testing/selftests/arm64/mte/check_prctl.c +++ b/tools/testing/selftests/arm64/mte/check_prctl.c @@ -60,7 +60,7 @@ void check_basic_read(void) /* * Attempt to set a specified combination of modes. */ -void set_mode_test(const char *name, int hwcap2, int mask) +void set_mode_test(const char *name, int hwcap2, int hwcap3, int mask) { int ret; =20 @@ -69,6 +69,11 @@ void set_mode_test(const char *name, int hwcap2, int mas= k) return; } =20 + if ((getauxval(AT_HWCAP3) & hwcap3) !=3D hwcap3) { + ksft_test_result_skip("%s\n", name); + return; + } + ret =3D set_tagged_addr_ctrl(mask); if (ret < 0) { ksft_test_result_fail("%s\n", name); @@ -81,7 +86,7 @@ void set_mode_test(const char *name, int hwcap2, int mask) return; } =20 - if ((ret & PR_MTE_TCF_MASK) =3D=3D mask) { + if ((ret & (PR_MTE_TCF_MASK | PR_MTE_STORE_ONLY)) =3D=3D mask) { ksft_test_result_pass("%s\n", name); } else { ksft_print_msg("Got %x, expected %x\n", @@ -93,12 +98,16 @@ void set_mode_test(const char *name, int hwcap2, int ma= sk) struct mte_mode { int mask; int hwcap2; + int hwcap3; const char *name; } mte_modes[] =3D { - { PR_MTE_TCF_NONE, 0, "NONE" }, - { PR_MTE_TCF_SYNC, HWCAP2_MTE, "SYNC" }, - { PR_MTE_TCF_ASYNC, HWCAP2_MTE, "ASYNC" }, - { PR_MTE_TCF_SYNC | PR_MTE_TCF_ASYNC, HWCAP2_MTE, "SYNC+ASYNC" }, + { PR_MTE_TCF_NONE, 0, 0, = "NONE" }, + { PR_MTE_TCF_SYNC, HWCAP2_MTE, 0, = "SYNC" }, + { PR_MTE_TCF_ASYNC, HWCAP2_MTE, 0, = "ASYNC" }, + { PR_MTE_TCF_SYNC | PR_MTE_TCF_ASYNC, HWCAP2_MTE, 0, = "SYNC+ASYNC" }, + { PR_MTE_TCF_SYNC | PR_MTE_STORE_ONLY, HWCAP2_MTE, HWC= AP3_MTE_STORE_ONLY, "SYNC+STONLY" }, + { PR_MTE_TCF_ASYNC | PR_MTE_STORE_ONLY, HWCAP2_MTE, HWC= AP3_MTE_STORE_ONLY, "ASYNC+STONLY" }, + { PR_MTE_TCF_SYNC | PR_MTE_TCF_ASYNC | PR_MTE_STORE_ONLY, HWCAP2_MTE, HWC= AP3_MTE_STORE_ONLY, "SYNC+ASYNC+STONLY" }, }; =20 int main(void) @@ -106,11 +115,11 @@ int main(void) int i; =20 ksft_print_header(); - ksft_set_plan(5); + ksft_set_plan(ARRAY_SIZE(mte_modes)); =20 check_basic_read(); for (i =3D 0; i < ARRAY_SIZE(mte_modes); i++) - set_mode_test(mte_modes[i].name, mte_modes[i].hwcap2, + set_mode_test(mte_modes[i].name, mte_modes[i].hwcap2, mte_modes[i].hwcap= 3, mte_modes[i].mask); =20 ksft_print_cnts(); --=20 LEVI:{C3F47F37-75D8-414A-A8BA-3980EC8A46D7}