From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4B8C6C433E1 for ; Mon, 24 Aug 2020 12:57:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2E2E320706 for ; Mon, 24 Aug 2020 12:57:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728114AbgHXM5b (ORCPT ); Mon, 24 Aug 2020 08:57:31 -0400 Received: from out30-43.freemail.mail.aliyun.com ([115.124.30.43]:33416 "EHLO out30-43.freemail.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726956AbgHXMz2 (ORCPT ); Mon, 24 Aug 2020 08:55:28 -0400 X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R761e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01f04397;MF=alex.shi@linux.alibaba.com;NM=1;PH=DS;RN=22;SR=0;TI=SMTPD_---0U6k9-bl_1598273712; Received: from aliy80.localdomain(mailfrom:alex.shi@linux.alibaba.com fp:SMTPD_---0U6k9-bl_1598273712) by smtp.aliyun-inc.com(127.0.0.1); Mon, 24 Aug 2020 20:55:19 +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, 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, kirill@shutemov.name, alexander.duyck@gmail.com, rong.a.chen@intel.com, mhocko@suse.com, vdavydov.dev@gmail.com, shy828301@gmail.com Cc: =?UTF-8?q?Mika=20Penttil=C3=A4?= Subject: [PATCH v18 18/32] mm/thp: add tail pages into lru anyway in split_huge_page() Date: Mon, 24 Aug 2020 20:54:51 +0800 Message-Id: <1598273705-69124-19-git-send-email-alex.shi@linux.alibaba.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1598273705-69124-1-git-send-email-alex.shi@linux.alibaba.com> References: <1598273705-69124-1-git-send-email-alex.shi@linux.alibaba.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Split_huge_page() must start with PageLRU(head), and we are holding the lru_lock here. If the head was cleared lru bit unexpected, keep tracking it. Signed-off-by: Alex Shi Reviewed-by: Kirill A. Shutemov Cc: Kirill A. Shutemov Cc: Andrew Morton Cc: Johannes Weiner Cc: Matthew Wilcox Cc: Hugh Dickins Cc: Mika Penttilä Cc: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org --- mm/huge_memory.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 0132d363253e..6380c925e904 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2321,17 +2321,20 @@ static void lru_add_page_tail(struct page *head, struct page *page_tail, VM_BUG_ON_PAGE(PageLRU(page_tail), head); lockdep_assert_held(&lruvec_pgdat(lruvec)->lru_lock); - if (!list) - SetPageLRU(page_tail); - - if (likely(PageLRU(head))) - list_add_tail(&page_tail->lru, &head->lru); - else if (list) { + if (list) { /* page reclaim is reclaiming a huge page */ get_page(page_tail); list_add_tail(&page_tail->lru, list); - } else + } else { + /* + * Split start from PageLRU(head), and we are holding the + * lru_lock. Do a warning if the head's lru bit was cleared + * unexpected. + */ VM_WARN_ON(!PageLRU(head)); + SetPageLRU(page_tail); + list_add_tail(&page_tail->lru, &head->lru); + } } static void __split_huge_page_tail(struct page *head, int tail, -- 1.8.3.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Shi Subject: [PATCH v18 18/32] mm/thp: add tail pages into lru anyway in split_huge_page() Date: Mon, 24 Aug 2020 20:54:51 +0800 Message-ID: <1598273705-69124-19-git-send-email-alex.shi@linux.alibaba.com> References: <1598273705-69124-1-git-send-email-alex.shi@linux.alibaba.com> Mime-Version: 1.0 Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1598273705-69124-1-git-send-email-alex.shi@linux.alibaba.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: Content-Type: text/plain; charset="macroman" To: akpm@linux-foundation.org, mgorman@techsingularity.net, tj@kernel.org, hughd@google.com, khlebnikov@yandex-team.ru, daniel.m.jordan@oracle.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, kirill@shutemov.name, alexander.duyck@gmail.com, rong.a.chen@intel.com, mhocko@suse.com, vdavydov.dev@gmail.com, shy828301@gmail.com Cc: =?UTF-8?q?Mika=20Penttil=C3=A4?= U3BsaXRfaHVnZV9wYWdlKCkgbXVzdCBzdGFydCB3aXRoIFBhZ2VMUlUoaGVhZCksIGFuZCB3ZSBh cmUgaG9sZGluZyB0aGUKbHJ1X2xvY2sgaGVyZS4gSWYgdGhlIGhlYWQgd2FzIGNsZWFyZWQgbHJ1 IGJpdCB1bmV4cGVjdGVkLCBrZWVwIHRyYWNraW5nIGl0LgoKU2lnbmVkLW9mZi1ieTogQWxleCBT aGkgPGFsZXguc2hpQGxpbnV4LmFsaWJhYmEuY29tPgpSZXZpZXdlZC1ieTogS2lyaWxsIEEuIFNo dXRlbW92IDxraXJpbGwuc2h1dGVtb3ZAbGludXguaW50ZWwuY29tPgpDYzogS2lyaWxsIEEuIFNo dXRlbW92IDxraXJpbGxAc2h1dGVtb3YubmFtZT4KQ2M6IEFuZHJldyBNb3J0b24gPGFrcG1AbGlu dXgtZm91bmRhdGlvbi5vcmc+CkNjOiBKb2hhbm5lcyBXZWluZXIgPGhhbm5lc0BjbXB4Y2hnLm9y Zz4KQ2M6IE1hdHRoZXcgV2lsY294IDx3aWxseUBpbmZyYWRlYWQub3JnPgpDYzogSHVnaCBEaWNr aW5zIDxodWdoZEBnb29nbGUuY29tPgpDYzogTWlrYSBQZW50dGlsw6QgPG1pa2EucGVudHRpbGFA bmV4dGZvdXIuY29tPgpDYzogbGludXgtbW1Aa3ZhY2sub3JnCkNjOiBsaW51eC1rZXJuZWxAdmdl ci5rZXJuZWwub3JnCi0tLQogbW0vaHVnZV9tZW1vcnkuYyB8IDE3ICsrKysrKysrKystLS0tLS0t CiAxIGZpbGUgY2hhbmdlZCwgMTAgaW5zZXJ0aW9ucygrKSwgNyBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9tbS9odWdlX21lbW9yeS5jIGIvbW0vaHVnZV9tZW1vcnkuYwppbmRleCAwMTMyZDM2 MzI1M2UuLjYzODBjOTI1ZTkwNCAxMDA2NDQKLS0tIGEvbW0vaHVnZV9tZW1vcnkuYworKysgYi9t bS9odWdlX21lbW9yeS5jCkBAIC0yMzIxLDE3ICsyMzIxLDIwIEBAIHN0YXRpYyB2b2lkIGxydV9h ZGRfcGFnZV90YWlsKHN0cnVjdCBwYWdlICpoZWFkLCBzdHJ1Y3QgcGFnZSAqcGFnZV90YWlsLAog CVZNX0JVR19PTl9QQUdFKFBhZ2VMUlUocGFnZV90YWlsKSwgaGVhZCk7CiAJbG9ja2RlcF9hc3Nl cnRfaGVsZCgmbHJ1dmVjX3BnZGF0KGxydXZlYyktPmxydV9sb2NrKTsKIAotCWlmICghbGlzdCkK LQkJU2V0UGFnZUxSVShwYWdlX3RhaWwpOwotCi0JaWYgKGxpa2VseShQYWdlTFJVKGhlYWQpKSkK LQkJbGlzdF9hZGRfdGFpbCgmcGFnZV90YWlsLT5scnUsICZoZWFkLT5scnUpOwotCWVsc2UgaWYg KGxpc3QpIHsKKwlpZiAobGlzdCkgewogCQkvKiBwYWdlIHJlY2xhaW0gaXMgcmVjbGFpbWluZyBh IGh1Z2UgcGFnZSAqLwogCQlnZXRfcGFnZShwYWdlX3RhaWwpOwogCQlsaXN0X2FkZF90YWlsKCZw YWdlX3RhaWwtPmxydSwgbGlzdCk7Ci0JfSBlbHNlCisJfSBlbHNlIHsKKwkJLyoKKwkJICogU3Bs aXQgc3RhcnQgZnJvbSBQYWdlTFJVKGhlYWQpLCBhbmQgd2UgYXJlIGhvbGRpbmcgdGhlCisJCSAq IGxydV9sb2NrLiBEbyBhIHdhcm5pbmcgaWYgdGhlIGhlYWQncyBscnUgYml0IHdhcyBjbGVhcmVk CisJCSAqIHVuZXhwZWN0ZWQuCisJCSAqLwogCQlWTV9XQVJOX09OKCFQYWdlTFJVKGhlYWQpKTsK KwkJU2V0UGFnZUxSVShwYWdlX3RhaWwpOworCQlsaXN0X2FkZF90YWlsKCZwYWdlX3RhaWwtPmxy dSwgJmhlYWQtPmxydSk7CisJfQogfQogCiBzdGF0aWMgdm9pZCBfX3NwbGl0X2h1Z2VfcGFnZV90 YWlsKHN0cnVjdCBwYWdlICpoZWFkLCBpbnQgdGFpbCwKLS0gCjEuOC4zLjEKCg==