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 A41BEC77B6F for ; Fri, 14 Apr 2023 02:18:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2ECDF6B0078; Thu, 13 Apr 2023 22:18:37 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 20A4A6B007D; Thu, 13 Apr 2023 22:18:37 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E11AC6B007B; Thu, 13 Apr 2023 22:18:36 -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 C63566B0078 for ; Thu, 13 Apr 2023 22:18:36 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 92719804DA for ; Fri, 14 Apr 2023 02:18:36 +0000 (UTC) X-FDA: 80678387832.26.D13BAC2 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by imf02.hostedemail.com (Postfix) with ESMTP id 1759980004 for ; Fri, 14 Apr 2023 02:18:32 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf02.hostedemail.com: domain of xialonglong1@huawei.com designates 45.249.212.255 as permitted sender) smtp.mailfrom=xialonglong1@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1681438714; 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; bh=p1AbJ2oUTLt2oGwlTqJ0DWjcnIhr4L4FHich0jayOqM=; b=pJeYwSSQxHbsdXfqMJ1ynNk6PSQVfzPZlz8AchbcjZZ6KvmJWjAF6l4t8eATbgFLOktZMo og98zTjr4n60+nOX2iLbNMNJuojkZPhcx+S2/stx3y59inhvhHjqbZOH8viXA3PdLosE1O F7sazrX6CFDti3XkIHyeATrjP00vw+E= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf02.hostedemail.com: domain of xialonglong1@huawei.com designates 45.249.212.255 as permitted sender) smtp.mailfrom=xialonglong1@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1681438714; a=rsa-sha256; cv=none; b=NMn3jsnK+Eyl+zqskoJW5ruKB90I0cR3eJwdaMM0EOu5NWo4F5AYL3K87dmEGn2UgbwL1f 8AVTh7MtieOalJ6UDE55m7zuGsh5HXa4JB5TpjABY4IW/47MmAXAoqJJI6WWJLF8cGmBBd +IpBObii06FnTyrMdZhspmgF2s3StTU= Received: from kwepemm600003.china.huawei.com (unknown [172.30.72.56]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4PyKlc2fcMz17SV0; Fri, 14 Apr 2023 10:14:52 +0800 (CST) Received: from localhost.localdomain (10.175.112.125) by kwepemm600003.china.huawei.com (7.193.23.202) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Fri, 14 Apr 2023 10:18:27 +0800 From: Longlong Xia To: , CC: , , , , , Longlong Xia Subject: [PATCH v2 1/2] mm: memory-failure: Refactor add_to_kill() Date: Fri, 14 Apr 2023 10:17:40 +0800 Message-ID: <20230414021741.2597273-2-xialonglong1@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230414021741.2597273-1-xialonglong1@huawei.com> References: <20230414021741.2597273-1-xialonglong1@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To kwepemm600003.china.huawei.com (7.193.23.202) X-CFilter-Loop: Reflected X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 1759980004 X-Stat-Signature: ot3yhseyao3a8i4tgdt3cy1oakmysu83 X-HE-Tag: 1681438712-802239 X-HE-Meta: U2FsdGVkX19U3cs04azRG1pvP1OeSid9+4TsjhU9TlmEmDhtKvG0Tu9wr4F/9U6GU8ZZGAJ9fck6KPyin3ulFE0LNfZBf466NWRfsSSi7g/jP1mZQ3PN544GBX+OyDEXGXzljwbcQsbDl38P5ItD6YIiMpAkq/zYYAGuV2T8OGNr6wTr/zd/DFyZCfUYdQC+yumW0mXhLWbG5vkt/jyTM1ADnmU7cerQp7BSEiCV5K8cqePD1HNE4PKc5RfYslDYvZqpTcbJWzM9rwDTFoiTY8JzZPNY2cE5h2SJ3AD8L7M5BKp5CxavQ5Q6MEXDsmjEiTVfRUjV5gPcAkGMd4IP3yKwaCE87ArpRw5noC7RbbDaEplK62eEMCE6AKXRco4xfi3+kPuCm6k9SxeDg5knIpG4gM8NH8nOMYXnHx/Ct+Tuz5W7C9rM33yotqE0s7cS4oGSqezFD7Eb3yemBmuEozf+VLes4i1sOiKKA3ssVuR2LdgknKgn+oPXwfO0fzroo/LqIE/SXx/KFXRT/w6/yzpW7xA/gKYaJZqyXmg9oy+4BujDw8DvwIG+tSY/5IETHQczIDE41z0Llc+owg+KkcgIYGSlTsSYg3v7vpGWhssqXjrqkaeGxGDpXfN8+Knyf3SlS2bWVbLVOV9Yykm90RjIsDrC79cMBl+6/Mv6ZNMPiStekQsnhQfLy1naXZ8I0xO+TA7LzRY9l4g0oWH3isK8HlRUQ4Go7K5pWcyvvTQcKAy3haZAmFd+r+TpsLGXjMt90LfEt1zAvCpLKvRRU4zi/7v5Z8qRa66EvvrcrzIDW3YKrCvjl2O54hPcpJpL1+26w5ad8FajEUPLwJi3eEphnfchh2raK+n+UYf+R1MzEpAu7S/42hWvDuxPbFF5OIgyb/hs1rUlD0Qyf28hfpGoQASWQKFsMiLqowTFtZQloB8NHcyaHgRDr/Yy/mEBAe7OjxgkQgp3QrbL5KW +9r83QXK qHZDkx6F2FR49P8u3VpCl9VPTV7mOJb+umIVOd6LPKS0CeNiR+ETCFiSBmGtT28qwaWVhX1vWCRYD7qpKKLmYHVN3Vrs9fx5Y9qubVH0ZdgTAyyLWalgDw/MtL9ho3PsTzp/fqkXPtHJw7RjwO87SNXEG4fkATfE7XO/Ju6Fu9a8G8h8GZuodKqxT5CeGOe+3EcHRWYBwmQN1f4Lhtgyx4mZYvjV/GdrqwUHA 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: The page_address_in_vma() is used to find the user virtual address of page in add_to_kill(), but it doesn't support ksm due to the ksm page->index unusable, add an ksm_addr as parameter to add_to_kill(), let's the caller to pass it, also rename the function to __add_to_kill(), and adding add_to_kill_anon_file() for handling anonymous pages and file pages, adding add_to_kill_fsdax() for handling fsdax pages. Signed-off-by: Longlong Xia Tested-by: Naoya Horiguchi Reviewed-by: Kefeng Wang --- mm/memory-failure.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/mm/memory-failure.c b/mm/memory-failure.c index fae9baf3be162..f5e1d80a82738 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -405,9 +405,9 @@ static unsigned long dev_pagemap_mapping_shift(struct vm_area_struct *vma, * page->mapping are sufficient for mapping the page back to its * corresponding user virtual address. */ -static void add_to_kill(struct task_struct *tsk, struct page *p, - pgoff_t fsdax_pgoff, struct vm_area_struct *vma, - struct list_head *to_kill) +static void __add_to_kill(struct task_struct *tsk, struct page *p, + struct vm_area_struct *vma, struct list_head *to_kill, + unsigned long ksm_addr, pgoff_t fsdax_pgoff) { struct to_kill *tk; @@ -417,7 +417,7 @@ static void add_to_kill(struct task_struct *tsk, struct page *p, return; } - tk->addr = page_address_in_vma(p, vma); + tk->addr = ksm_addr ? ksm_addr : page_address_in_vma(p, vma); if (is_zone_device_page(p)) { if (fsdax_pgoff != FSDAX_INVALID_PGOFF) tk->addr = vma_pgoff_address(fsdax_pgoff, 1, vma); @@ -448,6 +448,13 @@ static void add_to_kill(struct task_struct *tsk, struct page *p, list_add_tail(&tk->nd, to_kill); } +static void add_to_kill_anon_file(struct task_struct *tsk, struct page *p, + struct vm_area_struct *vma, + struct list_head *to_kill) +{ + __add_to_kill(tsk, p, vma, to_kill, 0, FSDAX_INVALID_PGOFF); +} + /* * Kill the processes that have been collected earlier. * @@ -573,7 +580,7 @@ static void collect_procs_anon(struct page *page, struct list_head *to_kill, continue; if (!page_mapped_in_vma(page, vma)) continue; - add_to_kill(t, page, FSDAX_INVALID_PGOFF, vma, to_kill); + add_to_kill_anon_file(t, page, vma, to_kill); } } read_unlock(&tasklist_lock); @@ -609,8 +616,7 @@ static void collect_procs_file(struct page *page, struct list_head *to_kill, * to be informed of all such data corruptions. */ if (vma->vm_mm == t->mm) - add_to_kill(t, page, FSDAX_INVALID_PGOFF, vma, - to_kill); + add_to_kill_anon_file(t, page, vma, to_kill); } } read_unlock(&tasklist_lock); @@ -618,6 +624,13 @@ static void collect_procs_file(struct page *page, struct list_head *to_kill, } #ifdef CONFIG_FS_DAX +static void add_to_kill_fsdax(struct task_struct *tsk, struct page *p, + struct vm_area_struct *vma, + struct list_head *to_kill, pgoff_t pgoff) +{ + __add_to_kill(tsk, p, vma, to_kill, 0, pgoff); +} + /* * Collect processes when the error hit a fsdax page. */ @@ -637,7 +650,7 @@ static void collect_procs_fsdax(struct page *page, continue; vma_interval_tree_foreach(vma, &mapping->i_mmap, pgoff, pgoff) { if (vma->vm_mm == t->mm) - add_to_kill(t, page, pgoff, vma, to_kill); + add_to_kill_fsdax(t, page, vma, to_kill, pgoff); } } read_unlock(&tasklist_lock); -- 2.25.1