From: Song Liu <songliubraving@fb.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Randy Dunlap <rdunlap@infradead.org>,
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>,
Linux MM <linux-mm@kvack.org>
Subject: Re: linux-next: Tree for Aug 7 (mm/khugepaged.c)
Date: Wed, 7 Aug 2019 21:00:04 +0000 [thread overview]
Message-ID: <BB7412DE-A88E-41A4-9796-5ECEADE31571@fb.com> (raw)
In-Reply-To: <20190807131029.f7f191aaeeb88cc435c6306f@linux-foundation.org>
Hi Andrew,
> On Aug 7, 2019, at 1:10 PM, Andrew Morton <akpm@linux-foundation.org> wrote:
>
> On Wed, 7 Aug 2019 16:59:14 +0000 Song Liu <songliubraving@fb.com> wrote:
>
>> Hi Randy,
>>
>>> On Aug 7, 2019, at 8:11 AM, Randy Dunlap <rdunlap@infradead.org> wrote:
>>>
>>> On 8/7/19 1:36 AM, Stephen Rothwell wrote:
>>>> Hi all,
>>>>
>>>> Changes since 20190806:
>>>>
>>>
>>> on i386:
>>>
>>> when CONFIG_SHMEM is not set/enabled:
>>>
>>> ../mm/khugepaged.c: In function ‘khugepaged_scan_mm_slot’:
>>> ../mm/khugepaged.c:1874:2: error: implicit declaration of function ‘khugepaged_collapse_pte_mapped_thps’; did you mean ‘collapse_pte_mapped_thp’? [-Werror=implicit-function-declaration]
>>> khugepaged_collapse_pte_mapped_thps(mm_slot);
>>> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>>
>> Thanks for the report.
>>
>> Shall I resend the patch, or shall I send fix on top of current patch?
>
> Either is OK. If the difference is small I will turn it into an
> incremental patch so that I (and others) can see what changed.
Please find the patch to fix this at the end of this email. It applies
right on top of "khugepaged: enable collapse pmd for pte-mapped THP".
It may conflict a little with the "Enable THP for text section of
non-shmem files" set, which renames function khugepaged_scan_shmem().
Also, I found v3 of the set in linux-next. The latest is v4:
https://lkml.org/lkml/2019/8/2/1587
https://lkml.org/lkml/2019/8/2/1588
https://lkml.org/lkml/2019/8/2/1589
Thanks,
Song
======== 8< ===========
From 26715c923f6cd283a2950cfd0a7cca483a3eb406 Mon Sep 17 00:00:00 2001
From: Song Liu <songliubraving@fb.com>
Date: Wed, 7 Aug 2019 10:21:30 -0700
Subject: [PATCH] khugepaged: fix build without CONFIG_SHMEM
Without CONFIG_SHMEM, we need dummy khugepaged_collapse_pte_mapped_thps.
Signed-off-by: Song Liu <songliubraving@fb.com>
---
mm/khugepaged.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/mm/khugepaged.c b/mm/khugepaged.c
index ba36ff5c1d82..086323112c07 100644
--- a/mm/khugepaged.c
+++ b/mm/khugepaged.c
@@ -1764,6 +1764,11 @@ static void khugepaged_scan_shmem(struct mm_struct *mm,
{
BUILD_BUG();
}
+
+static int khugepaged_collapse_pte_mapped_thps(struct mm_slot *mm_slot)
+{
+ return 0;
+}
#endif
static unsigned int khugepaged_scan_mm_slot(unsigned int pages,
--
2.17.1
next prev parent reply other threads:[~2019-08-07 21:00 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-07 8:36 linux-next: Tree for Aug 7 Stephen Rothwell
2019-08-07 15:11 ` linux-next: Tree for Aug 7 (mm/khugepaged.c) Randy Dunlap
2019-08-07 16:59 ` Song Liu
2019-08-07 20:10 ` Andrew Morton
2019-08-07 21:00 ` Song Liu [this message]
2019-08-07 21:27 ` Andrew Morton
2019-08-07 21:30 ` Randy Dunlap
2019-08-07 22:11 ` Song Liu
2019-08-08 1:31 ` Stephen Rothwell
2019-08-07 22:13 ` Song Liu
2019-08-08 1:20 ` Stephen Rothwell
2019-08-07 15:29 ` linux-next: Tree for Aug 7 (net/bridge/netfilter/nf_conntrack_bridge.c) Randy Dunlap
2019-08-07 15:29 ` [Bridge] " Randy Dunlap
2019-08-07 15:57 ` Jeremy Sowden
2019-08-07 15:57 ` [Bridge] " Jeremy Sowden
2019-09-23 22:26 ` Ivan Kalvachev
2019-09-23 22:26 ` [Bridge] " Ivan Kalvachev
2019-09-23 22:48 ` Jeremy Sowden
2019-09-23 22:48 ` [Bridge] " Jeremy Sowden
2019-08-08 5:13 ` linux-next: Tree for Aug 7 Michael Ellerman
2019-08-08 15:54 ` Gustavo A. R. Silva
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=BB7412DE-A88E-41A4-9796-5ECEADE31571@fb.com \
--to=songliubraving@fb.com \
--cc=akpm@linux-foundation.org \
--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 \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.