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 CA2A1C001B0 for ; Wed, 16 Aug 2023 09:17:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1FC2A280009; Wed, 16 Aug 2023 05:17:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1AC9C8D0001; Wed, 16 Aug 2023 05:17:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 07437280009; Wed, 16 Aug 2023 05:17:55 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id E88D68D0001 for ; Wed, 16 Aug 2023 05:17:54 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id B718FC0247 for ; Wed, 16 Aug 2023 09:17:54 +0000 (UTC) X-FDA: 81129415668.06.476CD4F Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf24.hostedemail.com (Postfix) with ESMTP id 7C6B7180023 for ; Wed, 16 Aug 2023 09:17:52 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="Tz1h0/P3"; spf=pass (imf24.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1692177472; 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=p0hy7xCSgkB5y82kJ9bqLd809a5NSoF3GSa+sQi+q0s=; b=K5oLLnFwqz5WERsbzXfHjCoh3wWwU94riNYCGYUCLO+ZTBl1UCqFxDPuUU6TSzromV7L44 IdjOGvxwhEPI25lquq/jHJ0Y4e/a+2kJz7hdgM/n2OE+8I5HPhHfok222dMhis3q3OAUr7 H7CwiNhGfdXVCu4GbdcwC37s5FikKZg= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1692177472; a=rsa-sha256; cv=none; b=v5VYJ//COJB5wzc3FN9nBiMDWdkW6/waczJ3oAYIQ/cjpJ7em6sTbZnWOh4Tg2bcbSOGbw +ZZIoMveQ2gqjd6GnItSBIKOvDyQA5m1b+lTNuqm6Vur9/NVad0uCx/YPW3foYycUqS3TB Ll6/dzx3qkZCHANwdSnWkocLAeKygYI= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="Tz1h0/P3"; spf=pass (imf24.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692177471; 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=p0hy7xCSgkB5y82kJ9bqLd809a5NSoF3GSa+sQi+q0s=; b=Tz1h0/P3xl5M8Dbc/ng4jf8JcwAVVAb44k5QU11kxtjsaUazGtlzZj7tejsri1FAP2UqJ7 /fwy2LZouYSCKolQl7K/0rVabp4YAtPvOGL31PcT9WsniG1Q6WtckZsAIaA31ZzGSCLdvX xqnFtFpWsS4UdjOInkAaKx3NhiUNd4w= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-446-mVMDpXAePCOpeZ-76AMYbA-1; Wed, 16 Aug 2023 05:17:48 -0400 X-MC-Unique: mVMDpXAePCOpeZ-76AMYbA-1 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-3178ddc3d94so3691431f8f.1 for ; Wed, 16 Aug 2023 02:17:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692177467; x=1692782267; 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=p0hy7xCSgkB5y82kJ9bqLd809a5NSoF3GSa+sQi+q0s=; b=eOhL1P/FY31TQP9ncuHSpjg4HzgDHcmYpQjYcEBqBYXL5zgtuj8EPutYt3jkM5tyAr bguxajbZXtOFMNSLrtihG/0Alv2Q/7rxrHkfnvskx/xQR5pqM3O6EzAe34vPSZxGwkV6 oN/+qZJdrnRvMTH0L4c+dwrvkT+XLj5oYIzCZbYO+lF66jWSBomwBmbGRx5DaEL8zeAN ZqYY+62E2Vu2/6XQ9oZGYdlPYOahyLWtsAWdovz83TdNw3S6q1RqNKrpq9087QeaHr8/ kBMr3s/gZWwSRdPEPMrtjtJeM82qOqTkc7XvJga/N9yX37GEqQtbeZRtWeFXFAc1GjUA lVfw== X-Gm-Message-State: AOJu0YwQILXD1qGrWN7hO16FgJq3iiRujpGMt2/0H72szbZky3XMZn+7 b0UdzF3oU/2N7zZ0M1ItgboN9kCVT6d/upTjYGNDhefPQMWpkL1oiOXS2Tuluh1tiVUi4VpScCw wdau/PVuP3UU= X-Received: by 2002:a5d:4641:0:b0:317:d048:8d87 with SMTP id j1-20020a5d4641000000b00317d0488d87mr970861wrs.61.1692177467003; Wed, 16 Aug 2023 02:17:47 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEYE8tW6njcCIpnp7/kJmLxpwrTbmRPFKOuz6M/fKJILyg4/LEYonOQvScK74W0S5TnSt2G2g== X-Received: by 2002:a5d:4641:0:b0:317:d048:8d87 with SMTP id j1-20020a5d4641000000b00317d0488d87mr970842wrs.61.1692177466572; Wed, 16 Aug 2023 02:17:46 -0700 (PDT) Received: from ?IPV6:2003:cb:c74b:8b00:5520:fa3c:c527:592f? (p200300cbc74b8b005520fa3cc527592f.dip0.t-ipconnect.de. [2003:cb:c74b:8b00:5520:fa3c:c527:592f]) by smtp.gmail.com with ESMTPSA id e1-20020a5d5941000000b003141f96ed36sm20719966wri.0.2023.08.16.02.17.45 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 16 Aug 2023 02:17:45 -0700 (PDT) Message-ID: <6d58c4b4-b1d4-bc88-282c-10f90c59084b@redhat.com> Date: Wed, 16 Aug 2023 11:17:45 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: [PATCH v2] mm/secretmem: use a folio in secretmem_fault() To: Peng Zhang , linux-mm@kvack.org, willy@infradead.org Cc: akpm@linux-foundation.org, wangkefeng.wang@huawei.com, sunnanyong@huawei.com References: <20230812062612.3184990-1-zhangpeng362@huawei.com> From: David Hildenbrand Organization: Red Hat In-Reply-To: <20230812062612.3184990-1-zhangpeng362@huawei.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-Rspamd-Queue-Id: 7C6B7180023 X-Rspam-User: X-Stat-Signature: y94zc1kztumz99gdg7dhcoux1houcqeh X-Rspamd-Server: rspam03 X-HE-Tag: 1692177472-382351 X-HE-Meta: U2FsdGVkX1+SVt3JJyCdQ+0KNEMQG/qoaFy0Z4GHh5wKBH4hKuoef5rxMA8dg/yf36UjvTB2otm0Mw+I7ap4g1JrLAQTK/zBKrWsAHU+coLC/tj2lTFZSeVFLshI1+B82zwxXi5qIL+5+PPo8PPJgfpGQg0F7Z8jb1kLnSco27vQEEuaoF+b24yFrB5jtfhvuOqpqQj41JUOtOCNdNHtFrcx3F7TbIX3y6b7mhhNEHpff6CHjYCGWI4mT/LGeom2NXZ5PkCpHRHQHhdBfhjhDJ1jGjIRrKcBzFQHH+c14vy1JQIpFNU1pBfjVSK/imiBw6losrbwp/lWnAbBIxDaqtZeEzWJbfhAcSA2+BRoJm6CP9mWjZ2Dx5jYSDiheGfggWyOXZhj8g2G5rpJBT5vlt4Rs1+zq/n/Z+mhBu/n1BTlDRGx9CoQf4L0HBlKpNkXUKYiwaeh6DIK8woSoIakmkkGVU2JgYzX7d4JHdauWrQtKqeNqfaxX+8rRmE5YK1ramhhgAjaEu+WoO9AMxMDu2N2O43dYaSikimdNibDvFF/qm/S+bZdxL8KozQ+UwEVjPFlaE2brRWWV+SoQTjuHTOY7uAgxgCdoi/Bxe01bUq5Lq+NS7sDnCgvZ9+Xm7DIiidEGi+yjbvqQLx+jcEHv/9JFLjQBi0OrRxlbdkmyZ1Y5ejmGxMNU1xTwYUsafX6sFM3tqKp9zw9yd203SGzk+X7ywI2b4YkYbxdxlMWK0TQowqmnO2IMgl7pYwGGoQx8DDH81mlcdTIR+oRM61/+UFkTHPbjFWfN7kBr+D1iEKwn66JsiBFSo9G7rkMg9FbUbKjKRUZgtyF2Ddqjl5SO+CYUF+wQ69orB6khALT4I21f+3WIBW3p3afCYubDkCT1mbteSlPssv0+kXjGcgKY7lM26wOwayTgaqDqWLTDkeDSINO6vElpkaankkmyuN874FiYaxZH3v55dG6iAr LFPAnIlz 0dsB6VpTcp38qcbUv/+UqYTM5E/BMpHZYJaqjnXEp5Jag6r8KJCNzaZw4pqhlOmhQftwqVGWX3V14ds+45y0TA/Sa/WnompTnqHqHel/J/1Ye8CPW6xDZimfm3p49asDmkJiDuuFZpYbNCvlrbgV68TJ+CBXRMJrz/9MvASA03vmNbMcv66C2Omkubz93pyPzCzxZLKSnqv82tSmTW7YJFJHuDpSJGegWOni0Snzchjd0ZM002uLpYkqQIXlQDI+okxBO6ITMz7ADB03+ystSGYbpjO0PdLOf0k35VYwNTtp9idQH3wChNmB57pm1RA++oJOc57QtsDSADN3mV01TSj5SVYu9NC6WDfiBsyJoEbVJdCgLJQYru7i1w5ZzzlosYSdZ+4pQeL8Q6HklEdHzoVnsE+q1jnd4Osnr9X5HrhDJj7JBM9fLAPjTkYjUs2ZHk3W8Pp6v7V1ysvcxyxwsOdncDfWfJIAFA/poTjdu8e786Kdb02PVbMq53JXID5sa/GJhpOTLAF7HFz+NO047+7fkYw== 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 12.08.23 08:26, Peng Zhang wrote: > From: ZhangPeng > > Saves four implicit call to compound_head(). > > Signed-off-by: ZhangPeng > Reviewed-by: Matthew Wilcox (Oracle) > --- > v2: update commit message per Matthew Wilcox > --- > mm/secretmem.c | 14 ++++++++------ > 1 file changed, 8 insertions(+), 6 deletions(-) > > diff --git a/mm/secretmem.c b/mm/secretmem.c > index 86442a15d12f..3afb5ad701e1 100644 > --- a/mm/secretmem.c > +++ b/mm/secretmem.c > @@ -55,6 +55,7 @@ static vm_fault_t secretmem_fault(struct vm_fault *vmf) > gfp_t gfp = vmf->gfp_mask; > unsigned long addr; > struct page *page; > + struct folio *folio; > vm_fault_t ret; > int err; > > @@ -66,23 +67,24 @@ static vm_fault_t secretmem_fault(struct vm_fault *vmf) > retry: > page = find_lock_page(mapping, offset); > if (!page) { > - page = alloc_page(gfp | __GFP_ZERO); > - if (!page) { > + folio = folio_alloc(gfp | __GFP_ZERO, 0); > + if (!folio) { > ret = VM_FAULT_OOM; > goto out; > } > > + page = &folio->page; > err = set_direct_map_invalid_noflush(page); > if (err) { > - put_page(page); > + folio_put(folio); > ret = vmf_error(err); > goto out; > } > > - __SetPageUptodate(page); > - err = add_to_page_cache_lru(page, mapping, offset, gfp); > + __folio_mark_uptodate(folio); > + err = filemap_add_folio(mapping, folio, offset, gfp); > if (unlikely(err)) { > - put_page(page); > + folio_put(folio); > /* > * If a split of large page was required, it > * already happened when we marked the page invalid Reviewed-by: David Hildenbrand -- Cheers, David / dhildenb