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 B841AC3DA7A for ; Mon, 2 Jan 2023 15:53:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 205BB8E0002; Mon, 2 Jan 2023 10:53:27 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1B6098E0001; Mon, 2 Jan 2023 10:53:27 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 07E6E8E0002; Mon, 2 Jan 2023 10:53:27 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id EDF6B8E0001 for ; Mon, 2 Jan 2023 10:53:26 -0500 (EST) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id CCEF916011F for ; Mon, 2 Jan 2023 15:53:26 +0000 (UTC) X-FDA: 80310303612.01.7D5D57B Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf08.hostedemail.com (Postfix) with ESMTP id AFFB816000F for ; Mon, 2 Jan 2023 15:53:24 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=C7bkFE07; spf=pass (imf08.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1672674804; a=rsa-sha256; cv=none; b=45HzeKutJxzuOwd2FncQ9IZwO6vszZ5SfRlGdLLAx2Oa1srtMxsbKStAlOnGgDMtYmja6M yCDBfMx+X8FULj2AvtEmFiA6kw/4jtsfc+cEbhjUYO01jyYj4pEjR3SXICzHInWexZryEm V7sn5Tox2vIMwfhNx/CLtlXnzvmS0k4= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=C7bkFE07; spf=pass (imf08.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1672674804; 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=08dCYsa5Ayalb0WHzc9Dc+dPt0AFb2C2DyR+UOE8zaY=; b=FbY8je1ASTpvj6M/C0dKye8aNhusFPrgCRBpgSZbGLKC3EN65ovL4f3oHwUA8u9o9XQCR0 IMvyVrgCTFKQNW+Or1r8cQ43cp3QvRLFl1Rorea+MDTt0wYQxb7Kv+BQV76+seKnys3jCD w3mJrGlTASIzZo9p072GSv72kbr5h2s= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1672674804; 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=08dCYsa5Ayalb0WHzc9Dc+dPt0AFb2C2DyR+UOE8zaY=; b=C7bkFE07gLsEtVfkfzh/DYKscmoJSfmg/2enR47iyUHky0B4jAc3wrCT0y7Zho/hGjfZOv uae1N2g+yaS47eMaECivaXQCdiqAqe/JUnwrsRJv67YVhzrctOVW2jHRnv0p0DbZfEmuMS Z7SGa0IxHeysilsSAo5mGoib2UJfeEU= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-314-iLMnIsugMsOobsD0QUcwMQ-1; Mon, 02 Jan 2023 10:53:22 -0500 X-MC-Unique: iLMnIsugMsOobsD0QUcwMQ-1 Received: by mail-wm1-f71.google.com with SMTP id t24-20020a1c7718000000b003d1fd0b866fso6455262wmi.3 for ; Mon, 02 Jan 2023 07:53:22 -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:organization:from:references :cc:to:content-language:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=08dCYsa5Ayalb0WHzc9Dc+dPt0AFb2C2DyR+UOE8zaY=; b=TMUCzrWzNxi/SH4e98y+qOjYNUvCijjEVVAdmD7Mfo/3KljYxsVQ88sJ3uXb6oRP5H /WxMRCvkuAofiw1D5EZMh3ZyO6voAWDulMk/Rkgtt2g51RL4HifNTiOqClWLaXTL1HmK jcxSxmltuvlwSJEXLCqoGN7b08NwnFPzS/pW+uGLmPba5Ogc9C1DCFC8J2OLlMpBdliz 78N8mn47cRtNmVvVatvNMnCjK1hICblBskvW40iBhlQlazUduNfd7VuTsFqo3fRs8nph k8tQsFgWp2Pa3w+CICY87morteyLvXce+0U4ShsWGNkAgyC8XANv0mD/ZD2VqaxtMCqy 2sSA== X-Gm-Message-State: AFqh2koBwpvUQ70btmMqtKz/Vnm9XzLKEhgxB6o9vd64uBZcj3sajO1L /LmRK2LAYP7mIBpZw+JtNXM1/AMJjXTwGp+pI5sF9eR4oBthi9JJmZ8MYmnYGF6yPSIujVSfrCi Z9IprABFB5mo= X-Received: by 2002:adf:cc8e:0:b0:273:75d2:8d01 with SMTP id p14-20020adfcc8e000000b0027375d28d01mr23779221wrj.26.1672674801692; Mon, 02 Jan 2023 07:53:21 -0800 (PST) X-Google-Smtp-Source: AMrXdXvsKmOyCmw5BR6SbNL6IHnflKGvVcnU44NWhqj6A8qfHLRPHgTXjmjL32Q503GqLTl/iAl4Zg== X-Received: by 2002:adf:cc8e:0:b0:273:75d2:8d01 with SMTP id p14-20020adfcc8e000000b0027375d28d01mr23779202wrj.26.1672674801440; Mon, 02 Jan 2023 07:53:21 -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 j13-20020a5d618d000000b002425dc49024sm28834869wru.43.2023.01.02.07.53.20 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 02 Jan 2023 07:53:21 -0800 (PST) Message-ID: <54da9c76-a506-0acd-3f97-60a0cce87c8a@redhat.com> Date: Mon, 2 Jan 2023 16:53:20 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.6.0 Subject: Re: [PATCH v2] selftest/vm: add mremap expand merge offset test To: Lorenzo Stoakes Cc: linux-mm@kvack.org, Andrew Morton , Shuah Khan , linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Vlastimil Babka , Jakub Matena , Matthew Wilcox , Mel Gorman , Michal Hocko References: <3a4fbe90-b46e-aa49-9866-e2b0cf6de38d@redhat.com> From: David Hildenbrand Organization: Red Hat 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: rspam03 X-Rspamd-Queue-Id: AFFB816000F X-Stat-Signature: mihmcshmtirdr7zkus1anou9jekcd31m X-HE-Tag: 1672674804-77458 X-HE-Meta: U2FsdGVkX19VLrA8/4f2x8V4pB5fMUX8xCHYiuXYdddNmhlFaby/VcoJKsbctS+9EvHc+LUoP2xpe/rdhtT0j1NBSRIh5aRrZNOa+zDa6B7nU0nZYMqWDzKPrAFfFW7nitW6CFJOTq6ry+CNxU/CgGw8C2+ZLVeSybMSpANGkQqtGkR7u9a0rVjVS6v5k/agYYNCLDYJvdqKJ2X+baR8kL/j/Hv8s42+aoBnz0MRirQei+OmSJ2+t0DiNyj+J5K/yU61M3lr1bKZNDHlaL/gSXEwm9wrFLTz9j8wu5Y2muGkFfzscjrhVQxzxXdXHo7RfAK7L9YJ+dFRcDx2N01nPbSDfhZ2s0GJ0DCzwVAW5rmuQF2JxD1WgWMXJhk8kd24vUuiaYpGM4Oa5nai34EO79NwOpI5SUQidQveAjwdmUDi9HbaXHQzTZY0FRojdaSvxhujbpmsXrILZ+UxdZStlgfSOa0T+dU2yQeXjrPS+l6bzaRN8j8Uzfg+f+Oml1d+C28xb7NHF79PFE/nueWMJ23993KvdueMEvYe+qInnptpH1RiP7dwPIyz6GlLxPa2ENfhFkDLet1DilBxEE3MuSaQqdEuKwD1Bcw3CDPx6HoxbuXGCDeTvB68cAvV5fUN4NdsT+n1qApcSvcy2ayHFdiWSrBzi1J/zvpxM+BiFa6/OffiYMLrRCkRfMNMlQHJyHkllJF5MxJL+z9hBr6shjNsz8tmlzQ08ydOjZak5t4raTjWi7flsmx8N9sB8eTTY1sqklNRq5XPdWTZaJw+q/bHQclIMHYZF7iWBXrA9tw5T8dihCKRj7AyKGbeJSjCtfQ9jk3N6wt62Zx9P1qIgbK98fUlQk1s0d2RLPs72/Hz2YfYvcLNVla06h4/SAlIJCbEpEdhjeQQtgY9JX6EMwXXZA8oCr6tK6arA6zhh1NI1eVNZ8rErwcMpoB6gaE+o8HsMl/JF4eR6UsfW8K CFlg0mT2 XuVnrvQKrmKv4sZI60VIG81lCBTDYK+lU64kFqURA3AMuMRc3Kf1KMVxzAnn4G6F7JHtFcgnw4cXVEviihlq7Fmbwjo4ofOxPGtQcVUtvYMyDsKOTu00xOVaywG3q8UQZxVJaSxF0dIJxx/o= 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 16:49, Lorenzo Stoakes wrote: > On Mon, Jan 02, 2023 at 04:34:14PM +0100, David Hildenbrand wrote: >> 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. >> > > I have to disagree on this, to be consistent with the other tests the > failure messages should include the test name, and putting the > ksft_test_result_fail("test name") in each branch as well as the error > message would just be wilful duplication. > > I do think it's a pity C lacks mechanisms such that gotos are sometimes > necessary, but I can only right so many wrongs in this patch :) > Let's agree to disagree ;) Too bad we don't have prefix push/pop functionality as we have in other similar testing frameworks -- to avoid exactly that duplication. [...] >> I'd simply use a global variable, same applies for page_size. But passing it >> around is also ok. >> > > I am trying to keep things consistent with what's gone before in this code, > and given page_size is being passed around I think the 'when in Rome' > principle applies equally to passing the fp around I think. Other tests we have handle it "easier". :) -- Thanks, David / dhildenb