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 34F9AC5478C for ; Mon, 4 Mar 2024 12:11:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A4D3C6B006E; Mon, 4 Mar 2024 07:11:02 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A2D656B0072; Mon, 4 Mar 2024 07:11:02 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8EC4E6B0074; Mon, 4 Mar 2024 07:11:02 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 7DF836B006E for ; Mon, 4 Mar 2024 07:11:02 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 51310C0A8F for ; Mon, 4 Mar 2024 12:11:02 +0000 (UTC) X-FDA: 81859240764.07.E26AA42 Received: from szxga05-in.huawei.com (szxga05-in.huawei.com [45.249.212.191]) by imf21.hostedemail.com (Postfix) with ESMTP id 34CE81C0003 for ; Mon, 4 Mar 2024 12:10:58 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=none; spf=pass (imf21.hostedemail.com: domain of linmiaohe@huawei.com designates 45.249.212.191 as permitted sender) smtp.mailfrom=linmiaohe@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1709554259; 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=2BPodtJoFPHdYOihHCK26ncRqVCbT1b6ncUP3vgd3PM=; b=R4GTvyecuDi9oCTAEwp8UvVfyIaNcCoVZ8vKrwT6taLDZBClqc3ptwDhbVm67/cKXxL/5v rTdgKLCuUwjUYfYRc8CHqLUjPLKGih2myH1doXQKILLYGo7zB1a1MZtQXM5zVKCmOLJ+4R itGjwWQJEj4Bql9HadjD6fAcFfh9Fhc= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=none; spf=pass (imf21.hostedemail.com: domain of linmiaohe@huawei.com designates 45.249.212.191 as permitted sender) smtp.mailfrom=linmiaohe@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1709554259; a=rsa-sha256; cv=none; b=46xtisT0xt4zqf73uBzdqjydunmdDVCiM22yi2zgPwCaUYxt/pqeX/NCKBkdRR1fI9Cppc X8z6DHD9RcOUcPCZ1aysLvdnJQCc8sEgrYWWyOQCUo0upxn8v582wBWvRkaXOefXf5mCA9 ddOIWFsvv4btoRKJgoXbs8D2eLRsoe0= Received: from mail.maildlp.com (unknown [172.19.163.44]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4TpHXg55vHz1h15s; Mon, 4 Mar 2024 20:08:35 +0800 (CST) Received: from canpemm500002.china.huawei.com (unknown [7.192.104.244]) by mail.maildlp.com (Postfix) with ESMTPS id EE941140118; Mon, 4 Mar 2024 20:10:54 +0800 (CST) Received: from [10.173.135.154] (10.173.135.154) by canpemm500002.china.huawei.com (7.192.104.244) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Mon, 4 Mar 2024 20:10:54 +0800 Subject: Re: [PATCH 2/8] mm/memory-failure: Pass addr to __add_to_kill() To: "Matthew Wilcox (Oracle)" CC: , Naoya Horiguchi , Longlong Xia , Andrew Morton References: <20240229212036.2160900-1-willy@infradead.org> <20240229212036.2160900-3-willy@infradead.org> From: Miaohe Lin Message-ID: Date: Mon, 4 Mar 2024 20:10:54 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: <20240229212036.2160900-3-willy@infradead.org> Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [10.173.135.154] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To canpemm500002.china.huawei.com (7.192.104.244) X-Rspamd-Queue-Id: 34CE81C0003 X-Rspam-User: X-Stat-Signature: de75mqy7z6n86da4ydj9fti8hktb8c3o X-Rspamd-Server: rspam01 X-HE-Tag: 1709554258-267097 X-HE-Meta: U2FsdGVkX191Sj98txIUFQyaRhcoSkcI9jSObAvDaolmZfFWELt8fVjU/XWQX78N1/BT7oMe9zsQQWPVuSblimhHqMg46ytX+C5+2SRaztD6Zt98BI1QvRJ1D5O6dj2Id746XlViiyB4pLetnlw0lpXitSxNqz52Pa60xruT7AyvyPdyGeYxawqvf2nj3gHTtHunNUzgUwdr0DCcBXXtjZzXOhKVFOwTpkqL0NQF2cuJucdFrpMJTzo7QwazFiyEMhUr2P30G1gBAWDU++RXAdqiQeDjgaBdiTlvzCc3RWp/ZrjMbbCe6121XPVWBx+xCbjDCQZm391OMvRFlClOUjapJycBUCpD5NhiMStGPiRIUyVzXG+AaV60+WKxvMg9Nx8WRu3Yra97Eb1cjx9nT8J9Qq7jKyfi7FDvZLsnGlpvZpvZV4S6utvXsTNhqvpqxY7p0m1IeSTsuNBfGCvYegaUC3xhKF1jkUxX/qdszPc2uyzSSJopjDLELsLIl50D2OCshav1TOH/5G6jgDa2f/nQgNyHe+A3RyWm7l8nF15aKjTz6M15nR56f9CPaibVaqakqyYyy17KAOLprVbGdtuMiVqiGKIZ+g1btzGoIid7ZIY1Epw9P88CMPTCxKgQ0Az1+yRq+M27XOH/SuOm2E9AIbQtgJbqJILJUwAc2SyoB4sV1nu0GT5HHuOXbDiuZi3XrVRtHvKlLbJMYvIKvAnIWg9dxFqriEW+AYMSPOAO0aG4uMCT4DhoWaNYdi3baUIoqmZvkGry2qMqbZ1dW3yUCMYtcuezqdCt66eRsrGs9tPcZaBEPOKyZ/JZ/X1koLQoDzTlFdRyAjrI/zdncAcNoUZODYS6 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 2024/3/1 5:20, Matthew Wilcox (Oracle) wrote: > Handle anon/file folios the same way as KSM & DAX folios by passing in > the address. > > Signed-off-by: Matthew Wilcox (Oracle) > Cc: Longlong Xia LGTM. Thanks. Acked-by: Miaohe Lin > --- > mm/memory-failure.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/mm/memory-failure.c b/mm/memory-failure.c > index 9356227a50bb..7f8473c08ae3 100644 > --- a/mm/memory-failure.c > +++ b/mm/memory-failure.c > @@ -432,7 +432,7 @@ static void __add_to_kill(struct task_struct *tsk, struct page *p, > return; > } > > - tk->addr = addr ? addr : page_address_in_vma(p, vma); > + tk->addr = addr; > if (is_zone_device_page(p)) > tk->size_shift = dev_pagemap_mapping_shift(vma, tk->addr); > else > @@ -465,7 +465,8 @@ 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); > + unsigned long addr = page_address_in_vma(p, vma); > + __add_to_kill(tsk, p, vma, to_kill, addr); > } > > #ifdef CONFIG_KSM > @@ -481,6 +482,7 @@ static bool task_in_to_kill_list(struct list_head *to_kill, > > return false; > } > + > void add_to_kill_ksm(struct task_struct *tsk, struct page *p, > struct vm_area_struct *vma, struct list_head *to_kill, > unsigned long addr) >