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 0FC6CC001B0 for ; Thu, 13 Jul 2023 14:11:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9AB3F900022; Thu, 13 Jul 2023 10:11:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 933F990001C; Thu, 13 Jul 2023 10:11:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 78636900022; Thu, 13 Jul 2023 10:11:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 5FE4690001C for ; Thu, 13 Jul 2023 10:11:40 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id A713BC02D9 for ; Thu, 13 Jul 2023 14:11:39 +0000 (UTC) X-FDA: 81006776718.21.CE0A60E Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf16.hostedemail.com (Postfix) with ESMTP id 8BC7E180016 for ; Thu, 13 Jul 2023 14:11:33 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=BiEeInIM; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf16.hostedemail.com: domain of david@redhat.com designates 170.10.129.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=1689257496; 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=tw/eoBEWLDHVsIdpPF3KdQhX368y1HB9uJr9R7DEshg=; b=mxXyoDHtDhVRyMfB2a0Fl/i2rkPhh0XZ35xGsu0QMDq85O53gIE7pApgdjjdbyE5xQem64 e8Ro225PZbefyKrUiEAxNvUyYiverL/LW9gArD6XhDvxfigh+U1sxpFT9T/RQzQZbTBxmV RWTRaop2DtNARhsUj8xvpfrpgbp3jg4= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=BiEeInIM; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf16.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689257496; a=rsa-sha256; cv=none; b=YjuFLkO7JSsmXhnQ7EvTWMuEusKhoLFY5zxGQrqItcLgimo7IXHW5jn1ySCIXsabHgqj5K 2iB8etT/ygZ/wEx/H2A03GDvULGiJsyS/8mEYOja1+xGjgiEYDU7ArM6RIYau0Iz/DfH+p immcIPtS3LcRJLhc51jPqbFz1cZWYC0= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689257486; 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=tw/eoBEWLDHVsIdpPF3KdQhX368y1HB9uJr9R7DEshg=; b=BiEeInIM2K80EbfHvfwYrNINUPEyZwkPM0RPmKKKE1IkyeW82H1k2VkuDm/v4/4eNQ/XWc 4Y8EVwuRaFCi7z3XL+EEm3JOxzMCUBxUrfyEsewaJ2pv2E8967iWq4eTlmnUwJIOv+Awth AHNR1SNuBsqFW2ke9vL/IJrNJG3Gfg4= 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_256_GCM_SHA384) id us-mta-563-o1VMfMNaP9yHR1tSRY1MLA-1; Thu, 13 Jul 2023 10:09:50 -0400 X-MC-Unique: o1VMfMNaP9yHR1tSRY1MLA-1 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-3fc0627eafbso3473155e9.0 for ; Thu, 13 Jul 2023 07:09:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689257356; x=1691849356; 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=tw/eoBEWLDHVsIdpPF3KdQhX368y1HB9uJr9R7DEshg=; b=j8phVSY+VjjeagmiYkxAScC7+p/5osh+tmVQOiq/SNzxTd6yCSp+EWKKFczi4/bv7Y qkR7lK9MhcMd+nhcdl8XQnfrzLK41XEUhbPsu1OO+vNgcJfy4hWIMFu5vk8EriNBplsd IOYeMRuNQwomKExmQwx3ZE+WfwHvkAHvMcHP5gEYHwRCrLAYzQiWkYKUjDiGsLqocCwB UfBK9Wrn63PWdjR9W4sU/GqcWiR2tEKw8/6iN9qN2IHbHdRXHxxzF4mJtYWYWRVBGOGu fiznvbljpWEwWYyk4fa9UeeR5Qq6DB3w6PHvSTZUk/lIRhSbQntbohPGS3Izv3RMxha5 9SOA== X-Gm-Message-State: ABy/qLYSW1UfW3QgKXANBvSTOmiuVhBqRHeF/H7bAjdSP/MzsVf14Vof JXAEmr5TesaW0yWrWZa8vdi4Rae+/CLW3fZTxGaC2M2yOOmiBpG0350mHoGw3UUMJKbCNrKUlNE azP6okovbUXY= X-Received: by 2002:a1c:4c13:0:b0:3f7:e660:cdc5 with SMTP id z19-20020a1c4c13000000b003f7e660cdc5mr1798966wmf.9.1689257356163; Thu, 13 Jul 2023 07:09:16 -0700 (PDT) X-Google-Smtp-Source: APBJJlGu9H5wSS8hXXhYYApaNJvReqEuskvCWOKnvIxqDav0vh5y4IkEbUfbVxj6FQh37NRgSwfV6g== X-Received: by 2002:a1c:4c13:0:b0:3f7:e660:cdc5 with SMTP id z19-20020a1c4c13000000b003f7e660cdc5mr1798949wmf.9.1689257355790; Thu, 13 Jul 2023 07:09:15 -0700 (PDT) Received: from [192.168.3.108] (p4ff23613.dip0.t-ipconnect.de. [79.242.54.19]) by smtp.gmail.com with ESMTPSA id f21-20020a7bcc15000000b003fbb06af219sm7938206wmh.32.2023.07.13.07.09.14 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 13 Jul 2023 07:09:14 -0700 (PDT) Message-ID: <3c566e28-c7ad-7ba8-4583-619266282387@redhat.com> Date: Thu, 13 Jul 2023 16:09:13 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 Subject: Re: [PATCH v1 3/9] selftests/mm: Skip soft-dirty tests on arm64 To: Ryan Roberts , 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> From: David Hildenbrand Organization: Red Hat In-Reply-To: <773cc0a8-24b8-7fcb-2980-7676fc772014@arm.com> 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: 8bit X-Rspamd-Queue-Id: 8BC7E180016 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: jxefg3wn9yhna5mwqpwikyfr7gozg1gn X-HE-Tag: 1689257493-154619 X-HE-Meta: U2FsdGVkX18MMxLQWdN0eNzZg01fywyPs0mDq13CS5br4jDCocKi2Kyu55YJpYBiPS/ysu1UUtA8iKdE9glaci2hXi1QgF5NfqPAek1+NRj+wNW4OsTLgFDp+vx9sqexuDlMrsnKXlR+IGWNT8FB/ijqNdGDvJV3zTqivKi9R6kewYjWKT2gEPBDIAIZt6I0FiwGVea+eV8KPG+dzpkJNK4QQ1rDAz2frxyUyjmslcClRAsZTfF7FJIHv7GeYOqKhoeeewjDCG5G+Vz16XMll090nFVWEK7Ks/JAV6eW8Hb3gXMT9VTfBvveKny1fieMn+Qdu8FfPt5J8bOaz2INglJRyCVRx6KhTtKwqMA80A9xmnqdYL70Ux/m8OXcrjolKeijHPWGI7iTaUG3CWnAhoCBAsB4XetaZHqDwPWE34qB3eLqMlfXaoLZ3uAxlE0MYajDFyC9NGH9jy2Pp1BqIUntTU4ddoDdQl79evnfVKDVeHORuXkis/BzKaHbOodLFehPCP8LX5U9U9OOBrwlulsyVwOmX/PpeU09xhrgJLfOPjbZPr+tvQ5+tQL1tpot3LW2UIR2/XcKAhuDPQLy+iNahJZ567rqEwXrYICSiVQTo61YULadvI72uoRB4sgHQZH6ZLJC1kNm0HsL3UBNOlWGaNP6c7nSubaxP2imA5BvZhajFrU/s/yds1g5yvuwNJ/vv0cLNYCYnpSPIZlNvf1rKTYbbBRHJVXJQSFIkLbJuHdRXmo/Mp+WKonpQh6x6zC9WQJrIr4z8nRnlVBD6Hoxaj/TKwe3yy7+Z7vwcn+AXukpzP4olBtVFIPlWKN1ROxyOT4uEnlmqsY7m0td7IwrCmcQJdFJ/jpPaOXtDsio1i9RMmpwQyJvQpVXC4TGiSr4+iOMM7EReuP8iDZuLdW2Uu9YNBFD5VapVwFF+QAwgA20rSko3fZsudHD80xbzQOdf3NDpUHi/QQm33f bpe7n+Nm fWCRlR7x/T8J6PlRPSV2m7JbOUpy+dm+w7SxzequzBD0l2oZ8VZk0/L1jMBkrk83ogsqcESqK73gh6QVAje6H7/knzMjZS2XVIdPDXbvoN5CCeLQmUbCXSLUzAjlglBmpJzfIQVgMrL89tlk3iyB3S2zmCR7gZOTKBdvlElfiVomD2/j0l5taxY+aj8up62DGm4cF9B2MFX93LqsYMeTK8ZnJgsASR+n6uNvM45F2fbNdH6MmvkhRfz2bVFtl+BEVRg3TdNCV+1l08RKZCdZNuronH+7uw1dwP7a+5SuX2oKgLS5vYpev9t5AeVGbmF/LRMOrpt6cJkTAE7AOlnaidrfIMlAPkI1p5Jsd3v2T9w7XJOQ= 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.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; + 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) -- Cheers, David / dhildenb