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 A18F9C7EE23 for ; Wed, 17 May 2023 08:38:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3E88E900009; Wed, 17 May 2023 04:38:17 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 39783900006; Wed, 17 May 2023 04:38:17 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2391B900009; Wed, 17 May 2023 04:38:17 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 14EAD900006 for ; Wed, 17 May 2023 04:38:17 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id C9FB3ADD96 for ; Wed, 17 May 2023 08:38:16 +0000 (UTC) X-FDA: 80799094992.22.2A91B01 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf26.hostedemail.com (Postfix) with ESMTP id 51053140014 for ; Wed, 17 May 2023 08:38:14 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=RMVCrUeY; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf26.hostedemail.com: domain of david@redhat.com designates 170.10.133.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=1684312694; 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=97ToGLKuvaj7XmcoRhe/olZuS/lpM05KUIrSj3Fc5mA=; b=kfD8NfRDp1zqO1j0h6Z9bGMl2I+nx6ujNEs3WLJPQ9NFVwnJLhBYOwCDO8Gvci2ZVtRBmt iwa5O+giaoulPScyc06ttqTHKpI4paWzuuE5G2gzQ4VHeEfRHb/RFnD5pEFQHG7mTW6qHn 0mgdkOfWp1xXSbWRoISPdwccqoI+Q48= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=RMVCrUeY; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf26.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684312694; a=rsa-sha256; cv=none; b=ic+v/evFU9UHwkcSSRxb3sHqomfTyETiaYtU0jDlRGl52CuG03qmUnh1N+4o2c3ZReHdOP o034EaJGPKZa0UV6hSWkWeKVRnRPjAM3wPcCAom/XuZLuwLGdCcyypDodmHdVy4Ew6bWoh +bNGp+EBOfSu2ljMm0KDQzn/x8ak9zs= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684312693; 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=97ToGLKuvaj7XmcoRhe/olZuS/lpM05KUIrSj3Fc5mA=; b=RMVCrUeYC/dCg7IiXkyg6Q0isF6fKnRT1lDb3GfCKp/P8GhlXK0xt8Q0cCpbaVt7LI3n7C PLE5l1BFlA/po0xlziLh5kjhhHwfJ3nvEeNMKGo86mBR2r2cBkjMY3gg4EJIEBVEcGE02b hrSxUYkeXoZ0c0oao/6CmwKPytYsGEc= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-558-clu84DIiMhi5vZnHTX5ulg-1; Wed, 17 May 2023 04:37:32 -0400 X-MC-Unique: clu84DIiMhi5vZnHTX5ulg-1 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-3063089cff4so290901f8f.0 for ; Wed, 17 May 2023 01:37:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684312651; x=1686904651; 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=97ToGLKuvaj7XmcoRhe/olZuS/lpM05KUIrSj3Fc5mA=; b=fuRPasigSPr37U9I+iqs4kFhgMaLU0LG3cG1hw5LlzJWWSD3OPZu+bOdJrk2mi9A+k +OmgC0IcBq0jZv1WhrC1QAPopsHEBJCOVL/3BgC6k9yNiEBeKirGHoDo5qL/IsN2P/sE kye5VUwaxJRACQQMzkG6Enu+U6Qirb+pQ0I39KyYdy3T8CTVcHFHVFMcikw8nWQJLtT5 fpYeZtoxU85eNhHkUHM4Mq2fWpV07qjnhHbaEub3JvTrs4R+OTRvtkEtacWr+8rr02/r cWFyLZONEKlOUkkMLyYps1On8liLRtWWlHdSC4f1mZaKVdB9iOniCSrl94dV+IUDAo4V McVw== X-Gm-Message-State: AC+VfDwbDzB034bNlHwmWrCHvRBPou6ERVe6CduyaXRMcXZo+Pt2az0h RGDuVDnsGIIF1xt5JFFVtyxFMJRnOJQsaTFvHW8VymSEwB4JVbWg5kgnaM9l0CKIdbBY81fp+ub PqnveahMVAPQ= X-Received: by 2002:a05:6000:548:b0:306:4162:ebbe with SMTP id b8-20020a056000054800b003064162ebbemr27840937wrf.49.1684312650868; Wed, 17 May 2023 01:37:30 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ61oQtI8NSfdfqGeBSv749qPFZlbpUYgWlIACvEuF6nv468SUUYxofca3rAKZHN/GQIfcueNw== X-Received: by 2002:a05:6000:548:b0:306:4162:ebbe with SMTP id b8-20020a056000054800b003064162ebbemr27840916wrf.49.1684312650566; Wed, 17 May 2023 01:37:30 -0700 (PDT) Received: from ?IPV6:2003:cb:c707:3900:757e:83f8:a99d:41ae? (p200300cbc7073900757e83f8a99d41ae.dip0.t-ipconnect.de. [2003:cb:c707:3900:757e:83f8:a99d:41ae]) by smtp.gmail.com with ESMTPSA id r14-20020adfe68e000000b00307d58b3da9sm2030355wrm.25.2023.05.17.01.37.28 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 17 May 2023 01:37:30 -0700 (PDT) Message-ID: <12b29199-4469-d970-579a-46a60e6e8236@redhat.com> Date: Wed, 17 May 2023 10:37:28 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 Subject: Re: [PATCH v3 2/3] mm: Call arch_swap_restore() from unuse_pte() To: Peter Collingbourne , Catalin Marinas Cc: =?UTF-8?B?UXVuLXdlaSBMaW4gKOael+e+pOW0tCk=?= , linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, "surenb@google.com" , =?UTF-8?B?Q2hpbndlbiBDaGFuZyAo5by16Yym5paHKQ==?= , "kasan-dev@googlegroups.com" , =?UTF-8?B?S3Vhbi1ZaW5nIExlZSAo5p2O5Yag56mOKQ==?= , =?UTF-8?B?Q2FzcGVyIExpICjmnY7kuK3mpq4p?= , "gregkh@linuxfoundation.org" , vincenzo.frascino@arm.com, Alexandru Elisei , will@kernel.org, eugenis@google.com, Steven Price References: <20230517022115.3033604-1-pcc@google.com> <20230517022115.3033604-3-pcc@google.com> From: David Hildenbrand Organization: Red Hat In-Reply-To: <20230517022115.3033604-3-pcc@google.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 X-Stat-Signature: sf84hd1kgbggy6cbsihjm3nqgmy1sju3 X-Rspam-User: X-Rspamd-Queue-Id: 51053140014 X-Rspamd-Server: rspam07 X-HE-Tag: 1684312694-836748 X-HE-Meta: U2FsdGVkX19VHOtnQHfrdRyp+eTCh0S9YHJUyduuPHl+3kyHmfYoZdnUav6KRzeGg1zaGLQ1hIMbQ71Eo54OSw2pD0B9IuBZxHlQHvOp/xDVqz7+r8+zMniUIjOaqtuImi8jpVBuGbm65uiTOZqXUgOHpiEqrzqskEOMiDMoy6xvpMMz1dY5+7WYdOvusAVCoLKVHtIS8IcWz/7gCfJDd9fYw/4ietpmFhy84pGY+yiWubqWohBP4OKuVfnG0w5kftJ3I3EE2H3ePSo7hdBuZvZQ/lc23Y48O6NRqPEURnoQRxFT9Xa/QAym/8YnLQNtHM9cMmJ4gO7TXtxPyNvK855LpSMPlPOJOxeFMmgv7bXG1GqnGFc/D/vGg5R8kpXr6sc/v1XDaw9wKQf02Znyvq/qOQBAutSdhfULiStCxWy8TLaQAgFS+fFqnUD9lRB4MCiCR+yG0fpdC1HN5dBJHWhp0L7yGN34VAPRQ3FRO1eWUT3bdRdLJRs0zniAahZ25/Cm1DqrQOG5g3spyJoSWLlXDKX81VWAobGwGI1DOTE02XVfM1FfTP2fiZ8N7OefWjQOIwlaKLKmQHbIzpeY26IKbfaTRGlo4u//0Cqy/YBvezoCz72lNwHzB/CUqGOzHkz4d2CsFhwlrLXv1Vsr9kxDJh1Cwg81dCw92vWzKqb1Mge6IOsuP+Iw1awGJvhrKzPMHdOPcW52C2sxU82JEPbTR5aEth8fQtbVe7XwnAAKD1uvjopN5kkhF2SIcLYY3N8fTFcmV98d6CkM9+fTXXijbBaAwbxwA7nWhCJeL2ah+G18BgGHdcAiWWYMURxUmtATPsuuhG6kQTT49TNey8ARdVNdwzQhWvuWsTjZ/rZApS4U6yO2H/dwAS96AwSPjaFQhb0trrKUwVENWoNqUSssBvmpZi/Qf4uYWZgl5aEcJoiWfHoxTfZeOnoR5AkrXo9Lb/bqwqWuvzjNZOv E7v9712m 20ltfO45QWugPQk9hUDSHoCl+73Rw4A/m7FeLeI7DFDsi4etQjJILm3UdGGjO8/n/6pPtAtXZIJ81VX4bEpXgYFqT9umOoPx+1mOzIdl27o/NOVodvOrgPi8qFsO1EiUgQD2gegf7aa/x/OAWOwrqOlEzaw2viR6jFVBe0Vi8xpSEIKw1VsCi91tiwRZbcDQhigak1V9sRqTE1ZOxZJfQexh0PAhKNn6ua2UPMp8z0oPknxnHNY/1JuGyPKQ1Rm/y42R9iRUsIjI/8O6vk+v5psKZL0uHA3CcIbOy0eKlJ+fNZUbyeLf8fyeyKOEtg1pyLuI8vKIUiP37pUm0Lj5Zw4MR8g+NOrqCXF1osksCevaxSEfUS3Pehv1+jFZOZvxjxO1gRJkRRPwdoyegje907crDoThkGU2ex9+PztrBciT9ZgRuw3M93RaIkaIaNsNXzvgpxjFBR3X1gKso/5n6gc/K42np1H7HGeePa9IvV6pgu+iDe2oYsOgwNiWIe2aUGo2KjIcAPQil3Rq3DJokr7nOYORtJjTHfjAqVmH7+GkB1wq5Mj28Iyix09TtnZ6rPNXw 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 17.05.23 04:21, Peter Collingbourne wrote: > We would like to move away from requiring architectures to restore > metadata from swap in the set_pte_at() implementation, as this is not only > error-prone but adds complexity to the arch-specific code. This requires > us to call arch_swap_restore() before calling swap_free() whenever pages > are restored from swap. We are currently doing so everywhere except in > unuse_pte(); do so there as well. > > Signed-off-by: Peter Collingbourne > Link: https://linux-review.googlesource.com/id/I68276653e612d64cde271ce1b5a99ae05d6bbc4f > --- > mm/swapfile.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/mm/swapfile.c b/mm/swapfile.c > index 274bbf797480..e9843fadecd6 100644 > --- a/mm/swapfile.c > +++ b/mm/swapfile.c > @@ -1794,6 +1794,13 @@ static int unuse_pte(struct vm_area_struct *vma, pmd_t *pmd, > goto setpte; > } > > + /* > + * Some architectures may have to restore extra metadata to the page > + * when reading from swap. This metadata may be indexed by swap entry > + * so this must be called before swap_free(). > + */ > + arch_swap_restore(entry, page_folio(page)); > + > /* See do_swap_page() */ > BUG_ON(!PageAnon(page) && PageMappedToDisk(page)); > BUG_ON(PageAnon(page) && PageAnonExclusive(page)); Acked-by: David Hildenbrand -- Thanks, David / dhildenb