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=-3.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER,SPF_HELO_NONE,SPF_PASS autolearn=no 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 34DF9C388F9 for ; Thu, 22 Oct 2020 16:49:47 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 7FC0522267 for ; Thu, 22 Oct 2020 16:49:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=fb.com header.i=@fb.com header.b="hpKh2aP7"; dkim=pass (1024-bit key) header.d=fb.onmicrosoft.com header.i=@fb.onmicrosoft.com header.b="S4s753GO" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7FC0522267 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=fb.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id EC7E36B006E; Thu, 22 Oct 2020 12:49:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E79796B0070; Thu, 22 Oct 2020 12:49:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D18C76B0071; Thu, 22 Oct 2020 12:49:45 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0020.hostedemail.com [216.40.44.20]) by kanga.kvack.org (Postfix) with ESMTP id A61036B006E for ; Thu, 22 Oct 2020 12:49:45 -0400 (EDT) Received: from smtpin01.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 4D458180AD802 for ; Thu, 22 Oct 2020 16:49:45 +0000 (UTC) X-FDA: 77400147930.01.head69_041082827252 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin01.hostedemail.com (Postfix) with ESMTP id 1BCCE10046496 for ; Thu, 22 Oct 2020 16:49:45 +0000 (UTC) X-HE-Tag: head69_041082827252 X-Filterd-Recvd-Size: 8935 Received: from mx0b-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by imf26.hostedemail.com (Postfix) with ESMTP for ; Thu, 22 Oct 2020 16:49:43 +0000 (UTC) Received: from pps.filterd (m0109331.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 09MGhFxi031419; Thu, 22 Oct 2020 09:49:42 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=message-id : subject : from : to : cc : date : in-reply-to : references : content-type : content-transfer-encoding : mime-version; s=facebook; bh=cWne/3p9UxzZphn+Oykp8yjMla1uGUvvusPMVbkP5Nc=; b=hpKh2aP7i9RsE0XMzgGc9lrjXzrEJ/eUAjsVw49KZ7uOP4JpSxHFy8hTzveY0cDOfgM9 Q0ld3GSm3JcVYFa4UeCigdsc937WQVOwLx9LKGyBCuPNm2Wp2aEPeQdynHsJ+c6lZn9s BX0FvJ17bVuk+YERx36mAxdGvSxkj6dKFPk= Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com with ESMTP id 34a1ttd7j0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Thu, 22 Oct 2020 09:49:42 -0700 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (100.104.98.9) by o365-in.thefacebook.com (100.104.94.230) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Thu, 22 Oct 2020 09:49:41 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OfpHk9GIlawNNc5apJ/ejuV25C9qJ+W0LbAgY0Q9dzk1VN1sUIEvH+XhA9zflQgnwazJdYfhpTA0OwgYtdXpxew6iCPgi5A2/CR/pGi7aZJ+Gx4ROL7j/bR3tac9cc4yCDleTpy4stAgj7gEHkyZVkPypL29ERIIWFLe9HfpxhE0PCk1fGt7lfgkPwbSNTXA/3V7imWXOyLUDwRg7V6a1QzDEztVnxr9g/lxvA6m9Hf3djZzT5JjhKJc2taiPChRaGJt1cJhJt53UdSqekawo16CWd+gQyNVxju4OTFqorJTPxyevIfUzeozQjYH7+JVJ9xsoAyW6/B4C4vuTDGdEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cWne/3p9UxzZphn+Oykp8yjMla1uGUvvusPMVbkP5Nc=; b=eC/Z6ZqSssGKE9mU48t93Bl94RVQaOHcuJxSWLj/GLMbq8JHi3BFD4uz36M4gIfjl6IbmaLoSeWYROdFKn97azHbjjDnDirClWyyquxMnw/lMrlJL761SBDavt327eKyzsniMscFMaRY64VeAaSiTQ6CqLmnZNPdjEgOH7ZnaH5VVLLLRPL2wg54za1lMlp17AEcK6s+2vkVPeULsRYhJurJ8gaidZpbpNElF8kk8bvOg8baD2vEr6lnmK4jsnmJjlWrTZHc+rcXbmOASKaewevxEwfdPUnu0cZEIZqVlWmnwV0JtxOtwgbEdmMV27+H0Lb6IdAj2ilDdWUNcUm2zw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=fb.com; dmarc=pass action=none header.from=fb.com; dkim=pass header.d=fb.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.onmicrosoft.com; s=selector2-fb-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cWne/3p9UxzZphn+Oykp8yjMla1uGUvvusPMVbkP5Nc=; b=S4s753GOHV9B8pEgOmUHIv8KvORGWmBhnZOhWSK7gPV1ImDxXbGPQUutApVv0981VrFTcj2kBFnwNX030+nJmw9dh4sAqBFhp4/0x9sejkSEy+KjeAizd13Qopz6k51Kj2vIwaPnVBYlSCZblW7h+uJ7zOZHV8sjI8CmxBqMGwY= Authentication-Results: cmpxchg.org; dkim=none (message not signed) header.d=none;cmpxchg.org; dmarc=none action=none header.from=fb.com; Received: from MN2PR15MB3327.namprd15.prod.outlook.com (2603:10b6:208:fd::28) by MN2PR15MB3037.namprd15.prod.outlook.com (2603:10b6:208:f9::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.18; Thu, 22 Oct 2020 16:49:38 +0000 Received: from MN2PR15MB3327.namprd15.prod.outlook.com ([fe80::a124:777e:37bd:2f1d]) by MN2PR15MB3327.namprd15.prod.outlook.com ([fe80::a124:777e:37bd:2f1d%4]) with mapi id 15.20.3477.028; Thu, 22 Oct 2020 16:49:38 +0000 Message-ID: Subject: Re: [PATCH] mm: memcontrol: add file_thp, shmem_thp to memory.stat From: Rik van Riel To: Johannes Weiner , Andrew Morton CC: Michal Hocko , , , , Date: Thu, 22 Oct 2020 12:49:34 -0400 In-Reply-To: <20201022151844.489337-1-hannes@cmpxchg.org> References: <20201022151844.489337-1-hannes@cmpxchg.org> Organization: Facebook, Inc. Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.4 (3.34.4-1.fc31) Content-Transfer-Encoding: 7bit X-Originating-IP: [2620:10d:c091:480::1:fdc6] X-ClientProxiedBy: MN2PR20CA0009.namprd20.prod.outlook.com (2603:10b6:208:e8::22) To MN2PR15MB3327.namprd15.prod.outlook.com (2603:10b6:208:fd::28) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from imladris.surriel.com (2620:10d:c091:480::1:fdc6) by MN2PR20CA0009.namprd20.prod.outlook.com (2603:10b6:208:e8::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.18 via Frontend Transport; Thu, 22 Oct 2020 16:49:37 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: dd2a4354-6f7f-46c4-9d10-08d876aa76e6 X-MS-TrafficTypeDiagnostic: MN2PR15MB3037: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-FB-Source: Internal X-MS-Oob-TLC-OOBClassifiers: OLM:4941; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yC7joLTDMc+axOaSmdbGIM1Pf5jCrv6SxxsUmU1N3pDFKK220xUDkL0fFhu6qFReNmpGsTERS6QpWB9cZ7ZwZYRVvD9qmrlB68B/M23GLD3S9LqLpr0BEXvTJvfev3dYE5X7tdNpwASIxSPOInjhd4CQQY//ipFoFqhBKkzvHS9uKoclRdgvL2y4tj7wA6ZX+UJt3OTRISJ8Dv2kc2b4Wpfu6V1nfxsSVHVLJDChwcmSJbVQzzBO6Us1rpIjIHTcnW76khaTF6ZB+Sr5xrWFhyyDMfGln1uzJ6qt9HkNofrdWeZywXt6w/dz0i5I08LOwYS4XHEoeiUGZ3idQ2F7cw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MN2PR15MB3327.namprd15.prod.outlook.com;PTR:;CAT:NONE;SFS:(396003)(376002)(136003)(346002)(366004)(39860400002)(5660300002)(83380400001)(2906002)(6506007)(66556008)(6512007)(2616005)(36756003)(6666004)(52116002)(36916002)(6486002)(110136005)(16526019)(66946007)(8936002)(66476007)(86362001)(4744005)(4001150100001)(186003)(478600001)(8676002)(4326008)(316002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData: FGnOs9csIQvZRpOYt+ElkKqTMQf2rAMpwtxm1wXS7EvkrKCF3G76p0ll0LFXMgtE+HsQIoFLn1aFUFU9JSHiq12hrI407qQ0KzMEom4YnWsJz6ER2zkwQf7AAV2LeaQx98ErpGe2Azayl2jjDEBn5Q6R1eAps/zEex1NrCUS9vB/8siVBJR3yAeLuLzSQakBZAtOP7xt1T/szRSx1xCzmqtjUhPsSuVxgY5nxbIhy8hmLAPK8z5U1eppOVcM/csZ3RETp0//ZRKL1IqiIl4PbdzzjWNa+vQaOKn+G4KqyI+jJGczhY6i93B9EE0Su06hkTyGPmTvlAbmZu2mPd4QewJx8dG6EmKZJyG2sSWEhkm4jnZK9PRNsuahvT+cye9zJLZn3uvN/cKGsind8fT9MK6nCd1sQgIIs3p1v3uvCtI0slR+EGWtMJDf5ogPsW8v+ulBbC59GEq1FHfUe3HWcoMv+uclanDIxX6iszQ3yHGnF6sYcnNH7H5e34U10wOtlXmJrJplPaUWnKc9qc6lwzY8m0JrAbK8PWKSdcmAmMXWTwPgr8YbRFhYlnqL9FFm+4fxlzTANl0EdNlULudYBTzxl//Ta2DdgeYmOaYc8EF4lrRPo9tIF7RiPbbn506WCoUfzYIYgtnIOQc/8YEfCYab6txQZqTuTYQBPwNDfStOmSFtIBuCgG0SUtcm3cM6 X-MS-Exchange-CrossTenant-Network-Message-Id: dd2a4354-6f7f-46c4-9d10-08d876aa76e6 X-MS-Exchange-CrossTenant-AuthSource: MN2PR15MB3327.namprd15.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Oct 2020 16:49:38.5937 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ae927fe-1255-47a7-a2af-5f3a069daaa2 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: kO+W3nh+oT14ZSQZDWSGr90aW28Yr4aA7M9ZX6Mwh5hhSOHweBkIb37p7VGldokg X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR15MB3037 X-OriginatorOrg: fb.com X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.235,18.0.737 definitions=2020-10-22_12:2020-10-20,2020-10-22 signatures=0 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 suspectscore=0 adultscore=0 clxscore=1011 mlxlogscore=908 mlxscore=0 bulkscore=0 priorityscore=1501 lowpriorityscore=0 spamscore=0 impostorscore=0 phishscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2010220110 X-FB-Internal: deliver 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: On Thu, 2020-10-22 at 11:18 -0400, Johannes Weiner wrote: > index e80aa9d2db68..334ce608735c 100644 > --- a/mm/filemap.c > +++ b/mm/filemap.c > @@ -204,9 +204,9 @@ static void unaccount_page_cache_page(struct > address_space *mapping, > if (PageSwapBacked(page)) { > __mod_lruvec_page_state(page, NR_SHMEM, -nr); > if (PageTransHuge(page)) > - __dec_node_page_state(page, NR_SHMEM_THPS); > + __dec_lruvec_page_state(page, NR_SHMEM_THPS); > } else if (PageTransHuge(page)) { > - __dec_node_page_state(page, NR_FILE_THPS); > + __dec_lruvec_page_state(page, NR_FILE_THPS); > filemap_nr_thps_dec(mapping); > } This may be a dumb question, but does that mean the NR_FILE_THPS number will no longer be visible in /proc/vmstat or is there some magic I overlooked in a cursory look of the code?