From patchwork Wed Feb 9 15:22:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joey Gouly X-Patchwork-Id: 12740368 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8A2A8C433EF for ; Wed, 9 Feb 2022 15:23:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235817AbiBIPXQ (ORCPT ); Wed, 9 Feb 2022 10:23:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40986 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235795AbiBIPXF (ORCPT ); Wed, 9 Feb 2022 10:23:05 -0500 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70074.outbound.protection.outlook.com [40.107.7.74]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AFCACC0612BE for ; Wed, 9 Feb 2022 07:23:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ZanT3lyN1gc3fQ/1uYZewHTiTDHs37oT+i2jKj450Ro=; b=DTgseelI/togpL+Po2OVRYC+eN/M9Biv7q9WeAQV+2ctVn9cyrpf2mL/wfutsVWIVX+zf+7w6nnd4LyGfORfkiGRCfrjK26sqfjadqMvNBWb0vVCwe53MzzGt5Rhuq9/kzkic9WCeFMXGlaGITaZmYicErpC/eBfuq1Lzfykhbs= Received: from DB6PR07CA0021.eurprd07.prod.outlook.com (2603:10a6:6:2d::31) by DB6PR0801MB2120.eurprd08.prod.outlook.com (2603:10a6:4:3c::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.17; Wed, 9 Feb 2022 15:23:05 +0000 Received: from DB5EUR03FT019.eop-EUR03.prod.protection.outlook.com (2603:10a6:6:2d:cafe::cb) by DB6PR07CA0021.outlook.office365.com (2603:10a6:6:2d::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.11 via Frontend Transport; Wed, 9 Feb 2022 15:23:05 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by DB5EUR03FT019.mail.protection.outlook.com (10.152.20.163) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.12 via Frontend Transport; Wed, 9 Feb 2022 15:23:05 +0000 Received: ("Tessian outbound 741ca6c82739:v113"); Wed, 09 Feb 2022 15:23:05 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 3c0223871a9261da X-CR-MTA-TID: 64aa7808 Received: from ece15a54c64a.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 52E19A3B-1094-46AB-9DE6-B5E2A04C8133.1; Wed, 09 Feb 2022 15:22:55 +0000 Received: from EUR05-DB8-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id ece15a54c64a.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Wed, 09 Feb 2022 15:22:55 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kgwu0xORQQ9ZikGSX/fhxzQfsAJhJP4IJBCEIbpjGDYYysHhxupU+JUiHLzg56QVNi2K3mTgbVn8WEEZIBiSdUAEVoXtgPKlJ/tUfcAewOYp02QT4klrzkox2DA3xFV4yr1ZyJ1o0MqLxC9kkE5BWmZ0C0R/nCSsvDjugK5wgNMzqjTwUJBU7pliD2/sefuuHpvMg6SwRfH0nJfa56SpYGBT4pcttwlpdpp1qR/4u/lyE2fM3cmArpfbgz8+StuWrqQJajUTMRl8XkbgC03QSvj8p3/2qppeMRpg7S/fDntBfmqTNSZ+vsE1GNh2uCbbMREwx9rIjsBwSHmGxZ7oYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ZanT3lyN1gc3fQ/1uYZewHTiTDHs37oT+i2jKj450Ro=; b=N0pdEJwiUMAeg/JH6uP1hFHVKxT/irkIoOf+YAw+JXHgv8EdV2zddhXcCoglaR3unMB39A7jROzPO/dC563pSrSCku0EtMndXfeu7pDKXh6OCuw5C0AbENayO09GVpnfSeXHUzljaye9sVdifDtzJlnIwTkoWHtBeF7JW6sGFmQPBl/IGT2kS+YO/FIUkoBFi4t7hrx/m1XGe7BHPGDcuuOtkfly6K+U9iDZDsDi6fiSZejw9yfwlSogSxKeAl5G5sRnBq7Owkq79PrROxL3N5NH32jch7ClAM4oODiW2ZhEoTAluLW8C0gqdnrsTLMxlKRu0niXGwHkB4Gn/RowMg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 40.67.248.234) smtp.rcpttodomain=lists.infradead.org smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ZanT3lyN1gc3fQ/1uYZewHTiTDHs37oT+i2jKj450Ro=; b=DTgseelI/togpL+Po2OVRYC+eN/M9Biv7q9WeAQV+2ctVn9cyrpf2mL/wfutsVWIVX+zf+7w6nnd4LyGfORfkiGRCfrjK26sqfjadqMvNBWb0vVCwe53MzzGt5Rhuq9/kzkic9WCeFMXGlaGITaZmYicErpC/eBfuq1Lzfykhbs= Received: from AM6PR02CA0023.eurprd02.prod.outlook.com (2603:10a6:20b:6e::36) by GV1PR08MB7329.eurprd08.prod.outlook.com (2603:10a6:150:1c::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.12; Wed, 9 Feb 2022 15:22:53 +0000 Received: from AM5EUR03FT015.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:6e:cafe::29) by AM6PR02CA0023.outlook.office365.com (2603:10a6:20b:6e::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.19 via Frontend Transport; Wed, 9 Feb 2022 15:22:53 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 40.67.248.234 as permitted sender) receiver=protection.outlook.com; client-ip=40.67.248.234; helo=nebula.arm.com; Received: from nebula.arm.com (40.67.248.234) by AM5EUR03FT015.mail.protection.outlook.com (10.152.16.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4951.12 via Frontend Transport; Wed, 9 Feb 2022 15:22:52 +0000 Received: from AZ-NEU-EX03.Arm.com (10.251.24.31) by AZ-NEU-EX04.Arm.com (10.251.24.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Wed, 9 Feb 2022 15:22:49 +0000 Received: from e124191.cambridge.arm.com (10.1.197.45) by mail.arm.com (10.251.24.31) with Microsoft SMTP Server id 15.1.2308.20 via Frontend Transport; Wed, 9 Feb 2022 15:22:49 +0000 From: Joey Gouly To: CC: , , , , , , , Subject: [PATCH v3 1/6] kselftest/arm64: mte: user_mem: introduce tag_offset and tag_len Date: Wed, 9 Feb 2022 15:22:35 +0000 Message-ID: <20220209152240.52788-2-joey.gouly@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220209152240.52788-1-joey.gouly@arm.com> References: <20220209152240.52788-1-joey.gouly@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-Correlation-Id: 8de4a09d-902f-4a1f-12d3-08d9ebe011d1 X-MS-TrafficTypeDiagnostic: GV1PR08MB7329:EE_|DB5EUR03FT019:EE_|DB6PR0801MB2120:EE_ X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:10000;OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: 0nt3vRsz0pCNNLFi2D9egZVgy2iFyCAJpHWBrbIk8HQ5pDJzrnb9dHjefNJ11M7yJw2obddMF+Af1aO8UXJZIVTPq9b4j1qL3yxpYQpl2i2OzGzlWDqLR0enmvh0T+m8ByCQoobIx5/zRrDRwL8nvXOkt4s/IXXEYEuDFOaULBnRkHaNw36z2zU2foCclimp4bO0pg43CB9/jKuDOqaHOEPxJkSIU1CSyFB9+ctTc1m+p3aXHBnwSyi8AN979NfObT84nTwg+z1lqbtlD7vBFpiV2Fm4D5kI+cTD2xv+iIZucMllKrE1hOyjX1kcPln/hYwCWt8B6cZP8JH0BA8wvY2zebIGAOpNi/WCPaPt8JYTfgKcHm0Qai5p9KZ5C7tKCNYiIOxDjOvoLof8IpC4gSCmeDyVsSV49/MBduvF+zJoalaLjUmPhvT1Bx5wO03/o4t4uPg1Yx7Pe8ENmuoOfjG+UpI71kXPuQCQMfgrJlxxOOM97axcsS14EAJWzwDsShkSthhzI5yhTGvLUZsurUaxQSPY46Qh5WMaq08fcilQUDgf3Fi8627h66Ydtkj7MooxiZrbqTcAH2/ukxPIevWKPcwMAtTsScSwGhatRXm5Jk/iTGQ28VPpCN5Iz/HWt3NofSPX2vcm1FLFJ6jhtx5rkwepyZwn2rbr0GK+VSbbbXTevGAeeez0MpZ0tOA/W+lCt769e4hHGMWLecEVlw== X-Forefront-Antispam-Report-Untrusted: CIP:40.67.248.234;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:nebula.arm.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230001)(4636009)(46966006)(40470700004)(36840700001)(6666004)(86362001)(6916009)(2616005)(70586007)(7696005)(82310400004)(40460700003)(508600001)(36860700001)(5660300002)(54906003)(8676002)(47076005)(70206006)(8936002)(316002)(1076003)(44832011)(83380400001)(36756003)(26005)(426003)(356005)(4326008)(81166007)(336012)(186003)(2906002)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1PR08MB7329 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DB5EUR03FT019.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 64f74e5b-62cc-4639-a0af-08d9ebe00a6b X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +WOiw/IXLoRWNXd2jmX2fcrkJSPYZsCYee73sr3Hime/oQkHP+29BKFYygT10QGx534wWJzHdxJk9mMiux4ZowOqzMjtG2gFau1ClszqvxmvOsQa52TxqFzgRMyPXdrZtQl5lWtstVH9vqbWOXYSIgj8pLmeTO5xLzx4AkbVSVvNGp/xkmoReeBT++UxgvgrQde1Ay88JI35lw+7s2qPqKOJcTrVwdBbiMm8wYNSqB4rhJLIz3pCXtvPoWCoMK/QURlg4FbSVK60CB18nurUOEAf8ikB4F9CTRzQ8ZYZOc0aHmvUC0xuxpk8Hw7H/DXk7ab3aS+80YqwSvv6pWqZY55H28hTvYQd08/Ex5Q/sc6rO/WceYnU8/XgYC0IbOZQdl+Af3OVh+NWoRMiG4ByInoAT2OTKlKxJZZMqe7MMChckN6L8ZX8szFdKXHaW7rnKaYJmT2kw/msLal6JQn+a8xx+Jd1aMcWnxE5jhhGTUChAEZK9SZbglEohsCcf1DTZlG80/ycNipszWCtPeiYutYQNNcbj1jZzTB2Tk4G0KKu0VvKC/B/OSO132qmgphJGQEiZWo21QOJVNSRQQzIPuSrQLVNICHvANr7+ANIHxjMzRw/32w+CYF+evSTAmOopMVgrj18fikbcjge7Ty4JEea+C/uR3Kn2uVBXNoiAohPZrD2ZU75Mangs7UFtvHx X-Forefront-Antispam-Report: CIP:63.35.35.123;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:64aa7808-outbound-1.mta.getcheckrecipient.com;PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com;CAT:NONE;SFS:(13230001)(4636009)(40470700004)(36840700001)(46966006)(40460700003)(36756003)(2616005)(1076003)(186003)(6862004)(426003)(5660300002)(316002)(54906003)(336012)(4326008)(86362001)(47076005)(2906002)(70206006)(7696005)(6666004)(8936002)(44832011)(81166007)(8676002)(83380400001)(36860700001)(70586007)(508600001)(26005)(82310400004);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Feb 2022 15:23:05.3595 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8de4a09d-902f-4a1f-12d3-08d9ebe011d1 X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d;Ip=[63.35.35.123];Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: DB5EUR03FT019.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0801MB2120 Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org These can be used to place an MTE tag at an address that is not at a page size boundary. The kernel prior to 295cf156231c ("arm64: Avoid premature usercopy failure"), would infinite loop if an MTE tag was placed not at a PAGE_SIZE boundary. This is because the kernel checked if the pages were readable by checking the first byte of each page, but would then fault in the middle of the page due to the MTE tag. Signed-off-by: Joey Gouly Cc: Catalin Marinas Cc: Will Deacon Cc: Mark Brown Cc: Shuah Khan Reviewed-by: Mark Brown Tested-by: Mark Brown Reviewed-by: Shuah Khan Reviewed-by: Catalin Marinas --- .../selftests/arm64/mte/check_user_mem.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/tools/testing/selftests/arm64/mte/check_user_mem.c b/tools/testing/selftests/arm64/mte/check_user_mem.c index 1de7a0abd0ae..5a5a7e1f5789 100644 --- a/tools/testing/selftests/arm64/mte/check_user_mem.c +++ b/tools/testing/selftests/arm64/mte/check_user_mem.c @@ -19,7 +19,8 @@ static size_t page_sz; -static int check_usermem_access_fault(int mem_type, int mode, int mapping) +static int check_usermem_access_fault(int mem_type, int mode, int mapping, + int tag_offset, int tag_len) { int fd, i, err; char val = 'A'; @@ -54,10 +55,12 @@ static int check_usermem_access_fault(int mem_type, int mode, int mapping) if (i < len) goto usermem_acc_err; - /* Tag the next half of memory with different value */ - ptr_next = (void *)((unsigned long)ptr + page_sz); + if (!tag_len) + tag_len = len - tag_offset; + /* Tag a part of memory with different value */ + ptr_next = (void *)((unsigned long)ptr + tag_offset); ptr_next = mte_insert_new_tag(ptr_next); - mte_set_tag_address_range(ptr_next, page_sz); + mte_set_tag_address_range(ptr_next, tag_len); lseek(fd, 0, 0); /* Copy from file into buffer with invalid tag */ @@ -100,14 +103,14 @@ int main(int argc, char *argv[]) /* Set test plan */ ksft_set_plan(4); - evaluate_test(check_usermem_access_fault(USE_MMAP, MTE_SYNC_ERR, MAP_PRIVATE), + evaluate_test(check_usermem_access_fault(USE_MMAP, MTE_SYNC_ERR, MAP_PRIVATE, page_sz, 0), "Check memory access from kernel in sync mode, private mapping and mmap memory\n"); - evaluate_test(check_usermem_access_fault(USE_MMAP, MTE_SYNC_ERR, MAP_SHARED), + evaluate_test(check_usermem_access_fault(USE_MMAP, MTE_SYNC_ERR, MAP_SHARED, page_sz, 0), "Check memory access from kernel in sync mode, shared mapping and mmap memory\n"); - evaluate_test(check_usermem_access_fault(USE_MMAP, MTE_ASYNC_ERR, MAP_PRIVATE), + evaluate_test(check_usermem_access_fault(USE_MMAP, MTE_ASYNC_ERR, MAP_PRIVATE, page_sz, 0), "Check memory access from kernel in async mode, private mapping and mmap memory\n"); - evaluate_test(check_usermem_access_fault(USE_MMAP, MTE_ASYNC_ERR, MAP_SHARED), + evaluate_test(check_usermem_access_fault(USE_MMAP, MTE_ASYNC_ERR, MAP_SHARED, page_sz, 0), "Check memory access from kernel in async mode, shared mapping and mmap memory\n"); mte_restore_setup(); From patchwork Wed Feb 9 15:22:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joey Gouly X-Patchwork-Id: 12740367 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 64919C433F5 for ; Wed, 9 Feb 2022 15:23:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235743AbiBIPXB (ORCPT ); Wed, 9 Feb 2022 10:23:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40418 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232106AbiBIPXA (ORCPT ); Wed, 9 Feb 2022 10:23:00 -0500 Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-eopbgr140049.outbound.protection.outlook.com [40.107.14.49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3A7A3C05CB89 for ; Wed, 9 Feb 2022 07:23:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=TnQ2a7+r9tAcGqJnhjaZ6Xuq0tSBsq/+9bztvJcnbak=; b=eofYRzQ8pZPRoLcovHKuWmM43dwWP/YPRK3RigWkAq3Wk16ZnUwY0eK4/D85IVb+hrN6EnaMohmMY0908M8lYoadjK1n+O/VGuN2GIDMKvF3yrGnCRb4KFUKBPrDlqZSYwiTNlu9mgCkJ4BGETWb9WT7TSmhP6+e9tJRMgHO3CQ= Received: from AS9PR06CA0288.eurprd06.prod.outlook.com (2603:10a6:20b:45a::19) by VI1PR08MB5309.eurprd08.prod.outlook.com (2603:10a6:803:133::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.12; Wed, 9 Feb 2022 15:22:57 +0000 Received: from AM5EUR03FT041.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:45a:cafe::c7) by AS9PR06CA0288.outlook.office365.com (2603:10a6:20b:45a::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.14 via Frontend Transport; Wed, 9 Feb 2022 15:22:57 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by AM5EUR03FT041.mail.protection.outlook.com (10.152.17.186) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.12 via Frontend Transport; Wed, 9 Feb 2022 15:22:57 +0000 Received: ("Tessian outbound 2877e54fe176:v113"); Wed, 09 Feb 2022 15:22:56 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 75ed4d2460b9115f X-CR-MTA-TID: 64aa7808 Received: from e8c803774e21.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 2CF22B2F-50B4-4D32-9119-613B9F1D3A2B.1; Wed, 09 Feb 2022 15:22:50 +0000 Received: from EUR05-AM6-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id e8c803774e21.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Wed, 09 Feb 2022 15:22:50 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=C3nbLnrTuFifHqkNQp+8qMLhd67RK0C88qnvhvesaLDxaX4LD3TvmBm3rn8jCcFtfpu8FaUoXKaquvk0J7vtwH77dc8PAPIXp4H3aRExHXLUyNyMMKPNnSV4HnLaiM4gLJOu+YvfqDKwYvoxAp3K5pT0t4WERidiCZbaoyDWEAvUGBw+O54FzopBg+j6HeWBxWlqURx+lWXR8PmDmf3wKzKSMgE67jxtQxCpsAjGvtbJpANhmhvcAkUMSmnJ6pnbD4Da6AEzJJmV+l1F1q7nZFqFx8LZTIvXtQtJ+tIt3Hq0fuxBg06vwb8YBS7MO5/h2mU4bB5wZ8aAJIztchCv9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=TnQ2a7+r9tAcGqJnhjaZ6Xuq0tSBsq/+9bztvJcnbak=; b=RWcryQWprqEXhYYkdVja/S4RV7+5JxPgMQs2VjR/Gf1r2hYdrckCrE12Rb0ZzUF9RoBcqkQxJD4O6RAE9odlQWMepHwcau2wtsnN5kVjth5P/ShVbVZqamrs89/iHg2tyccm+OxTLfhwZ87Uuj6nRJ9ls6WxtHMAubEaAzaexJaCghf5qr9SfV8fs01uvYt8fOEqmcAxifmQuaI5mm2MAOsWHQznlFoLWjdN2whVnUMxcUUIauB0WfgJM/vuTU7/31JHF09Q6xvnk/xZN51/1PYwiv483Yh14xQPdyEk6VrCRs8VGjuFbV0PqYlNz3gmr1AAIzo/ewfERjnN/CgsTA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 40.67.248.234) smtp.rcpttodomain=lists.infradead.org smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=TnQ2a7+r9tAcGqJnhjaZ6Xuq0tSBsq/+9bztvJcnbak=; b=eofYRzQ8pZPRoLcovHKuWmM43dwWP/YPRK3RigWkAq3Wk16ZnUwY0eK4/D85IVb+hrN6EnaMohmMY0908M8lYoadjK1n+O/VGuN2GIDMKvF3yrGnCRb4KFUKBPrDlqZSYwiTNlu9mgCkJ4BGETWb9WT7TSmhP6+e9tJRMgHO3CQ= Received: from AS9PR05CA0032.eurprd05.prod.outlook.com (2603:10a6:20b:489::30) by VE1PR08MB5055.eurprd08.prod.outlook.com (2603:10a6:803:115::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.12; Wed, 9 Feb 2022 15:22:48 +0000 Received: from AM5EUR03FT014.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:489:cafe::25) by AS9PR05CA0032.outlook.office365.com (2603:10a6:20b:489::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.19 via Frontend Transport; Wed, 9 Feb 2022 15:22:47 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 40.67.248.234 as permitted sender) receiver=protection.outlook.com; client-ip=40.67.248.234; helo=nebula.arm.com; Received: from nebula.arm.com (40.67.248.234) by AM5EUR03FT014.mail.protection.outlook.com (10.152.16.130) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4951.12 via Frontend Transport; Wed, 9 Feb 2022 15:22:47 +0000 Received: from AZ-NEU-EX01.Emea.Arm.com (10.251.26.4) by AZ-NEU-EX03.Arm.com (10.251.24.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.2308.20; Wed, 9 Feb 2022 15:22:50 +0000 Received: from AZ-NEU-EX03.Arm.com (10.251.24.31) by AZ-NEU-EX01.Emea.Arm.com (10.251.26.4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.20; Wed, 9 Feb 2022 15:22:45 +0000 Received: from e124191.cambridge.arm.com (10.1.197.45) by mail.arm.com (10.251.24.31) with Microsoft SMTP Server id 15.1.2308.20 via Frontend Transport; Wed, 9 Feb 2022 15:22:49 +0000 From: Joey Gouly To: CC: , , , , , , , Subject: [PATCH v3 2/6] kselftest/arm64: mte: user_mem: rework error handling Date: Wed, 9 Feb 2022 15:22:36 +0000 Message-ID: <20220209152240.52788-3-joey.gouly@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220209152240.52788-1-joey.gouly@arm.com> References: <20220209152240.52788-1-joey.gouly@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-Correlation-Id: cbf42059-4bd7-46fd-5670-08d9ebe00d09 X-MS-TrafficTypeDiagnostic: VE1PR08MB5055:EE_|AM5EUR03FT041:EE_|VI1PR08MB5309:EE_ X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:7691;OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: r7GR9BleRN2DP3GHnld5guZfhnmjnyUx33yq7ljHD2pMc8MKKFCiHx8bdQzPs/6+xmeWwVE/FfAfN0nAK3iF2wgDM82/APa3d3nzlnt5sOQeZP8WJHW/+Ip1RIS3kGtFU6D8xyGfzXylZFCWToOHvFfjMdMrLyReKrwSv52uZ2H5SjXWC2EDNXt8B5Jf9IrmT6WunIB5DcRs0iTvbu1wCIhdxkzN6x1pa+V1ht9c7VO8hCan8SwaeJEsq2J8Hy2VZrSAVO0E0EZsKIPdgurMSUo4ujxDAMWNWlBy5LnWfIqZIowdXEFsQvt1sRMWYj352GbsrKO7lhQj9wqVKhGEMFurSCWPcKHIkyGqojWLsbI3zYzMsCQ/by1eHz3KSG2MG+BPq+fmPtF6aiabwj8KkRMx92edUoJh5aAikvxWuun21sv4sdXVjdUmdND/O/r6MTjOkrzVrYWFbkriH+rH8aPDJjh8FYmQ5azBQpBY9D/ngvp3MxqhARAouB2Xkzr0Cn8FtHP4olmY/VWtPQeedlwLxQCc+unlYnBQkVyS7HNUSVXLJN19lumhAW8nc5ZrymY8zxScn8lPLLWlyOYcN147nIl7P0NtOi4ZxBxqZSw8TJY4GL5x3bJlohHv0We/S/mP0iL5UPhljFeJGOz88cu5ExiguhMIdShHpGaOkbha5vhHPuJhwBzc9zLCHdAHfmvwuQRg9qRg/xPYvy5ibA== X-Forefront-Antispam-Report-Untrusted: CIP:40.67.248.234;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:nebula.arm.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230001)(4636009)(36840700001)(40470700004)(46966006)(1076003)(47076005)(356005)(81166007)(6666004)(70206006)(7696005)(83380400001)(70586007)(44832011)(5660300002)(2906002)(86362001)(316002)(4326008)(8936002)(336012)(508600001)(40460700003)(426003)(54906003)(26005)(186003)(82310400004)(36860700001)(6916009)(8676002)(2616005)(36756003)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR08MB5055 X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM5EUR03FT041.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 33631bb3-2ebc-485b-9d7f-08d9ebe00731 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wfsldFbK0EM8+WLoqZF4Hjz7PjSn6ajgTzSb9xX4NmAfFauqpAbtQ7UxiG7+raXtKpbff0OkqnJx/B3NdF65SPxRrdib7oZeyVCmrXwupW7Mk0Ouh0nt6Qz1eVf50rUFOqMggRt6S9ykbkRc0Bm4LnRaKgYYabWBvKcrTAAcC2OVKseJdp9HwKjmYPjx0TVtfcKd9ZNbvAsN4v51Oc2ra8StpuCJylH9iZN6rlJpKYrMDEpFre70CTPDgqs7JbA4VnmouveQyHsZxW2/Yd1HtmP+iBkIWMRjGBhG5f1svHGvebFtt+HJHl9oEdqckTI2of662xppNSNImV48eqhNsxB4nJ9l5cgYmBDPFS6P9w1Q/M/jmyvM/EaK+Le9KwmI6EkLmkTVup93Oeqkj88gSjXDMqJap2zv9ZRfHDUkwpkKMB0+LJmHtgtUMZJO1TU2fVJepGID8qhLf09fdE3rqhaeJ848OrEzXn5eNT5WCYgNisXKLuT9t3U2nzPZqErM8boeAEgXSxyjSccaCDNxfD31gUgBorBrHSAr7ycz8LOHw724Ug0uY7P941vIRo3xCHesOXPTTlkXlabhHGUhEBneuffYZfhKkzZfv7tORhm72Kmera9TuxCn6IQLXnKGVDf73p3jKAZ//xopfUjSF1YIhlsMt+hGZf7Gj7CfedoK5T2Y2B4dOKfm8OLhnu2y X-Forefront-Antispam-Report: CIP:63.35.35.123;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:64aa7808-outbound-1.mta.getcheckrecipient.com;PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com;CAT:NONE;SFS:(13230001)(4636009)(36840700001)(40470700004)(46966006)(1076003)(83380400001)(4326008)(44832011)(54906003)(36860700001)(336012)(70586007)(81166007)(316002)(426003)(26005)(86362001)(40460700003)(186003)(47076005)(2906002)(7696005)(6666004)(6862004)(8676002)(2616005)(8936002)(508600001)(36756003)(82310400004)(5660300002)(70206006);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Feb 2022 15:22:57.1365 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cbf42059-4bd7-46fd-5670-08d9ebe00d09 X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d;Ip=[63.35.35.123];Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: AM5EUR03FT041.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB5309 Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org 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 Cc: Catalin Marinas Cc: Will Deacon Cc: Mark Brown Cc: Shuah Khan Reviewed-by: Mark Brown Tested-by: Mark Brown Reviewed-by: Shuah Khan Reviewed-by: Catalin Marinas --- .../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; From patchwork Wed Feb 9 15:22:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joey Gouly X-Patchwork-Id: 12740370 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B6A6FC433F5 for ; Wed, 9 Feb 2022 15:23:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229949AbiBIPXR (ORCPT ); Wed, 9 Feb 2022 10:23:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41004 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235796AbiBIPXG (ORCPT ); Wed, 9 Feb 2022 10:23:06 -0500 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60086.outbound.protection.outlook.com [40.107.6.86]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1315FC05CB82 for ; Wed, 9 Feb 2022 07:23:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7zrFR/5yfryMYPJxbnasHVRAHNFbLp4MPEyNkzpxB0U=; b=3lyo/kg5MdO5OvqXUYJYOueq3dPsLYDmvEdrvllLkCFf84THD8Idc86djq78w3ql9L1LjvW5urrba82HeP4nyNmRWtZuMiq+sEpTUuEzi22etWS0q1tTSv1w7j1di1hlccZKPMZZpRMqp3FkgQ0IFZ/w4TmsTvFcPw4XF4h/CO4= Received: from DB6PR0301CA0044.eurprd03.prod.outlook.com (2603:10a6:4:54::12) by AM7PR08MB5336.eurprd08.prod.outlook.com (2603:10a6:20b:105::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.11; Wed, 9 Feb 2022 15:23:06 +0000 Received: from DB5EUR03FT050.eop-EUR03.prod.protection.outlook.com (2603:10a6:4:54:cafe::e) by DB6PR0301CA0044.outlook.office365.com (2603:10a6:4:54::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.11 via Frontend Transport; Wed, 9 Feb 2022 15:23:06 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by DB5EUR03FT050.mail.protection.outlook.com (10.152.21.128) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.12 via Frontend Transport; Wed, 9 Feb 2022 15:23:06 +0000 Received: ("Tessian outbound 741ca6c82739:v113"); Wed, 09 Feb 2022 15:23:06 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 3e56b5aebf36f51a X-CR-MTA-TID: 64aa7808 Received: from f8e88ca1b39e.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 4A2C5390-15E0-4B9E-8DA4-E09E9902D79D.1; Wed, 09 Feb 2022 15:22:59 +0000 Received: from EUR03-VE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id f8e88ca1b39e.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Wed, 09 Feb 2022 15:22:59 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kULLDDWYzFWET/+u64l+1EF6wq/s6gF9bYPVrC7QeEjoXsryiUyo50ei/QEHgQXnlYRrUzcw1+7pRYqlezFWgDNa0hiizQxPwUkuCFJM7BTyrAqCMxZmUxhkK/DYXtq8FyR4zGUN4T/M7Wnd4E+grXVP2QDPF/5EXtoX4krlpDX7kaE5JQ/eI3o+oNZOXCisZb01CKdm75Z9STRcOVIuaG4TIOPrF4HObZEWvozXCk0vLXA3E6otPmpABVCPC7ALr79rTEAuhUH4I5ej7vMBewYf2gcvx6yA78+JQAO99BZuPzjpK+Sx4D9RyrukftLn69XE+v4e3+YyvW94i4g+Hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=7zrFR/5yfryMYPJxbnasHVRAHNFbLp4MPEyNkzpxB0U=; b=lXedgpTgZ2WI7fok7vb/8pv9JsJbMa453ifpsOXE1VAYbhzfh+A08kC/CplaVlFUxzizD76ITj/Smu5teEdrCXptNVwV6tHZOBYntwARoDzmR/7D5iKyi9STH1uv/CyD9ixpqN4bvc4Q6qQU1V2HIHGJNShQHlhCCa0uAp8bv/wfDKrXGRDbvUR3/l0Q5seh/6Vuv/JiwkUR2UC3+wT3wcREwelYhqlCIeqgxFLbs3o5O8PZO59vsDP35y2FjJfPFdPIE8jHNfUZF0YcAtGzEvyV+J+QRwsrZotknBuzRgA3nNU02JvPqqtITMqUdFAD3v4HRCG6VJOBGgsYv7vODg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 40.67.248.234) smtp.rcpttodomain=lists.infradead.org smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7zrFR/5yfryMYPJxbnasHVRAHNFbLp4MPEyNkzpxB0U=; b=3lyo/kg5MdO5OvqXUYJYOueq3dPsLYDmvEdrvllLkCFf84THD8Idc86djq78w3ql9L1LjvW5urrba82HeP4nyNmRWtZuMiq+sEpTUuEzi22etWS0q1tTSv1w7j1di1hlccZKPMZZpRMqp3FkgQ0IFZ/w4TmsTvFcPw4XF4h/CO4= Received: from AM6PR02CA0019.eurprd02.prod.outlook.com (2603:10a6:20b:6e::32) by HE1PR08MB2923.eurprd08.prod.outlook.com (2603:10a6:7:2b::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.18; Wed, 9 Feb 2022 15:22:56 +0000 Received: from AM5EUR03FT015.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:6e:cafe::9b) by AM6PR02CA0019.outlook.office365.com (2603:10a6:20b:6e::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.19 via Frontend Transport; Wed, 9 Feb 2022 15:22:56 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 40.67.248.234 as permitted sender) receiver=protection.outlook.com; client-ip=40.67.248.234; helo=nebula.arm.com; Received: from nebula.arm.com (40.67.248.234) by AM5EUR03FT015.mail.protection.outlook.com (10.152.16.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4951.12 via Frontend Transport; Wed, 9 Feb 2022 15:22:56 +0000 Received: from AZ-NEU-EX03.Arm.com (10.251.24.31) by AZ-NEU-EX04.Arm.com (10.251.24.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Wed, 9 Feb 2022 15:22:50 +0000 Received: from e124191.cambridge.arm.com (10.1.197.45) by mail.arm.com (10.251.24.31) with Microsoft SMTP Server id 15.1.2308.20 via Frontend Transport; Wed, 9 Feb 2022 15:22:50 +0000 From: Joey Gouly To: CC: , , , , , , , Subject: [PATCH v3 3/6] kselftest/arm64: mte: user_mem: check different offsets and sizes Date: Wed, 9 Feb 2022 15:22:37 +0000 Message-ID: <20220209152240.52788-4-joey.gouly@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220209152240.52788-1-joey.gouly@arm.com> References: <20220209152240.52788-1-joey.gouly@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-Correlation-Id: fba8ddbc-37ee-4501-c37b-08d9ebe01277 X-MS-TrafficTypeDiagnostic: HE1PR08MB2923:EE_|DB5EUR03FT050:EE_|AM7PR08MB5336:EE_ X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:7691;OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: npbCxEm940+s0nO0Yy20R2gIFzzkgkmDWxhKvmeulZeADWS52IgTpYgSFFxfAo8zuoQFmyl0H1lbwPXY+YRMjjERkmDFpOYtgoUWHEjDcm8HqfdTx7clALB1OnaBEpG+77CaXWrGUiF55udpPNEwkfZDpTj++52LPEwLzHpmHVYIKrFqiyJLlZWtN1MooWXkerMg1CNvAEaLcF+F1GacgXbF8rZTDOfEwEMNXnQKPfgzDuDnMq4LMrxQCb2DmDy6c0I42bTRYzByi2ozrMM+MvyNsWPoQ+fySt/S5JoPf45BJ/Xds9gJ+pf0Eoq0u0hdnCWpSmHNiWNQz8gCjJMkHLFsAW4XLaptqKQAt8AIutzeNnwujFpc1u+2QK9URdODQjdWFLXYjjHCTsiva8TjgpY2+Ku1QlU7okAl0KVP9yLMs0fdZiub1ECDZ4qOSJIhhwutfEfqT2wDBYjV97cdnI2+ruUGNXZk2nR2ImLdKt+dwf/diEJ3m2k47o6dc2eSl9BXxoYE7m9WICDi0dPm0DEZdgFrX5jHxqgQz3Ti+sG7DkyygsD729AmytjGjTcvT9rhIS/4swGPqgn2SfrI1hnG9W4ZZPJYbO0zB4+njq6ZlsSrcALqI7fuGVKJTef6GDbG8mWkMVWoUBHLKU3+KYWAUXPqbYKGXc/fYmiRgpY0zPIj4wKKpvGdsLqwxU5zaTkubqB13Uk0L+dCLgJZNg== X-Forefront-Antispam-Report-Untrusted: CIP:40.67.248.234;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:nebula.arm.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230001)(4636009)(40470700004)(46966006)(36840700001)(36860700001)(26005)(4326008)(8936002)(8676002)(86362001)(1076003)(336012)(426003)(70206006)(70586007)(6916009)(82310400004)(54906003)(186003)(316002)(81166007)(7696005)(2906002)(6666004)(47076005)(356005)(2616005)(36756003)(40460700003)(83380400001)(44832011)(508600001)(5660300002)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR08MB2923 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DB5EUR03FT050.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 7d558006-94ad-406a-bc63-08d9ebe00c56 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: h20I9oZADYxINUNI/6c7tabyptat5CNGR+RtdNi+wvTL1VsMI4KdFVD8xvodxeLzLefHMUgPyA0hmntzrZJBbketA5avIssOPz/RdrHxXZlWwAXs9UIrJr7YyB5IxcUPqRJZc+Io7FHRaXNCgx/wUte4ffZW/K6nbKzRXZuO8lMV02Bhml4C3sFWOB4ZQaRPfYmgtB91qw5g2yok4yn88AFW1ns0jTeG060R7mW0vROrEA271GBD2eCxwA0P3GxB5PEzSEgh17IEA0yXGuh0r++aUMLObl2UvdGieme7MYiAyxxiD1Uq5V9rf1HhdpPSsu3TRY84PM/yiW0qzmrAV32M4zdT2CBGgI0eztbNG26qtfzeEaHmf6qINyyy1s2nIgc/Xc2mPRDkfcDWcvl6qC18Fy5Eh3HyPiXFmyXOAWkck5K24nBQ7/KR9cbvyPum4YBZkZ43KoSFjA7a1PIcZ1z2lHfdTff3+c7KYD35WqdS6sCmL2jGsYP0hR7KGVH5lrzMJq/Deqet+V6xEQ7F7eTwIqy8er7tKK4hAG3kZgWa/Px84hUiYPFlh12VQW80moHZ+gULB8KlRk0sOBEVdakrjSAov34O1KaAHkx0F+q+UuPZzLp534NLnvtektcJ/tT3N6tQVnzr/BhkdTWmXniRMoeez0lcgx2xRbgsTVV6dd/caZPqhSQm3AgwxKda X-Forefront-Antispam-Report: CIP:63.35.35.123;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:64aa7808-outbound-1.mta.getcheckrecipient.com;PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com;CAT:NONE;SFS:(13230001)(4636009)(40470700004)(36840700001)(46966006)(54906003)(8936002)(2616005)(36756003)(7696005)(36860700001)(47076005)(316002)(40460700003)(6666004)(508600001)(1076003)(8676002)(83380400001)(86362001)(426003)(336012)(82310400004)(70206006)(4326008)(6862004)(186003)(70586007)(26005)(44832011)(2906002)(81166007)(5660300002);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Feb 2022 15:23:06.4596 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fba8ddbc-37ee-4501-c37b-08d9ebe01277 X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d;Ip=[63.35.35.123];Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: DB5EUR03FT050.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR08MB5336 Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org To check there are no assumptions in the kernel about buffer sizes or alignments of user space pointers, expand the test to cover different sizes and offsets. Signed-off-by: Joey Gouly Cc: Catalin Marinas Cc: Will Deacon Cc: Mark Brown Cc: Shuah Khan Reviewed-by: Mark Brown Tested-by: Mark Brown Reviewed-by: Shuah Khan Reviewed-by: Catalin Marinas --- .../selftests/arm64/mte/check_user_mem.c | 45 +++++++++++-------- 1 file changed, 27 insertions(+), 18 deletions(-) diff --git a/tools/testing/selftests/arm64/mte/check_user_mem.c b/tools/testing/selftests/arm64/mte/check_user_mem.c index 2afcc9fb9ae8..89c861ee68fa 100644 --- a/tools/testing/selftests/arm64/mte/check_user_mem.c +++ b/tools/testing/selftests/arm64/mte/check_user_mem.c @@ -26,6 +26,8 @@ static int check_usermem_access_fault(int mem_type, int mode, int mapping, char val = 'A'; size_t len, read_len; void *ptr, *ptr_next; + int fileoff, ptroff, size; + int sizes[] = {1, 2, 3, 8, 16, 32, 4096, page_sz}; err = KSFT_PASS; len = 2 * page_sz; @@ -62,24 +64,31 @@ static int check_usermem_access_fault(int mem_type, int mode, int mapping, ptr_next = mte_insert_new_tag(ptr_next); mte_set_tag_address_range(ptr_next, tag_len); - lseek(fd, 0, 0); - /* Copy from file into buffer with invalid tag */ - read_len = read(fd, ptr, len); - mte_wait_after_trig(); - /* - * Accessing user memory in kernel with invalid tag should fail in sync - * mode without fault but may not fail in async mode as per the - * implemented MTE userspace support in Arm64 kernel. - */ - 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; + for (fileoff = 0; fileoff < 16; fileoff++) { + for (ptroff = 0; ptroff < 16; ptroff++) { + for (i = 0; i < ARRAY_SIZE(sizes); i++) { + size = sizes[i]; + lseek(fd, 0, 0); + /* Copy from file into buffer with invalid tag */ + read_len = read(fd, ptr + ptroff, size); + mte_wait_after_trig(); + /* + * Accessing user memory in kernel with invalid tag should fail in sync + * mode without fault but may not fail in async mode as per the + * implemented MTE userspace support in Arm64 kernel. + */ + 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 == size) { + /* test passed */ + } else { + goto usermem_acc_err; + } + } + } } goto exit; From patchwork Wed Feb 9 15:22:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joey Gouly X-Patchwork-Id: 12740371 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C4241C433EF for ; Wed, 9 Feb 2022 15:23:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233045AbiBIPXe (ORCPT ); Wed, 9 Feb 2022 10:23:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41366 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233738AbiBIPX1 (ORCPT ); Wed, 9 Feb 2022 10:23:27 -0500 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70059.outbound.protection.outlook.com [40.107.7.59]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8C8FEC05CB90 for ; Wed, 9 Feb 2022 07:23:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mk8UCdrCbfHrikHsK0eP/ECI2A9aeI8O1MImQnAZT2c=; b=sgaam0UTxXxWfEGrukZGN2qYudMkdhvbpPagnHIDx1h3KQLI6A848sLoZilDe5HES96TeOUzbPPnF8mi6OQlK8qtbwqpSfrwBRfSXi4yvrYB8eL5AJVSwpVHb2+AeQx+JSRillBwvIle7OHzFXg7oF2uF9OVsPdv9qH8a49Gfhc= Received: from AM5PR0601CA0076.eurprd06.prod.outlook.com (2603:10a6:206::41) by VI1PR08MB4336.eurprd08.prod.outlook.com (2603:10a6:803:fe::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.14; Wed, 9 Feb 2022 15:23:23 +0000 Received: from VE1EUR03FT062.eop-EUR03.prod.protection.outlook.com (2603:10a6:206:0:cafe::cf) by AM5PR0601CA0076.outlook.office365.com (2603:10a6:206::41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.11 via Frontend Transport; Wed, 9 Feb 2022 15:23:23 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by VE1EUR03FT062.mail.protection.outlook.com (10.152.18.252) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.12 via Frontend Transport; Wed, 9 Feb 2022 15:23:22 +0000 Received: ("Tessian outbound 741ca6c82739:v113"); Wed, 09 Feb 2022 15:23:22 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 12beb7a43d10e576 X-CR-MTA-TID: 64aa7808 Received: from f12f5f16e401.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 9F163494-A6BE-442E-97BD-2562E1D2019B.1; Wed, 09 Feb 2022 15:23:16 +0000 Received: from EUR04-VI1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id f12f5f16e401.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Wed, 09 Feb 2022 15:23:16 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bkNtA6agkJM4K0obZHZchmiRIowMFGKh8sYQSxSHmhLCHi058Wvl6CpAHFvszuIWt82BpAOyVQ0r9F9PnXLE9Jf0k1BYlSmuJLU6fXhzs9EwlKxeqHWuGlFiJ1YVx2psSKVrBpg/efKg47D9730ctYnizuJPtSGrh2CoI9TxO4cfUsM+ssgVheIwUM341C/cHe6QODMxcz3O3NEvN6nJlAKbW2p6pT8JvyhoZ0hMrvfXK1UwYodJHavVJDC6/aJ6/wklk79aPrYpVVblpSAj3WvndHs8vZIYLi8pkVc57oNhqP2xtnM/8j8XdgFY2kwZlYqYdKHEZ6rIU4hbFgKxVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=mk8UCdrCbfHrikHsK0eP/ECI2A9aeI8O1MImQnAZT2c=; b=bPASvwMi58DGrnVPlJJlZVmg8QDrRhjDKwVtEpPaKK7/w1ihoadvsgF/irsdicEX5wRitFjTgI2M5WUsY15XpKMxIauadenK/JNppSBbsiLYB3/egR0Ek3ULceX6rhxAMxfDIrsSWulqdzk/ySOnQF9OKd9XtPR6+3K1b8DknjuPjWtLPLBV408ypoqDpdC6FgudpNSrROvaEYFLu3DUrypkGta5eZ6PIRL3XmNgLlEHkGowLybdewuJdHTP0vTLM24HiwoqCUzxsnYF5sCLM6fxXQ7YzA5TfmRH7fFm7ytrPFNZ0McSupQWYVEb0tkvhUAWgt5rtyT6xtq+Z6kz3w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 40.67.248.234) smtp.rcpttodomain=lists.infradead.org smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mk8UCdrCbfHrikHsK0eP/ECI2A9aeI8O1MImQnAZT2c=; b=sgaam0UTxXxWfEGrukZGN2qYudMkdhvbpPagnHIDx1h3KQLI6A848sLoZilDe5HES96TeOUzbPPnF8mi6OQlK8qtbwqpSfrwBRfSXi4yvrYB8eL5AJVSwpVHb2+AeQx+JSRillBwvIle7OHzFXg7oF2uF9OVsPdv9qH8a49Gfhc= Received: from AM6P194CA0040.EURP194.PROD.OUTLOOK.COM (2603:10a6:209:84::17) by AS8PR08MB6679.eurprd08.prod.outlook.com (2603:10a6:20b:393::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.11; Wed, 9 Feb 2022 15:23:14 +0000 Received: from AM5EUR03FT022.eop-EUR03.prod.protection.outlook.com (2603:10a6:209:84:cafe::a) by AM6P194CA0040.outlook.office365.com (2603:10a6:209:84::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.11 via Frontend Transport; Wed, 9 Feb 2022 15:23:14 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 40.67.248.234 as permitted sender) receiver=protection.outlook.com; client-ip=40.67.248.234; helo=nebula.arm.com; Received: from nebula.arm.com (40.67.248.234) by AM5EUR03FT022.mail.protection.outlook.com (10.152.16.79) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4951.12 via Frontend Transport; Wed, 9 Feb 2022 15:23:14 +0000 Received: from AZ-NEU-EX01.Emea.Arm.com (10.251.26.4) by AZ-NEU-EX04.Arm.com (10.251.24.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.2308.20; Wed, 9 Feb 2022 15:22:50 +0000 Received: from AZ-NEU-EX03.Arm.com (10.251.24.31) by AZ-NEU-EX01.Emea.Arm.com (10.251.26.4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.20; Wed, 9 Feb 2022 15:22:46 +0000 Received: from e124191.cambridge.arm.com (10.1.197.45) by mail.arm.com (10.251.24.31) with Microsoft SMTP Server id 15.1.2308.20 via Frontend Transport; Wed, 9 Feb 2022 15:22:50 +0000 From: Joey Gouly To: CC: , , , , , , , Subject: [PATCH v3 4/6] kselftest/arm64: mte: user_mem: add test type enum Date: Wed, 9 Feb 2022 15:22:38 +0000 Message-ID: <20220209152240.52788-5-joey.gouly@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220209152240.52788-1-joey.gouly@arm.com> References: <20220209152240.52788-1-joey.gouly@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-Correlation-Id: a2b2c379-afc3-4b7c-37c1-08d9ebe01c4c X-MS-TrafficTypeDiagnostic: AS8PR08MB6679:EE_|VE1EUR03FT062:EE_|VI1PR08MB4336:EE_ X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:3044;OLM:3044; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: XByxhaBfo3gIfeLXZ/Zf74jNW1t/y+ITSY4yb6Y49DqypKxdd3i1ZtPYYglKalsXMhEiYXHcx0us7n4KY1M1rLIyofS071nqyYcaEt5/6Bbj3tMVcRcwvU0itgHEkHWdwEtDPK6YpLU9Xwo1T5GofIbaUXJNa0bmsHs7VFi8oO8N10ELb7IuCv4jJd1w1llTBWHrGWM05jASQA4VN+/0NHp7HE6Q0xzEP1XU4O4ckl5DXyRrq4qWODBEjp+IOTXCmW0oBgLCxjqihsJzTir884VRgMFV4rPENebRgLA4W4kJ73cQxwfcR/YPGkFPSgSl1VPgqrB77AUXyKjpP74HnEUdYq9z0jZ7LSRP6E7kmiFhhdsFUPFrT4mcNDiIuRaItmyQxDqjBL5jRuXRbgV+VoeHNiI/5oGEgx2YMyU6O6xEhYjokmzvr3mZ6ofL/uMz7HmAzyYQliV9tjvmaebB3xyVE2W8JgrWtW+DGNsN0Ra8Ujx8nA4hpoxc6Zj0W0+tFuffvOYKP+sPcWZDSf1jEspPSmvy7ClIb/wkzzQ7u3q1Q4QZIbbu3/hP+pCmA03AL12bJcidzxEQ+DBwSxJvBIpGBBLHJRFROA2YBiT8sxmW8tYgCvi+5drnNRsFWni8hno/v50CzkDGJ13ze1z/2GdQhiqJtT6sYqjOxdLkew0Ij4uxOe+FiM2/Css9+WKWBAu+JtFzZqrWPHhhYbXVxA== X-Forefront-Antispam-Report-Untrusted: CIP:40.67.248.234;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:nebula.arm.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230001)(4636009)(40470700004)(36840700001)(46966006)(356005)(36756003)(336012)(36860700001)(5660300002)(82310400004)(426003)(316002)(7696005)(508600001)(6666004)(83380400001)(86362001)(47076005)(186003)(26005)(40460700003)(8676002)(2616005)(8936002)(70206006)(44832011)(2906002)(70586007)(81166007)(54906003)(6916009)(4326008)(1076003)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6679 X-MS-Exchange-Transport-CrossTenantHeadersStripped: VE1EUR03FT062.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: c1c813a8-800a-4036-bb4d-08d9ebe01707 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7xmf3gTGjuH3zgkLrfO65nKVAUcVNNS2a5p6LhrgzUHIV3xcLCCYS/Dn+gdZ0YWII9HzT6F3LNb4ScOUBx4SRfeQ9OQpNYo39D4J7xlc6JIzW0UgqyXxMtJLL4C7K4b9RMuDhLq06aqQbuc7W/KkIjJyvr7DV7G75hDnYy4wLaLOc2pQt+xIoPc9I2SsWlMK8eSKRMPslfw550v7dzFAWMhbQYXeSY6jk4ARFurcRFh8tnR0gImIDJDrVETXUg9l/xTYeZHfBpupoDeZu772SO3+DUgTofn2uMptF2UGu3iqLV8vq/oPPkwTInXcaHre6tZD6vmkZzoJUZVqYCtlEEU22dNNneyTS1zh5UqRih8Yhbv1uk/Y6A52v0vAJ3AWC6X8VKL5jkf8Edii3fYtdBXSGNtzSV2NvZWyLvO74ZRqxpIX5cGzGmZmanyrnqal8Ni0rFtnmd93XBSw+KyqF6ZS9cObbEzAcoBv+E65XjaG9TI16YZJJBeeILkqEMxoOsrhn2SnMa+YDi92xAg2PMGrTlB1G34cbMBemPKkVDqnHdt53qX0h6oa4SNNIIv5Zl1qmTe/7tTT7+wRm59NgeGNJ/FUS4ZsXpjkZLQYfv17kASJo4GcxvXPTEYbaKN3KKMXpN0M1WEZbd/+01BkzfnW0KakgW0yTQYPDGxDhqs= X-Forefront-Antispam-Report: CIP:63.35.35.123;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:64aa7808-outbound-1.mta.getcheckrecipient.com;PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com;CAT:NONE;SFS:(13230001)(4636009)(46966006)(40470700004)(36840700001)(6666004)(86362001)(2616005)(70586007)(7696005)(82310400004)(40460700003)(508600001)(36860700001)(5660300002)(54906003)(8676002)(47076005)(70206006)(6862004)(8936002)(316002)(1076003)(44832011)(83380400001)(36756003)(26005)(426003)(4326008)(81166007)(336012)(186003)(2906002);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Feb 2022 15:23:22.8526 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a2b2c379-afc3-4b7c-37c1-08d9ebe01c4c X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d;Ip=[63.35.35.123];Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR03FT062.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB4336 Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org The test is currently hardcoded to use the `read` syscall, this commit adds a test_type enum to support expanding the test coverage to other syscalls. Signed-off-by: Joey Gouly Cc: Catalin Marinas Cc: Will Deacon Cc: Mark Brown Cc: Shuah Khan Reviewed-by: Mark Brown Tested-by: Mark Brown Reviewed-by: Shuah Khan Reviewed-by: Catalin Marinas --- .../selftests/arm64/mte/check_user_mem.c | 38 +++++++++++++------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/tools/testing/selftests/arm64/mte/check_user_mem.c b/tools/testing/selftests/arm64/mte/check_user_mem.c index 89c861ee68fa..58b1b272ca80 100644 --- a/tools/testing/selftests/arm64/mte/check_user_mem.c +++ b/tools/testing/selftests/arm64/mte/check_user_mem.c @@ -19,12 +19,18 @@ static size_t page_sz; +enum test_type { + READ_TEST, + LAST_TEST, +}; + static int check_usermem_access_fault(int mem_type, int mode, int mapping, - int tag_offset, int tag_len) + int tag_offset, int tag_len, + enum test_type test_type) { int fd, i, err; char val = 'A'; - size_t len, read_len; + ssize_t len, syscall_len; void *ptr, *ptr_next; int fileoff, ptroff, size; int sizes[] = {1, 2, 3, 8, 16, 32, 4096, page_sz}; @@ -46,9 +52,9 @@ static int check_usermem_access_fault(int mem_type, int mode, int mapping, } mte_initialize_current_context(mode, (uintptr_t)ptr, len); /* Copy from file into buffer with valid tag */ - read_len = read(fd, ptr, len); + syscall_len = read(fd, ptr, len); mte_wait_after_trig(); - if (cur_mte_cxt.fault_valid || read_len < len) + if (cur_mte_cxt.fault_valid || syscall_len < len) goto usermem_acc_err; /* Verify same pattern is read */ for (i = 0; i < len; i++) @@ -69,8 +75,16 @@ static int check_usermem_access_fault(int mem_type, int mode, int mapping, for (i = 0; i < ARRAY_SIZE(sizes); i++) { size = sizes[i]; lseek(fd, 0, 0); - /* Copy from file into buffer with invalid tag */ - read_len = read(fd, ptr + ptroff, size); + + /* perform file operation on buffer with invalid tag */ + switch (test_type) { + case READ_TEST: + syscall_len = read(fd, ptr + ptroff, size); + break; + case LAST_TEST: + goto usermem_acc_err; + } + mte_wait_after_trig(); /* * Accessing user memory in kernel with invalid tag should fail in sync @@ -80,9 +94,9 @@ static int check_usermem_access_fault(int mem_type, int mode, int mapping, if (cur_mte_cxt.fault_valid) { goto usermem_acc_err; } - if (mode == MTE_SYNC_ERR && read_len < len) { + if (mode == MTE_SYNC_ERR && syscall_len < len) { /* test passed */ - } else if (mode == MTE_ASYNC_ERR && read_len == size) { + } else if (mode == MTE_ASYNC_ERR && syscall_len == size) { /* test passed */ } else { goto usermem_acc_err; @@ -120,14 +134,14 @@ int main(int argc, char *argv[]) /* Set test plan */ ksft_set_plan(4); - evaluate_test(check_usermem_access_fault(USE_MMAP, MTE_SYNC_ERR, MAP_PRIVATE, page_sz, 0), + evaluate_test(check_usermem_access_fault(USE_MMAP, MTE_SYNC_ERR, MAP_PRIVATE, page_sz, 0, READ_TEST), "Check memory access from kernel in sync mode, private mapping and mmap memory\n"); - evaluate_test(check_usermem_access_fault(USE_MMAP, MTE_SYNC_ERR, MAP_SHARED, page_sz, 0), + evaluate_test(check_usermem_access_fault(USE_MMAP, MTE_SYNC_ERR, MAP_SHARED, page_sz, 0, READ_TEST), "Check memory access from kernel in sync mode, shared mapping and mmap memory\n"); - evaluate_test(check_usermem_access_fault(USE_MMAP, MTE_ASYNC_ERR, MAP_PRIVATE, page_sz, 0), + evaluate_test(check_usermem_access_fault(USE_MMAP, MTE_ASYNC_ERR, MAP_PRIVATE, page_sz, 0, READ_TEST), "Check memory access from kernel in async mode, private mapping and mmap memory\n"); - evaluate_test(check_usermem_access_fault(USE_MMAP, MTE_ASYNC_ERR, MAP_SHARED, page_sz, 0), + evaluate_test(check_usermem_access_fault(USE_MMAP, MTE_ASYNC_ERR, MAP_SHARED, page_sz, 0, READ_TEST), "Check memory access from kernel in async mode, shared mapping and mmap memory\n"); mte_restore_setup(); From patchwork Wed Feb 9 15:22:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joey Gouly X-Patchwork-Id: 12740372 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DAA9EC433F5 for ; Wed, 9 Feb 2022 15:23:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233641AbiBIPXg (ORCPT ); Wed, 9 Feb 2022 10:23:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41538 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235111AbiBIPXf (ORCPT ); Wed, 9 Feb 2022 10:23:35 -0500 Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30055.outbound.protection.outlook.com [40.107.3.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4814FC061355 for ; Wed, 9 Feb 2022 07:23:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vBWkP3xTDqEI9nZFAGoaqV6fBxjZyDpGtlpDd0o4wHg=; b=rJuu4RIa7MnnraHG6gJzRLPMmNfl2Ad3QTXW8cZiikWbousyWghwHRAcXjK7e4GprlBcH1oA4Z6nYWEm69D4QM8XuqqpzP8Vnqar+G7wZtOXReGh1ofRsan2tcIOHGSSEMSgH8xHt0F56pnWETyjjaRGQZ/nK29tSJ602iJZJ14= Received: from AS9PR06CA0217.eurprd06.prod.outlook.com (2603:10a6:20b:45e::17) by DB7PR08MB3900.eurprd08.prod.outlook.com (2603:10a6:10:33::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.17; Wed, 9 Feb 2022 15:23:23 +0000 Received: from VE1EUR03FT007.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:45e:cafe::24) by AS9PR06CA0217.outlook.office365.com (2603:10a6:20b:45e::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.14 via Frontend Transport; Wed, 9 Feb 2022 15:23:23 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by VE1EUR03FT007.mail.protection.outlook.com (10.152.18.114) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.12 via Frontend Transport; Wed, 9 Feb 2022 15:23:22 +0000 Received: ("Tessian outbound 63bb5eb69ee8:v113"); Wed, 09 Feb 2022 15:23:22 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 797637f393daa84b X-CR-MTA-TID: 64aa7808 Received: from 75e4919ea095.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id A75D58E6-37C5-4AEC-ADFA-5EF4F6699137.1; Wed, 09 Feb 2022 15:23:15 +0000 Received: from EUR01-DB5-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 75e4919ea095.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Wed, 09 Feb 2022 15:23:15 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j9NQ6gm+yEc0d7UI8fdaiothQiRlvwanVPtl5vDHcvdOE/XAiCf/r1KbwCwH+jSBVmbLpJ1l75TWHfHq8dt0ovahqt3CCGlWcQKx7hEpF4z99I2xsoyKEufwS3p7Ffrlaqb3Rso7Ri/2aVZpggVN0ln3URMgyApAhSxUWnzT0gXiYQvIp8ST9h7fk9RIOBtDp9oLSFi+Dg6yqw3pOhJEiW2yug63DRLGM9+GEnNGSRgBQIwhQAgOVJwYb9Dy4EYbPkrypI0w7oMhja5mZtbQHxW1xyEcnyiBgdEs9i1/DqkNjjoe/wFAYMI7uHfQc0awUBGYiaE+rdWXl4UfudkISQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=vBWkP3xTDqEI9nZFAGoaqV6fBxjZyDpGtlpDd0o4wHg=; b=KH/5VEqNn+O1TV/fVK1wH87LfUO++JmueX588e5pTcndEAvhrP2Nzad7C/dc6FRPrGd7GoMdOBV7oJ+XPhGpzIgGqMxb6WABhaXftC1GjbMDrwfA1E8FRRGHnKO1vEl9/bgQfqn196kTZ/YQZls0tJitDOtHcxl6Ey1OYG0/xUmscNudfTcAj94wR35TV9nqxC4PEU3R1lUq7H5GCFfOE7ZdqIIERQ9ARfTggtLAX5lX0WturguRqs/NGYTtSw5BnTaYzzkLEO0anQtsXga0hT+UkuAmUe/omkXPnnP3lXBWTzl0MHDCB8SSpwzTk3rE6taXAPnIjvr4Rp0+hlVopQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 40.67.248.234) smtp.rcpttodomain=lists.infradead.org smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vBWkP3xTDqEI9nZFAGoaqV6fBxjZyDpGtlpDd0o4wHg=; b=rJuu4RIa7MnnraHG6gJzRLPMmNfl2Ad3QTXW8cZiikWbousyWghwHRAcXjK7e4GprlBcH1oA4Z6nYWEm69D4QM8XuqqpzP8Vnqar+G7wZtOXReGh1ofRsan2tcIOHGSSEMSgH8xHt0F56pnWETyjjaRGQZ/nK29tSJ602iJZJ14= Received: from AM6P194CA0038.EURP194.PROD.OUTLOOK.COM (2603:10a6:209:84::15) by DB9PR08MB7219.eurprd08.prod.outlook.com (2603:10a6:10:2be::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.12; Wed, 9 Feb 2022 15:23:13 +0000 Received: from AM5EUR03FT022.eop-EUR03.prod.protection.outlook.com (2603:10a6:209:84:cafe::bd) by AM6P194CA0038.outlook.office365.com (2603:10a6:209:84::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.12 via Frontend Transport; Wed, 9 Feb 2022 15:23:13 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 40.67.248.234 as permitted sender) receiver=protection.outlook.com; client-ip=40.67.248.234; helo=nebula.arm.com; Received: from nebula.arm.com (40.67.248.234) by AM5EUR03FT022.mail.protection.outlook.com (10.152.16.79) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4951.12 via Frontend Transport; Wed, 9 Feb 2022 15:23:13 +0000 Received: from AZ-NEU-EX03.Arm.com (10.251.24.31) by AZ-NEU-EX04.Arm.com (10.251.24.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Wed, 9 Feb 2022 15:22:50 +0000 Received: from e124191.cambridge.arm.com (10.1.197.45) by mail.arm.com (10.251.24.31) with Microsoft SMTP Server id 15.1.2308.20 via Frontend Transport; Wed, 9 Feb 2022 15:22:50 +0000 From: Joey Gouly To: CC: , , , , , , , Subject: [PATCH v3 5/6] kselftest/arm64: mte: user_mem: add more test types Date: Wed, 9 Feb 2022 15:22:39 +0000 Message-ID: <20220209152240.52788-6-joey.gouly@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220209152240.52788-1-joey.gouly@arm.com> References: <20220209152240.52788-1-joey.gouly@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-Correlation-Id: 009f7dc9-85bb-4396-9f6d-08d9ebe01c3f X-MS-TrafficTypeDiagnostic: DB9PR08MB7219:EE_|VE1EUR03FT007:EE_|DB7PR08MB3900:EE_ X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:3044;OLM:3044; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: mEJayZ/8YA66+sLfsjUZOCL649PGRprNRJ8fMzYIYkonVSqiyGu9yzFUqtwwMXCsVETqljsZ1Q0SZqMdC+YRoMOFJA4EDo02incDFjNT0jZlhjYTa9QKeCoD6rR0/pWcPx/T0+f8u3uv6dccd9ut0QrXkIF1jmd4HAyrZrKddBOXQ6hSfyPs+M5VXvPr6NmTPoLf7zNVZR0K0yaOlQRno2xNhvIpHaQxbmKc9gJ5XMUvDuvcdTxetwm09VUHhsfWlqS+oRRFIO6U4mslixTPLYU4KnulSb8WHv5cYD5IME/MG/G93wIOTNAfM4R6sFxQzXRBmG/zX7jtxeq7Rm8iGKS3NiQLrcyAHUxLMckE6nzHFj5SAIU9nGsKSdZxxTfpOpw4to+YodSF+sDe37cRi26VOiuwO/cqb/XIYWfcBwugTqpDdXvTcnqDyWenD81JP8XvbppIvIfjbVtL8BMg2lhL+6HFrZ4qv+8EgS9NMqwWjoC57C/HXLs6zhIG2vFYOCP2x0JhF//f/kwnI4VsJvVaGksOTipiNdv8dcI2VPUp4fQ4N8b9LsXCnh7tInTJzHWhk2X7JiPN3ISugVVYrQNPIDs3pRMpklcdCoKlx7BGKVxgvWV5MBe9KDmP9dASKfmpjBIhowauhDP7IpLaO9FOINwMKHPWvms9ki7U18LixdAa3GUXz11DaTQDhhCTWO+O6TFNPrNLwKYKoE9pjA== X-Forefront-Antispam-Report-Untrusted: CIP:40.67.248.234;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:nebula.arm.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230001)(4636009)(36840700001)(46966006)(40470700004)(2616005)(356005)(36756003)(40460700003)(508600001)(8936002)(4326008)(70586007)(5660300002)(83380400001)(1076003)(47076005)(26005)(8676002)(81166007)(36860700001)(6916009)(44832011)(70206006)(186003)(82310400004)(426003)(336012)(7696005)(86362001)(316002)(54906003)(2906002)(6666004)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR08MB7219 X-MS-Exchange-Transport-CrossTenantHeadersStripped: VE1EUR03FT007.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: a838568f-9ebb-4d85-aaa4-08d9ebe016d5 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eugQsCy4WfWWU0rVCW3WmG7snQFAnVGEinTOjZ9UC5vpF6EvfG7k4KGygzTXAkcfj0CXzpBGUzxIP9kfYAne8NoDRnb+XieFS2HltrCqPV1ZkzJ75mU6rHt7rNl8KpCWZc0nOACwn0YdHa2lQ2+eEhB543JV2OuBhbb9L6+EeX0iO5cIlMqXldXzMEx6dXuaFNzJoVlJI5QOWXp/VIzsBeGs4ogOVo7fZDQsinG7feGwrsbC2EtkuyaiVvYReGTcg6Aes8zl4wmY77Uvu1DHJPTjnCxWGokjwFfMStXE8yM5LKs6uPN+9Y03tBxZynRwb2Y7MNXa+DLmB/NKn5tUn1Rm/1wI18mVym/azsCEjRUcuxYJAnpkDi2QUiLtbLwe7hjSw9QGWRSXCQ/b0S69CO5d6vFtf0cYT0xXrJ9FPtHNihkBq/W2jJ50ewfCMgyeFlk4WdcjgJbZj002d1mXVIKf8ZnzRk9H+3Zs+m7zeKp584m9JxS2qv16TYAsB3SJCgeMWEe72wVhmbRXKxn84p2+7H53y78yfx3L8oVaggyPiH7YLhWV4tDkAnqW+HtEfqDDNelWLumkxcwJzj4ytdMHikytE/INMAEm4RiixIKrjsqSepF/wWZSwBN71b0LIermUCUIae1pl46cTCI3xId5WaWTrmPPl1JTq46t53E= X-Forefront-Antispam-Report: CIP:63.35.35.123;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:64aa7808-outbound-1.mta.getcheckrecipient.com;PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com;CAT:NONE;SFS:(13230001)(4636009)(36840700001)(40470700004)(46966006)(1076003)(47076005)(81166007)(6666004)(70206006)(7696005)(83380400001)(70586007)(44832011)(5660300002)(2906002)(86362001)(316002)(4326008)(6862004)(8936002)(336012)(508600001)(40460700003)(426003)(54906003)(26005)(186003)(82310400004)(36860700001)(8676002)(2616005)(36756003);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Feb 2022 15:23:22.7641 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 009f7dc9-85bb-4396-9f6d-08d9ebe01c3f X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d;Ip=[63.35.35.123];Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR03FT007.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR08MB3900 Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org To expand the test coverage for MTE tags in userspace memory, also perform the test with `write`, `readv` and `writev` syscalls. Signed-off-by: Joey Gouly Cc: Catalin Marinas Cc: Will Deacon Cc: Mark Brown Cc: Shuah Khan Reviewed-by: Mark Brown Tested-by: Mark Brown Reviewed-by: Shuah Khan Reviewed-by: Catalin Marinas --- .../selftests/arm64/mte/check_user_mem.c | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/tools/testing/selftests/arm64/mte/check_user_mem.c b/tools/testing/selftests/arm64/mte/check_user_mem.c index 58b1b272ca80..bb4974c437f8 100644 --- a/tools/testing/selftests/arm64/mte/check_user_mem.c +++ b/tools/testing/selftests/arm64/mte/check_user_mem.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include "kselftest.h" @@ -21,6 +22,9 @@ static size_t page_sz; enum test_type { READ_TEST, + WRITE_TEST, + READV_TEST, + WRITEV_TEST, LAST_TEST, }; @@ -81,6 +85,23 @@ static int check_usermem_access_fault(int mem_type, int mode, int mapping, case READ_TEST: syscall_len = read(fd, ptr + ptroff, size); break; + case WRITE_TEST: + syscall_len = write(fd, ptr + ptroff, size); + break; + case READV_TEST: { + struct iovec iov[1]; + iov[0].iov_base = ptr + ptroff; + iov[0].iov_len = size; + syscall_len = readv(fd, iov, 1); + break; + } + case WRITEV_TEST: { + struct iovec iov[1]; + iov[0].iov_base = ptr + ptroff; + iov[0].iov_len = size; + syscall_len = writev(fd, iov, 1); + break; + } case LAST_TEST: goto usermem_acc_err; } From patchwork Wed Feb 9 15:22:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joey Gouly X-Patchwork-Id: 12740369 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B2881C4332F for ; Wed, 9 Feb 2022 15:23:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231447AbiBIPXR (ORCPT ); Wed, 9 Feb 2022 10:23:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41248 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235322AbiBIPXQ (ORCPT ); Wed, 9 Feb 2022 10:23:16 -0500 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2065.outbound.protection.outlook.com [40.107.20.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 454ACC05CB8F for ; Wed, 9 Feb 2022 07:23:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+rFtWJxLVhYuLjiP61fT9Jzk8/FSoAfCPlO+An3ySwc=; b=vnujyJ6NJQ5Qi3moFlGJhZ84M4+kihDSDQW9zihgGWEj3EJr6E8c+246KGKg7mhAEmYdFycDANHlcwhbTh9whdWRJe6RnvUIdzB6cqB+9wOfO+eY51JKl+X8zIHADqqcWHtLMjus04h6nGCyGrhZYgJdUSMyTjZHH13rGewz8Wg= Received: from AM6P193CA0053.EURP193.PROD.OUTLOOK.COM (2603:10a6:209:8e::30) by AM6PR08MB4103.eurprd08.prod.outlook.com (2603:10a6:20b:a4::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.12; Wed, 9 Feb 2022 15:22:59 +0000 Received: from AM5EUR03FT046.eop-EUR03.prod.protection.outlook.com (2603:10a6:209:8e:cafe::9b) by AM6P193CA0053.outlook.office365.com (2603:10a6:209:8e::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.12 via Frontend Transport; Wed, 9 Feb 2022 15:22:59 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by AM5EUR03FT046.mail.protection.outlook.com (10.152.16.164) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.12 via Frontend Transport; Wed, 9 Feb 2022 15:22:59 +0000 Received: ("Tessian outbound 63bb5eb69ee8:v113"); Wed, 09 Feb 2022 15:22:59 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 7e58cded069838b5 X-CR-MTA-TID: 64aa7808 Received: from 7e25753eca15.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 5769496F-6A58-4D61-87E7-9BDDC57C399A.1; Wed, 09 Feb 2022 15:22:53 +0000 Received: from EUR04-HE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 7e25753eca15.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Wed, 09 Feb 2022 15:22:53 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YJhX0R608cIjVEXRGVgRQfciptyOmVAtvffvu5Ls5qc7/+KmCFFqqyG3IZIp0Dp+F6YAWZLeXLTRraO5FaryDFNjZpj6ZN2fGcqzlZxe5Yn3FXBzn9yFTQ9JUqsYRFfw50qHoHl4bd9Z9+Tdqr4RYN5zogvOufqMXaf7kudgo0Jys3ysPupktv7E6QGPBxwCOiEwq987hvl/GY3onfhZByiqaOXnM7lHtK9Y7uN5N4WONW9f/8dM7TF5BEetLW4AtxqeGFhe9OMRMhJi5+pRyLdRgcAPCQwQVQnXrdZSJ4vjwwPl5MXsUwDxTHuinE2xj20i2I6G1BT4C/Fycwkw8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=+rFtWJxLVhYuLjiP61fT9Jzk8/FSoAfCPlO+An3ySwc=; b=bfEisWYGFCGIMeqBiXlUKIBUj+D28smsy3Cbb2bf68QYGzKLNwpwdpJ+Cc+spiRrqbwfnqATCi35TTolG3qPb5pSqczqbIvg1UOFjKXLUGrp8XA33aa858X/0AbSM9LE09dkDlOj7B1bEoI9jLTbk/0cqSJxmrdUB3Ha2ysQ/whWlzG/pCWTIRWeb7BeynWtuxKoKvpVbchK4v8ffc3vvk1SomLa7sz4hMvb1o8/HytELQ5jg3KJbNSyg9/RGUh8d+tfRC705D0pL/I9+9EnAg35kBzBuLVr5xpoyzoWl5LkSygJR38fYGK9EkEoQXr1EB61qr1Oe+f3+Yn0JwPUXw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 40.67.248.234) smtp.rcpttodomain=lists.infradead.org smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+rFtWJxLVhYuLjiP61fT9Jzk8/FSoAfCPlO+An3ySwc=; b=vnujyJ6NJQ5Qi3moFlGJhZ84M4+kihDSDQW9zihgGWEj3EJr6E8c+246KGKg7mhAEmYdFycDANHlcwhbTh9whdWRJe6RnvUIdzB6cqB+9wOfO+eY51JKl+X8zIHADqqcWHtLMjus04h6nGCyGrhZYgJdUSMyTjZHH13rGewz8Wg= Received: from AS9PR05CA0045.eurprd05.prod.outlook.com (2603:10a6:20b:489::11) by PR3PR08MB5609.eurprd08.prod.outlook.com (2603:10a6:102:81::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.17; Wed, 9 Feb 2022 15:22:51 +0000 Received: from AM5EUR03FT014.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:489:cafe::65) by AS9PR05CA0045.outlook.office365.com (2603:10a6:20b:489::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.11 via Frontend Transport; Wed, 9 Feb 2022 15:22:51 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 40.67.248.234 as permitted sender) receiver=protection.outlook.com; client-ip=40.67.248.234; helo=nebula.arm.com; Received: from nebula.arm.com (40.67.248.234) by AM5EUR03FT014.mail.protection.outlook.com (10.152.16.130) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4951.12 via Frontend Transport; Wed, 9 Feb 2022 15:22:50 +0000 Received: from AZ-NEU-EX01.Emea.Arm.com (10.251.26.4) by AZ-NEU-EX03.Arm.com (10.251.24.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.2308.20; Wed, 9 Feb 2022 15:22:51 +0000 Received: from AZ-NEU-EX03.Arm.com (10.251.24.31) by AZ-NEU-EX01.Emea.Arm.com (10.251.26.4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.20; Wed, 9 Feb 2022 15:22:46 +0000 Received: from e124191.cambridge.arm.com (10.1.197.45) by mail.arm.com (10.251.24.31) with Microsoft SMTP Server id 15.1.2308.20 via Frontend Transport; Wed, 9 Feb 2022 15:22:51 +0000 From: Joey Gouly To: CC: , , , , , , , Subject: [PATCH v3 6/6] kselftest/arm64: mte: user_mem: test a wider range of values Date: Wed, 9 Feb 2022 15:22:40 +0000 Message-ID: <20220209152240.52788-7-joey.gouly@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220209152240.52788-1-joey.gouly@arm.com> References: <20220209152240.52788-1-joey.gouly@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-Correlation-Id: b1bc5bbe-b623-43b0-7b43-08d9ebe00e30 X-MS-TrafficTypeDiagnostic: PR3PR08MB5609:EE_|AM5EUR03FT046:EE_|AM6PR08MB4103:EE_ X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:989;OLM:989; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: FKd1cpuMxDz4udbUMdzQYeZYFfpAun7ycxLdWXBUSiHLDw62nJ1eGuPZNB4i2Zb/xRXoCeRs5ayNmywMtRcrDQpZmQ9EcWcR+u6B2NXJ5IyFDvKeoy5PxSDLBJ+qVdDdzx6SK4OedJawzp/AshHERq2aNSaqN5Ml4nu2KHIiSm/1aNl/tuz9bahwzqjVPtYhrYchU4ZxRIt5L+wxEBXkBLUu6NS0UmVojtwfzODF6n4MVyPyPJWT6eYyBGpdhYXfi7WPjZhGMMEouvC2QGHc0uEP/G8/fxf2rQCBn0DxWv5O9b/rvc+VybJgTqoF0ia0pSBLmiWv1eW/BcAVWfrL9R/hMLDUptjxcOzjRQL1OKZMNskyUUedBLRfFaU18TVfIAmgMxceNyiYxjPJsR2Y2mKXjsXhzca/zNlretP9cWxnQz7AvkanzJ/cjQ90Oc0R1WcRIhvC7eqXRiFw3Ybu7W860aAgx6/Bn3tY4yK4IpNHIbvwt+1HGLZKe33xC9Jw0LFxGlkYeXwZaAi4JZZW1WtgmQnecZslCXqIm7HL0k4AtgkEUncYhU+TE4Soh2wC0VkB7oDItN6kiUX+fx/v0CNozv5wxA7eVwHfEgHLHoTOepyhmIXNdNUMYJRAd6rffu9AEyfFOHUjN+DBQj+q6RBVbHFBbAv0EC3vFvwfy0H9xklcD1Rly28EQLWm1dRgfwj5wDOOtP1NCNFEbiyD7Q== X-Forefront-Antispam-Report-Untrusted: CIP:40.67.248.234;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:nebula.arm.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230001)(4636009)(46966006)(40470700004)(36840700001)(47076005)(5660300002)(4326008)(44832011)(508600001)(2616005)(356005)(81166007)(1076003)(26005)(8676002)(8936002)(54906003)(40460700003)(70206006)(70586007)(36756003)(2906002)(7696005)(6666004)(36860700001)(82310400004)(6916009)(316002)(186003)(83380400001)(86362001)(336012)(426003)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR08MB5609 X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM5EUR03FT046.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: f3b3c1a2-c09d-49ae-2df6-08d9ebe00913 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lzEfOXtDSxwLEGSS6C2IAvANBvA5UzkQToSj0ZTGum9fdQO7SqHca/pRi6k6FkRQpwiyLAUrRtBayKwOUuxQCuE/4PQvcN9/qEuNPZTdM9gYR39ptR9Y8eEWxynU3d4KSfDFPkeYwEok7Xu9l3jnezts/ZKgmkMD//YpT0IJs77u/TdBrU0DucB2N97D/vVpgeLGM3gddzlUyKK0zMhGbOeotcUZx50SFP839mlSA2Y86arGkLxJ+NSIF7nah3r1L0+sZFPeI28Lned+eTsSgqVB7LiGFk9kVs5X4XrUMGiwKyQ31NQmbyrwf4P+7zqbV/ra0US1Nr/LJcQjYKygyXzwWRS5WHITMwRTeCA6QRbthOXo5Clm1XFMCkXCPDUgVLFPXCpSWa5N8Un2qwTouX/8aRvzuvc24BtUs7h5SbPsekY6E921bedqDebHJOvRDVl7IbWCatCjFUwWzrHKLmGoY8Cf/W8etGzquG2K0/RaTADIROpjJwJKvaSHHNzSU1CWQbn1ty9aTqiySFVLuvD+cMGs8zXb7Wzp/PVPxuk/Duo+3E2JydILvqIArccbqcRC1ZnduKPH0dnqS8672VfzOi2oJdsSR785J8/dQ0mnkwcrUOzZQYLzSzsgrs24TQrPHXHt+wIdlxP2kiqcmHvnIRmMWLhYmxT7/smLIRQMe3jpAgNalcymrka/ROso X-Forefront-Antispam-Report: CIP:63.35.35.123;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:64aa7808-outbound-1.mta.getcheckrecipient.com;PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com;CAT:NONE;SFS:(13230001)(4636009)(46966006)(36840700001)(40470700004)(70206006)(70586007)(426003)(1076003)(6862004)(26005)(44832011)(336012)(4326008)(83380400001)(186003)(8676002)(5660300002)(86362001)(81166007)(47076005)(54906003)(40460700003)(36756003)(8936002)(2906002)(2616005)(316002)(7696005)(6666004)(508600001)(82310400004)(36860700001);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Feb 2022 15:22:59.2114 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b1bc5bbe-b623-43b0-7b43-08d9ebe00e30 X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d;Ip=[63.35.35.123];Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: AM5EUR03FT046.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB4103 Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org Instead of hard coding a small amount of tests, generate a wider range of tests to try catch any corner cases that could show up. These new tests test different MTE tag lengths and offsets, which previously would have caused infinite loops in the kernel. This was fixed by 295cf156231c ("arm64: Avoid premature usercopy failure"), so these are regressions tests for that corner case. Signed-off-by: Joey Gouly Cc: Catalin Marinas Cc: Will Deacon Cc: Mark Brown Cc: Shuah Khan Reviewed-by: Mark Brown Tested-by: Mark Brown Reviewed-by: Shuah Khan Reviewed-by: Catalin Marinas --- .../selftests/arm64/mte/check_user_mem.c | 94 ++++++++++++++++--- 1 file changed, 83 insertions(+), 11 deletions(-) diff --git a/tools/testing/selftests/arm64/mte/check_user_mem.c b/tools/testing/selftests/arm64/mte/check_user_mem.c index bb4974c437f8..f4ae5f87a3b7 100644 --- a/tools/testing/selftests/arm64/mte/check_user_mem.c +++ b/tools/testing/selftests/arm64/mte/check_user_mem.c @@ -3,6 +3,7 @@ #define _GNU_SOURCE +#include #include #include #include @@ -20,6 +21,8 @@ static size_t page_sz; +#define TEST_NAME_MAX 100 + enum test_type { READ_TEST, WRITE_TEST, @@ -136,9 +139,67 @@ static int check_usermem_access_fault(int mem_type, int mode, int mapping, return err; } +void format_test_name(char* name, int name_len, int type, int sync, int map, int len, int offset) { + const char* test_type; + const char* mte_type; + const char* map_type; + + switch (type) { + case READ_TEST: + test_type = "read"; + break; + case WRITE_TEST: + test_type = "write"; + break; + case READV_TEST: + test_type = "readv"; + break; + case WRITEV_TEST: + test_type = "writev"; + break; + default: + assert(0); + break; + } + + switch (sync) { + case MTE_SYNC_ERR: + mte_type = "MTE_SYNC_ERR"; + break; + case MTE_ASYNC_ERR: + mte_type = "MTE_ASYNC_ERR"; + break; + default: + assert(0); + break; + } + + switch (map) { + case MAP_SHARED: + map_type = "MAP_SHARED"; + break; + case MAP_PRIVATE: + map_type = "MAP_PRIVATE"; + break; + default: + assert(0); + break; + } + + snprintf(name, name_len, + "test type: %s, %s, %s, tag len: %d, tag offset: %d\n", + test_type, mte_type, map_type, len, offset); +} + int main(int argc, char *argv[]) { int err; + int t, s, m, l, o; + int mte_sync[] = {MTE_SYNC_ERR, MTE_ASYNC_ERR}; + int maps[] = {MAP_SHARED, MAP_PRIVATE}; + int tag_lens[] = {0, MT_GRANULE_SIZE}; + int tag_offsets[] = {page_sz, MT_GRANULE_SIZE}; + char test_name[TEST_NAME_MAX]; page_sz = getpagesize(); if (!page_sz) { @@ -153,17 +214,28 @@ int main(int argc, char *argv[]) mte_register_signal(SIGSEGV, mte_default_handler); /* Set test plan */ - ksft_set_plan(4); - - evaluate_test(check_usermem_access_fault(USE_MMAP, MTE_SYNC_ERR, MAP_PRIVATE, page_sz, 0, READ_TEST), - "Check memory access from kernel in sync mode, private mapping and mmap memory\n"); - evaluate_test(check_usermem_access_fault(USE_MMAP, MTE_SYNC_ERR, MAP_SHARED, page_sz, 0, READ_TEST), - "Check memory access from kernel in sync mode, shared mapping and mmap memory\n"); - - evaluate_test(check_usermem_access_fault(USE_MMAP, MTE_ASYNC_ERR, MAP_PRIVATE, page_sz, 0, READ_TEST), - "Check memory access from kernel in async mode, private mapping and mmap memory\n"); - evaluate_test(check_usermem_access_fault(USE_MMAP, MTE_ASYNC_ERR, MAP_SHARED, page_sz, 0, READ_TEST), - "Check memory access from kernel in async mode, shared mapping and mmap memory\n"); + ksft_set_plan(64); + + for (t = 0; t < LAST_TEST; t++) { + for (s = 0; s < ARRAY_SIZE(mte_sync); s++) { + for (m = 0; m < ARRAY_SIZE(maps); m++) { + for (l = 0; l < ARRAY_SIZE(tag_lens); l++) { + for (o = 0; o < ARRAY_SIZE(tag_offsets); o++) { + int sync = mte_sync[s]; + int map = maps[m]; + int offset = tag_offsets[o]; + int tag_len = tag_lens[l]; + int res = check_usermem_access_fault(USE_MMAP, sync, + map, offset, + tag_len, t); + format_test_name(test_name, TEST_NAME_MAX, + t, sync, map, tag_len, offset); + evaluate_test(res, test_name); + } + } + } + } + } mte_restore_setup(); ksft_print_cnts();