Received: by 2002:ac0:8c9a:0:0:0:0:0 with SMTP id r26csp3851726ima; Mon, 4 Feb 2019 06:18:40 -0800 (PST) X-Google-Smtp-Source: AHgI3IZ3pER3a9ITx+91JpJZF6pTxFN6P9361xCf+kxXYnOQlWqE0UyWDjhbA/VznKeJ6ppbD8ht X-Received: by 2002:a65:608d:: with SMTP id t13mr9169356pgu.129.1549289920600; Mon, 04 Feb 2019 06:18:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549289920; cv=none; d=google.com; s=arc-20160816; b=IUlCBHTleL6paF1apHUXtpc6/0FbN5TwWC9zAunMaVZghtiSQLlXh1r9XNZWlSIvO+ PbEuoXj8t/iGpim3J1JTKKXkwd12QjgivCd08671ehnwwEFRC8xtz38qk7mSH7VOlZX2 S5kyb0hHWQdHMw54xdZ/dR9JgQECPe/SBeXY6nAZtT8erfPYn8fuOG1uEQPOuOlJfF9X iFkM/oeRQfghRxwDCGFNI51G4HPH9PNNlrPSwH8DEHEQs0PgZA1Rf+sGKaghiodV8XYh eSLfkyDjMu5rrmxftSHxZFUuP6jQLQYv6YvDDnuE0Kzg3zQ8TstdicPx657Y+PTwAF07 5eQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-disposition:mime-version:references:message-id:subject:cc :to:from:date; bh=DUDeaUultJTCbcVNFgMhm03+XXMrysryOdcNTXsIPJ4=; b=g2cS9GF/xU6hQZ4CuFtYC+42icUs5pBGIV42URDs9YQ9b4A0d5CwveAtaVUhJiz2gg NOMHqMFMIOosF/xhnEp0Fy+eA5QUyEjWZfTRB0g7HICT/L2imSC7B7MQH3M3VQzmo4ps OdSoJlkcvXxAeQeC+2phaBS1+ycQReFkEk92McYCXI4qXgIebudRXT4ALyP8VAbQCqy+ 5pP8a1cj0YSJV/eukPPOkWJEqZc1r37YMjtQTzGf854bBUwQvNhhUqTmpS1/mf/VDECW sgwuoHS5eGSqWAH9xidlUAU5Tt6tYEEOZ31rT3wxA6qMGYhFHyymEei87DY8IARWteJl +LOw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z7si149487plo.266.2019.02.04.06.18.24; Mon, 04 Feb 2019 06:18:40 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729589AbfBDMBR (ORCPT + 99 others); Mon, 4 Feb 2019 07:01:17 -0500 Received: from outbound-smtp02.blacknight.com ([81.17.249.8]:42905 "EHLO outbound-smtp02.blacknight.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729283AbfBDMBP (ORCPT ); Mon, 4 Feb 2019 07:01:15 -0500 Received: from mail.blacknight.com (pemlinmail04.blacknight.ie [81.17.254.17]) by outbound-smtp02.blacknight.com (Postfix) with ESMTPS id CFA1598BEC for ; Mon, 4 Feb 2019 12:01:12 +0000 (UTC) Received: (qmail 3119 invoked from network); 4 Feb 2019 12:01:12 -0000 Received: from unknown (HELO techsingularity.net) (mgorman@techsingularity.net@[37.228.225.79]) by 81.17.254.9 with ESMTPSA (AES256-SHA encrypted, authenticated); 4 Feb 2019 12:01:12 -0000 Date: Mon, 4 Feb 2019 12:01:11 +0000 From: Mel Gorman To: Andrew Morton Cc: Vlastimil Babka , David Rientjes , Andrea Arcangeli , Linux List Kernel Mailing , Linux-MM Subject: [PATCH] mm, compaction: Use free lists to quickly locate a migration source -fix Message-ID: <20190204120111.GL9565@techsingularity.net> References: <20190118175136.31341-1-mgorman@techsingularity.net> <20190118175136.31341-12-mgorman@techsingularity.net> <81e45dc0-c107-015b-e167-19d7ca4b6374@suse.cz> <20190201145139.GI9565@techsingularity.net> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Vlastimil correctly pointed out that when a fast search fails and cc->migrate_pfn is reinitialised to the lowest PFN found that the caller does not use the updated PFN. He also pointed out that there is an inconsistency between move_freelist_head and move_freelist_tail. This patch adds a new helper and uses it in move_freelist_tail so that list manipulations are avoided if the first list item traversed is a suitable migration source. The end result will be that the helpers should be symmetrical and it's been confirmed that the scan rates are slightly improved as a result of the fix but not enough to rewrite the changelogs. This is a fix for the mmotm patch mm-compaction-use-free-lists-to-quickly-locate-a-migration-source.patch . It's been provided as a combined patch as the first patch is not picked up at the time of writing and a rolled up patch is less likely to fall through the cracks. Signed-off-by: Mel Gorman --- drivers/gpu/drm/i915/i915_utils.h | 6 ------ include/linux/list.h | 11 +++++++++++ mm/compaction.c | 10 ++++++---- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_utils.h b/drivers/gpu/drm/i915/i915_utils.h index 9726df37c4c4..540e20eb032c 100644 --- a/drivers/gpu/drm/i915/i915_utils.h +++ b/drivers/gpu/drm/i915/i915_utils.h @@ -123,12 +123,6 @@ static inline u64 ptr_to_u64(const void *ptr) #include -static inline int list_is_first(const struct list_head *list, - const struct list_head *head) -{ - return head->next == list; -} - static inline void __list_del_many(struct list_head *head, struct list_head *first) { diff --git a/include/linux/list.h b/include/linux/list.h index edb7628e46ed..79626b5ab36c 100644 --- a/include/linux/list.h +++ b/include/linux/list.h @@ -206,6 +206,17 @@ static inline void list_bulk_move_tail(struct list_head *head, head->prev = last; } +/** + * list_is_first -- tests whether @ list is the first entry in list @head + * @list: the entry to test + * @head: the head of the list + */ +static inline int list_is_first(const struct list_head *list, + const struct list_head *head) +{ + return list->prev == head; +} + /** * list_is_last - tests whether @list is the last entry in list @head * @list: the entry to test diff --git a/mm/compaction.c b/mm/compaction.c index 92d10eb3d1c7..55f7ab142af2 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -1062,7 +1062,7 @@ move_freelist_tail(struct list_head *freelist, struct page *freepage) { LIST_HEAD(sublist); - if (!list_is_last(freelist, &freepage->lru)) { + if (!list_is_first(freelist, &freepage->lru)) { list_cut_position(&sublist, freelist, &freepage->lru); if (!list_empty(&sublist)) list_splice_tail(&sublist, freelist); @@ -1238,14 +1238,16 @@ update_fast_start_pfn(struct compact_control *cc, unsigned long pfn) cc->fast_start_pfn = min(cc->fast_start_pfn, pfn); } -static inline void +static inline unsigned long reinit_migrate_pfn(struct compact_control *cc) { if (!cc->fast_start_pfn || cc->fast_start_pfn == ULONG_MAX) - return; + return cc->migrate_pfn; cc->migrate_pfn = cc->fast_start_pfn; cc->fast_start_pfn = ULONG_MAX; + + return cc->migrate_pfn; } /* @@ -1361,7 +1363,7 @@ static unsigned long fast_find_migrateblock(struct compact_control *cc) * that had free pages as the basis for starting a linear scan. */ if (pfn == cc->migrate_pfn) - reinit_migrate_pfn(cc); + pfn = reinit_migrate_pfn(cc); return pfn; }