From patchwork Fri Jan 18 17:51:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mel Gorman X-Patchwork-Id: 10771359 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9FD0C6C5 for ; Fri, 18 Jan 2019 17:52:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8E60A2FC07 for ; Fri, 18 Jan 2019 17:52:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7D97E2FEF7; Fri, 18 Jan 2019 17:52:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E537F2FC07 for ; Fri, 18 Jan 2019 17:52:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 16B878E0012; Fri, 18 Jan 2019 12:52:20 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 11D5D8E0002; Fri, 18 Jan 2019 12:52:20 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0316D8E0012; Fri, 18 Jan 2019 12:52:19 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by kanga.kvack.org (Postfix) with ESMTP id 9E3588E0002 for ; Fri, 18 Jan 2019 12:52:19 -0500 (EST) Received: by mail-ed1-f70.google.com with SMTP id c3so5330279eda.3 for ; Fri, 18 Jan 2019 09:52:19 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references; bh=KxB+olxFRz15ByQGQdOPEkv73792TGdbwQgnAht0mak=; b=Qyy4mDNx9uEyrEM5mD5vthWqTvc7bbzFzAOmhWtiRusCoYzBLXiF14tDSn/iDQPhGp GVC2cmrmrx9sm54H5OJfnPmKfzr4ae4JWP2MtYt3wnMZtwiTv7XgIa29wOgXMN297Pqi bgcjglFm/mN2Gx+4G5+OtRpmRFQYCXdzKXhViUe6uQCeCwG4joRxMbJYO21oKsgTmm+Q s9Qx4fUimh5iK6XZCXb5kj8ez8UMc0qMNpJfKh+Z1bBQQ7sIdJF/adsnjc4EpOBCbKoe LwjBYu8YjEbvFcIEUjDyZln9/hdzIlk4DLRFrH0ctynCjv1lyIf2TzgwRrHX43oRHVHC ULhg== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of mgorman@techsingularity.net designates 81.17.249.35 as permitted sender) smtp.mailfrom=mgorman@techsingularity.net X-Gm-Message-State: AJcUukcr0kXKvNWcJvoQUjdDMHFF38kGCwf2NxR0+EQB7AMiQM3kA5G5 3o5a2LiDTloOlps9Lmo7ABefOgAKP8+TMnV2NGcYY/zRHQWbDHzoxmrg7Ayb5y6i6NBG27ytqgK GH00L0h3XR5pTr+3dorH+KeTWN3cxwHcUJ5FUuzhjz0oyh5gdYXn8sJXWImM7KWZE9Q== X-Received: by 2002:a50:f4c3:: with SMTP id v3mr16714278edm.196.1547833939131; Fri, 18 Jan 2019 09:52:19 -0800 (PST) X-Google-Smtp-Source: ALg8bN4wfGrcH2o2wH3W3AZluoil44ZkmKQNCdxW+idW+HpH2x1xU0NnuJ0uh8wCdVT+it/YYJMJ X-Received: by 2002:a50:f4c3:: with SMTP id v3mr16714217edm.196.1547833937966; Fri, 18 Jan 2019 09:52:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547833937; cv=none; d=google.com; s=arc-20160816; b=gm/T67fgq6IW0mc1h0Cxn/xGJn60+OpyPuGdKOVB3uQtt6yu1WigiA+ktwdRU3xFQY 3Q+MaVTgbVmHoDSFVitnKucdfjwFmyajHG+JYAHla5rJ6LXF2JosVg5NMCwfg9W+wZ5q jzDAdoSNCFAYjCa35oVO3yfj0UH1DUKV3JGRX9IzxjHlMRJ9DrLpstaGsJdrJiIEEr2P MGmdg1ZNMntr1X9Kb0/teGN3F3548d+XeqnyyBCpM9aqLna8/jc13f8SMrW8g9KdAGof mktRLwYtTBc+F3xyq0+VJBE5Z8PnImehw02Ci6Ugw5BAcsl/27MG6ZJZSIKke+Z3U5Tn oacw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from; bh=KxB+olxFRz15ByQGQdOPEkv73792TGdbwQgnAht0mak=; b=YM2uIujRTOXO0Rd58xINFBulvXKwbJsuGQTMXjC5BdzkMIoQnPTwTGjqna5/W9rLi5 N0FtrFJBmCbSa+XKpU/+0rsIUF462Fb+YsLkIG23Bg0iIA+rHpoRmSGJgj5uxGaqezwE zwXXqHmCg3VB+PmkWDdzAE0uaIyQF4KwDNvDxP5h6O0AMSSoF91ARRa0APoy1iQUGpJE DB0ZlUoYVsNfHrF4H/bNFg7bX/wQoFoRGD+RGjK8AVR21//GElMNjIWYpEYtxz7/Kvk8 b3a/StMsDogZ8ag5DjC8iyQ9U3kpmF9KTzYSu9+5cwczyjc8Jzph2OcYiyzjBcFtDW3V Ph4g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of mgorman@techsingularity.net designates 81.17.249.35 as permitted sender) smtp.mailfrom=mgorman@techsingularity.net Received: from outbound-smtp04.blacknight.com (outbound-smtp04.blacknight.com. [81.17.249.35]) by mx.google.com with ESMTPS id x1-v6si2649794eju.324.2019.01.18.09.52.17 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Jan 2019 09:52:17 -0800 (PST) Received-SPF: pass (google.com: domain of mgorman@techsingularity.net designates 81.17.249.35 as permitted sender) client-ip=81.17.249.35; Authentication-Results: mx.google.com; spf=pass (google.com: domain of mgorman@techsingularity.net designates 81.17.249.35 as permitted sender) smtp.mailfrom=mgorman@techsingularity.net Received: from mail.blacknight.com (pemlinmail03.blacknight.ie [81.17.254.16]) by outbound-smtp04.blacknight.com (Postfix) with ESMTPS id A2D9D98C47 for ; Fri, 18 Jan 2019 17:52:17 +0000 (UTC) Received: (qmail 31737 invoked from network); 18 Jan 2019 17:52:17 -0000 Received: from unknown (HELO stampy.163woodhaven.lan) (mgorman@techsingularity.net@[37.228.229.96]) by 81.17.254.9 with ESMTPA; 18 Jan 2019 17:52:17 -0000 From: Mel Gorman To: Andrew Morton Cc: David Rientjes , Andrea Arcangeli , Vlastimil Babka , Linux List Kernel Mailing , Linux-MM , Mel Gorman Subject: [PATCH 03/22] mm, compaction: Remove last_migrated_pfn from compact_control Date: Fri, 18 Jan 2019 17:51:17 +0000 Message-Id: <20190118175136.31341-4-mgorman@techsingularity.net> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20190118175136.31341-1-mgorman@techsingularity.net> References: <20190118175136.31341-1-mgorman@techsingularity.net> 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: X-Virus-Scanned: ClamAV using ClamSMTP The last_migrated_pfn field is a bit dubious as to whether it really helps but either way, the information from it can be inferred without increasing the size of compact_control so remove the field. Signed-off-by: Mel Gorman Acked-by: Vlastimil Babka --- mm/compaction.c | 25 +++++++++---------------- mm/internal.h | 1 - 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/mm/compaction.c b/mm/compaction.c index c15b4bbc9e9e..e59dd7a7564c 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -886,15 +886,6 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn, cc->nr_migratepages++; nr_isolated++; - /* - * Record where we could have freed pages by migration and not - * yet flushed them to buddy allocator. - * - this is the lowest page that was isolated and likely be - * then freed by migration. - */ - if (!cc->last_migrated_pfn) - cc->last_migrated_pfn = low_pfn; - /* Avoid isolating too much */ if (cc->nr_migratepages == COMPACT_CLUSTER_MAX) { ++low_pfn; @@ -918,7 +909,6 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn, } putback_movable_pages(&cc->migratepages); cc->nr_migratepages = 0; - cc->last_migrated_pfn = 0; nr_isolated = 0; } @@ -1539,6 +1529,7 @@ static enum compact_result compact_zone(struct zone *zone, struct compact_contro enum compact_result ret; unsigned long start_pfn = zone->zone_start_pfn; unsigned long end_pfn = zone_end_pfn(zone); + unsigned long last_migrated_pfn; const bool sync = cc->mode != MIGRATE_ASYNC; cc->migratetype = gfpflags_to_migratetype(cc->gfp_mask); @@ -1584,7 +1575,7 @@ static enum compact_result compact_zone(struct zone *zone, struct compact_contro cc->whole_zone = true; } - cc->last_migrated_pfn = 0; + last_migrated_pfn = 0; trace_mm_compaction_begin(start_pfn, cc->migrate_pfn, cc->free_pfn, end_pfn, sync); @@ -1593,12 +1584,14 @@ static enum compact_result compact_zone(struct zone *zone, struct compact_contro while ((ret = compact_finished(zone, cc)) == COMPACT_CONTINUE) { int err; + unsigned long start_pfn = cc->migrate_pfn; switch (isolate_migratepages(zone, cc)) { case ISOLATE_ABORT: ret = COMPACT_CONTENDED; putback_movable_pages(&cc->migratepages); cc->nr_migratepages = 0; + last_migrated_pfn = 0; goto out; case ISOLATE_NONE: /* @@ -1608,6 +1601,7 @@ static enum compact_result compact_zone(struct zone *zone, struct compact_contro */ goto check_drain; case ISOLATE_SUCCESS: + last_migrated_pfn = start_pfn; ; } @@ -1639,8 +1633,7 @@ static enum compact_result compact_zone(struct zone *zone, struct compact_contro cc->migrate_pfn = block_end_pfn( cc->migrate_pfn - 1, cc->order); /* Draining pcplists is useless in this case */ - cc->last_migrated_pfn = 0; - + last_migrated_pfn = 0; } } @@ -1652,18 +1645,18 @@ static enum compact_result compact_zone(struct zone *zone, struct compact_contro * compact_finished() can detect immediately if allocation * would succeed. */ - if (cc->order > 0 && cc->last_migrated_pfn) { + if (cc->order > 0 && last_migrated_pfn) { int cpu; unsigned long current_block_start = block_start_pfn(cc->migrate_pfn, cc->order); - if (cc->last_migrated_pfn < current_block_start) { + if (last_migrated_pfn < current_block_start) { cpu = get_cpu(); lru_add_drain_cpu(cpu); drain_local_pages(zone); put_cpu(); /* No more flushing until we migrate again */ - cc->last_migrated_pfn = 0; + last_migrated_pfn = 0; } } diff --git a/mm/internal.h b/mm/internal.h index 867af5425432..f40d06d70683 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -188,7 +188,6 @@ struct compact_control { unsigned int nr_migratepages; /* Number of pages to migrate */ unsigned long free_pfn; /* isolate_freepages search base */ unsigned long migrate_pfn; /* isolate_migratepages search base */ - unsigned long last_migrated_pfn;/* Not yet flushed page being freed */ struct zone *zone; unsigned long total_migrate_scanned; unsigned long total_free_scanned;