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 D9A3AECAAD8 for ; Wed, 14 Sep 2022 10:09:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 549236B0071; Wed, 14 Sep 2022 06:09:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5059E8D0002; Wed, 14 Sep 2022 06:09:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 39A088D0001; Wed, 14 Sep 2022 06:09:16 -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 2C2C46B0071 for ; Wed, 14 Sep 2022 06:09:16 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id EDAF8A0B06 for ; Wed, 14 Sep 2022 10:09:15 +0000 (UTC) X-FDA: 79910268270.30.09045E7 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf01.hostedemail.com (Postfix) with ESMTP id 91B5040094 for ; Wed, 14 Sep 2022 10:09:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1663150155; 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=tRy6NMXVqAdLaaelo9/KHPKagVual2K79eNRneTqSHA=; b=EyQ9du6xRmFX7YB9MtOcw0ux1gbmZFbMa870f0cREnvSY2IrABqTEJKu1seMY5Z6ZTAgA0 BF8Gqmj8ht3sJ0Koqz7ckcfPs18wTEGvkTactiV0Ta1+Js/OVzQMzhGoQ1VJL8JT+taLEi aBjTYbA9zjRHMMROLQ6qkJecchuWkfU= 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_128_GCM_SHA256) id us-mta-287-AA7mH4rKOoqGal6DYgppxA-1; Wed, 14 Sep 2022 06:09:13 -0400 X-MC-Unique: AA7mH4rKOoqGal6DYgppxA-1 Received: by mail-wr1-f69.google.com with SMTP id r18-20020adfa152000000b0022abc6c0673so1874938wrr.6 for ; Wed, 14 Sep 2022 03:09:13 -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:references :cc:to:content-language:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date; bh=tRy6NMXVqAdLaaelo9/KHPKagVual2K79eNRneTqSHA=; b=oYNdqyxs9Bce7i+w5zO2d7WIjHp2DIDqGbOXEJO/sicdV1//6iyCJgQOsMxQp8o6Ce fPTwTLdIGQOM8HNh379+PGeQzkHUrfTuStoImD3rBKGRq62AxhAy2qliQ4h/pJ1eKlEO 4BUX2rrStL3WFn/87uueqoEk6tmaxUlrX3YLIq7e4zEtgvT6mvnTb8fxjPp8WmPolabL qV6AN5Kyb9YIbGaexYEMFmfBzJJhWs6/9fnPn0ndrxpz/G4kr15jJsJKBFiqCiGwGCJ3 +gm2BwwWlNXBpwyk69fFBMQzzTZu0E00iIB+XyGQM/R/KRa9nbaLWyrtXA9zkQ51Gsu0 P/UA== X-Gm-Message-State: ACgBeo2UTPvY1FE639937/hKgWamnjhq/cNC3PKrpSV18qPPWdxrDLkV Df8Rdr9L81e3pYKJNqm2JADvtp2mGTIAxR5NcKoyq/oWwd3N744f9I3S4dyFx3vMCzvtPq0stKA FpN6n0dOxe8s= X-Received: by 2002:a5d:47aa:0:b0:226:dbf6:680c with SMTP id 10-20020a5d47aa000000b00226dbf6680cmr20947361wrb.581.1663150152756; Wed, 14 Sep 2022 03:09:12 -0700 (PDT) X-Google-Smtp-Source: AA6agR6mUE0OyqSCSCmqM4mki5eCHDSHXk9TWtC5yJAaN4TbupXuzHkSxN3OSWGQKjEVNQGAFCI3Hw== X-Received: by 2002:a5d:47aa:0:b0:226:dbf6:680c with SMTP id 10-20020a5d47aa000000b00226dbf6680cmr20947344wrb.581.1663150152500; Wed, 14 Sep 2022 03:09:12 -0700 (PDT) Received: from [10.119.22.46] ([89.101.193.71]) by smtp.gmail.com with ESMTPSA id v2-20020adfe282000000b00228dff8d975sm12603941wri.109.2022.09.14.03.09.11 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 14 Sep 2022 03:09:11 -0700 (PDT) Message-ID: <35003c8f-d777-b2b1-4d48-20f90ba66994@redhat.com> Date: Wed, 14 Sep 2022 12:09:10 +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 Cc: linux-mm@kvack.org, akpm@linux-foundation.org, 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> <53390539-cfa9-7498-5b69-8fb8b307182d@redhat.com> <878rmnn0jq.fsf@nvdebian.thelocal> From: David Hildenbrand Organization: Red Hat In-Reply-To: <878rmnn0jq.fsf@nvdebian.thelocal> 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-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1663150155; a=rsa-sha256; cv=none; b=nN5WozEdk1YbjeQ3bk4efqDrNwCMYdRRHBojCl8RZF0siJOvHSo+cWfHQTk7h6vwwxsQob ezM3l5kjZdn24SrKBba+gpJ2u4REA6tgn1wgZe+645DPC1MbKvrHEJTGJd8FvMFRAExmRa b+OEIcl2+vct4BxfyCE5ai2oMUlbJwM= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=EyQ9du6x; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf01.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=1663150155; 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=tRy6NMXVqAdLaaelo9/KHPKagVual2K79eNRneTqSHA=; b=HBurDV0CBW3Wu2AkcfVc8MqwKF3Tl/OuUB+F4cOvoKIw/90Eajn4xkqXAJ3t6BZqGYhqbq 4+UHUpF/OvJpjU53jomN/Yf2a/gLFYA8qOeyXXH7qLl1ktUuVc+rZA8zjnJgqOHWIUC4Or hoAGap9b6YoGU+phDydina3x/wlfNdw= X-Rspam-User: Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=EyQ9du6x; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf01.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com X-Rspamd-Server: rspam11 X-Stat-Signature: oknigqwc9mr8fuff31yo74cdojx8ndep X-Rspamd-Queue-Id: 91B5040094 X-HE-Tag: 1663150155-865041 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 10:20, Alistair Popple wrote: > > David Hildenbrand writes: > >> 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. > > Thanks. I'd missed that, although `grep pagemap > tools/testing/selftests/vm` suggests I'm not the first to follow a > tradition of open-coding this :-) > > But there's no need to perpetuate that tradition, so will redo this to > use vm_util.c instead. Yeah, we just recently factored stuff out into there. I'll be factoring out more in my upcoming tests from the madv_populate tests. -- Thanks, David / dhildenb