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 14F52C761AF for ; Thu, 30 Mar 2023 07:45:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 44ABA6B0072; Thu, 30 Mar 2023 03:45:48 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 362696B007D; Thu, 30 Mar 2023 03:45:48 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 166056B007B; Thu, 30 Mar 2023 03:45:48 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 0802F6B0072 for ; Thu, 30 Mar 2023 03:45:48 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id D41231208BA for ; Thu, 30 Mar 2023 07:45:47 +0000 (UTC) X-FDA: 80624780334.30.16D4B39 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by imf06.hostedemail.com (Postfix) with ESMTP id 7AE86180009 for ; Thu, 30 Mar 2023 07:45:43 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf06.hostedemail.com: domain of xialonglong1@huawei.com designates 45.249.212.188 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=1680162346; 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=y92L8olXVGMZIOIiwYaONE70RKoXVUiTQMqyC/YUffY=; b=JMydORsWjKv7fIPWNN73JKVMQwa/naHB5acNf00F8YXFbcVcuMytORMUNzT9ny6DjTkh7C lOfkCh7o6CFJae0x8YMeybe0mbRhH494WJCQMaNY2fc8w93R3jzUzXwnpkRTadfW61YtdE ThTiIANQENWVVxnl5ecYDKO8k2OxdgM= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf06.hostedemail.com: domain of xialonglong1@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=xialonglong1@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1680162346; a=rsa-sha256; cv=none; b=Q8IP9qmkY38ByfgDQPx3SgOgZZhMkRBZ1RonBegQ9VXw3KSlFYXia4dX/HB1TbokbNe6Rc 3MZ8zHF4EUSDO/PhqSx8LLk/ZmsyEIcoVEN9QmlH4ZdbKwJ96F7ArE76NismB4pV7TLy/D ERMKlUjB8egfkhIB/YcbJxPBci/bHwE= Received: from kwepemm600003.china.huawei.com (unknown [172.30.72.53]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4PnFk33fHlzSqrN; Thu, 30 Mar 2023 15:42:03 +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.21; Thu, 30 Mar 2023 15:45:39 +0800 From: Longlong Xia To: , CC: , , , , , Longlong Xia Subject: [PATCH 1/2] mm: memory-failure: Refactor add_to_kill() Date: Thu, 30 Mar 2023 15:45:00 +0800 Message-ID: <20230330074501.205092-2-xialonglong1@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230330074501.205092-1-xialonglong1@huawei.com> References: <20230330074501.205092-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: dggems702-chm.china.huawei.com (10.3.19.179) To kwepemm600003.china.huawei.com (7.193.23.202) X-CFilter-Loop: Reflected X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 7AE86180009 X-Rspam-User: X-Stat-Signature: kpw7p6sqrfr4u8puiwks14hqo6qpqtum X-HE-Tag: 1680162343-5132 X-HE-Meta: U2FsdGVkX1/QPG8UbDov5NYxkIoUNeoVBVEs0orfN9t8NWbNDhdGFJMiTmEkTTSPFFgpuc4Hfs9cVxJssHHG1qRZZBqN1GVKN77FnS19aXm7MBDAmx/qQtaicRXJ3CO8PTUnR4m/BFPLaX+w+aqzh2EZSQa68baXkkas/ndPn0h2xwrTltECmJ56qFgRjuNqGzrIwXMsEkLRITzOYM9t6YUi2y0RSnd4Jb8w08aWHYMZZpQyozG4Ff3jAqnUAzLUrpEnGG8Y0QOV05cm8xvuohfQu4wWh7XflE0N+Oh2WlzasfVboCb+O7TihrYgN98sM4g25dZuTwu5GTYK2BEIF3WwnGOzyk8JadAjWiXP2cIToHx0OBHdYDg5cIfmItsD36vg70td14R9/F1pETaXdwvkFAjQio53NWjHkNOW6V3Yqaz3LMvCJ27WgTBZ/CAdRCWCjYLhSMPbFkdcxB7ovVo62cmPLBimeLJaJJ9AiJN4hVtPIB+n/ZGG6jM7sKaGbrjHLhNirkSEDKccuVREUSct/c04G883BYRBSg5xklHqt1Jp5ZvAdbMWlQ+ISwuyMtw67pyAJX93TsKRU7MFO4DHLXNcp4uXtDwzMtiCugeWI++RHNY2FWVm349Rwbdx5yxq5ofQ1gjIX+J1Y/GL2CVb8ycBsIDxRTAbxUdNgw3sIKa+7aYhW/QPpM779UUefO0vmuaPvCq5pH0xxjn5iv2Qx8mab3h3X9bLD+r+UAID+cj3ddsZkAL7KPEMjgNXytvUbwzn5qlawcfVywCv0fQra6jsuYABBXBwfH6b2Ad8hpx8lgR5Vregisn4O5CCzWDHQ1+zbCRiVZ2VOjD8Bi+/xHgYoSL2bhm0ioW5l5F0w8RWcaOTkfD4jZySkUXrpbZzWuITGPtCXaS4AhutNhsjTsjt6PYOR/m7G0TJmWhf6PKcMPbda1BEFVdnWF5BiqkvvQGQnD1znDUjyJ9 6d8tWZ+x C0dInaPz75jRD2pwbiuz7LA8nlGwhSuA4SXnEFs9T95kWK3u22Z3n7zHd1kKBOjBtdrWrfjUcsF0/r3Bu59bbkc2p5gumtDyB0NtdHWMxeE3ZsXdw9kzSKnNyd0Z/l0GM0Sig4ADreXjljmqc0M5WF12+Sv2C34/w5xXnUSKpEk6R4fI3LvAD6pBKroGOltSP3Eld/N6I4chxNHGvszDpZSo5mw== 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 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 --- 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 a1ede7bdce95e..9ca058f659121 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 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 = addr ? 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