From: Anshuman Khandual <anshuman.khandual@arm.com>
To: Matthew Wilcox <willy@infradead.org>,
Randy Dunlap <rdunlap@infradead.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Alexander Duyck <alexander.h.duyck@linux.intel.com>,
Andrew Morton <akpm@linux-foundation.org>,
Linux MM <linux-mm@kvack.org>
Subject: Re: linux-next: Tree for May 13 (mm/page_alloc.c, <linux/mm.h>: sizeof(struct page))
Date: Tue, 18 May 2021 09:33:09 +0530 [thread overview]
Message-ID: <06c8a6a6-9999-7f03-6bfb-34efb7ced637@arm.com> (raw)
In-Reply-To: <YJ2ZvZaR9PTyPp8S@casper.infradead.org>
On 5/14/21 2:57 AM, Matthew Wilcox wrote:
> On Thu, May 13, 2021 at 10:29:49AM -0700, Randy Dunlap wrote:
>> On 5/12/21 10:44 PM, Stephen Rothwell wrote:
>>> Hi all,
>>>
>>> Changes since 20210512:
>>>
>>
>> on x86_64:
>>
>> In function ‘__mm_zero_struct_page.isra.75’,
>> inlined from ‘__init_single_page.isra.76’ at ../mm/page_alloc.c:1494:2:
>> ./../include/linux/compiler_types.h:328:38: error: call to ‘__compiletime_assert_162’ declared with attribute error: BUILD_BUG_ON failed: sizeof(struct page) > 80
>
> Hmm.
>
> struct {
> long unsigned int _pt_pad_1; /* 8 8 */
> pgtable_t pmd_huge_pte; /* 16 8 */
> long unsigned int _pt_pad_2; /* 24 8 */
> union {
> struct mm_struct * pt_mm; /* 32 8 */
> atomic_t pt_frag_refcount; /* 32 4 */
> }; /* 32 8 */
> spinlock_t ptl; /* 40 72 */
> }; /* 8 104 */
>
> #if ALLOC_SPLIT_PTLOCKS
> spinlock_t *ptl;
> #else
> spinlock_t ptl;
> #endif
>
> something has disabled ALLOC_SPLIT_PTLOCKS when it ought to be enabled.
>
> #if USE_SPLIT_PTE_PTLOCKS
> #define ALLOC_SPLIT_PTLOCKS (SPINLOCK_SIZE > BITS_PER_LONG/8)
> #else
> #define ALLOC_SPLIT_PTLOCKS 0
> #endif
>
> Oh. This is Anshuman's fault.
>
> commit 9b8a39056e2472592a5e5897987387f43038b8ba
> Author: Anshuman Khandual <anshuman.khandual@arm.com>
> Date: Tue May 11 15:06:01 2021 +1000
>
> mm/thp: make ALLOC_SPLIT_PTLOCKS dependent on USE_SPLIT_PTE_PTLOCKS
>
>
Previously ALLOC_SPLIT_PTLOCKS was evaluated and the spin lock element
in struct page was getting created independent of whether split pte
locks are being used or not. AFAICS without USE_SPLIT_PTE_PTLOCKS, it
does not really matter whether struct page has spinlock_t *ptl or ptl
element because that is not going to be used. Should the BUILD_BUG_ON()
evaluation be changed when USE_SPLIT_PTE_PTLOCKS is not enabled or we
could something like this which drops the ptl element in such cases ?
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@ -152,11 +152,13 @@ struct page {
struct mm_struct *pt_mm; /* x86 pgds only */
atomic_t pt_frag_refcount; /* powerpc */
};
+#if USE_SPLIT_PTE_PTLOCKS
#if ALLOC_SPLIT_PTLOCKS
spinlock_t *ptl;
#else
spinlock_t ptl;
#endif
+#endif
};
struct { /* ZONE_DEVICE pages */
/** @pgmap: Points to the hosting device page map. */
next prev parent reply other threads:[~2021-05-18 4:02 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-13 5:44 linux-next: Tree for May 13 Stephen Rothwell
2021-05-13 17:29 ` linux-next: Tree for May 13 (mm/page_alloc.c, <linux/mm.h>: sizeof(struct page)) Randy Dunlap
2021-05-13 21:27 ` Matthew Wilcox
2021-05-18 4:03 ` Anshuman Khandual [this message]
2021-05-18 4:59 ` Randy Dunlap
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=06c8a6a6-9999-7f03-6bfb-34efb7ced637@arm.com \
--to=anshuman.khandual@arm.com \
--cc=akpm@linux-foundation.org \
--cc=alexander.h.duyck@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-next@vger.kernel.org \
--cc=rdunlap@infradead.org \
--cc=sfr@canb.auug.org.au \
--cc=willy@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).