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.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 09CF8C2D0A3 for ; Mon, 26 Oct 2020 18:32:08 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 8179F22265 for ; Mon, 26 Oct 2020 18:31:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="O5P8PEjz" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8179F22265 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id B26846B0071; Mon, 26 Oct 2020 14:31:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AD5836B0072; Mon, 26 Oct 2020 14:31:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 927FA6B0073; Mon, 26 Oct 2020 14:31:49 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0121.hostedemail.com [216.40.44.121]) by kanga.kvack.org (Postfix) with ESMTP id 6793B6B0071 for ; Mon, 26 Oct 2020 14:31:49 -0400 (EDT) Received: from smtpin24.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 12130181AC9CC for ; Mon, 26 Oct 2020 18:31:49 +0000 (UTC) X-FDA: 77414920338.24.straw59_300fe1527275 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin24.hostedemail.com (Postfix) with ESMTP id E4D3F1A4A0 for ; Mon, 26 Oct 2020 18:31:48 +0000 (UTC) X-HE-Tag: straw59_300fe1527275 X-Filterd-Recvd-Size: 2277 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf47.hostedemail.com (Postfix) with ESMTP for ; Mon, 26 Oct 2020 18:31:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=HWRDY/xGxom/HFnGYYY2Iux/rYuJshH0/dvieqGPquA=; b=O5P8PEjzWtkJMIjikpin9q4lkl 7eQsNQjKzfA1g526ZkjcXgfI4VY3b3t5Kw2wabGRFSkhZ5AEEsJo2yERHDSXHX0O9dBWO6YmfTTw9 nKPHprqoVKwPh21qEdupXeXZGJPj3Qgi87pa68/wl687xkAYMqO7/d2Kqc1zpUQXTFIl1a0HxXvAJ sUXgUmeHn+8IigGi3PPh783K7pUSYYGPTH3sNxg0AaZdxuWNBuVzVd/CuIw1n8t5UDKXhFRn9wvNq Dbq+UDn1Fu6Zm/W55JVS8N22W6dSAI9QT/h1mQhEBdFmIIkft51EVMAPw2Ptn8zL4WReueepHzJrJ R03aeTiQ==; Received: from willy by casper.infradead.org with local (Exim 4.92.3 #3 (Red Hat Linux)) id 1kX7HT-0002k5-IT; Mon, 26 Oct 2020 18:31:43 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: Zi Yan , linux-fsdevel@vger.kernel.org, Matthew Wilcox Subject: [PATCH 8/9] mm: Fix THP size assumption in mem_cgroup_split_huge_fixup Date: Mon, 26 Oct 2020 18:31:35 +0000 Message-Id: <20201026183136.10404-9-willy@infradead.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20201026183136.10404-1-willy@infradead.org> References: <20201026183136.10404-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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: From: Zi Yan Ask the page what size it is instead of assuming PMD size. Signed-off-by: Zi Yan Signed-off-by: Matthew Wilcox (Oracle) --- mm/memcontrol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 3a24e3b619f5..e7824c4dab25 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -3280,7 +3280,7 @@ void mem_cgroup_split_huge_fixup(struct page *head) if (mem_cgroup_disabled()) return; =20 - for (i =3D 1; i < HPAGE_PMD_NR; i++) { + for (i =3D 1; i < thp_nr_pages(head); i++) { css_get(&memcg->css); head[i].mem_cgroup =3D memcg; } --=20 2.28.0