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 70F38C433EF for ; Thu, 21 Apr 2022 13:13:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CC8456B0074; Thu, 21 Apr 2022 09:13:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C76DA6B0075; Thu, 21 Apr 2022 09:13:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B18AE6B0078; Thu, 21 Apr 2022 09:13:19 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (relay.hostedemail.com [64.99.140.26]) by kanga.kvack.org (Postfix) with ESMTP id A100C6B0074 for ; Thu, 21 Apr 2022 09:13:19 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay11.hostedemail.com (Postfix) with ESMTP id 7DA3D805EE for ; Thu, 21 Apr 2022 13:13:19 +0000 (UTC) X-FDA: 79380927318.17.B2F587E 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 38C8F180030 for ; Thu, 21 Apr 2022 13:13:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1650546798; 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=FzWrq6wADG8fls2g3YNi2KBRby6mI91KD1aPFaOuBgg=; b=SeXBelFwQWNxBbJQ1hOQQTUD7A9sjJ8FeB2avYBR6Dtse8DfLuIyo6Y6PVsPMpvpKGRSBa dQsxrpU313X9wrw5Db56tOxNP1uLt7kevSn3ymgdAIBDzLg17gM3DXyjwk4I6+ZavLsyut nfSf9G3vX/+U0gxERBsrg+HL6qI3mVI= 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.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-587-_V4pEepyONGfxRxr5ye88w-1; Thu, 21 Apr 2022 09:13:16 -0400 X-MC-Unique: _V4pEepyONGfxRxr5ye88w-1 Received: by mail-wr1-f69.google.com with SMTP id t15-20020adfdc0f000000b001ef93643476so1119612wri.2 for ; Thu, 21 Apr 2022 06:13:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:organization:in-reply-to :content-transfer-encoding; bh=FzWrq6wADG8fls2g3YNi2KBRby6mI91KD1aPFaOuBgg=; b=uZYpw4BxQ/hPMCJQXA0ODPA/rZ3DteJ4GISTM1WfRssFLxGnN8XJvjnWNiB6JyZ9+W TgO8PzeN3I2AX+2Qx7BzmNsSsEBIYcks3m5oJfBo+dRSsBE69O5XDHzuQDtfBBqriCtj zwtBko1GVtrTsUTATzbhoqXtiCxGfrNj3uyeY3b+QrqjbJZGVqhTcPchk6MCaz2aPaxT U9g+7YVZABJMAOEEAGuI/oiswyK4m56AFy1mAcjpvtf3IjpDGtCykiSYbGbWWEVYsIBd +HRuY36Vd2ntMbVhKSKKik9zb/EE3kmHwC4Hot3palcIFWel9bUwqBB34u47exZqHLSg iXmw== X-Gm-Message-State: AOAM533rj+0gXxUromoUcLN9YNTe1wp0ZLD+KA5zxtbLV5Av+cJnfPMk YOIfpioyxoAdLIxSHT7Qy6Gyn4tTLlLdX8wLwCJyli+zKZj42aRw6egLyo/Ov39UEMnK4p/aLXI ywG0IIOCRaxs= X-Received: by 2002:a5d:604a:0:b0:20a:8145:ad04 with SMTP id j10-20020a5d604a000000b0020a8145ad04mr19085012wrt.255.1650546795371; Thu, 21 Apr 2022 06:13:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyb38/K7fR5vGj0BbR2nbDRw0aq+8b3KsKUW8o45emQVthbAQ8YqAtEFEH0t8BYy5sf4flfXA== X-Received: by 2002:a5d:604a:0:b0:20a:8145:ad04 with SMTP id j10-20020a5d604a000000b0020a8145ad04mr19085000wrt.255.1650546795119; Thu, 21 Apr 2022 06:13:15 -0700 (PDT) Received: from ?IPV6:2003:cb:c702:de00:711b:76af:b335:9b70? (p200300cbc702de00711b76afb3359b70.dip0.t-ipconnect.de. [2003:cb:c702:de00:711b:76af:b335:9b70]) by smtp.gmail.com with ESMTPSA id m7-20020adfe0c7000000b002060e7bbe49sm2764840wri.45.2022.04.21.06.13.13 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 21 Apr 2022 06:13:14 -0700 (PDT) Message-ID: <67fc9368-0876-b931-14c2-ffa4dac35b6d@redhat.com> Date: Thu, 21 Apr 2022 15:13:13 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.6.2 Subject: Re: [PATCH v2 2/3] mm/swapfile: Fix lost swap bits in unuse_pte() To: Miaohe Lin , akpm@linux-foundation.org Cc: willy@infradead.org, vbabka@suse.cz, dhowells@redhat.com, neilb@suse.de, apopple@nvidia.com, surenb@google.com, minchan@kernel.org, peterx@redhat.com, sfr@canb.auug.org.au, naoya.horiguchi@nec.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org References: <20220421125348.62483-1-linmiaohe@huawei.com> <20220421125348.62483-3-linmiaohe@huawei.com> From: David Hildenbrand Organization: Red Hat In-Reply-To: <20220421125348.62483-3-linmiaohe@huawei.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspam-User: X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 38C8F180030 X-Stat-Signature: gwdmwh9x5tx7tjns5tt6c5rynbocaqjn Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=SeXBelFw; spf=none (imf24.hostedemail.com: domain of david@redhat.com has no SPF policy when checking 170.10.129.124) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com X-HE-Tag: 1650546797-543401 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 21.04.22 14:53, Miaohe Lin wrote: > This is observed by code review only but not any real report. > > When we turn off swapping we could have lost the bits stored in the swap > ptes. The new rmap-exclusive bit is fine since that turned into a page > flag, but not for soft-dirty and uffd-wp. Add them. > > Suggested-by: Peter Xu > Signed-off-by: Miaohe Lin > --- > mm/swapfile.c | 12 +++++++++--- > 1 file changed, 9 insertions(+), 3 deletions(-) > > diff --git a/mm/swapfile.c b/mm/swapfile.c > index 95b63f69f388..332ccfc76142 100644 > --- a/mm/swapfile.c > +++ b/mm/swapfile.c > @@ -1783,7 +1783,7 @@ static int unuse_pte(struct vm_area_struct *vma, pmd_t *pmd, > { > struct page *swapcache; > spinlock_t *ptl; > - pte_t *pte; > + pte_t *pte, new_pte; > int ret = 1; > > swapcache = page; > @@ -1832,8 +1832,14 @@ static int unuse_pte(struct vm_area_struct *vma, pmd_t *pmd, > page_add_new_anon_rmap(page, vma, addr); > lru_cache_add_inactive_or_unevictable(page, vma); > } > - set_pte_at(vma->vm_mm, addr, pte, > - pte_mkold(mk_pte(page, vma->vm_page_prot))); > + new_pte = pte_mkold(mk_pte(page, vma->vm_page_prot)); > + if (pte_swp_soft_dirty(*pte)) > + new_pte = pte_mksoft_dirty(new_pte); > + if (pte_swp_uffd_wp(*pte)) { > + new_pte = pte_mkuffd_wp(new_pte); > + new_pte = pte_wrprotect(new_pte); The wrprotect shouldn't be necessary, we don't do a pte_mkwrite(). Note that in do_swap_page() we might have done a maybe_mkwrite(pte_mkdirty(pte)), which is why the pte_wrprotect() is required there. -- Thanks, David / dhildenb