Received: by 2002:a25:683:0:0:0:0:0 with SMTP id 125csp1065840ybg; Wed, 10 Jun 2020 23:21:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxTt5mHmtHmMK9SJYp/UPnucY1WRfObKsLtJLiwAMmEMEN6UB+SuzXo15Ax2F1OomhI4GJF X-Received: by 2002:a50:9b16:: with SMTP id o22mr5490715edi.130.1591856486224; Wed, 10 Jun 2020 23:21:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1591856486; cv=none; d=google.com; s=arc-20160816; b=p2dMONj6eYmTV0LpyoISP7hak2TfwoUyU7kzK1EliMSuygM03YWn6kS+d5NSxwbTNv KwOtjKD613G+VvcHuDASBryRRe1ZgZn5lXGa3grhJC9xnUHwsqtHDVM3LwxS/U7KIdn7 JraCrGfthNermo2BIkX9+/3BO/AI5CRAkM2Ou0h2SxgO/ou1p0zY6M8YbHyXroTmOeET tOQcRjfmpKU+nfOIt+ESF7kbQ34JBBUVbOyaGuU1KdBt0lQtAdmIfEPH2VFam3ppEK98 SM5gLC7u2Qec+orYx5LXJvp561/s4YuhqUjzzSGPs6OjD230KZDZ0FYfvItoqsOHQbWF 5ung== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:to:from; bh=3LRJpnrNZuhIMjIZU6ZIaZWbP+WMKxa/Le9y81FoX2o=; b=Drhyp4tU0gUYlnHAb376B525LCb7I70HlPpRfPDyfAdQeJkVfhAF7obVWtdznGX8pz IP8YmlQwtW30K1QsjwXnH1UmlsBgb4MKrCG+bnjwnpvhpwTUpDQYLhyDteT14oKIZuvg lCCjs6MtbLtQ95lg7f8LzlE/ODvUZDwivfTvyKI+aB2FgeIlkQMoC4k2H6LZ4Pzs3AU9 jziycK56IwWl/NOieFmwXzqRhqwpBRtXDdkZBiyKxipcIwda7WgHp4xe+pvmWBvKgQgx lHnEwXSpXKYI8YRoVFlvnCSr8uSWnGmyHAyMefqOR1Y+Oo0CEtt+GAV6f9oaATulu/XS nudg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id li7si1343215ejb.607.2020.06.10.23.21.03; Wed, 10 Jun 2020 23:21:26 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726645AbgFKGRL (ORCPT + 99 others); Thu, 11 Jun 2020 02:17:11 -0400 Received: from out30-133.freemail.mail.aliyun.com ([115.124.30.133]:39554 "EHLO out30-133.freemail.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726379AbgFKGRJ (ORCPT ); Thu, 11 Jun 2020 02:17:09 -0400 X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R131e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e07425;MF=alex.shi@linux.alibaba.com;NM=1;PH=DS;RN=16;SR=0;TI=SMTPD_---0U.EtHon_1591856223; Received: from localhost(mailfrom:alex.shi@linux.alibaba.com fp:SMTPD_---0U.EtHon_1591856223) by smtp.aliyun-inc.com(127.0.0.1); Thu, 11 Jun 2020 14:17:03 +0800 From: Alex Shi To: akpm@linux-foundation.org, mgorman@techsingularity.net, tj@kernel.org, hughd@google.com, khlebnikov@yandex-team.ru, daniel.m.jordan@oracle.com, yang.shi@linux.alibaba.com, willy@infradead.org, hannes@cmpxchg.org, lkp@intel.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, shakeelb@google.com, iamjoonsoo.kim@lge.com, richard.weiyang@gmail.com Subject: [PATCH v12 01/16] mm/vmscan: remove unnecessary lruvec adding Date: Thu, 11 Jun 2020 14:16:34 +0800 Message-Id: <1591856209-166869-2-git-send-email-alex.shi@linux.alibaba.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1591856209-166869-1-git-send-email-alex.shi@linux.alibaba.com> References: <1591856209-166869-1-git-send-email-alex.shi@linux.alibaba.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We don't have to add a freeable page into lru and then remove from it. This change saves a couple of actions and makes the moving more clear. The SetPageLRU needs to be kept here for list intergrity. Otherwise: #0 mave_pages_to_lru #1 release_pages if (put_page_testzero()) if !put_page_testzero !PageLRU //skip lru_lock list_add(&page->lru,) list_add(&page->lru,) //corrupt [akpm@linux-foundation.org: coding style fixes] Signed-off-by: Alex Shi Cc: Andrew Morton Cc: Johannes Weiner Cc: Tejun Heo Cc: Matthew Wilcox Cc: Hugh Dickins Cc: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org --- mm/vmscan.c | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index b6d84326bdf2..81228334f7d6 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -1855,26 +1855,29 @@ static unsigned noinline_for_stack move_pages_to_lru(struct lruvec *lruvec, while (!list_empty(list)) { page = lru_to_page(list); VM_BUG_ON_PAGE(PageLRU(page), page); + list_del(&page->lru); if (unlikely(!page_evictable(page))) { - list_del(&page->lru); spin_unlock_irq(&pgdat->lru_lock); putback_lru_page(page); spin_lock_irq(&pgdat->lru_lock); continue; } - lruvec = mem_cgroup_page_lruvec(page, pgdat); + /* + * The SetPageLRU needs to be kept here for list intergrity. + * Otherwise: + * #0 mave_pages_to_lru #1 release_pages + * if (put_page_testzero()) + * if !put_page_testzero + * !PageLRU //skip lru_lock + * list_add(&page->lru,) + * list_add(&page->lru,) //corrupt + */ SetPageLRU(page); - lru = page_lru(page); - - nr_pages = hpage_nr_pages(page); - update_lru_size(lruvec, lru, page_zonenum(page), nr_pages); - list_move(&page->lru, &lruvec->lists[lru]); - if (put_page_testzero(page)) { + if (unlikely(put_page_testzero(page))) { __ClearPageLRU(page); __ClearPageActive(page); - del_page_from_lru_list(page, lruvec, lru); if (unlikely(PageCompound(page))) { spin_unlock_irq(&pgdat->lru_lock); @@ -1882,9 +1885,16 @@ static unsigned noinline_for_stack move_pages_to_lru(struct lruvec *lruvec, spin_lock_irq(&pgdat->lru_lock); } else list_add(&page->lru, &pages_to_free); - } else { - nr_moved += nr_pages; + continue; } + + lruvec = mem_cgroup_page_lruvec(page, pgdat); + lru = page_lru(page); + nr_pages = hpage_nr_pages(page); + + update_lru_size(lruvec, lru, page_zonenum(page), nr_pages); + list_add(&page->lru, &lruvec->lists[lru]); + nr_moved += nr_pages; } /* -- 1.8.3.1