From patchwork Tue May 9 02:20:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Huang, Ying" X-Patchwork-Id: 91349 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2572861vqo; Mon, 8 May 2023 19:30:47 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5tE3anVf3vP/1/d24SBwK8YNfrWp47SEg7sk4u19drclk0xDL9hNpsimFjFG98x9M94xkt X-Received: by 2002:a17:902:d38c:b0:1ab:675:3e31 with SMTP id e12-20020a170902d38c00b001ab06753e31mr14377842pld.37.1683599447070; Mon, 08 May 2023 19:30:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683599447; cv=none; d=google.com; s=arc-20160816; b=q02yW621Ec3TO+nMaTsQwVId0eWZbAHGYcUEV+VuKzSLE2cvgojK+YBOL5hs+kcnpE EU+oLJ02h+wQ5xhom9c3twygu4ys/v1vbLQE1ek2Sm0yx0uJF5WGM6N/2cwlZqLrW41s pqx+Hz0jXvZTctB1TXetY3CWqz7ZlscZaQ8YZfWMzGm2KwfwiG6DwcVFJcWsXmtVOHYM 1rsLEHXzHghgclph4wirmm66OaOv1hhkttdvaGrohi39xuBckUv1RqNcCz+0OzSH+JMz D713lm2T7xEYejPTim8avluOfo/JGKTby1oP3Vx9NTztlG2MwEkevcgC7BsO+YwDYQXH XJCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=NZsjKvq/oEZwGKiUkWDbW0O1PTl5KHPWQkK+rF33UGg=; b=aDQnYTW6sLZGTLe4oXajJuT5q8G3CRSEdN12Zp+WHsJPZVjx0ugf0JqCahX+wtj2P9 wceQt+pfnu+J9T6LNoK208Ung1n/M1A4njYQLwXxB5/nmOmmoDpjF6sYEcjH3MFDjdzL 6xR7DX5R5/N/uqBueYlRgL0sTSnhjMDmX4SW2ipteQXjo6lHU0qCLAVOtmVCKayogwlM e04i+be+2jIJOReOKKZ6/ljNmFR0Q2vHsU2Eb4zqpwcM5rp8gvbU7fJvokfhy60qfUc5 QzxOmvqCp4V1zwQ3tYhGfMJHLDN1HkcjyitOffOgarBMNqWO7RuBnIegeKGK3XE84dDT VSgg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=nPQzQgm7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id jb4-20020a170903258400b001aad604bb95si413908plb.152.2023.05.08.19.30.34; Mon, 08 May 2023 19:30:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=nPQzQgm7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234111AbjEICU3 (ORCPT + 99 others); Mon, 8 May 2023 22:20:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33752 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233970AbjEICU0 (ORCPT ); Mon, 8 May 2023 22:20:26 -0400 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E906693CD for ; Mon, 8 May 2023 19:20:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1683598825; x=1715134825; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=jhv+F2tb9b4VuUgfQs8d2vVC/9qfFsg1b8FLFSc2Iok=; b=nPQzQgm7dX/tKdF/YaYQwF+DpVqXCtTawxjKUdgqXhOYf21xo2wEbFGP cLmmbdQPbN6upG/ww4nv7x11A7xtrdbiT1jOYN7ssag8UhJe0XGcewZ/b 4Qzfd11S0KLx//yr7jxcZ3vNpS21Kz/L6oMpSMOeOqqBy+HWWDpc45799 2tlF17SwoX8nj5HfPg8xon6bra85x1W+tcbmkfwVlYeiFlsAUKbtdUcDW jw8O4pxdcdk3j1epy+3VRCfAFwFVs34DXYuSL5QAINKSdCraXDyfBfyC0 De/+/TqOtbuj7M61q0Lj7evh4HRlV8TcfxoFqnihErx7TPPZWgDADftf1 Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10704"; a="330155080" X-IronPort-AV: E=Sophos;i="5.99,259,1677571200"; d="scan'208";a="330155080" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 May 2023 19:20:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10704"; a="731515730" X-IronPort-AV: E=Sophos;i="5.99,259,1677571200"; d="scan'208";a="731515730" Received: from jiudongl-mobl1.ccr.corp.intel.com (HELO yhuang6-mobl2.ccr.corp.intel.com) ([10.255.30.15]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 May 2023 19:20:23 -0700 From: Huang Ying To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Huang Ying , Xin Hao , Zi Yan , Yang Shi , Baolin Wang , Oscar Salvador , Alistair Popple Subject: [PATCH 2/2] migrate_pages_batch: code cleanup: remove is_large Date: Tue, 9 May 2023 10:20:14 +0800 Message-Id: <20230509022014.380493-2-ying.huang@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230509022014.380493-1-ying.huang@intel.com> References: <20230509022014.380493-1-ying.huang@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1765381974009919421?= X-GMAIL-MSGID: =?utf-8?q?1765381974009919421?= Previously, in migrate_pages_batch we need to track whether the source folio is large/THP before splitting. So is_large is used to cache folio_test_large() result. Now, we don't need that variable any more because we don't count retrying and failure of large folios (only counting that of THP folios). So, in this patch, is_large is removed to simplify the code. This is just code cleanup, no functionality changes are expected. Signed-off-by: "Huang, Ying" Cc: Xin Hao Cc: Zi Yan Cc: Yang Shi Cc: Baolin Wang Cc: Oscar Salvador Cc: Alistair Popple Reviewed-by: Alistair Popple Reviewed-by: Xin Hao --- mm/migrate.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/mm/migrate.c b/mm/migrate.c index 10709aed76d3..2ac927a82bbc 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -1618,7 +1618,6 @@ static int migrate_pages_batch(struct list_head *from, new_page_t get_new_page, int nr_failed = 0; int nr_retry_pages = 0; int pass = 0; - bool is_large = false; bool is_thp = false; struct folio *folio, *folio2, *dst = NULL, *dst2; int rc, rc_saved = 0, nr_pages; @@ -1635,13 +1634,7 @@ static int migrate_pages_batch(struct list_head *from, new_page_t get_new_page, nr_retry_pages = 0; list_for_each_entry_safe(folio, folio2, from, lru) { - /* - * Large folio statistics is based on the source large - * folio. Capture required information that might get - * lost during migration. - */ - is_large = folio_test_large(folio); - is_thp = is_large && folio_test_pmd_mappable(folio); + is_thp = folio_test_large(folio) && folio_test_pmd_mappable(folio); nr_pages = folio_nr_pages(folio); cond_resched(); @@ -1688,7 +1681,7 @@ static int migrate_pages_batch(struct list_head *from, new_page_t get_new_page, nr_failed++; stats->nr_thp_failed += is_thp; /* Large folio NUMA faulting doesn't split to retry. */ - if (is_large && !nosplit) { + if (folio_test_large(folio) && !nosplit) { int ret = try_split_folio(folio, split_folios); if (!ret) {