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 0AB36C71156 for ; Fri, 18 Aug 2023 14:38:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8932A940062; Fri, 18 Aug 2023 10:38:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 84337940012; Fri, 18 Aug 2023 10:38:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 69597940062; Fri, 18 Aug 2023 10:38:13 -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 5715B940012 for ; Fri, 18 Aug 2023 10:38:13 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 36388A01FA for ; Fri, 18 Aug 2023 14:38:13 +0000 (UTC) X-FDA: 81137480466.04.0F2FD26 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf26.hostedemail.com (Postfix) with ESMTP id C6727140010 for ; Fri, 18 Aug 2023 14:38:10 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=FzqveNu0; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf26.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=1692369490; 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=6AO8bLQMMqRA/kR1FMLwLK33QBpyyFpkWuDBu3UgDsQ=; b=MthFUbCW2jRS/RaKr43p3LzZFxAer+uyIftW2KvjGgKK0QmLylASV6AY17rZDrutIqeedF 95uWG6YcXgJ1vZcaDaH4mKjAbOtflMHZJNxKq+2FVIIaI0+FvFe9qQ+PHfLc9aCH6vlqp8 AAlR+vS1yxScYXLzy27TiO3mHfIOqf8= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=FzqveNu0; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf26.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1692369490; a=rsa-sha256; cv=none; b=It3pm0+Vp7xgpbSRfvzrUle1bR88kUfEZMzOPV+nviNqUwGyCQPgZuKiVXCe6UnMS2fS3N Gs6ChTcKuC64ncqExuQ1KY4s+4mHP4nJLSe2GKrxYZZRRRQUTWCcenY7YCcHkHIA6DzX42 IpIH6EVkrTl15UWB3oHUYSuIU3/Vb2E= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692369490; 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=6AO8bLQMMqRA/kR1FMLwLK33QBpyyFpkWuDBu3UgDsQ=; b=FzqveNu0Js06AxHs6Qz3O7+LlBRJUlk2Co9vj38PL4ZkfHUSoUl/lY9+WYazLoK/DvCiU5 a7ccuj2LiGJTdXRgPZCLYTPyaWDcwFxV6uSF9XKMV2HYWuAYbdQs8sVg17mxV8RQjbwNdo UPasZrFi4+56VsqOiG2HnMY7KR63UvI= 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-269-GqP3YLwDNsaJwZ4sOgsp9w-1; Fri, 18 Aug 2023 10:38:08 -0400 X-MC-Unique: GqP3YLwDNsaJwZ4sOgsp9w-1 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-317c8fbbd4fso644757f8f.3 for ; Fri, 18 Aug 2023 07:38:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692369487; x=1692974287; 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=6AO8bLQMMqRA/kR1FMLwLK33QBpyyFpkWuDBu3UgDsQ=; b=WtYJTWGrq3fOcb6PKiOi5vEheVFiAHeuhnpAbmyL4uSE8QrjJDzsxUecWPboNZ92rv uIvCKoUlbOVDsAVw8VG4uVjLNcATLCRIGObGtmSsQFU3Vs/Ax6qRpnAGevLOOkiy3BY5 dBOzLER3GnL8GxHoSbyNiPsyxQYfE+pFRRk30RGm1OwUQfl1/2X8QK5nZfmiklGqsKNv 60UynvH7NqcBgWWshD5rTZ8SvwNNyuJ9H2DlS9PfMiawbktIQwcurmiKMdu3rMBfPc7T /3twNc7bYaeOqIQQf+VZ8YmhTujv2W3uh/ZbkSVrNQFMjln7zZBs8FeXH+fCDJlu2wFH r+BQ== X-Gm-Message-State: AOJu0YxivABbem4adcL1CuTnd3e0hHmsOjZJ5CBVq3J++PSVvj8lvyUW c7kTPMHGT6ntlouGF/FCoN+Bp+eGnJncOLXkMV/LfVWwUUjxhrluHjTxZftvaYsavH+i+ae+AoD BbqwB7SK7/nA= X-Received: by 2002:a1c:ed1a:0:b0:3fa:96ad:5d2e with SMTP id l26-20020a1ced1a000000b003fa96ad5d2emr2353268wmh.19.1692369487540; Fri, 18 Aug 2023 07:38:07 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHTQmCt8Bmk74oFkZxUBhky826R2XGHuTRXwL4/0sN/eFqiJynhHbdlec1cDmlmtyABhmh5Mw== X-Received: by 2002:a1c:ed1a:0:b0:3fa:96ad:5d2e with SMTP id l26-20020a1ced1a000000b003fa96ad5d2emr2353237wmh.19.1692369487088; Fri, 18 Aug 2023 07:38:07 -0700 (PDT) Received: from ?IPV6:2003:cb:c726:ff00:a22a:6d42:439d:de2? (p200300cbc726ff00a22a6d42439d0de2.dip0.t-ipconnect.de. [2003:cb:c726:ff00:a22a:6d42:439d:de2]) by smtp.gmail.com with ESMTPSA id eo4-20020a05600c82c400b003fe1a092925sm3036929wmb.19.2023.08.18.07.38.06 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 18 Aug 2023 07:38:06 -0700 (PDT) Message-ID: <6259fc1c-62e4-5ac0-33cb-0cd9a985c5f4@redhat.com> Date: Fri, 18 Aug 2023 16:38:05 +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 RFC v3] mm: Proper document tail pages fields for folio To: Matthew Wilcox Cc: Peter Xu , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Hugh Dickins , "Kirill A . Shutemov" , Randy Dunlap , Mike Kravetz , Yu Zhao , Ryan Roberts , Andrew Morton , Yang Shi References: <20230815212547.431693-1-peterx@redhat.com> From: David Hildenbrand Organization: Red Hat In-Reply-To: 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: C6727140010 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: gbwbhwiakoatgb1r9d5dmjfehwf6wpep X-HE-Tag: 1692369490-420580 X-HE-Meta: U2FsdGVkX19TzTNDhtFGgKo98FKgcP0HszCk7gRfuZwzgedxu3L7f741N9JuhwLFLisP448YEDxUdrw4dBTYaSY6B0R4dhKhGnAS50nRvPxfI5frXqD4qf3SRFDu3tZqrGdoC1OrAEdQtyR0i9LrSZ3OSPt/JbUoTVqCY6pGhtshsIdRjpSSjG8nbMgmc0XM2+A1J1GW1FIW9yKxghWGMAD2hgc8Sr3GJoTwJOE37zfbvf2mcJp4mLEVGpy9aXhOfJplXi/EfyAindGUbdZAgxtu50T5D43e58uWbShXkMNmzdrKLMKCzDmr2PMDiFb82CGWmapDDU1nTqyp95QoHnPHKObibBbCbkPMnePeii38JjMBlo7c/PJVug9suV3UOxrJTGQ3V8Cfu3urGp+3XVWl9ArAIYUw0oW53FYMwmlgqIkn4iMGRf6xMiyigkJSplrRerOUgCbkA6DM3uomrSIFtSLd9Mc3+s3eu2XWoALl8HFeq+tpPzq2spRGEHxAYi7I3/HPwuWs/Dk9dEYJ3ZvyijdSsie40DC9vduysSBeErPv4ctFMCicfvEulYQu8KQYgwMNOZsBDpEGdOLhf7MuRKmzdq4qU++3BCEwFEWNFxFJdIY7vJu989kagIWYu+V4KnQv6e1lJacy5JwzpgP0TX4eN4YNasjMscpc5ynUyJTbf8vnmzYCbspuf7fxXi8hIOCKyEMh/MKEKxSN9fK2eTYl1PnA4Af77jRKj++Va83IHurAtaqp+JQ0TCTpqh41D3lEAzqx6xFU3K3Oqnayjbjig6CWS3NBashOzDCjhcY2m+jnnKnYyerzrV5lLnqxWoQS29b2AQn9gTY3owFpu5yFaRyAQma6bnM+Zalw18GHNg8AVfY64hNG/WYfi6+5i5w7bSXnkzZwnm5npXJzANtvvCyeTsYRCyMA/ly+M9kdY04V+IYS6cAwJDPLmi/Pmipy/wB60QsvC/X I/T8ZFnT G06V42UO6uc8WCCFZYMT2Tl7SZTt2neqkN36M6lSLACmI0tqNNeEDBUDeb/PP67LtgL6VhJkZcmaa3L162me98SaGrsyIzFRiAAOuHVyqSdkjpd0m5fOiwhPf3QbqyQkCN6eM+nW+nyqk1VM1Okv1l6Nau/s796NQUl8mmtyvzuvDJiTfurAemXJuaRx1STpwXl3Zvn+eQ+FENHFVIcrUH0NU6SKTrJXcBj3YPZX9wcRqc9hpy2gqra1SA/JqEKhJnseULBGjW1qAVGP7SZaJwG5CNGzZsrH8X8QbuyzOQAwtGUG4FmsHxdb4g6FPWQI1uthzZLpcVEpSO/2ac2Nwl39pI+waK2QXrGSXLSW/2jGcBF5E3FxGMa2nmQjS2iC6IpnQ 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.08.23 00:05, Matthew Wilcox wrote: > On Wed, Aug 16, 2023 at 08:51:49PM +0200, David Hildenbrand wrote: >> On 16.08.23 20:41, Matthew Wilcox wrote: >>> On Wed, Aug 16, 2023 at 03:33:30PM +0200, David Hildenbrand wrote: >>>> My simple tests passed so far. If there isn't something obvious missing, >>>> I can do more testing and send this as an official patch. >>> >>> I think you missed one: >>> >>> +++ b/mm/swapfile.c >>> @@ -1490,7 +1490,7 @@ int swp_swapcount(swp_entry_t entry) >>> >>> page = vmalloc_to_page(p->swap_map + offset); >>> offset &= ~PAGE_MASK; >>> - VM_BUG_ON(page_private(page) != SWP_CONTINUED); >>> + VM_BUG_ON(page_swap_entry(page).val != SWP_CONTINUED); >> >> That falls under the "weird handling of SWP_CONTINUED using vmalloced >> pages". So different user of page_private(). >> >> Note that we don't even store swap entries in there but extended swap >> counts. > > Ah, right. I see now. > > > Not necessarily as part of this patch, but it got me wondering ... > should we do this? And then maybe we could remove folio_swap_entry() > and folio_set_swap_entry() and just use folio->swap directly. > > > diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h > index 3880b3f2e321..e23d1356e504 100644 > --- a/include/linux/mm_types.h > +++ b/include/linux/mm_types.h > @@ -266,6 +266,14 @@ static inline struct page *encoded_page_ptr(struct encoded_page *page) > return (struct page *)(~ENCODE_PAGE_BITS & (unsigned long)page); > } > > +/* > + * A swap entry has to fit into a "unsigned long", as the entry is hidden > + * in the "index" field of the swapper address space. > + */ > +typedef struct { > + unsigned long val; > +} swp_entry_t; > + > /** > * struct folio - Represents a contiguous set of bytes. > * @flags: Identical to the page flags. > @@ -276,7 +284,7 @@ static inline struct page *encoded_page_ptr(struct encoded_page *page) > * @index: Offset within the file, in units of pages. For anonymous memory, > * this is the index from the beginning of the mmap. > * @private: Filesystem per-folio data (see folio_attach_private()). > - * Used for swp_entry_t if folio_test_swapcache(). > + * @swap: Used for swp_entry_t if folio_test_swapcache(). > * @_mapcount: Do not access this member directly. Use folio_mapcount() to > * find out how many times this folio is mapped by userspace. > * @_refcount: Do not access this member directly. Use folio_ref_count() > @@ -319,7 +327,10 @@ struct folio { > }; > struct address_space *mapping; > pgoff_t index; > - void *private; > + union { > + void *private; > + swp_entry_t swap; Probably with "/* for anon and shm pages only */ > + }; > atomic_t _mapcount; > atomic_t _refcount; > #ifdef CONFIG_MEMCG > @@ -1158,14 +1169,6 @@ enum tlb_flush_reason { > NR_TLB_FLUSH_REASONS, > }; > > - /* > - * A swap entry has to fit into a "unsigned long", as the entry is hidden > - * in the "index" field of the swapper address space. > - */ > -typedef struct { > - unsigned long val; > -} swp_entry_t; > - > /** > * enum fault_flag - Fault flag definitions. > * @FAULT_FLAG_WRITE: Fault was a write fault. > diff --git a/include/linux/swap.h b/include/linux/swap.h > index bb5adc604144..59b0f37eae5b 100644 > --- a/include/linux/swap.h > +++ b/include/linux/swap.h > @@ -335,13 +335,12 @@ struct swap_info_struct { > > static inline swp_entry_t folio_swap_entry(struct folio *folio) > { > - swp_entry_t entry = { .val = page_private(&folio->page) }; > - return entry; > + return folio->swap; > } > > static inline void folio_set_swap_entry(struct folio *folio, swp_entry_t entry) > { > - folio->private = (void *)entry.val; > + folio->swap = entry; > } > > /* linux/mm/workingset.c */ > Sound reasonable, but maybe we should even get rid of the getter/setter completely then? -- Cheers, David / dhildenb