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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3765DC4345F for ; Wed, 17 Apr 2024 06:43:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 795876B0087; Wed, 17 Apr 2024 02:43:09 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 745146B0088; Wed, 17 Apr 2024 02:43:09 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 60DC86B0089; Wed, 17 Apr 2024 02:43:09 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 3CE916B0087 for ; Wed, 17 Apr 2024 02:43:09 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id EF61CA1DAE for ; Wed, 17 Apr 2024 06:43:08 +0000 (UTC) X-FDA: 82018081656.26.0E074AE Received: from madrid.collaboradmins.com (madrid.collaboradmins.com [46.235.227.194]) by imf30.hostedemail.com (Postfix) with ESMTP id 097AC80013 for ; Wed, 17 Apr 2024 06:43:06 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=collabora.com header.s=mail header.b=1BF+XyV3; dmarc=pass (policy=quarantine) header.from=collabora.com; spf=pass (imf30.hostedemail.com: domain of usama.anjum@collabora.com designates 46.235.227.194 as permitted sender) smtp.mailfrom=usama.anjum@collabora.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1713336187; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=RQr0tCMoPLKAyAf4gCoNHM3YcKgZLtsdx143j+RfiIE=; b=Bv/GQfnLWLA//3V0pmubxNGVGYldN6p/vMbPtxncZ3KO8wacmv/HhpJsfTA+wd1Rw+zOes XSVLd+XFO3CqdU47jS8510S9Ypg3u4KLTZ7xgSChA/edW/rckDvPrJBhBoRKWUbgJ4JApj b7nQJFidJymDj1OekCYpXf5G1n6jvzM= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=collabora.com header.s=mail header.b=1BF+XyV3; dmarc=pass (policy=quarantine) header.from=collabora.com; spf=pass (imf30.hostedemail.com: domain of usama.anjum@collabora.com designates 46.235.227.194 as permitted sender) smtp.mailfrom=usama.anjum@collabora.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1713336187; a=rsa-sha256; cv=none; b=Ou+9yBvWvJ2KKB0QmiBNdyhvjnIWadi3EpqFEoesSQR3kVXtULOzEmXNhFTccJercH/DGj PsQR0cKSbCijOavrgQHqq6ZeRlPUWIHb4sl8PXXQtTckCllfUbhSxpVNKYZmhBaZZwCgid TbsWaSK5Jpio+DjXTTi2zy4k9URpU8s= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1713336185; bh=R9EcQvz7lRn7yAuBHYxMfMgThZMjoqQJi8nMidHqEWU=; h=Date:Cc:Subject:To:References:From:In-Reply-To:From; b=1BF+XyV3xxnrRaX0tM4cBcbKk+Pi/4WQMwjrzyqyId06jPKXF4hgVTfbrv0nZHLzO CCWqOmRziOqYi032mN6iQBPMamI9rM09vQduI55MIetS8tUSdWXIOHv5CYwyJiawEn uddC7IB9RToTlCu9kkbPiRchNDZtdzvHh1H6dEVEZzsQlIALkNkPAMeoIOeIdvHX5B aWjqq1FJNusEkTBnC5uM0BbxlJxRq0GzPdxIdTsr7/OuyoHEGWzHYFFzeBgC+8YcAZ HQkh4RfDxubqoP8U85uPtiUghHvST001WWziZM4b2tLIHkRIcnRHkuhS83gqK0rEGe 1xizopOWhLKbA== Received: from [10.193.1.1] (broslavsky.collaboradmins.com [68.183.210.73]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: usama.anjum) by madrid.collaboradmins.com (Postfix) with ESMTPSA id D142237814B0; Wed, 17 Apr 2024 06:42:57 +0000 (UTC) Message-ID: Date: Wed, 17 Apr 2024 11:43:28 +0500 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Cc: Muhammad Usama Anjum , jeffxu@google.com, jorgelo@chromium.org, groeck@chromium.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-mm@kvack.org, jannh@google.com, sroettger@google.com, pedro.falcato@gmail.com, dave.hansen@intel.com, linux-hardening@vger.kernel.org, willy@infradead.org, gregkh@linuxfoundation.org, torvalds@linux-foundation.org, deraadt@openbsd.org, corbet@lwn.net, Liam.Howlett@oracle.com, surenb@google.com, merimus@google.com, rdunlap@infradead.org Subject: Re: [PATCH 1/1] selftest mm/mseal: style change To: jeffxu@chromium.org, akpm@linux-foundation.org, keescook@chromium.org References: <20240416220944.2481203-1-jeffxu@chromium.org> <20240416220944.2481203-2-jeffxu@chromium.org> Content-Language: en-US From: Muhammad Usama Anjum In-Reply-To: <20240416220944.2481203-2-jeffxu@chromium.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspam-User: X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 097AC80013 X-Stat-Signature: 7hpbsih3oauf47rnfqnuead8n48dqdes X-HE-Tag: 1713336186-226037 X-HE-Meta: U2FsdGVkX1+ErzV1XtfwM3nO8NBXz8hepY1bhasn8O3RCiTtiowiU5lrpRwkihwOYQYij1cIaJ9ZD6PkLHluCZj9++wfoZW2s+ekaGmtUJzbIPH6KXi/ZrFTYRCj4uwncECCeIXjV++xKbhzDsVhn781qr9gQ3pXLSVJsRpY51oy/SSAexC29O1T9Y1+OBmEi+S2w7DMPchdDgsGIb7/nai6wKlDZkGsF9FEoCBJKsC+QcUKhROaPrBlWuFeq3cz1cuTOLq7A3bOXX5BMGey4ZxxVHbbkkaqvrTzRmG0BzFXXNfccA5IKKh1ylNh9cFZ9gogMfjl9LYzzo/Z6Sc6ZRoMBrIOPzzwbt5b8LMB6IEwvGEwYvAEWfX00vKFMZWlavQJ+s1HaIP8KDEw02+Mv8lvAB+meV+TXR7lPo5f0tW4/7Wzq38JabGwXePQvqmy9zL5Jlm8owpjhWAXOeRg74kMphfwqK1kquZhTaWG9c5+0HfqiIi7piLJGDbrRc7dtyUaPSysH5kUUIXN4asF6K3EJlutm6gMumU3WjmkHfXNV7/7HUQOh6meCcSBtljIwVdoiEnXUkvFhHA4zNIKyGKfqDrMf82dpNwzYoNa97tG+kKBuyAZ5e/GjdaN/LJreH32sVlfZGjjLV3Y4fGMhnP6qExMPYRpPHheJOpwdXgpmJd5gnpnnu3YR0PijCv8J1aFAS9Y7Uwr8or6Kj2d2egtnUXJlmHmubabrb3tvRQYO0VhDYLt80xG7GN3OtrEHH2pe4oSOWw6MYSI8amV3Zkh3Wta0nhwQfxsIzybvz5wkiyI2xthNg/qpochs2jrfWM35E3gxUfGaPWUSxHURy/egdATUIh5uGQm+jeAS3RWVwsUlosCddt1nb183ik6WllxmOc2qhvJ8aWEv4z0XzXl7LSx1pAgbKJthLAhyPPGmWW3KPkE+fVbvovi+5hNuQNpQY+1iF7+SccJjCE dP+234ld e1tmdYDplgZ6p9g64ZTiNOPaUp8PhQ2a1sORNtTtDlG5CFK8chLvNpvYCFVka26DfqIH+LMzu9FDwbHsY5dmnp2KRfFDS9uzPwDcj88S2H+c2L2vbLMTkQ1+B3brN/sJ6mNXm1y1mHUc3L0Abg2UDmgpQVmej4GwRhv3Vt3FpkvKAtyCHFaIU0h0G864qU6RH2w+4uyOkEsnlaxrWYMQRYBFFlBKY6tSpjKe3PYg3y3AcVOpYBP9luDAmsLjJWqg8gDnddLU0hJTOwVs73uCDNCcsqx0QCclv/LnOg5ZlHNiIr2yYgBAvxQb+0phyduThvhvgha5TBa3zan2B2F2IxcbcyzzpIsSRELOdKKPso7es0ckyjCnmSGV8ravFAfBoSvKtHtPf2cxBwJcLH/076gOGrTFvOZUkt2p8D1Q4O4UZmyNQhiiXAucaIg== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On 4/17/24 3:09 AM, jeffxu@chromium.org wrote: > From: Jeff Xu > > remove "assert" from testcase. > remove "return 0" Thanks > > Signed-off-by: Jeff Xu > Suggested-by: Muhammad Usama Anjum Reviewed-by: Muhammad Usama Anjum > --- > tools/testing/selftests/mm/mseal_test.c | 124 +++++++++++++++++------- > tools/testing/selftests/mm/seal_elf.c | 3 - > 2 files changed, 91 insertions(+), 36 deletions(-) > > diff --git a/tools/testing/selftests/mm/mseal_test.c b/tools/testing/selftests/mm/mseal_test.c > index 06c780d1d8e5..4a326334726d 100644 > --- a/tools/testing/selftests/mm/mseal_test.c > +++ b/tools/testing/selftests/mm/mseal_test.c > @@ -12,9 +12,7 @@ > #include > #include > #include > -#include > #include > -#include > #include > #include > #include > @@ -189,7 +187,6 @@ static void __write_pkey_reg(u64 pkey_reg) > > asm volatile(".byte 0x0f,0x01,0xef\n\t" > : : "a" (eax), "c" (ecx), "d" (edx)); > - assert(pkey_reg == __read_pkey_reg()); > #endif > } > > @@ -214,7 +211,6 @@ static void set_pkey(int pkey, unsigned long pkey_value) > unsigned long mask = (PKEY_DISABLE_ACCESS | PKEY_DISABLE_WRITE); > u64 new_pkey_reg; > > - assert(!(pkey_value & ~mask)); > new_pkey_reg = set_pkey_bits(__read_pkey_reg(), pkey, pkey_value); > __write_pkey_reg(new_pkey_reg); > } > @@ -224,7 +220,6 @@ static void setup_single_address(int size, void **ptrOut) > void *ptr; > > ptr = sys_mmap(NULL, size, PROT_READ, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0); > - assert(ptr != (void *)-1); > *ptrOut = ptr; > } > > @@ -234,24 +229,21 @@ static void setup_single_address_rw(int size, void **ptrOut) > unsigned long mapflags = MAP_ANONYMOUS | MAP_PRIVATE; > > ptr = sys_mmap(NULL, size, PROT_READ | PROT_WRITE, mapflags, -1, 0); > - assert(ptr != (void *)-1); > *ptrOut = ptr; > } > > -static void clean_single_address(void *ptr, int size) > +static int clean_single_address(void *ptr, int size) > { > int ret; > - > ret = munmap(ptr, size); > - assert(!ret); > + return ret; > } > > -static void seal_single_address(void *ptr, int size) > +static int seal_single_address(void *ptr, int size) > { > int ret; > - > ret = sys_mseal(ptr, size); > - assert(!ret); > + return ret; > } > > bool seal_support(void) > @@ -290,6 +282,7 @@ static void test_seal_addseal(void) > unsigned long size = 4 * page_size; > > setup_single_address(size, &ptr); > + FAIL_TEST_IF_FALSE(ptr != (void *)-1); > > ret = sys_mseal(ptr, size); > FAIL_TEST_IF_FALSE(!ret); > @@ -305,6 +298,7 @@ static void test_seal_unmapped_start(void) > unsigned long size = 4 * page_size; > > setup_single_address(size, &ptr); > + FAIL_TEST_IF_FALSE(ptr != (void *)-1); > > /* munmap 2 pages from ptr. */ > ret = sys_munmap(ptr, 2 * page_size); > @@ -332,6 +326,7 @@ static void test_seal_unmapped_middle(void) > unsigned long size = 4 * page_size; > > setup_single_address(size, &ptr); > + FAIL_TEST_IF_FALSE(ptr != (void *)-1); > > /* munmap 2 pages from ptr + page. */ > ret = sys_munmap(ptr + page_size, 2 * page_size); > @@ -363,6 +358,7 @@ static void test_seal_unmapped_end(void) > unsigned long size = 4 * page_size; > > setup_single_address(size, &ptr); > + FAIL_TEST_IF_FALSE(ptr != (void *)-1); > > /* unmap last 2 pages. */ > ret = sys_munmap(ptr + 2 * page_size, 2 * page_size); > @@ -391,6 +387,7 @@ static void test_seal_multiple_vmas(void) > unsigned long size = 4 * page_size; > > setup_single_address(size, &ptr); > + FAIL_TEST_IF_FALSE(ptr != (void *)-1); > > /* use mprotect to split the vma into 3. */ > ret = sys_mprotect(ptr + page_size, 2 * page_size, > @@ -421,6 +418,7 @@ static void test_seal_split_start(void) > unsigned long size = 4 * page_size; > > setup_single_address(size, &ptr); > + FAIL_TEST_IF_FALSE(ptr != (void *)-1); > > /* use mprotect to split at middle */ > ret = sys_mprotect(ptr, 2 * page_size, PROT_READ | PROT_WRITE); > @@ -445,6 +443,7 @@ static void test_seal_split_end(void) > unsigned long size = 4 * page_size; > > setup_single_address(size, &ptr); > + FAIL_TEST_IF_FALSE(ptr != (void *)-1); > > /* use mprotect to split at middle */ > ret = sys_mprotect(ptr, 2 * page_size, PROT_READ | PROT_WRITE); > @@ -469,7 +468,9 @@ static void test_seal_invalid_input(void) > int ret; > > setup_single_address(8 * page_size, &ptr); > - clean_single_address(ptr + 4 * page_size, 4 * page_size); > + FAIL_TEST_IF_FALSE(ptr != (void *)-1); > + ret = clean_single_address(ptr + 4 * page_size, 4 * page_size); > + FAIL_TEST_IF_FALSE(!ret); > > /* invalid flag */ > ret = syscall(__NR_mseal, ptr, size, 0x20); > @@ -502,6 +503,7 @@ static void test_seal_zero_length(void) > int ret; > > setup_single_address(size, &ptr); > + FAIL_TEST_IF_FALSE(ptr != (void *)-1); > > ret = sys_mprotect(ptr, 0, PROT_READ | PROT_WRITE); > FAIL_TEST_IF_FALSE(!ret); > @@ -551,6 +553,7 @@ static void test_seal_twice(void) > unsigned long size = 4 * page_size; > > setup_single_address(size, &ptr); > + FAIL_TEST_IF_FALSE(ptr != (void *)-1); > > ret = sys_mseal(ptr, size); > FAIL_TEST_IF_FALSE(!ret); > @@ -570,9 +573,12 @@ static void test_seal_mprotect(bool seal) > int ret; > > setup_single_address(size, &ptr); > + FAIL_TEST_IF_FALSE(ptr != (void *)-1); > > - if (seal) > - seal_single_address(ptr, size); > + if (seal) { > + ret = seal_single_address(ptr, size); > + FAIL_TEST_IF_FALSE(!ret); > + } > > ret = sys_mprotect(ptr, size, PROT_READ | PROT_WRITE); > if (seal) > @@ -591,9 +597,12 @@ static void test_seal_start_mprotect(bool seal) > int ret; > > setup_single_address(size, &ptr); > + FAIL_TEST_IF_FALSE(ptr != (void *)-1); > > - if (seal) > - seal_single_address(ptr, page_size); > + if (seal) { > + ret = seal_single_address(ptr, page_size); > + FAIL_TEST_IF_FALSE(!ret); > + } > > /* the first page is sealed. */ > ret = sys_mprotect(ptr, page_size, PROT_READ | PROT_WRITE); > @@ -618,9 +627,12 @@ static void test_seal_end_mprotect(bool seal) > int ret; > > setup_single_address(size, &ptr); > + FAIL_TEST_IF_FALSE(ptr != (void *)-1); > > - if (seal) > - seal_single_address(ptr + page_size, 3 * page_size); > + if (seal) { > + ret = seal_single_address(ptr + page_size, 3 * page_size); > + FAIL_TEST_IF_FALSE(!ret); > + } > > /* first page is not sealed */ > ret = sys_mprotect(ptr, page_size, PROT_READ | PROT_WRITE); > @@ -645,9 +657,12 @@ static void test_seal_mprotect_unalign_len(bool seal) > int ret; > > setup_single_address(size, &ptr); > + FAIL_TEST_IF_FALSE(ptr != (void *)-1); > > - if (seal) > - seal_single_address(ptr, page_size * 2 - 1); > + if (seal) { > + ret = seal_single_address(ptr, page_size * 2 - 1); > + FAIL_TEST_IF_FALSE(!ret); > + } > > /* 2 pages are sealed. */ > ret = sys_mprotect(ptr, page_size * 2, PROT_READ | PROT_WRITE); > @@ -671,8 +686,11 @@ static void test_seal_mprotect_unalign_len_variant_2(bool seal) > int ret; > > setup_single_address(size, &ptr); > - if (seal) > - seal_single_address(ptr, page_size * 2 + 1); > + FAIL_TEST_IF_FALSE(ptr != (void *)-1); > + if (seal) { > + ret = seal_single_address(ptr, page_size * 2 + 1); > + FAIL_TEST_IF_FALSE(!ret); > + } > > /* 3 pages are sealed. */ > ret = sys_mprotect(ptr, page_size * 3, PROT_READ | PROT_WRITE); > @@ -696,13 +714,16 @@ static void test_seal_mprotect_two_vma(bool seal) > int ret; > > setup_single_address(size, &ptr); > + FAIL_TEST_IF_FALSE(ptr != (void *)-1); > > /* use mprotect to split */ > ret = sys_mprotect(ptr, page_size * 2, PROT_READ | PROT_WRITE); > FAIL_TEST_IF_FALSE(!ret); > > - if (seal) > - seal_single_address(ptr, page_size * 4); > + if (seal) { > + ret = seal_single_address(ptr, page_size * 4); > + FAIL_TEST_IF_FALSE(!ret); > + } > > ret = sys_mprotect(ptr, page_size * 2, PROT_READ | PROT_WRITE); > if (seal) > @@ -728,14 +749,17 @@ static void test_seal_mprotect_two_vma_with_split(bool seal) > int ret; > > setup_single_address(size, &ptr); > + FAIL_TEST_IF_FALSE(ptr != (void *)-1); > > /* use mprotect to split as two vma. */ > ret = sys_mprotect(ptr, page_size * 2, PROT_READ | PROT_WRITE); > FAIL_TEST_IF_FALSE(!ret); > > /* mseal can apply across 2 vma, also split them. */ > - if (seal) > - seal_single_address(ptr + page_size, page_size * 2); > + if (seal) { > + ret = seal_single_address(ptr + page_size, page_size * 2); > + FAIL_TEST_IF_FALSE(!ret); > + } > > /* the first page is not sealed. */ > ret = sys_mprotect(ptr, page_size, PROT_READ | PROT_WRITE); > @@ -772,10 +796,13 @@ static void test_seal_mprotect_partial_mprotect(bool seal) > int ret; > > setup_single_address(size, &ptr); > + FAIL_TEST_IF_FALSE(ptr != (void *)-1); > > /* seal one page. */ > - if (seal) > - seal_single_address(ptr, page_size); > + if (seal) { > + ret = seal_single_address(ptr, page_size); > + FAIL_TEST_IF_FALSE(!ret); > + } > > /* mprotect first 2 page will fail, since the first page are sealed. */ > ret = sys_mprotect(ptr, 2 * page_size, PROT_READ | PROT_WRITE); > @@ -795,6 +822,7 @@ static void test_seal_mprotect_two_vma_with_gap(bool seal) > int ret; > > setup_single_address(size, &ptr); > + FAIL_TEST_IF_FALSE(ptr != (void *)-1); > > /* use mprotect to split. */ > ret = sys_mprotect(ptr, page_size, PROT_READ | PROT_WRITE); > @@ -837,6 +865,7 @@ static void test_seal_mprotect_split(bool seal) > int ret; > > setup_single_address(size, &ptr); > + FAIL_TEST_IF_FALSE(ptr != (void *)-1); > > /* use mprotect to split. */ > ret = sys_mprotect(ptr, page_size, PROT_READ | PROT_WRITE); > @@ -873,6 +902,7 @@ static void test_seal_mprotect_merge(bool seal) > int ret; > > setup_single_address(size, &ptr); > + FAIL_TEST_IF_FALSE(ptr != (void *)-1); > > /* use mprotect to split one page. */ > ret = sys_mprotect(ptr, page_size, PROT_READ | PROT_WRITE); > @@ -906,6 +936,7 @@ static void test_seal_munmap(bool seal) > int ret; > > setup_single_address(size, &ptr); > + FAIL_TEST_IF_FALSE(ptr != (void *)-1); > > if (seal) { > ret = sys_mseal(ptr, size); > @@ -936,6 +967,7 @@ static void test_seal_munmap_two_vma(bool seal) > int ret; > > setup_single_address(size, &ptr); > + FAIL_TEST_IF_FALSE(ptr != (void *)-1); > > /* use mprotect to split */ > ret = sys_mprotect(ptr, page_size * 2, PROT_READ | PROT_WRITE); > @@ -976,6 +1008,7 @@ static void test_seal_munmap_vma_with_gap(bool seal) > int ret; > > setup_single_address(size, &ptr); > + FAIL_TEST_IF_FALSE(ptr != (void *)-1); > > ret = sys_munmap(ptr + page_size, page_size * 2); > FAIL_TEST_IF_FALSE(!ret); > @@ -1007,6 +1040,7 @@ static void test_munmap_start_freed(bool seal) > int prot; > > setup_single_address(size, &ptr); > + FAIL_TEST_IF_FALSE(ptr != (void *)-1); > > /* unmap the first page. */ > ret = sys_munmap(ptr, page_size); > @@ -1045,6 +1079,8 @@ static void test_munmap_end_freed(bool seal) > int ret; > > setup_single_address(size, &ptr); > + FAIL_TEST_IF_FALSE(ptr != (void *)-1); > + > /* unmap last page. */ > ret = sys_munmap(ptr + page_size * 3, page_size); > FAIL_TEST_IF_FALSE(!ret); > @@ -1074,6 +1110,8 @@ static void test_munmap_middle_freed(bool seal) > int prot; > > setup_single_address(size, &ptr); > + FAIL_TEST_IF_FALSE(ptr != (void *)-1); > + > /* unmap 2 pages in the middle. */ > ret = sys_munmap(ptr + page_size, page_size * 2); > FAIL_TEST_IF_FALSE(!ret); > @@ -1116,6 +1154,7 @@ static void test_seal_mremap_shrink(bool seal) > void *ret2; > > setup_single_address(size, &ptr); > + FAIL_TEST_IF_FALSE(ptr != (void *)-1); > > if (seal) { > ret = sys_mseal(ptr, size); > @@ -1144,6 +1183,7 @@ static void test_seal_mremap_expand(bool seal) > void *ret2; > > setup_single_address(size, &ptr); > + FAIL_TEST_IF_FALSE(ptr != (void *)-1); > /* ummap last 2 pages. */ > ret = sys_munmap(ptr + 2 * page_size, 2 * page_size); > FAIL_TEST_IF_FALSE(!ret); > @@ -1175,8 +1215,11 @@ static void test_seal_mremap_move(bool seal) > void *ret2; > > setup_single_address(size, &ptr); > + FAIL_TEST_IF_FALSE(ptr != (void *)-1); > setup_single_address(size, &newPtr); > - clean_single_address(newPtr, size); > + FAIL_TEST_IF_FALSE(newPtr != (void *)-1); > + ret = clean_single_address(newPtr, size); > + FAIL_TEST_IF_FALSE(!ret); > > if (seal) { > ret = sys_mseal(ptr, size); > @@ -1205,6 +1248,7 @@ static void test_seal_mmap_overwrite_prot(bool seal) > void *ret2; > > setup_single_address(size, &ptr); > + FAIL_TEST_IF_FALSE(ptr != (void *)-1); > > if (seal) { > ret = sys_mseal(ptr, size); > @@ -1232,6 +1276,7 @@ static void test_seal_mmap_expand(bool seal) > void *ret2; > > setup_single_address(size, &ptr); > + FAIL_TEST_IF_FALSE(ptr != (void *)-1); > /* ummap last 4 pages. */ > ret = sys_munmap(ptr + 8 * page_size, 4 * page_size); > FAIL_TEST_IF_FALSE(!ret); > @@ -1262,6 +1307,7 @@ static void test_seal_mmap_shrink(bool seal) > void *ret2; > > setup_single_address(size, &ptr); > + FAIL_TEST_IF_FALSE(ptr != (void *)-1); > > if (seal) { > ret = sys_mseal(ptr, size); > @@ -1290,7 +1336,9 @@ static void test_seal_mremap_shrink_fixed(bool seal) > void *ret2; > > setup_single_address(size, &ptr); > + FAIL_TEST_IF_FALSE(ptr != (void *)-1); > setup_single_address(size, &newAddr); > + FAIL_TEST_IF_FALSE(newAddr != (void *)-1); > > if (seal) { > ret = sys_mseal(ptr, size); > @@ -1319,7 +1367,9 @@ static void test_seal_mremap_expand_fixed(bool seal) > void *ret2; > > setup_single_address(page_size, &ptr); > + FAIL_TEST_IF_FALSE(ptr != (void *)-1); > setup_single_address(size, &newAddr); > + FAIL_TEST_IF_FALSE(newAddr != (void *)-1); > > if (seal) { > ret = sys_mseal(newAddr, size); > @@ -1348,7 +1398,9 @@ static void test_seal_mremap_move_fixed(bool seal) > void *ret2; > > setup_single_address(size, &ptr); > + FAIL_TEST_IF_FALSE(ptr != (void *)-1); > setup_single_address(size, &newAddr); > + FAIL_TEST_IF_FALSE(newAddr != (void *)-1); > > if (seal) { > ret = sys_mseal(newAddr, size); > @@ -1375,6 +1427,7 @@ static void test_seal_mremap_move_fixed_zero(bool seal) > void *ret2; > > setup_single_address(size, &ptr); > + FAIL_TEST_IF_FALSE(ptr != (void *)-1); > > if (seal) { > ret = sys_mseal(ptr, size); > @@ -1406,6 +1459,7 @@ static void test_seal_mremap_move_dontunmap(bool seal) > void *ret2; > > setup_single_address(size, &ptr); > + FAIL_TEST_IF_FALSE(ptr != (void *)-1); > > if (seal) { > ret = sys_mseal(ptr, size); > @@ -1434,6 +1488,7 @@ static void test_seal_mremap_move_dontunmap_anyaddr(bool seal) > void *ret2; > > setup_single_address(size, &ptr); > + FAIL_TEST_IF_FALSE(ptr != (void *)-1); > > if (seal) { > ret = sys_mseal(ptr, size); > @@ -1469,6 +1524,7 @@ static void test_seal_merge_and_split(void) > > /* (24 RO) */ > setup_single_address(24 * page_size, &ptr); > + FAIL_TEST_IF_FALSE(ptr != (void *)-1); > > /* use mprotect(NONE) to set out boundary */ > /* (1 NONE) (22 RO) (1 NONE) */ > @@ -1700,9 +1756,12 @@ static void test_seal_discard_ro_anon(bool seal) > int ret; > > setup_single_address(size, &ptr); > + FAIL_TEST_IF_FALSE(ptr != (void *)-1); > > - if (seal) > - seal_single_address(ptr, size); > + if (seal) { > + ret = seal_single_address(ptr, size); > + FAIL_TEST_IF_FALSE(!ret); > + } > > ret = sys_madvise(ptr, size, MADV_DONTNEED); > if (seal) > @@ -1832,5 +1891,4 @@ int main(int argc, char **argv) > test_seal_discard_ro_anon_on_pkey(true); > > ksft_finished(); > - return 0; > } > diff --git a/tools/testing/selftests/mm/seal_elf.c b/tools/testing/selftests/mm/seal_elf.c > index 61a2f1c94e02..7143dc4f1b10 100644 > --- a/tools/testing/selftests/mm/seal_elf.c > +++ b/tools/testing/selftests/mm/seal_elf.c > @@ -12,9 +12,7 @@ > #include > #include > #include > -#include > #include > -#include > #include > #include > #include > @@ -179,5 +177,4 @@ int main(int argc, char **argv) > test_seal_elf(); > > ksft_finished(); > - return 0; > } -- BR, Muhammad Usama Anjum