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 3C4B5C001DE for ; Thu, 13 Jul 2023 23:56:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 48A416B0082; Thu, 13 Jul 2023 19:56:00 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 439B66B0083; Thu, 13 Jul 2023 19:56:00 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 301888E0001; Thu, 13 Jul 2023 19:56:00 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 1E6B06B0082 for ; Thu, 13 Jul 2023 19:56:00 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id D3998A03E4 for ; Thu, 13 Jul 2023 23:55:59 +0000 (UTC) X-FDA: 81008249238.28.FA78AB3 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) by imf20.hostedemail.com (Postfix) with ESMTP id 30CA01C0023 for ; Thu, 13 Jul 2023 23:55:58 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=NF6O5MTF; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf20.hostedemail.com: domain of 3DI-wZAgKCBk87zF7NzC5DD5A3.1DBA7CJM-BB9Kz19.DG5@flex--jiaqiyan.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=3DI-wZAgKCBk87zF7NzC5DD5A3.1DBA7CJM-BB9Kz19.DG5@flex--jiaqiyan.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1689292558; 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=aU6i2F+6ULOqe59AteyNAXfrQcm92q4cIphddyoISBg=; b=bzlCimRpy+pYqyLUjiQHELYsKfQdJ8Ygi0SBtLROtEJWn4JfcJ7U7fkCtBLbVC1RhxNZc4 U6I+DETgAGCy5rkg6+GUkRorUYBEiKVZoH5NmMz2bJML2Z1C7H+Da5TNcgsLR4rxxzXIyk yUS7UVVoPcgJMxN+AHknIsZcVEW33/E= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=NF6O5MTF; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf20.hostedemail.com: domain of 3DI-wZAgKCBk87zF7NzC5DD5A3.1DBA7CJM-BB9Kz19.DG5@flex--jiaqiyan.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=3DI-wZAgKCBk87zF7NzC5DD5A3.1DBA7CJM-BB9Kz19.DG5@flex--jiaqiyan.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689292558; a=rsa-sha256; cv=none; b=0a3cC9iopZRjK9Bz6LzvYyWXlUYNqRszTyp8uwjTWhsMflJxgS9s9hqRL7CHTDzhHeZ1Dn q0XnY9QH2Ty8gHOYHg0a7czBSOfxc5T5+/HdPlGGQpGbRDr4qn61DGT2n+vWmXUe5ioLR9 jehejfzk3gibR5HfqV1hBkLYxeiBMmk= Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-1b8a7734734so6118235ad.2 for ; Thu, 13 Jul 2023 16:55:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1689292557; x=1691884557; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=aU6i2F+6ULOqe59AteyNAXfrQcm92q4cIphddyoISBg=; b=NF6O5MTFFdpAf7KY2vn4PEUxgePYskzv+hy9CflU7krDrWiV62rur4Y1jkafVZjbKi ErdZM1vLSo/v1sdXKAuV4qLVmx1uzv8nhG85y4cWKmveJxAjtZvQ8p3c5oX1D41xZejF DY1qsZIE8brBNjLYgJY1XEzlMAXQZw9J+Tlbabj9C9OTiNE6vkyHopgT3hqKlNEhkpSC zxcq/j1wg5fnra82tgd6wNYbUfXztI2rLDQlFKh2ZPfxcUBczUfsesoZ3dInTssxi6jP Ek1Fewjeqlv5gpyAzPQ6piCkc7hiaW+J/jhGWAO4HJ/0c4JBqnpvIHsCJqqrZ2f1qjWS +nnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689292557; x=1691884557; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=aU6i2F+6ULOqe59AteyNAXfrQcm92q4cIphddyoISBg=; b=KrFjWZJ4Cxs8LdtoODk61TK/G2i5O2zKtU7zpXA7zDkI/ulvdT9YZEn/lQZHoEH2Yt z6zqNSuZ+1Bb/m65+qzj4XYrrMO4xRKqiYw9etrdqTc69rWPrVIzhsr3gbIYBwIAAio7 R7ripnXpJbFMzpmwo8Npc7PtQBJrTn8mH8GS5i/e4JxWTZQDBZR2Ef9oFsLgP4Jx4QqH R9MwNR+YllQ6MZ7YIVJorBe0B7zOrAHvjn3Qio/S98+eXF1Vt+GGhbbslMyIIbuYq0Xu 1XtYE3FqDsPd54Hw3xUuQPXE6zw6NnlIcvAJbFtq9pWepQj+Bwsa8vVt9ERzUmLoFv38 6a8A== X-Gm-Message-State: ABy/qLbdod4mTef+UDDG61vF18E+WmMHPGhIMWQ2fW2/8rB17EJKFUBy L58HOVS6dPgJjgSd3hFvMH1nIC8rsyspbA== X-Google-Smtp-Source: APBJJlGgKWTVl+VINClkkV4Sy6K7FrLwMBHCEPNjB11bji1KzzILm4Qp0tGIfuzjNJrtOsHwnsm3CheIxzsfjQ== X-Received: from yjq3.c.googlers.com ([fda3:e722:ac3:cc00:24:72f4:c0a8:272f]) (user=jiaqiyan job=sendgmr) by 2002:a17:902:b282:b0:1ba:1704:89d1 with SMTP id u2-20020a170902b28200b001ba170489d1mr9970plr.10.1689292556910; Thu, 13 Jul 2023 16:55:56 -0700 (PDT) Date: Thu, 13 Jul 2023 23:55:53 +0000 Mime-Version: 1.0 X-Mailer: git-send-email 2.41.0.255.g8b1d071c50-goog Message-ID: <20230713235553.4121855-1-jiaqiyan@google.com> Subject: [PATCH v1] mm/hwpoison: rename hwp_walk* to hwpoison_walk* From: Jiaqi Yan To: naoya.horiguchi@nec.com Cc: linmiaohe@huawei.com, akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, willy@infradead.org, Jiaqi Yan Content-Type: text/plain; charset="UTF-8" X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 30CA01C0023 X-Stat-Signature: iui9swt1a5xjtjys1ax6gbt8tf8o6jrk X-HE-Tag: 1689292557-397849 X-HE-Meta: U2FsdGVkX19XqXnYTZJxHaLIdqUzSPf7WW5KbafmS8U7LG+3TNt3JzA31vcLXxSB6WLIP9rZMLu4+xegO3mi21ookjvmho3GkekQtCJmVlNRXj5hnXC1R/ymdWAVOHTN6Czx05vhBd1prk4sea4GLvi2Jk58Fi6aDiHXc0Cuyactx2kCbp/fFxE3MahEa0WrMwPgcXhePmeq4yHXfwKwT35gwXkesd8M63lspDalN/4kkS9M6dzD28qulwxwJ5Ibl8NL3Gm5/zsvPo/lCZPUjF3t4wfjG7LmKZcaTEjGNTaSoVOYQtO8w5gYrIHvnSUd9S3m1Jj2Kc46qsam6HJq/Tyqab1sgYno+oWiaKGbfYmN0+IRx5GcVk09nf4hkX6fyfPs32Sg4Cyz0deQOkA9gwxL9aZQXtSXKuHPXVkQMB46dnIqsMaJvD5Kv67KAIsMeVJUkO9aN+bRxwYZFidIxrBVPxroKiOXYA8hqm4hb8r/k4l34Y5Mj51w/xLF15xU2CuJ8mLltnSSMqjoBhqkZadpl5le1/yrocSJUhNBABp+1sRhpR3IcTO1Pz8fk1ETjTXBlueDDypv/AnF7He/a3M7D1aBbQqRlmqO5R5/GhDez8gfD9vyLbnJBy8b+UAvaOX1PP9ucCDNRXXtlQ7BA6zOAZaFBAOXP7EcLdAMzUQHui6dHYaVBAuURxa4mI4zLZQKXBJ1BrCm2Qm5ouFC7/jrJ8NKsKVv5ErmGT4swZniio8gOnNkqFJzMhhUDTnpV5pHNJ/eIZwd0UUiLS7gdg+Dym2rz6o/nwuh5BO+sp5U/EhVEQF8R7KY1XmPTI6I5pgAWH/GrDAzW+WIxpmDI8+4chHw8oMIv/W/3m8+2ca+TCWsKqkZeWFmrdhCqQCkZpet7FtsG1CaMOAsDzwqg1OrXJzl4xdbsmopZh4yp1iNrPcXG96hnDkQzLv63735iojsExC50p+oAH/i9k2 aqzAbeJk CyySSdr0QS5brMV2NH9w67zlvz9q2KMbmNmjryY17A35x4ybnPQDBuyUw+RtJtaNiIObk7hzqFS7HA/CPjO/4DvQg60q69nxk+PksjazXzguvdyQY1JPYojqcerxrzuCXUGxPsISZkclcd4X9kKhVdmRu+7TQw9KQ1FLNBtxJQJLltMg6dXEL43Yt8QDENa6m3Cy8a1PCFegO2Gzn7EuyGGAKPm4RNuHglWCPdzvo+9m8vWY9FxZEN4lAZOmSLGljoNePKMNJXLDu16AWG/2SVhg0Q1BZiP0sc4hPiAhO/ATW4a7OZjz4hHRcTWRkZ6BeioNVxIzCnfoxr8qcSgG9594y0MRnAIvSKBcOtrahZ45XKzcY1wlgEKQMsx8xHraTFdsRDQLvjKGiSWTWLUat/32SPdZoTBJdYsRIxzRsWVjmjqLSXvF8MqmrVYrxKPnXMEFnuxKyf18Tmo3og/LRlh9qgG7VaAFudp3xdDqp9T7X+ene2//T0mnTLeZI8WIxgygSTXuifX+Hh0qfo8wGRJIPtS5aFeCpFN9ImCn37Nu05vDKVQak1p6/PnjP7EvkfuKljYZQFN6bOjX0aGZXPeh3rfPh6M/ByLyvAldWglUITzun45+JKsdAwFGS6mVOH0nQFqD2vzZ/7bfRYZwY/Jpaw/RMW43U2giGz7c1ZyIN3MfV9JOg0w2SruQ3gokbnnWEcq3oXrBcAMAEdAMfD/RvcrdbPjoAqu1PqDJPbl++y8pfOC7klgpbJRbznNnbEThPOfA+BAukEs4/0p1+eRKJXY/8hf5IZXuN 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: In the discussion of "Improve hugetlbfs read on HWPOISON hugepages", Matthew Wilcox suggests hwp is a bad abbreviation of hwpoison, as hwp is already used as "an acronym by acpi, intel_pstate, some clock drivers, an ethernet driver, and a scsi driver"[1]. So rename hwp_walk and hwp_walk_ops to hwpoison_walk and hwpoison_walk_ops respectively. raw_hwp_(page|list), *_raw_hwp, and raw_hwp_unreliable flag are other major appearances of "hwp". However, given the "raw" hint in the name, it is easy to differentiate them from other "hwp" acronyms. Since renaming them is not as straightforward as renaming hwp_walk*, they are not covered by this commit. [1] https://lore.kernel.org/lkml/20230707201904.953262-5-jiaqiyan@google.com/T/#me6fecb8ce1ad4d5769199c9e162a44bc88f7bdec Signed-off-by: Jiaqi Yan --- mm/memory-failure.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/mm/memory-failure.c b/mm/memory-failure.c index e245191e6b04..cb232e41f6c0 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -721,7 +721,7 @@ static void collect_procs(struct page *page, struct list_head *tokill, collect_procs_file(page, tokill, force_early); } -struct hwp_walk { +struct hwpoison_walk { struct to_kill tk; unsigned long pfn; int flags; @@ -756,7 +756,7 @@ static int check_hwpoisoned_entry(pte_t pte, unsigned long addr, short shift, #ifdef CONFIG_TRANSPARENT_HUGEPAGE static int check_hwpoisoned_pmd_entry(pmd_t *pmdp, unsigned long addr, - struct hwp_walk *hwp) + struct hwpoison_walk *hwp) { pmd_t pmd = *pmdp; unsigned long pfn; @@ -774,7 +774,7 @@ static int check_hwpoisoned_pmd_entry(pmd_t *pmdp, unsigned long addr, } #else static int check_hwpoisoned_pmd_entry(pmd_t *pmdp, unsigned long addr, - struct hwp_walk *hwp) + struct hwpoison_walk *hwp) { return 0; } @@ -783,7 +783,7 @@ static int check_hwpoisoned_pmd_entry(pmd_t *pmdp, unsigned long addr, static int hwpoison_pte_range(pmd_t *pmdp, unsigned long addr, unsigned long end, struct mm_walk *walk) { - struct hwp_walk *hwp = walk->private; + struct hwpoison_walk *hwp = walk->private; int ret = 0; pte_t *ptep, *mapped_pte; spinlock_t *ptl; @@ -817,7 +817,7 @@ static int hwpoison_hugetlb_range(pte_t *ptep, unsigned long hmask, unsigned long addr, unsigned long end, struct mm_walk *walk) { - struct hwp_walk *hwp = walk->private; + struct hwpoison_walk *hwp = walk->private; pte_t pte = huge_ptep_get(ptep); struct hstate *h = hstate_vma(walk->vma); @@ -828,7 +828,7 @@ static int hwpoison_hugetlb_range(pte_t *ptep, unsigned long hmask, #define hwpoison_hugetlb_range NULL #endif -static const struct mm_walk_ops hwp_walk_ops = { +static const struct mm_walk_ops hwpoison_walk_ops = { .pmd_entry = hwpoison_pte_range, .hugetlb_entry = hwpoison_hugetlb_range, }; @@ -850,7 +850,7 @@ static int kill_accessing_process(struct task_struct *p, unsigned long pfn, int flags) { int ret; - struct hwp_walk priv = { + struct hwpoison_walk priv = { .pfn = pfn, }; priv.tk.tsk = p; @@ -859,7 +859,7 @@ static int kill_accessing_process(struct task_struct *p, unsigned long pfn, return -EFAULT; mmap_read_lock(p->mm); - ret = walk_page_range(p->mm, 0, TASK_SIZE, &hwp_walk_ops, + ret = walk_page_range(p->mm, 0, TASK_SIZE, &hwpoison_walk_ops, (void *)&priv); if (ret == 1 && priv.tk.addr) kill_proc(&priv.tk, pfn, flags); -- 2.41.0.255.g8b1d071c50-goog