From patchwork Fri Jun 19 13:24:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pasha Tatashin X-Patchwork-Id: 224277 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=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,USER_AGENT_GIT 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 4A39DC433DF for ; Fri, 19 Jun 2020 13:24:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 236F720DD4 for ; Fri, 19 Jun 2020 13:24:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=soleen.com header.i=@soleen.com header.b="ZmEn8W2r" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732706AbgFSNYk (ORCPT ); Fri, 19 Jun 2020 09:24:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40842 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731869AbgFSNYf (ORCPT ); Fri, 19 Jun 2020 09:24:35 -0400 Received: from mail-qk1-x744.google.com (mail-qk1-x744.google.com [IPv6:2607:f8b0:4864:20::744]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 20C7AC0613EF for ; Fri, 19 Jun 2020 06:24:35 -0700 (PDT) Received: by mail-qk1-x744.google.com with SMTP id q198so1027117qka.2 for ; Fri, 19 Jun 2020 06:24:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=soleen.com; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=V0D9xk3SI/T+CK0VAFMcSpiPR6QOFoVjZ9Qrcy//Ru8=; b=ZmEn8W2rf0qhXWjz+lLdOuHloLGq0rbzXdEXswVZ7JTHztTvATDl8Cnt4BYbA3VNbW u5aOVw3bL1fQwRkIzcp6yxMz2rw6pZuKBau18aMkZS5PfjLD7bgnfhvMjR/qLaNW3RIC F6W9QDSPU21u1FgheX/nsD2cgfXBOqL1/3gJqV2pMAfRxmtQmyX5yviXPGfw9x8fvaie FHt1DOrSkmAe8wVs0LsyFWfxdW8sKKcCgRmfo6zPhPXsdyApvQkhvSA7agiapPSEPuDa eQnWBBtMvj2rhnrOPaX/l8LuSBV45pa1CoFdfz3dpXEkzqZKZzq3vcEbbEIK3OwzrTqz 22/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=V0D9xk3SI/T+CK0VAFMcSpiPR6QOFoVjZ9Qrcy//Ru8=; b=PSUct0vDc4e2iuYu2993I7u1R/xSMMbGMS8W+KXhmYzYxu3kncG0loI95oDGmIGTD0 qqnmE4bKyzwcLXlffycjnyatpcLgkxF6sSZe28zX1gzVghf6XGg5CmqhcU0DRiR2q1b+ GlPxiVWie6y+CuHwyviYRlceqhQl9Ou+bKemOfu/JC0JMJ3GhbMGk2chuHrDZ4sIuMMX wavgU9PMFha5DMloe98rLephl6blOoP9ovs/UpVz4Hi37xhXoWsB+TeOleGWPdRmGeA7 byAbfeMYnVLR2ShR56IjzcvDXdWagA5zkmTTfZUHkL3fcypW1vMfeTnNfvVKCjs7xEi6 fdGg== X-Gm-Message-State: AOAM5325kUqNACLKGpN3ut4sqV5Afze8zMQ4zPQs5jAodDbqv0m2SD7p NbWRP8DRZLYOTBRa8IvhRiQsnAtn/Uc= X-Google-Smtp-Source: ABdhPJzEDKYkRbnpMX1nwnzbjFhQhbIAoJoyJGTooKk6d0wZzB70o392Vyan/IxQFKDb3uFsmpKgqA== X-Received: by 2002:a05:620a:8c1:: with SMTP id z1mr3344438qkz.431.1592573074019; Fri, 19 Jun 2020 06:24:34 -0700 (PDT) Received: from localhost.localdomain (c-73-69-118-222.hsd1.nh.comcast.net. [73.69.118.222]) by smtp.gmail.com with ESMTPSA id m26sm7146268qtm.73.2020.06.19.06.24.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jun 2020 06:24:33 -0700 (PDT) From: Pavel Tatashin To: stable@vger.kernel.org, akpm@linux-foundation.org, mhocko@suse.com, dan.j.williams@intel.com, shile.zhang@linux.alibaba.com, daniel.m.jordan@oracle.com, pasha.tatashin@soleen.com, ktkhai@virtuozzo.com, david@redhat.com, jmorris@namei.org, sashal@kernel.org, vbabka@suse.cz, gregkh@linuxfoundation.org, torvalds@linux-foundation.org Subject: [PATCH 4.19 5/7] mm/pagealloc.c: call touch_nmi_watchdog() on max order boundaries in deferred init Date: Fri, 19 Jun 2020 09:24:23 -0400 Message-Id: <20200619132425.425063-5-pasha.tatashin@soleen.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200619132425.425063-1-pasha.tatashin@soleen.com> References: <20200619132425.425063-1-pasha.tatashin@soleen.com> MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Daniel Jordan From: Daniel Jordan commit 117003c32771df617acf66e140fbdbdeb0ac71f5 upstream. Patch series "initialize deferred pages with interrupts enabled", v4. Keep interrupts enabled during deferred page initialization in order to make code more modular and allow jiffies to update. Original approach, and discussion can be found here: http://lkml.kernel.org/r/20200311123848.118638-1-shile.zhang@linux.alibaba.com This patch (of 3): deferred_init_memmap() disables interrupts the entire time, so it calls touch_nmi_watchdog() periodically to avoid soft lockup splats. Soon it will run with interrupts enabled, at which point cond_resched() should be used instead. deferred_grow_zone() makes the same watchdog calls through code shared with deferred init but will continue to run with interrupts disabled, so it can't call cond_resched(). Pull the watchdog calls up to these two places to allow the first to be changed later, independently of the second. The frequency reduces from twice per pageblock (init and free) to once per max order block. Fixes: 3a2d7fa8a3d5 ("mm: disable interrupts while initializing deferred pages") Signed-off-by: Daniel Jordan Signed-off-by: Pavel Tatashin Signed-off-by: Andrew Morton Reviewed-by: David Hildenbrand Acked-by: Michal Hocko Acked-by: Vlastimil Babka Cc: Dan Williams Cc: Shile Zhang Cc: Kirill Tkhai Cc: James Morris Cc: Sasha Levin Cc: Yiqian Wei Cc: [4.17+] Link: http://lkml.kernel.org/r/20200403140952.17177-2-pasha.tatashin@soleen.com Signed-off-by: Linus Torvalds Signed-off-by: Pavel Tatashin --- mm/page_alloc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 2821e9824831..182f1198a406 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1493,7 +1493,6 @@ static void __init deferred_free_pages(unsigned long pfn, } else if (!(pfn & nr_pgmask)) { deferred_free_range(pfn - nr_free, nr_free); nr_free = 1; - touch_nmi_watchdog(); } else { nr_free++; } @@ -1523,7 +1522,6 @@ static unsigned long __init deferred_init_pages(struct zone *zone, continue; } else if (!page || !(pfn & nr_pgmask)) { page = pfn_to_page(pfn); - touch_nmi_watchdog(); } else { page++; } @@ -1663,8 +1661,10 @@ static int __init deferred_init_memmap(void *data) * that we can avoid introducing any issues with the buddy * allocator. */ - while (spfn < epfn) + while (spfn < epfn) { nr_pages += deferred_init_maxorder(&i, zone, &spfn, &epfn); + touch_nmi_watchdog(); + } zone_empty: pgdat_resize_unlock(pgdat, &flags); @@ -1748,6 +1748,7 @@ deferred_grow_zone(struct zone *zone, unsigned int order) first_deferred_pfn = spfn; nr_pages += deferred_init_maxorder(&i, zone, &spfn, &epfn); + touch_nmi_watchdog(); /* We should only stop along section boundaries */ if ((first_deferred_pfn ^ spfn) < PAGES_PER_SECTION)