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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C1848C001DD for ; Thu, 13 Jul 2023 14:12:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232227AbjGMOMj (ORCPT ); Thu, 13 Jul 2023 10:12:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59034 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231261AbjGMOMh (ORCPT ); Thu, 13 Jul 2023 10:12:37 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 62BD3212D for ; Thu, 13 Jul 2023 07:11:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689257496; 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=R6pSihALVkPBS7gy8ZVVW2u2G7ZKC9cp4uvbLeEgQpApGGgNxBFutw0iMUthRVp1fAP6Ww HiCJe6bqKGWxiowketwI9TzsrppPdblTI1C1iI7mXP6SpSA1MQmMM0wTrYpx5ao8btTnqL DW/odnNc4uleAho6xT81hr+KUAuAiKs= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-25-KeYwAMXFPdmy3hkCesWXuA-1; Thu, 13 Jul 2023 10:10:15 -0400 X-MC-Unique: KeYwAMXFPdmy3hkCesWXuA-1 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-315a03cae87so803702f8f.0 for ; Thu, 13 Jul 2023 07:09:28 -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=PSgKZ7p+1ZyhatPqWhQiVmgBdw3bf2S8Lke7OajRom+AmWFxmF2LHTBx75yRCX7aGB +gOSBOsgTsBno5+TRoUnkROL/v7OYu4g9evrl85bOVwx1jrXyVJP3Nt1eTSM2F+eYjSn 1MpzcFSphT9AgEmoc1qwMNpBwIwuOlTo/aSYYUbo+AiQaQX3PSVK0NKp1bNNX+qOBu8P OuGCg6oTo5uyt38Eo2kDovVlbqWa7abW30IEDdVsdAVoJbzQSI6I0q6tead113st0l+E 2AMrOUH4B+2c2wDSQpA7yRrMhh/rfxrg4BaR8bpwBv+zErYN2FYyY4MZWURbvnRVgJMV FpVg== X-Gm-Message-State: ABy/qLZVUdK+0H+5kxp8nWtz9cfGPX7mXP2BHqRckRNoIaa1zrrSu2VK Iou03Cu1XH6Jf9kRUsj1R5Tx9RLF+xMm8xJKKsTqANqytshxx5uqG5CfZKovEDrbCrxN77xpUMR DrgipfdxONa3DlpX53TmITSRH X-Received: by 2002:a1c:4c13:0:b0:3f7:e660:cdc5 with SMTP id z19-20020a1c4c13000000b003f7e660cdc5mr1798973wmf.9.1689257356164; 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 Content-Language: en-US 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> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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