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 94947C54EE9 for ; Tue, 13 Sep 2022 08:11:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 12F938D0001; Tue, 13 Sep 2022 04:11:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0B7B26B0073; Tue, 13 Sep 2022 04:11:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E73278D0001; Tue, 13 Sep 2022 04:11:29 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id D455C6B0072 for ; Tue, 13 Sep 2022 04:11:29 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id B15C3806AA for ; Tue, 13 Sep 2022 08:11:29 +0000 (UTC) X-FDA: 79906342698.27.D770CC6 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf24.hostedemail.com (Postfix) with ESMTP id ED70D1800C5 for ; Tue, 13 Sep 2022 08:11:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1663056688; 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=JmFmooLgl+35+BTBj+s1lGG8DnrrIwlLQYKFeHvmKdo=; b=T28SoIL8n0oW3gY7V+Sq2q4lyoz6iCXK0MuUES1Ngr3z91G7t/3mqDC1cbyO98d2XOAjuN ODC7S3zXYLWmZ0XHkfmT9LLz1FoBmSmuvFlCSDVv00LCurcIVnDy6Na9FyMxztI/uSMhdd VH/La6juU1mInfgap+GUQl4eqhtkzZ4= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-505-oMuH_Y7VMyCcTQt022cEew-1; Tue, 13 Sep 2022 04:11:27 -0400 X-MC-Unique: oMuH_Y7VMyCcTQt022cEew-1 Received: by mail-wr1-f70.google.com with SMTP id u27-20020adfa19b000000b0022863c08ac4so2940296wru.11 for ; Tue, 13 Sep 2022 01:11:27 -0700 (PDT) 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 :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:x-gm-message-state:from:to:cc:subject:date; bh=JmFmooLgl+35+BTBj+s1lGG8DnrrIwlLQYKFeHvmKdo=; b=LIBcDJl38N59cAkiUBGvkPnwzU5u19CYYtj0OVHKklpdDISR7NMeMZqh3Nzpvu3RDZ Zpfe9pGNAnAMt3vuGKOLkrFR6mCxUeRrlM4O1fb8bc/psAhBgIQt0ypKl6qAC6/eLXio xAUDxjGeyOwv7AFpjZcx5EeElrNA1VEHO1UAv4fn3LwKwIeIZtS5jTX3CGG5pAj2G2fK uXUy5EhJ/6QxcXj6VVQMMC8gO6AkkIHTkw88+4apt+4t1o/VlCUb7Wn/vNavUpNThQMY dXWOnTuTiLWjLFoUKXRbAYGDKxXxkVvif/r1OCg4ibE70GhP+Sp3fwumNQ6ny+FEnmiE HOMg== X-Gm-Message-State: ACgBeo0d+3eXkFfV3qwlI9VzXeUMiLSMz83LcOv4KGwpzsimEbF60oTP Y319dGNo4/bX+wgKEFwP+vpZOjvRA0mdeCqpchOsdA0OBvMKxNmGbOQJa+n1eKSFAlSg6P2CUs8 ++WeMGZNdkds= X-Received: by 2002:a05:600c:2c4d:b0:3b4:867f:1e6f with SMTP id r13-20020a05600c2c4d00b003b4867f1e6fmr1470240wmg.75.1663056686094; Tue, 13 Sep 2022 01:11:26 -0700 (PDT) X-Google-Smtp-Source: AA6agR6gvK/9o5ScYFHjDs446Lk12FBMcnw01AT8c1yJTTHwzIKu2JPOCYuyUxK2yCjziCsd7trgng== X-Received: by 2002:a05:600c:2c4d:b0:3b4:867f:1e6f with SMTP id r13-20020a05600c2c4d00b003b4867f1e6fmr1470208wmg.75.1663056685746; Tue, 13 Sep 2022 01:11:25 -0700 (PDT) Received: from [10.119.22.46] ([89.101.193.66]) by smtp.gmail.com with ESMTPSA id p35-20020a05600c1da300b003a5fa79007fsm11515445wms.7.2022.09.13.01.08.50 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 13 Sep 2022 01:11:24 -0700 (PDT) Message-ID: <53390539-cfa9-7498-5b69-8fb8b307182d@redhat.com> Date: Tue, 13 Sep 2022 10:06:20 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.2.0 Subject: Re: [PATCH] hmm-tests: Fix migrate_dirty_page test To: Alistair Popple , linux-mm@kvack.org, akpm@linux-foundation.org Cc: John Hubbard , Peter Xu , Nadav Amit , huang ying , LKML , "Sierra Guiza, Alejandro (Alex)" , Felix Kuehling , Jason Gunthorpe , Ralph Campbell , Matthew Wilcox , Karol Herbst , Lyude Paul , Ben Skeggs , Logan Gunthorpe , paulus@ozlabs.org, linuxppc-dev@lists.ozlabs.org References: <20220913052203.177071-1-apopple@nvidia.com> From: David Hildenbrand Organization: Red Hat In-Reply-To: <20220913052203.177071-1-apopple@nvidia.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: 7bit ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1663056689; 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=JmFmooLgl+35+BTBj+s1lGG8DnrrIwlLQYKFeHvmKdo=; b=elDYo3g0qnxs9hKqlJKTH776mv6ecxSAR1SgziSLvMmPjoRuT86VlNL+9S+aph0lWJ9TM3 pSjo2ku4gVXBDUs0WuUc6+hyI/l5FiRpPF3+q9CRrcwdTDJX5J5jwadXnxl1kLvBt9+OOH 1h7dx7o+cj1w7VXS6SeFirxiCbWJt58= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=T28SoIL8; spf=pass (imf24.hostedemail.com: domain of david@redhat.com designates 170.10.129.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=1663056689; a=rsa-sha256; cv=none; b=G2xSh/wnq+PyWvDpx3lg1rxTQYTIdFipVVpkgPEDSHE5jL7vIwOzkvlf7Rcw033nVp/nRk gZCag9LzCY3rUl000NQMChwQFiBSXs7wdQvg0cWJJyxpgABtMJSaT1hdpnFX4LSFn7lCh8 mc35TTAfj+k+CiPHpb/0sIdMlG/JvZw= X-Rspam-User: X-Stat-Signature: giiafs5s63f7zdrtyodbk1ea7hbsfuui X-Rspamd-Queue-Id: ED70D1800C5 Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=T28SoIL8; spf=pass (imf24.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com X-Rspamd-Server: rspam08 X-HE-Tag: 1663056688-41899 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.09.22 07:22, Alistair Popple wrote: > As noted by John Hubbard the original test relied on side effects of the > implementation of migrate_vma_setup() to detect if pages had been > swapped to disk or not. This is subject to change in future so > explicitly check for swap entries via pagemap instead. Fix a spelling > mistake while we're at it. > > Signed-off-by: Alistair Popple > Fixes: 5cc88e844e87 ("selftests/hmm-tests: add test for dirty bits") > --- > tools/testing/selftests/vm/hmm-tests.c | 50 +++++++++++++++++++++++--- > 1 file changed, 46 insertions(+), 4 deletions(-) > > diff --git a/tools/testing/selftests/vm/hmm-tests.c b/tools/testing/selftests/vm/hmm-tests.c > index 70fdb49b59ed..b5f6a7dc1f12 100644 > --- a/tools/testing/selftests/vm/hmm-tests.c > +++ b/tools/testing/selftests/vm/hmm-tests.c > @@ -1261,9 +1261,47 @@ static int destroy_cgroup(void) > return 0; > } > > +static uint64_t get_pfn(int fd, uint64_t ptr) > +{ > + uint64_t pfn; > + int ret; > + > + ret = pread(fd, &pfn, sizeof(ptr), > + (uint64_t) ptr / getpagesize() * sizeof(ptr)); > + if (ret != sizeof(ptr)) > + return 0; > + > + return pfn; > +} > + > +#define PAGEMAP_SWAPPED (1ULL << 62) > + > +/* Returns true if at least one page in the range is on swap */ > +static bool pages_swapped(void *ptr, unsigned long pages) > +{ > + uint64_t pfn; > + int fd = open("/proc/self/pagemap", O_RDONLY); > + unsigned long i; > + > + if (fd < 0) > + return false; > + > + for (i = 0; i < pages; i++) { > + pfn = get_pfn(fd, (uint64_t) ptr + i * getpagesize()); > + > + if (pfn & PAGEMAP_SWAPPED) { > + close(fd); > + return true; > + } We do have pagemap_get_entry() in vm_util.c to query the pagemap entry. Can you further, add pagemap_is_swapped() to vm_util.c? I'll be also needing that (including a variant for testing a range) in anon COW tests. -- Thanks, David / dhildenb