From patchwork Fri Dec 22 10:22:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kairui Song X-Patchwork-Id: 13503166 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8B014C4706C for ; Fri, 22 Dec 2023 10:24:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2533B6B0082; Fri, 22 Dec 2023 05:24:16 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 202796B0085; Fri, 22 Dec 2023 05:24:16 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0A3576B0087; Fri, 22 Dec 2023 05:24:16 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id E7E1D6B0082 for ; Fri, 22 Dec 2023 05:24:15 -0500 (EST) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id C2F5E40DF7 for ; Fri, 22 Dec 2023 10:24:15 +0000 (UTC) X-FDA: 81594069270.17.4D9965F Received: from mail-oa1-f48.google.com (mail-oa1-f48.google.com [209.85.160.48]) by imf22.hostedemail.com (Postfix) with ESMTP id DA167C0006 for ; Fri, 22 Dec 2023 10:24:13 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=BmVSWgPN; spf=pass (imf22.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.160.48 as permitted sender) smtp.mailfrom=ryncsn@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1703240653; a=rsa-sha256; cv=none; b=7an0guRZ1mxUcMIwzDwTHRU8fdWgEqj+8E8Vqr6hkJ0IMPT63ag60zOu+YZiTVcEjIG5JM OxTDy+/+TcRYaVA26JF5AWhBnue0nj2yEzpypuZPnhBuYMwEArDlkj3XHl76c/LWKeJu7O pwzC8Bai6b/Q0Xr6cHoEq8foO3yty0I= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=BmVSWgPN; spf=pass (imf22.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.160.48 as permitted sender) smtp.mailfrom=ryncsn@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1703240653; h=from:from:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=gsAcvd86KuP2ISw06xLpP7WDqEO9VY9n54CovJHHIls=; b=HGAErM74X/gABq5ZKXUiJsYgCvbULsqttrIKMFMr2/sKMn/gtPLjqTheAviRcVqB3UK1Iq 8mksHgxIpzG4r5sh6iNk2QwzRCQkfAvAAZ5ie6glnJEuxe/mG3BQhjE/ZFdFd8DYWBhCq9 5vAwOfc0RsUSw740NBjLAE4b0SuFU/c= Received: by mail-oa1-f48.google.com with SMTP id 586e51a60fabf-203fed05a31so1116478fac.0 for ; Fri, 22 Dec 2023 02:24:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1703240652; x=1703845452; darn=kvack.org; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=gsAcvd86KuP2ISw06xLpP7WDqEO9VY9n54CovJHHIls=; b=BmVSWgPN0/DEW25nrzZj6sLv/kR8haMwoWJFMTZTSWByA9ndmX+3HEyzaNeg7NuZac t5MZtcIvvo4Vtzbx78m79IdUxpISCJBt3bRtCqF6sCfxHDaiepOhln18WMlWVWo8gmMw 5bnqvKsodCaHiNMtmmJSGsk6nuQ/cPzGg76GHM9cSTQxxx0VxAAlrNI9Os9UiyM22VlK +NAL5XaG4JjC9gxKb+tbk1RSlDk9snUvyTG84zoaAN7tdMQ6UyVj9jPJw51EnTDLxZGb g7et9VP0pKW8BhppjodxIRW+dbzd36TvwYlkrjCjFHBhkNY/TL1b3ghJGlTY/Qcz4rSU 9bsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703240652; x=1703845452; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=gsAcvd86KuP2ISw06xLpP7WDqEO9VY9n54CovJHHIls=; b=npc7MshweZNjqb2g+v0gH9YCKCrQjktEgtSuOvt8WeGVWjsAy9cqxqTZqwZqtQ1FkS mP4zFHIYZXNJZ9Y5l7L1WWkcHguP7G/T0Hbk6oisf/jTAfVujbiBq0sJSXBXAwLMDuW5 +um1Xi+M9Ov0f2F1VElgNx2iphRv0atLqQb0AIC+nA1BgXqLdASlfQfkyd4nnxmZBAVf 8EMJGqW1014q55/XUT9SB/qT1uTd9RMClh4yM+Vcm9oGvzc0vTeXdzZ8kR+8Iaq3Zgbo 3Sg+nHabNw98qkx0JmzfT59Kjm6kMvIqcn+nY4NowI4K2PwK7LakZPWxXvRULGo0ycY/ vzYw== X-Gm-Message-State: AOJu0YxVMN+A/uYJYlD3AE/lGdoiiGLVkgUa7KyIIELVvjQV7MYqGKWu /u2itlW+5uXTaD+X4GG9sTwnaHs+lefXesnN X-Google-Smtp-Source: AGHT+IFM08JVkja56Id51LMPVYml7/oIhHyVGlp94LC9R8zx3T0/LUwfVjdY7Ob42uuEZ9jE1hgJMg== X-Received: by 2002:a05:6870:ce0b:b0:204:5455:c44b with SMTP id xc11-20020a056870ce0b00b002045455c44bmr41106oab.107.1703240651957; Fri, 22 Dec 2023 02:24:11 -0800 (PST) Received: from KASONG-MB2.tencent.com ([103.7.29.31]) by smtp.gmail.com with ESMTPSA id gx1-20020a056a001e0100b006d9912e9a77sm364074pfb.6.2023.12.22.02.24.09 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 22 Dec 2023 02:24:11 -0800 (PST) From: Kairui Song To: linux-mm@kvack.org Cc: Andrew Morton , Yu Zhao , linux-kernel@vger.kernel.org, Kairui Song Subject: [PATCH 2/3] mm, lru_gen: move pages in bulk when aging Date: Fri, 22 Dec 2023 18:22:54 +0800 Message-ID: <20231222102255.56993-3-ryncsn@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231222102255.56993-1-ryncsn@gmail.com> References: <20231222102255.56993-1-ryncsn@gmail.com> Reply-To: Kairui Song MIME-Version: 1.0 X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: DA167C0006 X-Stat-Signature: add4sq7r47i69dyt56qyr3obtfieb9zs X-Rspam-User: X-HE-Tag: 1703240653-600732 X-HE-Meta: U2FsdGVkX19KbEj1ncYdPgcYl1vPCn1/O4C81/WuMg61BMOVq/3YRmga9iy2KPSfWmtJqGWgWKHV4gN4tQFTydpZc9ZUFBUlKp9AwjOtOyfcyTXcZWZngpZsrKAyjl9Ujuf7BnBphvVjlOLbilsNOpApFqJ3I5KfODT0vlPmcP1SmzWTSMW8ZyG6JpQtlm28scleH+iHLvDTSq3Easoga0Sxj6gMSZr4nKJ5rR3Fz669yuJ/dArqrkuNuQ4DOBV1e2UGqX7R/6KVug/Aq60fSus6olCqcGVBTjbt07Rof1CNUbTevBRCr9+nkFERnnsUbOfwozMQsXw6XGawAwNXFfSdwytdWB5j1HNkLZRHDdd88IrwU6Z4HCMW0P7C56xIz5AqMOg2NYQ6o/rzZqaZI6m5T/DotZkcJx2dTHuriG3JMqiSnvqJ4YkziGgO65V35uA/2PW5EG/Yw2GXeeOMWvrDK7Q+209sUisneGtuCxjsgJIt6t46OCYfN5hi0fUebQc3tjLpz84hMikmHGEXdMKtGJ57/RkoExTvv8YjGDQC9R8a9FaZduIFs8ricryqO5Vb4qrC+TCRS/JiILSzvYqX8DEzJxhE8INW0KfVzlTiyazIBvx6GgcM83dUBoGwo2EdlnHINYhu4CuDZDXgnQaPEy79FU/6h8Ifr27cHpw2q/fGkFViFP3p8+onivYNepW2QvhJIw4gW1kwdxyxicKBBvc6dYBeztLn6vXY8EuEvJ88mZlaKhQATlqrFPUgpGhIvkuQ315dB/vNwJuLjHEJN090b5OZMLrpgAZwSxaKhaJpjpXPv9oyzqaoo8d7ZQaOaB5qDgrYLXu0oiHQBbFPODqToTAf3wLrsNqBnxKBNBQs5kSKlg8938/3nFdZ+JPzBPdTiJ5OLi0m8OL1NLZq4kP8FAJ0OZ4eQvwGYVGgRiNoub0GIw+X3Fr9VrvXi/SqUpCFDE9nyTy+E6I cgG/nbdC gexEz7DL/dhoLbALKHldVQLFGhzuidnX7tjJdz1R1ZuzzFcmbw9P8tmLSgeEoR8LLvpMo1p6eO3DvTHjZRIyd4vekgczP/5gWE7LZyZFlTwwD3HFaAGE2IrXmnsWl4Ccdi0u3dJXIgTfmO3jO6YHIRb6SDDJTuKR6kFCBpKeEYqwb5E6nNTPrHmGmOct0R2k2vxfxp5u35DOLORXomv3B4wA1txKuxConc6MXkgN1bdwojj0ndHGBv8unfYtENbIh+WKTXKRzt5Js3uvi1gTy5jYvP4OBwQKsN4X85emvmbqK0BFrJBPRseuryxoi2/dgJZKp0aHTiPx+xB1kf7jydCkNrXOmCgjA8k6+S/y54MFm82IrzsO39ytaAKMktlQ11PJ4DDo742n1j23EXWex6LV58mYvUu48Ji4iDOEy3YMcJdMY0hM/3mYTcEuFKDFw/eFnyg4r5b/BB821PWRA0CJh2D982Gy2nccn7WFU/6jBY91DszP60JJGemzYO1xVBcSMvMMHO/1gGIx8xG0HmaJnb2luHRh3RiJ4pJs6eukoy4KRl5AjcU6pNqPl69DDd08YL4GBwvfTD+PuDXSNmarBFApI7Mo3yVSqqD38BQl/IsqFG9d5xLx4bDaQD3FKi8iSMOaPQlfxwySB3hk6R5PyYOumLQELOufV1lBViozxJjg= X-Bogosity: Ham, tests=bogofilter, spamicity=0.433821, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: Kairui Song Another overhead of aging is page moving. Actually, in most cases, pages are being moved to the same gen after folio_inc_gen is called, especially the protected pages. So it's better to move them in bulk. This also has a good effect on LRU ordering. Currently when MGLRU ages, it walks the LRU backward, and the protected pages are moved to the tail of newer gen one by one, which reverses the order of pages in LRU. Moving them in batches can help keep their order, only in a small scope though due to the scan limit of MAX_LRU_BATCH pages. After this commit, we can see a performance gain: Tested in a 4G memcg on a EPYC 7K62 with: memcached -u nobody -m 16384 -s /tmp/memcached.socket \ -a 0766 -t 16 -B binary & memtier_benchmark -S /tmp/memcached.socket \ -P memcache_binary -n allkeys \ --key-minimum=1 --key-maximum=16000000 -d 1024 \ --ratio=1:0 --key-pattern=P:P -c 2 -t 16 --pipeline 8 -x 6 Average result of 18 test runs: Before: 44017.78 Ops/sec After patch 1-2: 44810.01 Ops/sec (+1.8%) Signed-off-by: Kairui Song --- mm/vmscan.c | 84 ++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 71 insertions(+), 13 deletions(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index e3b4797b9729..af1266129c1b 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -3102,9 +3102,46 @@ static int folio_update_gen(struct folio *folio, int gen) */ struct gen_update_batch { int delta[MAX_NR_GENS]; + struct folio *head, *tail; }; -static void lru_gen_update_batch(struct lruvec *lruvec, bool type, int zone, +static void inline lru_gen_inc_bulk_finish(struct lru_gen_folio *lrugen, + int bulk_gen, bool type, int zone, + struct gen_update_batch *batch) +{ + if (!batch->head) + return; + + list_bulk_move_tail(&lrugen->folios[bulk_gen][type][zone], + &batch->head->lru, + &batch->tail->lru); + + batch->head = NULL; +} + +/* + * When aging, protected pages will go to the tail of the same higher + * gen, so the can be moved in batches. Besides reduced overhead, this + * also avoids changing their LRU order in a small scope. + */ +static void inline lru_gen_try_inc_bulk(struct lru_gen_folio *lrugen, struct folio *folio, + int bulk_gen, int gen, bool type, int zone, + struct gen_update_batch *batch) +{ + /* + * If folio not moving to the bulk_gen, it's raced with promotion + * so it need to go to the head of another LRU. + */ + if (bulk_gen != gen) + list_move(&folio->lru, &lrugen->folios[gen][type][zone]); + + if (!batch->head) + batch->tail = folio; + + batch->head = folio; +} + +static void lru_gen_update_batch(struct lruvec *lruvec, int bulk_gen, bool type, int zone, struct gen_update_batch *batch) { int gen; @@ -3112,6 +3149,8 @@ static void lru_gen_update_batch(struct lruvec *lruvec, bool type, int zone, struct lru_gen_folio *lrugen = &lruvec->lrugen; enum lru_list lru = type ? LRU_INACTIVE_FILE : LRU_INACTIVE_ANON; + lru_gen_inc_bulk_finish(lrugen, bulk_gen, type, zone, batch); + for (gen = 0; gen < MAX_NR_GENS; gen++) { int delta = batch->delta[gen]; @@ -3705,6 +3744,7 @@ static bool inc_min_seq(struct lruvec *lruvec, int type, bool can_swap) struct gen_update_batch batch = { }; struct lru_gen_folio *lrugen = &lruvec->lrugen; int new_gen, old_gen = lru_gen_from_seq(lrugen->min_seq[type]); + int bulk_gen = (old_gen + 1) % MAX_NR_GENS; if (type == LRU_GEN_ANON && !can_swap) goto done; @@ -3712,24 +3752,33 @@ static bool inc_min_seq(struct lruvec *lruvec, int type, bool can_swap) /* prevent cold/hot inversion if force_scan is true */ for (zone = 0; zone < MAX_NR_ZONES; zone++) { struct list_head *head = &lrugen->folios[old_gen][type][zone]; + struct folio *prev = NULL; - while (!list_empty(head)) { - struct folio *folio = lru_to_folio(head); + if (!list_empty(head)) + prev = lru_to_folio(head); + while (prev) { + struct folio *folio = prev; VM_WARN_ON_ONCE_FOLIO(folio_test_unevictable(folio), folio); VM_WARN_ON_ONCE_FOLIO(folio_test_active(folio), folio); VM_WARN_ON_ONCE_FOLIO(folio_is_file_lru(folio) != type, folio); VM_WARN_ON_ONCE_FOLIO(folio_zonenum(folio) != zone, folio); + if (unlikely(list_is_first(&folio->lru, head))) + prev = NULL; + else + prev = lru_to_folio(&folio->lru); + new_gen = folio_inc_gen(lruvec, folio, false, &batch); - list_move_tail(&folio->lru, &lrugen->folios[new_gen][type][zone]); + lru_gen_try_inc_bulk(lrugen, folio, bulk_gen, new_gen, type, zone, &batch); if (!--remaining) { - lru_gen_update_batch(lruvec, type, zone, &batch); + lru_gen_update_batch(lruvec, bulk_gen, type, zone, &batch); return false; } } - lru_gen_update_batch(lruvec, type, zone, &batch); + + lru_gen_update_batch(lruvec, bulk_gen, type, zone, &batch); } done: reset_ctrl_pos(lruvec, type, true); @@ -4240,7 +4289,7 @@ static int lru_gen_memcg_seg(struct lruvec *lruvec) ******************************************************************************/ static bool sort_folio(struct lruvec *lruvec, struct folio *folio, struct scan_control *sc, - int tier_idx, struct gen_update_batch *batch) + int tier_idx, int bulk_gen, struct gen_update_batch *batch) { bool success; int gen = folio_lru_gen(folio); @@ -4283,7 +4332,7 @@ static bool sort_folio(struct lruvec *lruvec, struct folio *folio, struct scan_c int hist = lru_hist_from_seq(lrugen->min_seq[type]); gen = folio_inc_gen(lruvec, folio, false, batch); - list_move_tail(&folio->lru, &lrugen->folios[gen][type][zone]); + lru_gen_try_inc_bulk(lrugen, folio, bulk_gen, gen, type, zone, batch); WRITE_ONCE(lrugen->protected[hist][type][tier - 1], lrugen->protected[hist][type][tier - 1] + delta); @@ -4293,7 +4342,7 @@ static bool sort_folio(struct lruvec *lruvec, struct folio *folio, struct scan_c /* ineligible */ if (zone > sc->reclaim_idx || skip_cma(folio, sc)) { gen = folio_inc_gen(lruvec, folio, false, batch); - list_move_tail(&folio->lru, &lrugen->folios[gen][type][zone]); + lru_gen_try_inc_bulk(lrugen, folio, bulk_gen, gen, type, zone, batch); return true; } @@ -4367,11 +4416,16 @@ static int scan_folios(struct lruvec *lruvec, struct scan_control *sc, LIST_HEAD(moved); int skipped_zone = 0; struct gen_update_batch batch = { }; + int bulk_gen = (gen + 1) % MAX_NR_GENS; int zone = (sc->reclaim_idx + i) % MAX_NR_ZONES; struct list_head *head = &lrugen->folios[gen][type][zone]; + struct folio *prev = NULL; - while (!list_empty(head)) { - struct folio *folio = lru_to_folio(head); + if (!list_empty(head)) + prev = lru_to_folio(head); + + while (prev) { + struct folio *folio = prev; int delta = folio_nr_pages(folio); VM_WARN_ON_ONCE_FOLIO(folio_test_unevictable(folio), folio); @@ -4380,8 +4434,12 @@ static int scan_folios(struct lruvec *lruvec, struct scan_control *sc, VM_WARN_ON_ONCE_FOLIO(folio_zonenum(folio) != zone, folio); scanned += delta; + if (unlikely(list_is_first(&folio->lru, head))) + prev = NULL; + else + prev = lru_to_folio(&folio->lru); - if (sort_folio(lruvec, folio, sc, tier, &batch)) + if (sort_folio(lruvec, folio, sc, tier, bulk_gen, &batch)) sorted += delta; else if (isolate_folio(lruvec, folio, sc)) { list_add(&folio->lru, list); @@ -4401,7 +4459,7 @@ static int scan_folios(struct lruvec *lruvec, struct scan_control *sc, skipped += skipped_zone; } - lru_gen_update_batch(lruvec, type, zone, &batch); + lru_gen_update_batch(lruvec, bulk_gen, type, zone, &batch); if (!remaining || isolated >= MIN_LRU_BATCH) break;