From patchwork Mon May 6 17:00:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yosry Ahmed X-Patchwork-Id: 13655825 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id BBFE9C25B4F for ; Mon, 6 May 2024 17:00:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 333B86B0088; Mon, 6 May 2024 13:00:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2E36B6B0089; Mon, 6 May 2024 13:00:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1AB796B008A; Mon, 6 May 2024 13:00:31 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id F0FA96B0088 for ; Mon, 6 May 2024 13:00:30 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 3CC8A40AE0 for ; Mon, 6 May 2024 17:00:30 +0000 (UTC) X-FDA: 82088584620.08.F3986D7 Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) by imf15.hostedemail.com (Postfix) with ESMTP id 8624FA0038 for ; Mon, 6 May 2024 17:00:28 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=UWf3gu2n; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf15.hostedemail.com: domain of 3qww5ZgoKCOAaQUTaCJOGFIQQING.EQONKPWZ-OOMXCEM.QTI@flex--yosryahmed.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=3qww5ZgoKCOAaQUTaCJOGFIQQING.EQONKPWZ-OOMXCEM.QTI@flex--yosryahmed.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1715014828; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding:in-reply-to: references:dkim-signature; bh=NtGseJ2cTzNz5m7usek72YLEdD+Xy4saxF80B0cOKZw=; b=3hpLAz9bd7AnQ+JjghWqrE6B+dOYfs/xREBrj1rB55MQqMV/ZH4cMeBgK8mUWvIo7eDkgi 4yAuK456obsSquxGTK6p/XMZpZiQFr0+2vhWKT307Uo82ep5hB8GFUV4ydCzfpGVYHpE15 emKoqjUYFXkFd3P73hnxph+Hj2lSN8s= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1715014828; a=rsa-sha256; cv=none; b=ymOdJ3y9JCqKcBMVcHLPPx6zqVHHIvAYfv0/d3IfI0L6Z2UB5EvCt/tswQqnshnfAoPvJj 7y2vcshb/os1IEJyFSrmvNAaZTgoXpP+O4eJXcONJjNgsjx09QUAxg5kgxYCHNUqN+Zo6k +WyNOfd7EgUVbB96iOgkuSliUIZy9ac= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=UWf3gu2n; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf15.hostedemail.com: domain of 3qww5ZgoKCOAaQUTaCJOGFIQQING.EQONKPWZ-OOMXCEM.QTI@flex--yosryahmed.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=3qww5ZgoKCOAaQUTaCJOGFIQQING.EQONKPWZ-OOMXCEM.QTI@flex--yosryahmed.bounces.google.com Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-de54be7066bso4229289276.0 for ; Mon, 06 May 2024 10:00:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1715014827; x=1715619627; darn=kvack.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=NtGseJ2cTzNz5m7usek72YLEdD+Xy4saxF80B0cOKZw=; b=UWf3gu2n74Es8YxB7UmoCkojUcjYDW9zem+fGGQY9tSs+Vew/FHFTnFnfNMDg6wK2/ OvvwseGWV+gUcrniXHHbbZPq8iQLrREo9q23oBEBX2knaDPHqmi3NXbpBJUpBMbjsN6a u3HdoiYKOb37GmCFEJnSEYj5L0VDZ4DcC38Mf9qFYt73zakKHspE7l9EO16IA+AfbRZq vdo6Rvaz+FGVUNbEK75511LGPj8TwQPHG7kG53kq/M1yqaIO2uTIDfhOGQ88wTpqwWLG r0A6L/6Z3eMw+M/DEPc1ebY9aq7XwvBTNFz52Dv3QhUvQjq+ljuGAfTAQ1R2pulbM3tT Pteg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715014827; x=1715619627; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=NtGseJ2cTzNz5m7usek72YLEdD+Xy4saxF80B0cOKZw=; b=MtC1schAiDxXfHytjbflf3y/i/NGUSVtdduO+ELMegtJiMxBrt6cWhxXPAOzJ37KLQ nX3hpxwoXmXQbd8ymJrzIWiBxz34Lx+jN9lHfTC+cETUdCHwSid8lLvKTj1GiztEY/Vt ptQQGZAcn5ZvoDc1fizTpe/NXR+hYgFAOS+YKNypX8d6mCIYh8t+5Rhr9hKswrG17i9r Lj/V4KEhrPFSGH/y3istlzRJ/0X17HareNVBOh24geTsGo4dutTgmcxvUu7/5/+odQiM afYrzBarW3D2nm+isjR6kCeQONUSvJDWtTwvwLqxv991KyXL43VjRJEvkxOW1F21q4DQ hPbA== X-Forwarded-Encrypted: i=1; AJvYcCVfjr5OfSzFzRA/TlkTl66Wy/RJyyQXQNe1Td9L/P1mxfK4IW7wZCDnXm3PgUFndHde3z239NhZgIB7LN1/P65p7iw= X-Gm-Message-State: AOJu0YyKv9Eb+w2QUZKGq4xD5vV9xsbzJYp3ViTWARuHyzAkDRe20rXl 4Ik46VXRBviFQ95gMwNEef62LovoK6Vh71uxI6ij0J08ViksUoNV9Tlq4mS8kLH09MXgrlqyH+e 7ZY5PizuuQ8JM0YtaOA== X-Google-Smtp-Source: AGHT+IHlyLVb/6ZNQeHwPNEf5AX1+AhaGqFqM5/t0YfXLcEDdTp7Br6QVMdHD+ukGbKsxUoTnlGAazy8w9nonexk X-Received: from yosry.c.googlers.com ([fda3:e722:ac3:cc00:20:ed76:c0a8:29b4]) (user=yosryahmed job=sendgmr) by 2002:a05:6902:2b8a:b0:deb:88f5:fa10 with SMTP id fj10-20020a0569022b8a00b00deb88f5fa10mr1022569ybb.5.1715014827422; Mon, 06 May 2024 10:00:27 -0700 (PDT) Date: Mon, 6 May 2024 17:00:24 +0000 Mime-Version: 1.0 X-Mailer: git-send-email 2.45.0.rc1.225.g2a3ae87e7f-goog Message-ID: <20240506170024.202111-1-yosryahmed@google.com> Subject: [PATCH] mm: do not update memcg stats for NR_{FILE/SHMEM}_PMDMAPPED From: Yosry Ahmed To: Andrew Morton Cc: Shakeel Butt , Johannes Weiner , Michal Hocko , Roman Gushchin , Muchun Song , linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Yosry Ahmed , syzbot+9319a4268a640e26b72b@syzkaller.appspotmail.com X-Rspamd-Queue-Id: 8624FA0038 X-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: shs8yhhqnm368h351fcndjjsk7hinjzd X-HE-Tag: 1715014828-510764 X-HE-Meta: U2FsdGVkX1/uYzVxNhRVWmFfFsO15qgf7Io6SEyMXaNip279AEt7JBSItROuiw7j0ZX+jzshovsz5xF6IFbIZhbp6/QyHF/5nHuQopPJaqDnPhztFcEEjj/4U1ow1dauIPuJuthZmwLGRLv1DHemTb7h76EuU9PG5jSIkR61eluXPEp0WVR9/nqU6On55DQ7um0xgAwZNF3HkBHB6klzIyeoC4641TPsZ4lBzcoYzY/iXLNve5fJjSTvjmo+WNWOAjgqJ2ymoMerfj1r9OqAY1u0t+W1wP94sKEmd5E6BOjHk0OEom7a8+PmAdfxaTkqdrb97oWElh3Y4Jc+VKu52DB7vSGGYkY1Yt2cmGWf/8oFma3KyFFYhQKRLmE4s4PAGnokOri1ODq7OsKueoCNh5UsWnDtcLrT3TaCTE+pgtcN8zNzyZqlamTP+VD7LovP+vJqyunmJC4EnpAZtrQAxNNziV8FJEb+KzLcNq/tZkrFo98pCJHdescMmslUvAKlzzY7CD8uvsiK+vOeQfXy6nLyrR6q/iuzqz0AlRPJskjfwmBcwi3qPtcFyJNUNvi1/tbQLdrAiTWKU1jQVf5hl6EAIt1UA8X5rjCrSv8NEdFwppJ7otkdk4WRTPd2Q0zNSTeLzxfWBKgw6B2GRNt7HjYDG4gVMtuz+fV0BhcHSNIsmmfTTT70FqJNz5AGUvXzYEM/tZW+/vmIobdit27svN20r5yDc2vnaz6nFBTcKEWiOO4hv7VGZYlTRCV73ehOj1f7ZrvAGZzZt4cOkA/U/kk1IEqoNH1DrCyQREefcBDHq/7DK47Uj+Ohs2hU5wghHRrYtHyzAE7Xv+YYb7BaXAxEuP7ucdLFBClflxF3RuSX284ZDoMUaPi01pDvF7zHQhXeG5Ntc2tad+rrdtP5gMlQDgLh1tL2B3xeqmctuztmaa4wK2KYjE2O0hxSJJ0B+d63g+FKjDEVSDLmcgB swIi8QDS u2n7H4E2EOdrm7Y6OL0xzq9h4LWft5+gRY9VatRqC1MEKHxG5sTWMZGd76qA4g/ehsV/wwDpgkQ3GzbnxpodaOW5B2FVf1pCdpVRtm6pPQnUbeaRCIKpw3ejxKbGNFskGUOjORo34OOkvBLnC83VyE6xnuzGGRwWunIWYapoD4lbBXN5nYh4pqL5vtx/WVwprqCI229jdEfD5KA+fZi38yqVJyzzXnqwRVabGO6Nnnarl52ucaiTv03fDINj3z5V7yXD9eVFTbXWaqBemNBttgrAI6IKQD/juJc+cPziJTJfweZnn/+We4UWE7EL/YJ2FrfNkAhOJ6k5xPXfK8EJszI+ZJn3LJr5IAeX7u90ppUgu2kao7v76v+yldCyV5DSEWDG8Lqo51LORwOGcHGF3Q8ogQesJ8z7dmk6rsHhK1gfYsJqcviumUndtOio4AumUVhDn4YbMQtGXQc/UvogNZ/fq3rqMUK09h7O24iLepKxwGPn59LaKu7wBh4geBv49dkTLpird2C7RY0ML5/YE5gEmpnfyGmD8bEyBsbEDIRcYWcaXjRXNmEdOhDBviyPvypbI4pGgAeqK8yNprX7H5fewV3MJdm5siTr9RLwgPlazm59uqoMot/n7S0ScxqEj4w0JT1RJpkUTYOdY7ukgBtXGRrHT5Uz+jCBwn9jkJw+2NsQ1ijHk8nnNXYtTwAF+lX1qrTtIiTmnwfPQurvvVGgfN7mzIsLr8+5iBksX/5xG/CbZgIwW2MzCb8q0yS1LOeI4sDKf04uRnxnIOCUBH87TTBruKqQ/yHgxwG68PoSuW+YcCJXsUZFPfWbZG1IgX0CbrUW456PsZssbRKqKcnZn1TmIT95sBCxZYoGg7sGVJQUsayE47grRaiMisaCwq/SL 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: List-Subscribe: List-Unsubscribe: Do not use __lruvec_stat_mod_folio() when updating NR_FILE_PMDMAPPED and NR_SHMEM_PMDMAPPED as these stats are not maintained per-memcg. Use __mod_node_page_state() instead, which updates the global per-node stats only. Reported-by: syzbot+9319a4268a640e26b72b@syzkaller.appspotmail.com Closes: https://lore.kernel.org/lkml/0000000000001b9d500617c8b23c@google.com Signed-off-by: Yosry Ahmed Acked-by: Shakeel Butt --- mm/rmap.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/mm/rmap.c b/mm/rmap.c index 12be4241474ab..c2cfb750d2535 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1435,13 +1435,14 @@ static __always_inline void __folio_add_file_rmap(struct folio *folio, struct page *page, int nr_pages, struct vm_area_struct *vma, enum rmap_level level) { + pg_data_t *pgdat = folio_pgdat(folio); int nr, nr_pmdmapped = 0; VM_WARN_ON_FOLIO(folio_test_anon(folio), folio); nr = __folio_add_rmap(folio, page, nr_pages, level, &nr_pmdmapped); if (nr_pmdmapped) - __lruvec_stat_mod_folio(folio, folio_test_swapbacked(folio) ? + __mod_node_page_state(pgdat, folio_test_swapbacked(folio) ? NR_SHMEM_PMDMAPPED : NR_FILE_PMDMAPPED, nr_pmdmapped); if (nr) __lruvec_stat_mod_folio(folio, NR_FILE_MAPPED, nr); @@ -1493,6 +1494,7 @@ static __always_inline void __folio_remove_rmap(struct folio *folio, enum rmap_level level) { atomic_t *mapped = &folio->_nr_pages_mapped; + pg_data_t *pgdat = folio_pgdat(folio); int last, nr = 0, nr_pmdmapped = 0; bool partially_mapped = false; enum node_stat_item idx; @@ -1540,13 +1542,14 @@ static __always_inline void __folio_remove_rmap(struct folio *folio, } if (nr_pmdmapped) { + /* NR_{FILE/SHMEM}_PMDMAPPED are not maintained per-memcg */ if (folio_test_anon(folio)) - idx = NR_ANON_THPS; - else if (folio_test_swapbacked(folio)) - idx = NR_SHMEM_PMDMAPPED; + __lruvec_stat_mod_folio(folio, NR_ANON_THPS, -nr_pmdmapped); else - idx = NR_FILE_PMDMAPPED; - __lruvec_stat_mod_folio(folio, idx, -nr_pmdmapped); + __mod_node_page_state(pgdat, + folio_test_swapbacked(folio) ? + NR_SHMEM_PMDMAPPED : NR_FILE_PMDMAPPED, + nr_pmdmapped); } if (nr) { idx = folio_test_anon(folio) ? NR_ANON_MAPPED : NR_FILE_MAPPED;