From patchwork Thu Jul 26 07:30:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Biao X-Patchwork-Id: 10545377 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 71DE7112E for ; Thu, 26 Jul 2018 07:31:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 578372ADB2 for ; Thu, 26 Jul 2018 07:31:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 552562ADC6; Thu, 26 Jul 2018 07:31:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4111E2ADB2 for ; Thu, 26 Jul 2018 07:31:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4281B6B0266; Thu, 26 Jul 2018 03:31:34 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 3D81E6B0269; Thu, 26 Jul 2018 03:31:34 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2EEF36B026A; Thu, 26 Jul 2018 03:31:34 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f200.google.com (mail-pg1-f200.google.com [209.85.215.200]) by kanga.kvack.org (Postfix) with ESMTP id E43546B0266 for ; Thu, 26 Jul 2018 03:31:33 -0400 (EDT) Received: by mail-pg1-f200.google.com with SMTP id r20-v6so531953pgv.20 for ; Thu, 26 Jul 2018 00:31:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id; bh=dVlfm8L4Rku3bosZm0/8aSr7/0qF3sRlG/14SzSpkBg=; b=ch4/KYgBldDv8RCUro+F7CTOGYSIKo5pyjHjLMOzIH+TItb7WWb65MrmxBnm0p7bkl DD0AoBTcwhPvC3XmqZHhCwgojMRsoNhUjLTFqACJySSSwotfI+Um1n8hLCzQelSazDrL AI2l50rFykqoWFubC0AQNMdw/QHWmR14moSkx7Uxpmc+bxGDNobHuCEeXPeT8g0zFRTq oWlR+8XgUKy2j1lAIXlKTw7SMbFonZAUV2Xq9dMhZdkT2jGlu0EGfpcRC9RB4ReuKlOE YOLVXcdBQO1AtZa2Ajlap7ZRSFO++mf4rrXTCsrZBw+ZCQVZ/Zx7XvyASBHvLkobDpQZ 5BOg== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of jiang.biao2@zte.com.cn designates 202.103.147.172 as permitted sender) smtp.mailfrom=jiang.biao2@zte.com.cn X-Gm-Message-State: AOUpUlHKU8DP0wOddV8GASR3Z6CKHhOBvCJvm/rw74qtT/tzhNmLiF7/ kr1sXlYeeeLJTH6HxiiDvjEYnKOhZNOGDZWqI5tXgGohu+ELoNS9/62dlxE3ybkLNC1K1R/HJzP XwE2rKvwP00oU/OxMSMX7ZGaJ0UCa6iGvqLyPmPPq3Vjro23EEyAC3VFJ+Un98xR64Q== X-Received: by 2002:a62:198e:: with SMTP id 136-v6mr937041pfz.103.1532590293602; Thu, 26 Jul 2018 00:31:33 -0700 (PDT) X-Google-Smtp-Source: AAOMgpf/ybRC8OO2eehF3/ODuudJPSJBt29JahsZhFI+DtWeeXjAHI/1s1JOaU1hLiMoe62TnHHO X-Received: by 2002:a62:198e:: with SMTP id 136-v6mr936992pfz.103.1532590292575; Thu, 26 Jul 2018 00:31:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532590292; cv=none; d=google.com; s=arc-20160816; b=cT0+T82mRzBdbOgG+ei/WlJc12nczVnF5H5zhpd/XIUPwYAncGJ/KGP0P7jJSVPLsl NEBSvkGd6aZv35t/wJLFv+rfY3113Bms+nvwDqM0q+t43pE4gRNWTMBeNvFXbRgX7cvB J+ItUz6wEQnCIGNYWgyJ9t2hYhnKC8z1069tLMfhUjCjAgwKCYexvnDjL1Q3ev+aVHrO SYsArxMkqarOBoFpnThrXn4I53xhfteysmQexUQ+BqG/h1pJq2R8t1yVo+uUATxpzCNx tweOLeUVFSDzbMK3PFFZwz1hyBCO0uCZyaw0sQCHJ8EJ+ebZ/RI9QLC3BYiF/wrLfpcN D5qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:arc-authentication-results; bh=dVlfm8L4Rku3bosZm0/8aSr7/0qF3sRlG/14SzSpkBg=; b=TUSiI/P2PDmZxmMR6j3+iTVY+zzSq/0ndqSYRXm7KEQ/dlkQFh3qtHuoBAoPsaLsT+ St1lCAvfClD1YzOpINCQOsXU+oTNT0aLEfFetuoRVwc+UyRMImRMx2AihshA7T63dJdz cIoDkOmaEGIT+vpB7ywrWghKvsQz0GM/p+bPCc3sCjZXpomWZ10PJLXIKBkK963X0jJu F3Kf6TSB90HW+cmTKxk0+QQH1EFYsK6/0tOT81riFNwBWGnzHUvCy3xcdlveXtpEcWGB HkBKbCKVnpVREpOnlmabvSERJMKOGN1qZj0L3hOuqonV8CEv7u5NTwY8mCtIkT9bMllU Cyag== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of jiang.biao2@zte.com.cn designates 202.103.147.172 as permitted sender) smtp.mailfrom=jiang.biao2@zte.com.cn Received: from mxct.zte.com.cn (out1.zte.com.cn. [202.103.147.172]) by mx.google.com with ESMTPS id m12-v6si690970pgd.334.2018.07.26.00.31.32 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Jul 2018 00:31:32 -0700 (PDT) Received-SPF: pass (google.com: domain of jiang.biao2@zte.com.cn designates 202.103.147.172 as permitted sender) client-ip=202.103.147.172; Authentication-Results: mx.google.com; spf=pass (google.com: domain of jiang.biao2@zte.com.cn designates 202.103.147.172 as permitted sender) smtp.mailfrom=jiang.biao2@zte.com.cn Received: from mse01.zte.com.cn (unknown [10.30.3.20]) by Forcepoint Email with ESMTPS id 57F34C761B9189448E38; Thu, 26 Jul 2018 15:31:31 +0800 (CST) Received: from notes_smtp.zte.com.cn ([10.30.1.239]) by mse01.zte.com.cn with ESMTP id w6Q7VRZF089824; Thu, 26 Jul 2018 15:31:27 +0800 (GMT-8) (envelope-from jiang.biao2@zte.com.cn) Received: from localhost.localdomain ([10.75.10.200]) by szsmtp06.zte.com.cn (Lotus Domino Release 8.5.3FP6) with ESMTP id 2018072615313446-1934739 ; Thu, 26 Jul 2018 15:31:34 +0800 From: Jiang Biao To: akpm@linux-foundation.org, mhocko@suse.com, hannes@cmpxchg.org, hillf.zj@alibaba-inc.com, minchan@kernel.org, ying.huang@intel.com, mgorman@techsingularity.net, n-horiguchi@ah.jp.nec.com Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, jiang.biao2@zte.com.cn, zhong.weidong@zte.com.cn Subject: [PATCH v2] mm: fix page_freeze_refs and page_unfreeze_refs in comments. Date: Thu, 26 Jul 2018 15:30:26 +0800 Message-Id: <1532590226-106038-1-git-send-email-jiang.biao2@zte.com.cn> X-Mailer: git-send-email 1.8.3.1 X-MIMETrack: Itemize by SMTP Server on SZSMTP06/server/zte_ltd(Release 8.5.3FP6|November 21, 2013) at 2018-07-26 15:31:34, Serialize by Router on notes_smtp/zte_ltd(Release 9.0.1FP7|August 17, 2016) at 2018-07-26 15:31:15, Serialize complete at 2018-07-26 15:31:15 X-MAIL: mse01.zte.com.cn w6Q7VRZF089824 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: X-Virus-Scanned: ClamAV using ClamSMTP page_freeze_refs/page_unfreeze_refs have already been relplaced by page_ref_freeze/page_ref_unfreeze , but they are not modified in the comments. Signed-off-by: Jiang Biao Acked-by: Michal Hocko --- v1: fix comments in vmscan. v2: fix other two places and fix typoes. mm/ksm.c | 4 ++-- mm/memory-failure.c | 2 +- mm/vmscan.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mm/ksm.c b/mm/ksm.c index a6d43cf..4c39cb67 100644 --- a/mm/ksm.c +++ b/mm/ksm.c @@ -703,7 +703,7 @@ static struct page *get_ksm_page(struct stable_node *stable_node, bool lock_it) * We cannot do anything with the page while its refcount is 0. * Usually 0 means free, or tail of a higher-order page: in which * case this node is no longer referenced, and should be freed; - * however, it might mean that the page is under page_freeze_refs(). + * however, it might mean that the page is under page_ref_freeze(). * The __remove_mapping() case is easy, again the node is now stale; * but if page is swapcache in migrate_page_move_mapping(), it might * still be our page, in which case it's essential to keep the node. @@ -714,7 +714,7 @@ static struct page *get_ksm_page(struct stable_node *stable_node, bool lock_it) * work here too. We have chosen the !PageSwapCache test to * optimize the common case, when the page is or is about to * be freed: PageSwapCache is cleared (under spin_lock_irq) - * in the freeze_refs section of __remove_mapping(); but Anon + * in the ref_freeze section of __remove_mapping(); but Anon * page->mapping reset to NULL later, in free_pages_prepare(). */ if (!PageSwapCache(page)) diff --git a/mm/memory-failure.c b/mm/memory-failure.c index 9d142b9..c83a174 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -1167,7 +1167,7 @@ int memory_failure(unsigned long pfn, int flags) * R/W the page; let's pray that the page has been * used and will be freed some time later. * In fact it's dangerous to directly bump up page count from 0, - * that may make page_freeze_refs()/page_unfreeze_refs() mismatch. + * that may make page_ref_freeze()/page_ref_unfreeze() mismatch. */ if (!(flags & MF_COUNT_INCREASED) && !get_hwpoison_page(p)) { if (is_free_buddy_page(p)) { diff --git a/mm/vmscan.c b/mm/vmscan.c index 03822f8..02d0c20 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -744,7 +744,7 @@ static int __remove_mapping(struct address_space *mapping, struct page *page, refcount = 2; if (!page_ref_freeze(page, refcount)) goto cannot_free; - /* note: atomic_cmpxchg in page_freeze_refs provides the smp_rmb */ + /* note: atomic_cmpxchg in page_ref_freeze provides the smp_rmb */ if (unlikely(PageDirty(page))) { page_ref_unfreeze(page, refcount); goto cannot_free;