From mboxrd@z Thu Jan 1 00:00:00 1970 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DC8D2C4332F for ; Fri, 4 Feb 2022 16:00:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:From: References:Cc:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=EGTZpLHu/g6DLlCQx9PWAaKU6ahUZELV1UMGGHGDt9A=; b=oSVOq2pmjCUkruJjnUiSC2FEg4 Gqh/GPgmSYQcEZfbk8UaBRBLNJ46r/y4tGLzUsNByuKQFc8qpl7dgwC6BEZDyNs8vzmxxXal3+uTy DnHZaRjp06d4vFkrNlERzgk0dTK88jdUARkAIK+cUCxIKRYJvNNTvizpBIybwlnnXDcJBeDMJjqbu jKNASXqa0i3bGSs/1jwV16P3tvw0gA1ihgJfWgWQPPDFo7rVpR+20ghqjmZWbC2aC3X/pWWq5Gdm4 hMpb+vDInU+9Sw/ryMla7ujTqpFO8yR9eRn/GtHPISjHjEn5VwPhaMRt3R8dKKKw9T7qH7HlIZf8B cpFoyxzA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nG0zO-004rHq-88; Fri, 04 Feb 2022 15:59:10 +0000 Received: from mail-io1-xd2d.google.com ([2607:f8b0:4864:20::d2d]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nG0zK-004rGX-FJ for linux-arm-kernel@lists.infradead.org; Fri, 04 Feb 2022 15:59:08 +0000 Received: by mail-io1-xd2d.google.com with SMTP id q204so7867548iod.8 for ; Fri, 04 Feb 2022 07:59:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=GAdWs3CIH3A9w1RP2arJKKIFdEsFjNbiduHOesSU++E=; b=X3R73zsdECp1fGY8fjL6QODZ6UYj/b72bASmmgjgBxL7KxoaSFsWLcsBUdQh7lfg8W wi3knVC/KOsAJFqlQfERlRy8fNix//H62LGKXhOmViTAT7cLywtRo8wGEVWEI38VExPC IDPdxTpbWxM2J3JD/QqHmpHO7PhR5l87hL+9c= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=GAdWs3CIH3A9w1RP2arJKKIFdEsFjNbiduHOesSU++E=; b=Q7b85SN/HmnKgVTLpwkKfuYHIeBAq/OqAVLwNK6TQ5SB/AzkKvEa5ckjDNE3iRsyUY rFp66XZDm0lb80RdlAvMWp/zJ8ZVNcwGpKXa1KTpXCmZapAbQdbt1EPD6mF8ia/ta5Mm DyKCR7sLaPfroNMY9f7WJQ4oFZQupBxxmbRI8xCnUhT1LzY5thJvHXEkjCPkEtwHxSv5 w6zCCkuu4fDg6jYsbOYbDjsTkyYvtT/Rwq78T/RdjRKcLyTcqEgDGWed/o1v7KZcfyZm edAqDOfBlwzNFJRw7kUwowQnEwSbFSETvHuFplELI/aEXtYjLJF179vhfFYUfe79rMPT KIrA== X-Gm-Message-State: AOAM530sC3wNiaoq8QIR5sYYDN9SrfLFC3++ravkSyknf57kgduBsg2Q o8nGKNuGRdd+7mb4/YwO0zdnwg== X-Google-Smtp-Source: ABdhPJxiLCC/WGfwmdp4pzMA7lBqLbFDam13eweBSHsIfkIyIT673l6XSAwbYmFfWAVTuO+eCuRKjQ== X-Received: by 2002:a5d:89c9:: with SMTP id a9mr1456914iot.210.1643990344429; Fri, 04 Feb 2022 07:59:04 -0800 (PST) Received: from [192.168.1.128] ([71.205.29.0]) by smtp.gmail.com with ESMTPSA id r9sm1049824iov.26.2022.02.04.07.59.03 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 04 Feb 2022 07:59:04 -0800 (PST) Subject: Re: [PATCH v2 4/6] kselftest/arm64: mte: user_mem: add test type enum To: Joey Gouly , linux-arm-kernel@lists.infradead.org Cc: nd@arm.com, broonie@kernel.org, catalin.marinas@arm.com, shuah@kernel.org, will@kernel.org, Shuah Khan References: <20220203143620.30629-1-joey.gouly@arm.com> <20220203143620.30629-5-joey.gouly@arm.com> From: Shuah Khan Message-ID: <4303f271-83ef-4181-4e62-49b0535d5abf@linuxfoundation.org> Date: Fri, 4 Feb 2022 08:59:03 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.1 MIME-Version: 1.0 In-Reply-To: <20220203143620.30629-5-joey.gouly@arm.com> Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220204_075906_555877_05A0343E X-CRM114-Status: GOOD ( 24.97 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 2/3/22 7:36 AM, Joey Gouly wrote: > This enum will be used to parameterise the test to perform other syscalls > than 'read'. > More information here. > Signed-off-by: Joey Gouly > Cc: Catalin Marinas > Cc: Will Deacon > Cc: Mark Brown > Cc: Shuah Khan > --- > .../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 35061ae23ed5..6d4aeb14027b 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) { > err = KSFT_FAIL; > goto usermem_acc_err; > } > @@ -73,8 +79,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 > @@ -85,9 +99,9 @@ static int check_usermem_access_fault(int mem_type, int mode, int mapping, > err = KSFT_FAIL; > 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 { > err = KSFT_FAIL; > @@ -121,14 +135,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(); > The rest looks good With the above requested changes - Reviewed-by: Shuah Khan thanks, -- Shuah _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel