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 X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C4F60C433E2 for ; Tue, 15 Sep 2020 18:23:12 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 5F052206A4 for ; Tue, 15 Sep 2020 18:23:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=soleen.com header.i=@soleen.com header.b="n6trtHxT" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5F052206A4 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=soleen.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id B4E4C90007A; Tue, 15 Sep 2020 14:23:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AFE96900079; Tue, 15 Sep 2020 14:23:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A14C790007A; Tue, 15 Sep 2020 14:23:11 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0215.hostedemail.com [216.40.44.215]) by kanga.kvack.org (Postfix) with ESMTP id 8A5F6900079 for ; Tue, 15 Sep 2020 14:23:11 -0400 (EDT) Received: from smtpin20.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 471FD181AEF09 for ; Tue, 15 Sep 2020 18:23:11 +0000 (UTC) X-FDA: 77266117782.20.idea37_461161227113 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin20.hostedemail.com (Postfix) with ESMTP id 1C38D180C07A3 for ; Tue, 15 Sep 2020 18:23:11 +0000 (UTC) X-HE-Tag: idea37_461161227113 X-Filterd-Recvd-Size: 7110 Received: from mail-ej1-f65.google.com (mail-ej1-f65.google.com [209.85.218.65]) by imf34.hostedemail.com (Postfix) with ESMTP for ; Tue, 15 Sep 2020 18:23:10 +0000 (UTC) Received: by mail-ej1-f65.google.com with SMTP id z23so6386129ejr.13 for ; Tue, 15 Sep 2020 11:23:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=soleen.com; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=+ShJFz3O2UoFV/lQCaUWLOKhWZytgwFxTiuG7a5D3cE=; b=n6trtHxTcQjtJZGdvYFQ6qKRCrutxbVnecrpqzmMhwzyuU9Ny4ZkfwWLVyc0r7w4EX /PcgXTQasrpTvLF3ZXFmI6iAzuNbTobxASgARI/RpwPhiJdjDGweUSirtgJNA68Ucoq3 rY93Xyt9CayLfEeNYHBtTJnUYT5iR7AopYfUv1Zfcw4DmtpNZD1ALyfUdMdeoWiKNCSe LnahvlfCADtUOlcSBHdf8hguPwQ8BlodxxBE+b5gVEzKcvHRRTHruRTGSIs02JmpVsMe RzKlHD+XrhPX3Ree5CXvO+wSLpFZd4/7YZzt19+PXyaVp5pjRg3lFCqVardeSzR2lOlJ Orsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=+ShJFz3O2UoFV/lQCaUWLOKhWZytgwFxTiuG7a5D3cE=; b=lYwih9x12C06zPL+d2H+gNRcMhki682sKhaXYf4rSmcWuE6KVgguRlJlsaXsI/JKbv ZuiBKDl0Y2VnHqSD2WTilripU46Zd9C82a++ZQaGeb6LjoKdNQmHDEmZz4bCGGFqPJpt 3pEUtdTcoc50N3Vn4l/mnB87Rld3xBYEL4p06vCFi62d8tMfY5bF+B3PTrxz7PHcPFTi Y42gtUN8rrkO3eOjjUbP7ev8IRSh86h1px/HseHDrk9n1GVCeaY7k2ymiIa887ffZX82 jOd9oeNb6VmXFdObxWrRhJB8/CPZ8wlOu3PpxcLYuT1DlcBQ6D7ICTyiNaNp1+u8dr1R jFtQ== X-Gm-Message-State: AOAM5300WZ62Lbpkka5X0qLBO23khzKpJe3JBy4ebfLsAikiEH77dqYO mQGobm2NyMt38G1TM+XKaISikcHnMCwLLxXIBYyvgw== X-Google-Smtp-Source: ABdhPJwBbFBFr4upujk6kdCs5w48PheDKBveXyCTE/m3QQ3iQ9gA73rCQViLh2tmbEj4nRfNkfvHNwh1ROEwpwIF9RQ= X-Received: by 2002:a17:906:d787:: with SMTP id pj7mr20596675ejb.340.1600194189281; Tue, 15 Sep 2020 11:23:09 -0700 (PDT) MIME-Version: 1.0 References: <1599770859-14826-1-git-send-email-vijayb@linux.microsoft.com> In-Reply-To: <1599770859-14826-1-git-send-email-vijayb@linux.microsoft.com> From: Pavel Tatashin Date: Tue, 15 Sep 2020 14:22:33 -0400 Message-ID: Subject: Re: [[PATCH]] mm: khugepaged: recalculate min_free_kbytes after memory hotplug as expected by khugepaged To: Vijay Balakrishna Cc: Andrew Morton , "Kirill A. Shutemov" , Oleg Nesterov , Song Liu , Andrea Arcangeli , Allen Pais , LKML , linux-mm Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 1C38D180C07A3 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam02 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 Thu, Sep 10, 2020 at 4:47 PM Vijay Balakrishna wrote: > > When memory is hotplug added or removed the min_free_kbytes must be > recalculated based on what is expected by khugepaged. Currently > after hotplug, min_free_kbytes will be set to a lower default and higher > default set when THP enabled is lost. This leaves the system with small > min_free_kbytes which isn't suitable for systems especially with network > intensive loads. Typical failure symptoms include HW WATCHDOG reset, > soft lockup hang notices, NETDEVICE WATCHDOG timeouts, and OOM process > kills. > > Fixes: f000565adb77 ("thp: set recommended min free kbytes") > > Signed-off-by: Vijay Balakrishna > Cc: stable@vger.kernel.org > --- > include/linux/khugepaged.h | 5 +++++ > mm/khugepaged.c | 13 +++++++++++-- > mm/memory_hotplug.c | 3 +++ > 3 files changed, 19 insertions(+), 2 deletions(-) > > diff --git a/include/linux/khugepaged.h b/include/linux/khugepaged.h > index bc45ea1efbf7..c941b7377321 100644 > --- a/include/linux/khugepaged.h > +++ b/include/linux/khugepaged.h > @@ -15,6 +15,7 @@ extern int __khugepaged_enter(struct mm_struct *mm); > extern void __khugepaged_exit(struct mm_struct *mm); > extern int khugepaged_enter_vma_merge(struct vm_area_struct *vma, > unsigned long vm_flags); > +extern void khugepaged_min_free_kbytes_update(void); > #ifdef CONFIG_SHMEM > extern void collapse_pte_mapped_thp(struct mm_struct *mm, unsigned long addr); > #else > @@ -85,6 +86,10 @@ static inline void collapse_pte_mapped_thp(struct mm_struct *mm, > unsigned long addr) > { > } > + > +static inline void khugepaged_min_free_kbytes_update(void) > +{ > +} > #endif /* CONFIG_TRANSPARENT_HUGEPAGE */ > > #endif /* _LINUX_KHUGEPAGED_H */ > diff --git a/mm/khugepaged.c b/mm/khugepaged.c > index cfa0dba5fd3b..4f7107476a6f 100644 > --- a/mm/khugepaged.c > +++ b/mm/khugepaged.c > @@ -56,6 +56,9 @@ enum scan_result { > #define CREATE_TRACE_POINTS > #include > > +static struct task_struct *khugepaged_thread __read_mostly; > +static DEFINE_MUTEX(khugepaged_mutex); > + > /* default scan 8*512 pte (or vmas) every 30 second */ > static unsigned int khugepaged_pages_to_scan __read_mostly; > static unsigned int khugepaged_pages_collapsed; > @@ -2292,8 +2295,6 @@ static void set_recommended_min_free_kbytes(void) > > int start_stop_khugepaged(void) > { > - static struct task_struct *khugepaged_thread __read_mostly; > - static DEFINE_MUTEX(khugepaged_mutex); > int err = 0; > > mutex_lock(&khugepaged_mutex); > @@ -2320,3 +2321,11 @@ int start_stop_khugepaged(void) > mutex_unlock(&khugepaged_mutex); > return err; > } > + > +void khugepaged_min_free_kbytes_update(void) > +{ > + mutex_lock(&khugepaged_mutex); > + if (khugepaged_enabled() && khugepaged_thread) > + set_recommended_min_free_kbytes(); > + mutex_unlock(&khugepaged_mutex); > +} > diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c > index e9d5ab5d3ca0..3e19272c1fad 100644 > --- a/mm/memory_hotplug.c > +++ b/mm/memory_hotplug.c > @@ -36,6 +36,7 @@ > #include > #include > #include > +#include > > #include > > @@ -857,6 +858,7 @@ int __ref online_pages(unsigned long pfn, unsigned long nr_pages, > zone_pcp_update(zone); > > init_per_zone_wmark_min(); > + khugepaged_min_free_kbytes_update(); > > kswapd_run(nid); > kcompactd_run(nid); > @@ -1600,6 +1602,7 @@ static int __ref __offline_pages(unsigned long start_pfn, > pgdat_resize_unlock(zone->zone_pgdat, &flags); > > init_per_zone_wmark_min(); > + khugepaged_min_free_kbytes_update(); The bug makes sense that min_free_kbytes should be consistent after reboot or after hot-add, hence Reviewed-by: Pavel Tatashin