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 90AA3C001B0 for ; Thu, 13 Jul 2023 14:14:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3411E900024; Thu, 13 Jul 2023 10:14:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2F20290001C; Thu, 13 Jul 2023 10:14:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1BAF8900024; Thu, 13 Jul 2023 10:14:14 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 0BD6C90001C for ; Thu, 13 Jul 2023 10:14:14 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id D20621602E9 for ; Thu, 13 Jul 2023 14:14:13 +0000 (UTC) X-FDA: 81006783186.26.032766D Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf06.hostedemail.com (Postfix) with ESMTP id C9499180017 for ; Thu, 13 Jul 2023 14:14:10 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=none; spf=pass (imf06.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1689257650; 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; bh=x79StUW9y9xy9j3oAa5XPC3COSvSkHIp7eeVH6XvWZs=; b=t2RCeVF+3ZKkQAPZuu/+Z/ue6Q/HIDIiJvN1ghjqRGfuUIy32f1EsnRQxLf95nvZGt4Iyu u+VAqTEBe/A00R/LjhkS/pszNOF1YVMi2q+aP19RcD6KCyarXTquLoje21tcaEAfljC+js R3jai5yUNBPwQzWbbtxiRG+uMlGdTbA= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689257650; a=rsa-sha256; cv=none; b=ZyDMnHkUyQE7xWEIMykgTNxmz/muoE9+i3CXylmVb0nTPRAhHrEnFO/RSXlL+1XtUBawYm pKcc/ml1FT4P5rb3Hc6VZY+PiJiCimwULRw31IH19hCpbsPVLTJPXc0DrZJApmaFRPWMMe iJmxEXKZ94FLO6/NZOL2hyIavfSwaNo= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=none; spf=pass (imf06.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com; dmarc=pass (policy=none) header.from=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 893AF1570; Thu, 13 Jul 2023 07:14:52 -0700 (PDT) Received: from [10.1.30.48] (C02Z41KALVDN.cambridge.arm.com [10.1.30.48]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id A485A3F73F; Thu, 13 Jul 2023 07:14:08 -0700 (PDT) Message-ID: <556d05f0-7103-1079-fce1-1fb6bd40b17c@arm.com> Date: Thu, 13 Jul 2023 15:14:07 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: [PATCH v1 3/9] selftests/mm: Skip soft-dirty tests on arm64 To: David Hildenbrand , Andrew Morton , Shuah Khan , =?UTF-8?B?SsOpcsO0bWUgR2xpc3Nl?= , Mark Brown , John Hubbard , Florent Revest , "Liam R. Howlett" Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org References: <20230713135440.3651409-1-ryan.roberts@arm.com> <20230713135440.3651409-4-ryan.roberts@arm.com> <773cc0a8-24b8-7fcb-2980-7676fc772014@arm.com> <3c566e28-c7ad-7ba8-4583-619266282387@redhat.com> From: Ryan Roberts In-Reply-To: <3c566e28-c7ad-7ba8-4583-619266282387@redhat.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: C9499180017 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: xdyuqhxyej8izm9jwdipik9ct61bxo4t X-HE-Tag: 1689257650-801515 X-HE-Meta: U2FsdGVkX18uQpWTm8heYSU6dMDK9vtT7Hp7RWLYPCr1FQjZC201AD8EpgcjeaQGKjS5QY06KvZzywrSo49gjVJky7hHtflR+ExpH69URzaoY11R1RFkuKBwO8hbeynwXc3wSTbUNWX46BUasmNQRotVZLfJzjVZxgXkIe5aLs2+/EnGqVBMW0T5AjRMHXXtu6RVrw6iJbpZ6ifV2TxmbXl3F2tnbMuUJakvy+KtzXIaOKvDYMZl72l0hzE+RwFrHGWnlIv7goRm1yEi0gyeqnLYG1rLVfIsql3QIEIfnd4VYMruZhaVKTO1Z/dGmO7MPiwv0tm0IO8RmOy+bFhmC57yFy1krPnSczQJs2+uNMNMNORLS/u/AHly9sbvoVOmlpa6VbzCaOdbkGrArW9Cg+07XqOL7CeqIjmYGRuCIN4L8EgbzvF4Jmzs4RkvodyG1JiNORANRyqJFljL6hDrVfamcfO4w3c0U7G516Z4o3LNgYiNNpR+5JejEvZrAZol3cdMmhn2+NH8vr89GZ4hncB6XnQKfLlptlovVlqecsahQaWbLdyOjzqR1i5at8+eGllOyb+4VIAKqlSGwlCB2T0W0Z239TB+1Y1RPyp7p/KOnO8EwVyP6cDrFpZ+rj9uUHPD08DCm4vkMMO8oFy4ZcFDPcTMXfO4ZhWkHpWdKRi24YKjYQbgxmXjcXshPtVFTiODhD2FpUYIC3TddhnSzGtAlTPqUtwvmvnU4qVSKRd6K33vQGby0Tr/4rOdPzt38FCP9BOjgYvausfwyFnzjHggs+XnNkhE3WIbramej1K+vdAA8zyF1dRh2c7r3v1t1a8xUPaWxNNtvteJ66gEsdMyoY7bHVqBDlFw7XhNQ6kIph6v3eBbOV30dpQCzzM1ALIsbXvqfNnWAXmpkk/pbCdjaP/zY+ULBPHD5sOP0EN8+REl6yKOgpCd1yOnIqZ/tUj2mHHJvJIYpbZlsEM 0a8wtLwV IKGE8ZxFc0nPUjRs0NNO8i/4z8N/v8c7kUZN7i6GPYIl86ztxdCj1sLUuQJKOe6MgnD/v7vkJ/W0Pzij8GiUUmlKMgmHtF0m5pb60/iBqH7O6yQJoEn0p/eEVWhUgmWKrvE2Zn0I4zrjL4Z8XcNbpg7hrRm7Nv2Q1OXyg0MyOT5sgjU8= 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 13/07/2023 15:09, David Hildenbrand wrote: > On 13.07.23 16:03, Ryan Roberts wrote: >> On 13/07/2023 14:56, David Hildenbrand wrote: >>> On 13.07.23 15:54, Ryan Roberts wrote: >>>> arm64 does not support the soft-dirty PTE bit. However there are tests >>>> in `madv_populate` and `soft-dirty` which assume it is supported and >>>> cause spurious failures to be reported when preferred behaviour would be >>>> to mark the tests as skipped. >>>> >>>> Unfortunately, the only way to determine if the soft-dirty dirty bit is >>>> supported is to write to a page, then see if the bit is set in >>>> /proc/self/pagemap. But the tests that we want to conditionally execute >>>> are testing precicesly this. So if we introduced this feature check, we >>>> could accedentally turn a real failure (on a system that claims to >>>> support soft-dirty) into a skip. >>>> >>>> So instead, do the check based on architecture; for arm64, we report >>>> that soft-dirty is not supported. This is wrapped up into a utility >>>> function `system_has_softdirty()`, which is used to skip the whole >>>> `soft-dirty` suite, and mark the soft-dirty tests in the `madv_populate` >>>> suite as skipped. >>>> >>>> Signed-off-by: Ryan Roberts >>>> --- >>>>    tools/testing/selftests/mm/madv_populate.c | 18 +++++++++++++----- >>>>    tools/testing/selftests/mm/soft-dirty.c    |  3 +++ >>>>    tools/testing/selftests/mm/vm_util.c       | 17 +++++++++++++++++ >>>>    tools/testing/selftests/mm/vm_util.h       |  1 + >>>>    4 files changed, 34 insertions(+), 5 deletions(-) >>>> >>>> diff --git a/tools/testing/selftests/mm/madv_populate.c >>>> b/tools/testing/selftests/mm/madv_populate.c >>>> index 60547245e479..5a8c176d7fec 100644 >>>> --- a/tools/testing/selftests/mm/madv_populate.c >>>> +++ b/tools/testing/selftests/mm/madv_populate.c >>>> @@ -232,6 +232,14 @@ static bool range_is_not_softdirty(char *start, ssize_t >>>> size) >>>>        return ret; >>>>    } >>>> >>>> +#define ksft_test_result_if_softdirty(cond, ...)    \ >>>> +do {                            \ >>>> +    if (system_has_softdirty())            \ >>>> +        ksft_test_result(cond, __VA_ARGS__);    \ >>>> +    else                        \ >>>> +        ksft_test_result_skip(__VA_ARGS__);    \ >>>> +} while (0) >>>> + >>>>    static void test_softdirty(void) >>>>    { >>>>        char *addr; >>>> @@ -246,19 +254,19 @@ static void test_softdirty(void) >>>> >>>>        /* Clear any softdirty bits. */ >>>>        clear_softdirty(); >>>> -    ksft_test_result(range_is_not_softdirty(addr, SIZE), >>>> +    ksft_test_result_if_softdirty(range_is_not_softdirty(addr, SIZE), >>>>                 "range is not softdirty\n"); >>>> >>>>        /* Populating READ should set softdirty. */ >>>>        ret = madvise(addr, SIZE, MADV_POPULATE_READ); >>>> -    ksft_test_result(!ret, "MADV_POPULATE_READ\n"); >>>> -    ksft_test_result(range_is_not_softdirty(addr, SIZE), >>>> +    ksft_test_result_if_softdirty(!ret, "MADV_POPULATE_READ\n"); >>>> +    ksft_test_result_if_softdirty(range_is_not_softdirty(addr, SIZE), >>>>                 "range is not softdirty\n"); >>>> >>>>        /* Populating WRITE should set softdirty. */ >>>>        ret = madvise(addr, SIZE, MADV_POPULATE_WRITE); >>>> -    ksft_test_result(!ret, "MADV_POPULATE_WRITE\n"); >>>> -    ksft_test_result(range_is_softdirty(addr, SIZE), >>>> +    ksft_test_result_if_softdirty(!ret, "MADV_POPULATE_WRITE\n"); >>>> +    ksft_test_result_if_softdirty(range_is_softdirty(addr, SIZE), >>>>                 "range is softdirty\n"); >>> >>> We probably want to skip the whole test_*softdirty* test instead of adding this >>> (IMHO suboptimal) ksft_test_result_if_softdirty. >> >> Yeah I thought about doing it that way, but then the output just looks like >> there were fewer tests and they all passed. But thinking about it now, I guess >> the TAP header outputs the number of planned tests and the number of tests >> executed are fewer, so a machine parser would still notice. I just don't like >> that it outputs skipped:0. >> >> But it a lightly held view. Happy to just do: >> >>     if (system_has_softdirty()) >>         test_softdirty() >> >> If you insist. ;-) > > diff --git a/tools/testing/selftests/mm/madv_populate.c > b/tools/testing/selftests/mm/madv_populate.c > index 60547245e479..33fda0337b32 100644 > --- a/tools/testing/selftests/mm/madv_populate.c > +++ b/tools/testing/selftests/mm/madv_populate.c > @@ -266,12 +266,16 @@ static void test_softdirty(void) >   >  int main(int argc, char **argv) >  { > +       int nr_tests = 16; >         int err; >   >         pagesize = getpagesize(); >   > +       if (system_has_softdirty()) > +               nr_tests += 5; This is the opposite of the point I was trying to make; If there are 21 tests in a suite, I'd like to know that there are 21 tests, 16 of which passed and 5 of which were skipped. This will hide the 5 from the test report. > + >         ksft_print_header(); > -       ksft_set_plan(21); > +       ksft_set_plan(nr_tests); >   >         sense_support(); >         test_prot_read(); > @@ -279,7 +283,8 @@ int main(int argc, char **argv) >         test_holes(); >         test_populate_read(); >         test_populate_write(); > -       test_softdirty(); > +       if (system_has_softdirty()) > +               test_softdirty(); >   >         err = ksft_get_fail_cnt(); >         if (err) > >