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 56F63C4708E for ; Mon, 2 Jan 2023 15:34:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B62EC8E0002; Mon, 2 Jan 2023 10:34:23 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id B12948E0001; Mon, 2 Jan 2023 10:34:23 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9DAA48E0002; Mon, 2 Jan 2023 10:34:23 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 8CF348E0001 for ; Mon, 2 Jan 2023 10:34:23 -0500 (EST) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 50908140556 for ; Mon, 2 Jan 2023 15:34:23 +0000 (UTC) X-FDA: 80310255606.16.620629B Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf17.hostedemail.com (Postfix) with ESMTP id 183204000D for ; Mon, 2 Jan 2023 15:34:20 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=hbNFNMkd; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf17.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1672673661; 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=a+5ir2dAxOf4r5jAKNFoKfBMuHdGK8YeHk/tM6kCiR8=; b=EbgQSxpYbt8IvCdlXaVhxyia88Uot65R6SPNmdSXqTo0LBpw0+JZ40f8V/+8wbR4J13lHX Odm0sxvimie1QdjiArNmaOxasJIC5eunjRVFZ6n0SUV5QEEqLTg4Njq2EVwbA+zqLQUb5O 319Klm88RSoIg6N7PtoXhI/b8FkEd0U= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=hbNFNMkd; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf17.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1672673661; a=rsa-sha256; cv=none; b=yBUfVU72+s/FIa+NvUvf8hvPv6AWwSxDCnOUmT7KXG6hRvpAja6vh5nlvoKWFpGBDtPG+p +/TEd4rt1P8xh/LgVDJd5Ey3PIh4yDU8//YcvmTN920TBPQf4MwqbZzxU3ue1a+SNReH7X pEQ9H/Fr3ihyrPaG2EaqW22pxd5oyE4= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1672673660; h=from:from: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; bh=a+5ir2dAxOf4r5jAKNFoKfBMuHdGK8YeHk/tM6kCiR8=; b=hbNFNMkdRLLzK/iTpzpQfbi4kAV5nn1w6db4NQwqrolkxjVk/LC08iAPRaSTt0VT8DUVaJ 3E4lBdT/xOoejJB+F7THncN/e+vjDm+s7HNZ7VqX7uPXwy0SgG5taLmfaLkFlmcolBKvlm nfielfrjkqruWqThpbfwWYIn+ZRsglg= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-572-rG0ZqOfLOm616Dbl9WohkQ-1; Mon, 02 Jan 2023 10:34:17 -0500 X-MC-Unique: rG0ZqOfLOm616Dbl9WohkQ-1 Received: by mail-wm1-f72.google.com with SMTP id m38-20020a05600c3b2600b003d23f8c6ebdso10495729wms.0 for ; Mon, 02 Jan 2023 07:34:17 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:subject:organization:from :references:cc:to:content-language:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=a+5ir2dAxOf4r5jAKNFoKfBMuHdGK8YeHk/tM6kCiR8=; b=aWjvxgXQvrgYy8TbJTszxXdZFnfkSkxazw3PpC0oxLjBKTLKHPXlmekI7cK0IVDlbl ll85ItYVhK+2cV5afsyX6CHge/UhPZksUpRMn09nPuQs7zuZcAISCpydKfHJN1867Sfr Zu3MGExzCnYN+UWf+ThdBCSPHkcL9Q+SKw8r6kxfYwupkMTRLLc944CGKNe3tqymzvbx Qzhed0sXdoAfqKjHxurflkp8O/eQFhv0XA4n6flOx+2GJyqAh9l2jLGVJYni5copNvZb ZXSOutPyM6PcjjrPss8sO0Dw9uu5VGA0oM67OrwVetq+BNxb+5QI2t8D6+Nf/Wt2A0yG Hsqw== X-Gm-Message-State: AFqh2kpcMnJUijvy69KIqx29Qpzvg4XMSTDV/upFJlcdhnObP9KD5AVf VnqB9GU86N6Nz+fut90US21aUKbjjzAviSP+C1DLDoyNXd1FhopHBOTZcDexDOLG4pMiepv5GuS a6c87mF5++zk= X-Received: by 2002:a05:600c:540b:b0:3d9:6b72:39c8 with SMTP id he11-20020a05600c540b00b003d96b7239c8mr24840378wmb.31.1672673656043; Mon, 02 Jan 2023 07:34:16 -0800 (PST) X-Google-Smtp-Source: AMrXdXualOGi2mf4uyZVb3GyKqwUKW2Eq8B2soMduJPbwsGmd8IjQR6H6+2p6yI4quMvWqXU8ytGaA== X-Received: by 2002:a05:600c:540b:b0:3d9:6b72:39c8 with SMTP id he11-20020a05600c540b00b003d96b7239c8mr24840364wmb.31.1672673655770; Mon, 02 Jan 2023 07:34:15 -0800 (PST) Received: from ?IPV6:2003:cb:c703:500:9382:2e5a:fea:8889? (p200300cbc703050093822e5a0fea8889.dip0.t-ipconnect.de. [2003:cb:c703:500:9382:2e5a:fea:8889]) by smtp.gmail.com with ESMTPSA id i17-20020a05600c355100b003d9980c5e7asm19574268wmq.21.2023.01.02.07.34.14 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 02 Jan 2023 07:34:15 -0800 (PST) Message-ID: <3a4fbe90-b46e-aa49-9866-e2b0cf6de38d@redhat.com> Date: Mon, 2 Jan 2023 16:34:14 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.6.0 To: Lorenzo Stoakes , linux-mm@kvack.org, Andrew Morton , Shuah Khan , linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Vlastimil Babka , Jakub Matena , Matthew Wilcox , Mel Gorman , Michal Hocko References: From: David Hildenbrand Organization: Red Hat Subject: Re: [PATCH v2] selftest/vm: add mremap expand merge offset test In-Reply-To: X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 183204000D X-Stat-Signature: dy97xoyzonigyjoh6rozse7bbwgxi7pk X-HE-Tag: 1672673660-17601 X-HE-Meta: U2FsdGVkX18IckuSISo9DnxKxh8IdBte13TVvuNIh02RI6ril+yuA2cobaf2q8v3sfyv0sHw2qM+Aua55esurPrqdfh39A/9WvP2OVS1mFF4Bkm4CkuQgwK96oQbRfcYc/G9kpQrOmvlqJB6hGVbyJ57BIV0yqrauDF4/wK0lzSxrV7QlLZ5icbsJXrOnM7Mq3JAiILXLHHX8xibP5xdLIevJIq06IWvSkSWznxFSA3AMq5joqrgFIF5zFzwXmsYSghy0cF384C8lOAIbpG36hBcRiRq5FnskP8H3EPfHPDlsz4rn4HUFecfZvXP2RHfy69hcbniyGHMyKgqBetbLB1KJFz6qM4SOwvPjn2xjSmnCdGmwXsKqjb59I1lOcMxaAz9W8h9OMFfYgVFGZoeLojHVLfn8doafczp2XNz9P89y3urgs/XCbEyge6zC+lDfEihXMAYjhpqyGgIWl+wJcg+hssCMW2dHiRPK6YimgwBYG+abxmWRKt8dDWIlzbuqHzyzzU0cwXC1K7O+BZ5AGCvjuC0SEV8Quov0Kok+wtgzWf+Fwob9E8nX44XdpGOTRzb5WhsN8PrdcqTScjHU8CnKf4czMK5oJvcjHv6gnlxpJDei3zFUaT1OWMbSnhUdLotpHo31K4cPXadu6A6O5Gk02vlbEO1TOHHmvnTdGv+kercdade1zv2bbytOUvarhEXkgHYSIoNZUXD9z7fjHzzVs3WJ+avri/V+fm1R5X2C0RjJ1VLlA8hPksyoUrlbwwflxA1uckRWwGrO9gX0+QO58+pI/rVPCNkYilEXbKAnB4RhbE/6H5FZdTljRjVmBsxhIfVVTChEJ+65AtCITFdU2eq1qfCP2X8L0UWMjVr+PHWaG2DH7ylfF66/oLMpsM/od5lfmmC4lOoStHej5XqjUA+RSFwNgd/MkMRpTjrjt+EuZ+/dg+EA4jGvpyU5rmabg4p8SRJrhlIFOu mDIjeJJx BlutFlFbQ4oRYP3aaefMjXumh987+1i6NqBpGm0zeV40+NzAyzZ22ckiUzMDtTII1+n2uSrXnnClyjnwNc7jJyjkqSxztS8U4raZNsrxuOl4Qz3RzJP+wZ2VBTvwjDMszMgRIoNHmuFRF/EU= 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: On 02.01.23 15:44, Lorenzo Stoakes wrote: > Add a test to assert that we can mremap() and expand a mapping starting > from an offset within an existing mapping. We unmap the last page in a 3 > page mapping to ensure that the remap should always succeed, before > remapping from the 2nd page. > > This is additionally a regression test for the issue solved in "mm, mremap: > fix mremap() expanding vma with addr inside vma" and confirmed to fail > prior to the change and pass after it. > > Finally, this patch updates the existing mremap expand merge test to check > error conditions and reduce code duplication between the two tests. > > Signed-off-by: Lorenzo Stoakes > --- > tools/testing/selftests/vm/mremap_test.c | 115 ++++++++++++++++++----- > 1 file changed, 93 insertions(+), 22 deletions(-) > > diff --git a/tools/testing/selftests/vm/mremap_test.c b/tools/testing/selftests/vm/mremap_test.c ... > + > + start = mmap(NULL, 3 * page_size, PROT_READ | PROT_WRITE, > + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); > + > + if (start == MAP_FAILED) { > + ksft_print_msg("mmap failed: %s\n", strerror(errno)); I'd ksft_test_result_fail(...) return; > + goto out; > + } > + > + munmap(start + page_size, page_size); > + remap = mremap(start, page_size, 2 * page_size, 0); > + if (remap == MAP_FAILED) { > + ksft_print_msg("mremap failed: %s\n", strerror(errno)); > + munmap(start, page_size); > + munmap(start + 2 * page_size, page_size); > + goto out; dito ksft_test_result_fail(...) ... return; > + } > + > + success = is_range_mapped(maps_fp, start, start + 3 * page_size); > + munmap(start, 3 * page_size); > + > +out: then you can drop the out label. > + if (success) > + ksft_test_result_pass("%s\n", test_name); > + else > + ksft_test_result_fail("%s\n", test_name); > +} > + > +/* > + * Similar to mremap_expand_merge() except instead of removing the middle page, > + * we remove the last then attempt to remap offset from the second page. This > + * should result in the mapping being restored to its former state. > + */ > +static void mremap_expand_merge_offset(FILE *maps_fp, unsigned long page_size) > +{ > + > + char *test_name = "mremap expand merge offset"; > + bool success = false; > + char *remap, *start; > + > + start = mmap(NULL, 3 * page_size, PROT_READ | PROT_WRITE, > + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); > + > + if (start == MAP_FAILED) { > + ksft_print_msg("mmap failed: %s\n", strerror(errno)); > + goto out; > + } > + > + /* Unmap final page to ensure we have space to expand. */ > + munmap(start + 2 * page_size, page_size); > + remap = mremap(start + page_size, page_size, 2 * page_size, 0); > + if (remap == MAP_FAILED) { > + ksft_print_msg("mremap failed: %s\n", strerror(errno)); > + munmap(start, 2 * page_size); > + goto out; > + } > + > + success = is_range_mapped(maps_fp, start, start + 3 * page_size); > + munmap(start, 3 * page_size); > + > +out: dito. > if (success) > ksft_test_result_pass("%s\n", test_name); > else > ksft_test_result_fail("%s\n", test_name); > - fclose(fp); > } > > /* > @@ -385,6 +447,7 @@ int main(int argc, char **argv) > struct test perf_test_cases[MAX_PERF_TEST]; > int page_size; > time_t t; > + FILE *maps_fp; I'd simply use a global variable, same applies for page_size. But passing it around is also ok. > > pattern_seed = (unsigned int) time(&t); > > @@ -458,7 +521,15 @@ int main(int argc, char **argv) > run_mremap_test_case(test_cases[i], &failures, threshold_mb, > pattern_seed); > > - mremap_expand_merge(page_size); > + maps_fp = fopen("/proc/self/maps", "r"); > + if (maps_fp == NULL) { > + ksft_print_msg("Failed to read /proc/self/maps: %s\n", strerror(errno)); Maybe simply fail the test completely and return -errno ? > + } else { > + mremap_expand_merge(maps_fp, page_size); > + mremap_expand_merge_offset(maps_fp, page_size); > + > + fclose(maps_fp); No need to fclose, just keep it open ... > + } > > if (run_perf_tests) { > ksft_print_msg("\n%s\n", Acked-by: David Hildenbrand -- Thanks, David / dhildenb