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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id A66C9C25B75 for ; Thu, 23 May 2024 03:22:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3B2AF6B0083; Wed, 22 May 2024 23:22:06 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 363856B008C; Wed, 22 May 2024 23:22:06 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 22AF66B0096; Wed, 22 May 2024 23:22:06 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 03E8C6B0083 for ; Wed, 22 May 2024 23:22:05 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 6C5BE160150 for ; Thu, 23 May 2024 03:22:05 +0000 (UTC) X-FDA: 82148211810.29.4843D1C Received: from mail-ua1-f53.google.com (mail-ua1-f53.google.com [209.85.222.53]) by imf03.hostedemail.com (Postfix) with ESMTP id A68BD20010 for ; Thu, 23 May 2024 03:22:03 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=gdV5B1mP; spf=pass (imf03.hostedemail.com: domain of 21cnbao@gmail.com designates 209.85.222.53 as permitted sender) smtp.mailfrom=21cnbao@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1716434523; a=rsa-sha256; cv=none; b=rAzV7KWJ+1p48q0lHcKu7xQiFC+aRNMhvIuyDdyfj7wP8PYUZ1GZjY7TJNK6K366kM7ygG buueCySrxv10MolMFiURggJJX85yjiArqsiL0GbCCkjTf9PSZLIChcdM4mYwmg5pey1PmZ dE3Bu/LIYQSXG2+YbnM/xRnCT52/Wek= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=gdV5B1mP; spf=pass (imf03.hostedemail.com: domain of 21cnbao@gmail.com designates 209.85.222.53 as permitted sender) smtp.mailfrom=21cnbao@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1716434523; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=5cBMgH/meb7DXHpqDFrMQs3sMI8ZwAwTzDkQlsuKAC8=; b=RRsW2XmBX7Bm+XGYZTqYDmoPQe480dAjD/yZhq9ELP12qfP4lE/tRJyg5LQumnFJGCYRZN tOIDCvDRYWSMINqJdLYLPHniVwWo0M86YJlw9pRLwHVaIYObxyWeKpZUwBVLf1Xj0LqKMT SVwL/h2o7mh4MycrkHYy8+nIma277r8= Received: by mail-ua1-f53.google.com with SMTP id a1e0cc1a2514c-8032770aeadso133678241.0 for ; Wed, 22 May 2024 20:22:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716434522; x=1717039322; darn=kvack.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=5cBMgH/meb7DXHpqDFrMQs3sMI8ZwAwTzDkQlsuKAC8=; b=gdV5B1mPH0XGPG2qbOMPxuIDA4QZyvgWgkge7HXf6650X+316fFwK5gmujGGOGD9Rc xz1WmE8AtknqJH+Z8GC96LKtuug+8Ck8f20SxuIXAeYQo5VFeLmH8+EY6ucL0pn4i9mp Kutob+L8z8lyigLww4+SeORzqGsWw9/KtQR/3eX/Bta87/dwRIEbp4z/15G8CYvAXWlV zNiRFx9Z37Rq+d5ztK/3ycouK35b8rEl8Z+a9LzqQes7BUWcJW2NSu8ZECfgNiEoj6kx UmZ12HXYcCSP/VIqHMv+jBMHLTJz7dk/xfGFON81hGjX/oWc1V5eGVvkkI2MOuYWIHe6 B00g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716434522; x=1717039322; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5cBMgH/meb7DXHpqDFrMQs3sMI8ZwAwTzDkQlsuKAC8=; b=bX5soh8o9fo2kAr/Gjo8Vvt9YejmtSMaSR/takyfym6QpZ4x6AlaqyjnxDprOuyAN6 xsjKjhv0IKymb5AXMpweFl2yc2ckhn83dCgFpi7/PVoTYQ7AdHuHLwah3rdIwvQKx6Vw iVGY2Sui1rH+atZ/RQE9UBkAs4slDZUQfPUvgUcP8FKD3zh2+GOUa7tZBnYZto9uemV0 YYAFjq6kfUDmGUyuLuChsEVOhmDKIxoaOuPQRyqAnJxz2I32ZI1kCH+/IDBiVYL5mU3e 8N9xiqkLdXUR6qPxO/1x2conTPTkdfPSTZ+1rdKLRFECFz2rbW8NgswlEiwQnGOeLuyR aqPw== X-Forwarded-Encrypted: i=1; AJvYcCVJfb16uwhVH+rHmxbyhj67iem8wBf9p87ONq8wAn+ancksuH5sSswSsJsieQg9hZexX+xUluGD8uZ+yOjbWMMh/tg= X-Gm-Message-State: AOJu0YwbGc8LfaJtSUNZsaFdTSDvBrZo7UiPDfFgVqzFHRPD+SITZAMm tUo3C4bKF/74i76LZKl5NblSN3W/UIDDm5ukiRDNydfMsxkoZYTx3dVMhsfMQyPCLXX0celQW5b 1gapbc9YPgyRAMqkQtcOLJrcxJqQ= X-Google-Smtp-Source: AGHT+IFcH/gCwsAZh05Z9mcAv7Lon2D94TeRNOA6KqgmMMrmWQHTwznzdaCwb5CQJw6jDVriF5EfR7RacvHkkKRox38= X-Received: by 2002:a05:6102:6cb:b0:47f:2dde:2304 with SMTP id ada2fe7eead31-489009364f8mr3889758137.5.1716434522508; Wed, 22 May 2024 20:22:02 -0700 (PDT) MIME-Version: 1.0 References: <7a8989c13299920d7589007a30065c3e2c19f0e0.1716431702.git.baolin.wang@linux.alibaba.com> In-Reply-To: <7a8989c13299920d7589007a30065c3e2c19f0e0.1716431702.git.baolin.wang@linux.alibaba.com> From: Barry Song <21cnbao@gmail.com> Date: Thu, 23 May 2024 15:21:51 +1200 Message-ID: Subject: Re: [PATCH v2] mm: drop the 'anon_' prefix for swap-out mTHP counters To: Baolin Wang Cc: akpm@linux-foundation.org, willy@infradead.org, david@redhat.com, ying.huang@intel.com, ryan.roberts@arm.com, ziy@nvidia.com, ioworker0@gmail.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: A68BD20010 X-Stat-Signature: c1eqbcuh53dx7itokyu36rpis1owdoid X-HE-Tag: 1716434523-43492 X-HE-Meta: U2FsdGVkX1//Mh3pHfNYsmlRgLXJDWZdefiVTpZ3Vb7iz2bc0CAAGYiAQXvEv5nx2p4zv41DMWmC9VgcnwRDo+tDv8RehVBQz7rwmJlv4d0NH8tPywICNtYWD0jCQFoxC9hKFBoyM68zlcteZ5H530SpWjrBLBzt4oBpkV7a7UAlhfIeI3JzndXMocFCW5qRV+GeQZDLpVtDmS/v7CO6NAO4Y3x+pSlQE2YT1zzlElEuvEMiDXoFt2FEEUYqZp7f+B+7xNcT8HqmlsymBzMZ/Yf6L8I8fPdpME7Gw5gwh8GClfqOrH4QTohrwZ6JJV0XRegtagwy5hMX5/YR7mo7ZnbPl+/umqkSB8JqK+8CboJQssaVEPwxKCSynOg26+Vr6ZrGJUYkKBJtQD+A84ud2SpH+Jb75PEwFv0uBA/ajxMD3n6C9kF43NZxS58DZAaW5PTVdm8IDWXyxBR4L5bp4ereKuMY0RX9WzpcbYAw1KPBS4cMJdU2ny/88WA01uGPi+uM3Ra8W/x+YhnbGL6ki+SoPGJ/KDkpmiBjgSHWJGk9G6NJJf3DjYdUuu7EkrOkUc/QD1GvVQ+pO5PWgX0f8Br333QZTI4/e/MLiB0GsxsYNahpPIhnwdZy7dOOpCYSf2XpHH82nZgQretsmc5NyYfB6L4XD3tkV/hYyxsaScgSArnSpynw90lZcRKCU3uEhDkMtfu4VL7xi+TBzci8AucFxCx0xVaYgsoKlitTRcOLBFhC4S/nhMNW/syGQG/jE6XdMkz/zS9HU+E3fYkJP7663hF/UGKmV59cyNn0AIPPITpIFgP+yxN/8zXyifgEY4WxT4KV+IPMCWyzfDvgJSEBGTMT0pX2oH3QfmO/Dy6gOazUA9C19U1XxVB7+gX2eHhQgX8e60KnpldOeG6Ca+ytTU2Z4ysPJjTJVirWGmeSlRwu55qgWg9X8Cg3ah5v/9KXzHzElwbzvWMNfgJ KBf34sG5 rQvRdbniGnxf2zeAH3K8deihoKz7Fqc0ZfE5fwnpK9Nw/qwYxoo4LKKeK1I+gGyZChnJuJ0u4Fl0au0z+eO7XYBD93Sss/LtxRfAvnQ0esWyg+Nn8C6S818dV5hoqEdSZds5FLRFs8XieK/YJEZKm1nORSz5nx088i6zHzI5xZ1Rw3/CRp76aijQtwIqhQniEgAxwEVAt0ggLk0amlQ4KoZ0/NqXhAkNGdGCidymgVGRukh4l0YHerphoHZonF9p6ViT4GbF40edoSTiuuWl7aG0C03Skh94eXX7j3+hDbykH2r1ncJVc0P0TUBjg3a2o5bCeZxdT7ofqosOzbyMGjt1lRmh6+SUlFOhIq5ZuBwTY13Q3m5p17irbOu6BSyjZc4J2qwMWNFvtq2oRNcgwZ2ru/n6pGjtDqq202Pg8kBGKn+sgBbw1tusj8zUW0rk8Aqqj0426YapRWIJuZVaJDVTRIyeNpMnlV+sUjUcPihjSQR+PARHFhoPUQCyjpezLx4/i 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: On Thu, May 23, 2024 at 2:37=E2=80=AFPM Baolin Wang wrote: > > The mTHP swap related counters: 'anon_swpout' and 'anon_swpout_fallback' = are > confusing with an 'anon_' prefix, since the shmem can swap out non-anonym= ous > pages. So drop the 'anon_' prefix to keep consistent with the old swap co= unter > names. > > Suggested-by: "Huang, Ying" > Signed-off-by: Baolin Wang Acked-by: Barry Song > --- > Hi Andrew, > > Hope this patch can be merged into kernel 6.10-rc to maintain ABI compati= bility. > Thanks. > > Changes from v1: > - Update the documentation per Barry Song. > --- > Documentation/admin-guide/mm/transhuge.rst | 4 ++-- > include/linux/huge_mm.h | 4 ++-- > mm/huge_memory.c | 8 ++++---- > mm/page_io.c | 2 +- > mm/vmscan.c | 2 +- > 5 files changed, 10 insertions(+), 10 deletions(-) > > diff --git a/Documentation/admin-guide/mm/transhuge.rst b/Documentation/a= dmin-guide/mm/transhuge.rst > index 076443cc10a6..d414d3f5592a 100644 > --- a/Documentation/admin-guide/mm/transhuge.rst > +++ b/Documentation/admin-guide/mm/transhuge.rst > @@ -467,11 +467,11 @@ anon_fault_fallback_charge > instead falls back to using huge pages with lower orders or > small pages even though the allocation was successful. > > -anon_swpout > +swpout > is incremented every time a huge page is swapped out in one > piece without splitting. > > -anon_swpout_fallback > +swpout_fallback > is incremented if a huge page has to be split before swapout. > Usually because failed to allocate some continuous swap space > for the huge page. > diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h > index c8d3ec116e29..8c72d3786583 100644 > --- a/include/linux/huge_mm.h > +++ b/include/linux/huge_mm.h > @@ -269,8 +269,8 @@ enum mthp_stat_item { > MTHP_STAT_ANON_FAULT_ALLOC, > MTHP_STAT_ANON_FAULT_FALLBACK, > MTHP_STAT_ANON_FAULT_FALLBACK_CHARGE, > - MTHP_STAT_ANON_SWPOUT, > - MTHP_STAT_ANON_SWPOUT_FALLBACK, > + MTHP_STAT_SWPOUT, > + MTHP_STAT_SWPOUT_FALLBACK, > __MTHP_STAT_COUNT > }; > > diff --git a/mm/huge_memory.c b/mm/huge_memory.c > index 317de2afd371..89932fd0f62e 100644 > --- a/mm/huge_memory.c > +++ b/mm/huge_memory.c > @@ -558,15 +558,15 @@ static struct kobj_attribute _name##_attr =3D __ATT= R_RO(_name) > DEFINE_MTHP_STAT_ATTR(anon_fault_alloc, MTHP_STAT_ANON_FAULT_ALLOC); > DEFINE_MTHP_STAT_ATTR(anon_fault_fallback, MTHP_STAT_ANON_FAULT_FALLBACK= ); > DEFINE_MTHP_STAT_ATTR(anon_fault_fallback_charge, MTHP_STAT_ANON_FAULT_F= ALLBACK_CHARGE); > -DEFINE_MTHP_STAT_ATTR(anon_swpout, MTHP_STAT_ANON_SWPOUT); > -DEFINE_MTHP_STAT_ATTR(anon_swpout_fallback, MTHP_STAT_ANON_SWPOUT_FALLBA= CK); > +DEFINE_MTHP_STAT_ATTR(swpout, MTHP_STAT_SWPOUT); > +DEFINE_MTHP_STAT_ATTR(swpout_fallback, MTHP_STAT_SWPOUT_FALLBACK); > > static struct attribute *stats_attrs[] =3D { > &anon_fault_alloc_attr.attr, > &anon_fault_fallback_attr.attr, > &anon_fault_fallback_charge_attr.attr, > - &anon_swpout_attr.attr, > - &anon_swpout_fallback_attr.attr, > + &swpout_attr.attr, > + &swpout_fallback_attr.attr, > NULL, > }; > > diff --git a/mm/page_io.c b/mm/page_io.c > index 46c603dddf04..0a150c240bf4 100644 > --- a/mm/page_io.c > +++ b/mm/page_io.c > @@ -217,7 +217,7 @@ static inline void count_swpout_vm_event(struct folio= *folio) > count_memcg_folio_events(folio, THP_SWPOUT, 1); > count_vm_event(THP_SWPOUT); > } > - count_mthp_stat(folio_order(folio), MTHP_STAT_ANON_SWPOUT); > + count_mthp_stat(folio_order(folio), MTHP_STAT_SWPOUT); > #endif > count_vm_events(PSWPOUT, folio_nr_pages(folio)); > } > diff --git a/mm/vmscan.c b/mm/vmscan.c > index 6981a71c8ef0..18b796605aa5 100644 > --- a/mm/vmscan.c > +++ b/mm/vmscan.c > @@ -1244,7 +1244,7 @@ static unsigned int shrink_folio_list(struct list_h= ead *folio_list, > THP_SWPOUT_FALLBA= CK, 1); > count_vm_event(THP_SWPOUT= _FALLBACK); > } > - count_mthp_stat(order, MTHP_STAT_= ANON_SWPOUT_FALLBACK); > + count_mthp_stat(order, MTHP_STAT_= SWPOUT_FALLBACK); > #endif > if (!add_to_swap(folio)) > goto activate_locked_spli= t; > -- > 2.39.3 >