From: Joey Gouly <joey.gouly@arm.com>
To: <linux-arm-kernel@lists.infradead.org>
Cc: <linux-kselftest@vger.kernel.org>, <nd@arm.com>,
<broonie@kernel.org>, <catalin.marinas@arm.com>,
<joey.gouly@arm.com>, <shuah@kernel.org>,
<skhan@linuxfoundation.org>, <will@kernel.org>
Subject: [PATCH v3 2/6] kselftest/arm64: mte: user_mem: rework error handling
Date: Wed, 9 Feb 2022 15:22:36 +0000 [thread overview]
Message-ID: <20220209152240.52788-3-joey.gouly@arm.com> (raw)
In-Reply-To: <20220209152240.52788-1-joey.gouly@arm.com>
Future commits will have multiple iterations of tests in this function,
so make the error handling assume it will pass and then bail out if there
is an error.
Signed-off-by: Joey Gouly <joey.gouly@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will@kernel.org>
Cc: Mark Brown <broonie@kernel.org>
Cc: Shuah Khan <shuah@kernel.org>
Reviewed-by: Mark Brown <broonie@kernel.org>
Tested-by: Mark Brown <broonie@kernel.org>
Reviewed-by: Shuah Khan <skhan@linuxfoundation.org>
---
.../selftests/arm64/mte/check_user_mem.c | 22 +++++++++++++------
1 file changed, 15 insertions(+), 7 deletions(-)
diff --git a/tools/testing/selftests/arm64/mte/check_user_mem.c b/tools/testing/selftests/arm64/mte/check_user_mem.c
index 5a5a7e1f5789..2afcc9fb9ae8 100644
--- a/tools/testing/selftests/arm64/mte/check_user_mem.c
+++ b/tools/testing/selftests/arm64/mte/check_user_mem.c
@@ -27,7 +27,7 @@ static int check_usermem_access_fault(int mem_type, int mode, int mapping,
size_t len, read_len;
void *ptr, *ptr_next;
- err = KSFT_FAIL;
+ err = KSFT_PASS;
len = 2 * page_sz;
mte_switch_mode(mode, MTE_ALLOW_NON_ZERO_TAG);
fd = create_temp_file();
@@ -71,14 +71,22 @@ static int check_usermem_access_fault(int mem_type, int mode, int mapping,
* mode without fault but may not fail in async mode as per the
* implemented MTE userspace support in Arm64 kernel.
*/
- if (mode == MTE_SYNC_ERR &&
- !cur_mte_cxt.fault_valid && read_len < len) {
- err = KSFT_PASS;
- } else if (mode == MTE_ASYNC_ERR &&
- !cur_mte_cxt.fault_valid && read_len == len) {
- err = KSFT_PASS;
+ if (cur_mte_cxt.fault_valid)
+ goto usermem_acc_err;
+
+ if (mode == MTE_SYNC_ERR && read_len < len) {
+ /* test passed */
+ } else if (mode == MTE_ASYNC_ERR && read_len == len) {
+ /* test passed */
+ } else {
+ goto usermem_acc_err;
}
+
+ goto exit;
+
usermem_acc_err:
+ err = KSFT_FAIL;
+exit:
mte_free_memory((void *)ptr, len, mem_type, true);
close(fd);
return err;
--
2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2022-02-09 15:24 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-09 15:22 [PATCH v3 0/6] add more test coverage to MTE kselftests Joey Gouly
2022-02-09 15:22 ` [PATCH v3 1/6] kselftest/arm64: mte: user_mem: introduce tag_offset and tag_len Joey Gouly
2022-02-09 18:36 ` Catalin Marinas
2022-02-09 15:22 ` Joey Gouly [this message]
2022-02-09 18:40 ` [PATCH v3 2/6] kselftest/arm64: mte: user_mem: rework error handling Catalin Marinas
2022-02-09 15:22 ` [PATCH v3 3/6] kselftest/arm64: mte: user_mem: check different offsets and sizes Joey Gouly
2022-02-09 18:41 ` Catalin Marinas
2022-02-09 15:22 ` [PATCH v3 4/6] kselftest/arm64: mte: user_mem: add test type enum Joey Gouly
2022-02-09 18:43 ` Catalin Marinas
2022-02-09 15:22 ` [PATCH v3 5/6] kselftest/arm64: mte: user_mem: add more test types Joey Gouly
2022-02-09 18:43 ` Catalin Marinas
2022-02-09 15:22 ` [PATCH v3 6/6] kselftest/arm64: mte: user_mem: test a wider range of values Joey Gouly
2022-02-09 18:44 ` Catalin Marinas
2022-02-15 23:18 ` [PATCH v3 0/6] add more test coverage to MTE kselftests Will Deacon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220209152240.52788-3-joey.gouly@arm.com \
--to=joey.gouly@arm.com \
--cc=broonie@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=nd@arm.com \
--cc=shuah@kernel.org \
--cc=skhan@linuxfoundation.org \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).