From patchwork Wed Mar 10 17:46:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Shi X-Patchwork-Id: 12128833 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=-13.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 F16DCC433DB for ; Wed, 10 Mar 2021 17:46:46 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 96D9464F1D for ; Wed, 10 Mar 2021 17:46:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 96D9464F1D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 87B278D01EC; Wed, 10 Mar 2021 12:46:43 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 852C78D01D5; Wed, 10 Mar 2021 12:46:43 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6F1D88D01EC; Wed, 10 Mar 2021 12:46:43 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0120.hostedemail.com [216.40.44.120]) by kanga.kvack.org (Postfix) with ESMTP id 525558D01D5 for ; Wed, 10 Mar 2021 12:46:43 -0500 (EST) Received: from smtpin13.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id F23F88151 for ; Wed, 10 Mar 2021 17:46:42 +0000 (UTC) X-FDA: 77904694644.13.048A446 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by imf20.hostedemail.com (Postfix) with ESMTP id C578F2385 for ; Wed, 10 Mar 2021 17:46:38 +0000 (UTC) Received: by mail-pl1-f179.google.com with SMTP id a24so8826754plm.11 for ; Wed, 10 Mar 2021 09:46:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sHD52Sa+hkPXZ82uTwxwMMAdUbtnhYs3jM+eAa3hQC4=; b=PMvgCUnE80nILtQ2zlCJoYAgUvQmTVJucA6+y4K4wxwO6YJrKobwbUSLVLeis7S1KP d6UAmZakJ6HVzaoCYaOUOiQ87cpXlRynpv8Bdx94Osz6Ftkzr6wCePVsT1sWHtlg9t+u iXaL0vCXp4wW9yJa4ABJ8J0FK+LgqGPjx3Z/Wa4iu0fa97r1AiOiMX+vt9tT3ltyErqS tORkHF48vI39D1syGD3K2TzbOOs6S52RzC2oIl8HKh5dum7GPMi623Bz2mD2aUUIGQ3Z 5Tiqo/hn89JdQ0CGpkcxgi9hm/yMlCRAPcoNLPrMQszIe6HMuu6cHctnB4murDsq3NOk MqEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sHD52Sa+hkPXZ82uTwxwMMAdUbtnhYs3jM+eAa3hQC4=; b=LJe6P4t/im0CHU2ZVMZkYy6eWKU2PLrGPfk/LwNp2ejjKQwpdlQ10AQB+EZzRZiOFO AukTiCs4/KII4kWNJoL4LpEsj9k5yNdJbEO4I4ZC+vaFQ60K8az4W4jK7JbwY7lgMbOt gdW6UhCwBqDEewIEBnrEXNOoRMwBcsqYNYPZC+GinY9Hu/d2wD2F6npVvMNLZIskX4NR TVbcDTki5fLk/yjTScNJmXyXJAz4nXPVied/3nsneh+PfQmnt5Y9jmZLb7Cr8yVZ1R59 9r6KVpoNV+tCqPSAaP8x30VG9H1atd5OEw7r41fFIi0AVMhrGASzcMg2R2JS86WT17cQ zlRQ== X-Gm-Message-State: AOAM530xzoVG/MHHzxroygqR5ICIih8uVMGuEnNoRglJLkyX/LUfWCck dpB0KiFdYO+JDCFnRVmyKsM= X-Google-Smtp-Source: ABdhPJy0/FEbV2UYtiznaebUra6fBNIUYPi6n9765r1hA2Y/cHKhUMldo7IUnb9SWEgqSkqvqxTrdQ== X-Received: by 2002:a17:90a:8908:: with SMTP id u8mr4549214pjn.135.1615398401563; Wed, 10 Mar 2021 09:46:41 -0800 (PST) Received: from localhost.localdomain (c-73-93-239-127.hsd1.ca.comcast.net. [73.93.239.127]) by smtp.gmail.com with ESMTPSA id d6sm145804pfq.109.2021.03.10.09.46.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Mar 2021 09:46:41 -0800 (PST) From: Yang Shi To: guro@fb.com, ktkhai@virtuozzo.com, vbabka@suse.cz, shakeelb@google.com, david@fromorbit.com, hannes@cmpxchg.org, mhocko@suse.com, akpm@linux-foundation.org Cc: shy828301@gmail.com, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [v9 PATCH 13/13] mm: vmscan: shrink deferred objects proportional to priority Date: Wed, 10 Mar 2021 09:46:03 -0800 Message-Id: <20210310174603.5093-14-shy828301@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210310174603.5093-1-shy828301@gmail.com> References: <20210310174603.5093-1-shy828301@gmail.com> MIME-Version: 1.0 X-Stat-Signature: f65g7c45961uctzyus5bt3rg4fe851xn X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: C578F2385 Received-SPF: none (gmail.com>: No applicable sender policy available) receiver=imf20; identity=mailfrom; envelope-from=""; helo=mail-pl1-f179.google.com; client-ip=209.85.214.179 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1615398398-427262 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: The number of deferred objects might get windup to an absurd number, and it results in clamp of slab objects. It is undesirable for sustaining workingset. So shrink deferred objects proportional to priority and cap nr_deferred to twice of cache items. The idea is borrowed from Dave Chinner's patch: https://lore.kernel.org/linux-xfs/20191031234618.15403-13-david@fromorbit.com/ Tested with kernel build and vfs metadata heavy workload in our production environment, no regression is spotted so far. Signed-off-by: Yang Shi --- mm/vmscan.c | 46 +++++++++++----------------------------------- 1 file changed, 11 insertions(+), 35 deletions(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index 9a2dfeaa79f4..6a0a91b23597 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -662,7 +662,6 @@ static unsigned long do_shrink_slab(struct shrink_control *shrinkctl, */ nr = xchg_nr_deferred(shrinker, shrinkctl); - total_scan = nr; if (shrinker->seeks) { delta = freeable >> priority; delta *= 4; @@ -676,37 +675,9 @@ static unsigned long do_shrink_slab(struct shrink_control *shrinkctl, delta = freeable / 2; } + total_scan = nr >> priority; total_scan += delta; - if (total_scan < 0) { - pr_err("shrink_slab: %pS negative objects to delete nr=%ld\n", - shrinker->scan_objects, total_scan); - total_scan = freeable; - next_deferred = nr; - } else - next_deferred = total_scan; - - /* - * We need to avoid excessive windup on filesystem shrinkers - * due to large numbers of GFP_NOFS allocations causing the - * shrinkers to return -1 all the time. This results in a large - * nr being built up so when a shrink that can do some work - * comes along it empties the entire cache due to nr >>> - * freeable. This is bad for sustaining a working set in - * memory. - * - * Hence only allow the shrinker to scan the entire cache when - * a large delta change is calculated directly. - */ - if (delta < freeable / 4) - total_scan = min(total_scan, freeable / 2); - - /* - * Avoid risking looping forever due to too large nr value: - * never try to free more than twice the estimate number of - * freeable entries. - */ - if (total_scan > freeable * 2) - total_scan = freeable * 2; + total_scan = min(total_scan, (2 * freeable)); trace_mm_shrink_slab_start(shrinker, shrinkctl, nr, freeable, delta, total_scan, priority); @@ -745,10 +716,15 @@ static unsigned long do_shrink_slab(struct shrink_control *shrinkctl, cond_resched(); } - if (next_deferred >= scanned) - next_deferred -= scanned; - else - next_deferred = 0; + /* + * The deferred work is increased by any new work (delta) that wasn't + * done, decreased by old deferred work that was done now. + * + * And it is capped to two times of the freeable items. + */ + next_deferred = max_t(long, (nr + delta - scanned), 0); + next_deferred = min(next_deferred, (2 * freeable)); + /* * move the unused scan count back into the shrinker in a * manner that handles concurrent updates.