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 DED04C77B6E for ; Thu, 13 Apr 2023 09:26:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2281F6B0072; Thu, 13 Apr 2023 05:26:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1B1A46B0074; Thu, 13 Apr 2023 05:26:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 052416B0075; Thu, 13 Apr 2023 05:26:38 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id E6CA36B0072 for ; Thu, 13 Apr 2023 05:26:37 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id AD5E6C0281 for ; Thu, 13 Apr 2023 09:26:37 +0000 (UTC) X-FDA: 80675837634.07.911ED18 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by imf27.hostedemail.com (Postfix) with ESMTP id 33E1940019 for ; Thu, 13 Apr 2023 09:26:33 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=none; spf=pass (imf27.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.255 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1681377995; a=rsa-sha256; cv=none; b=z4pOUhQZ4L5bh+xtz7hvzV0cUQJ4GfRjf3ERz9DPNTqRbQbjchZ6hRL2ljdkhKnTjUUdpc SMBAFAXo/yl1/QUBLS0lxSx7+egICuVkOjt9NW+IcAEucSgzhFGJli54ITh3NGTT+B+Fqp ypdzsJi83UCpD44T3XWv0KC0ACKT8g4= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=none; spf=pass (imf27.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.255 as permitted sender) smtp.mailfrom=wangkefeng.wang@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=1681377995; 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=6TykRGE7on+jWzSJP3pjbVXbyz/XWmQ1lmPnjTNqbt4=; b=WoKuHCwqJnisyE0ytwgvfVx7wyNL5/Df7YNL2BTyiG8tP78qAiEwJ1vWqdN2dTbyxu3BJu btOjDbOsCYt3Go/N7pcnbFXeExz/+Olvk2l/q7/2E9UP56HsoLuW20NXlVROK80gNRs4+J V7SooFMFExoh9ILgAeL9jekQp/pNlxQ= Received: from dggpemm500001.china.huawei.com (unknown [172.30.72.55]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4PxvHy2kz2z17SHT; Thu, 13 Apr 2023 17:22:54 +0800 (CST) Received: from [10.174.177.243] (10.174.177.243) by dggpemm500001.china.huawei.com (7.185.36.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Thu, 13 Apr 2023 17:26:29 +0800 Message-ID: <2797d1c1-34cd-5dab-0db2-84a1bf493716@huawei.com> Date: Thu, 13 Apr 2023 17:26:28 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.5.1 Subject: Re: [PATCH 1/2] mm: memory-failure: Refactor add_to_kill() Content-Language: en-US To: =?UTF-8?B?SE9SSUdVQ0hJIE5BT1lBKOWggOWPoyDnm7TkuZ8p?= , Longlong Xia CC: "akpm@linux-foundation.org" , "linmiaohe@huawei.com" , "sunnanyong@huawei.com" , "linux-kernel@vger.kernel.org" , "linux-mm@kvack.org" References: <20230330074501.205092-1-xialonglong1@huawei.com> <20230330074501.205092-2-xialonglong1@huawei.com> <20230331054142.GA1435482@hori.linux.bs1.fc.nec.co.jp> From: Kefeng Wang In-Reply-To: <20230331054142.GA1435482@hori.linux.bs1.fc.nec.co.jp> Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 8bit X-Originating-IP: [10.174.177.243] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To dggpemm500001.china.huawei.com (7.185.36.107) X-CFilter-Loop: Reflected X-Rspam-User: X-Rspamd-Queue-Id: 33E1940019 X-Rspamd-Server: rspam01 X-Stat-Signature: h5w1ccnh3piwjbz3stzu6fyiijeannuw X-HE-Tag: 1681377993-322209 X-HE-Meta: U2FsdGVkX1/Bz6YAcp/teRpLbCoMZHx6ctzOAO1xGCRcW5GaqeN1C6/nLrx34URvbXWlqSTE68kcL4nqwP92nnLpAfjRqtMID4jDVhExe5EbrDyTdgcrnpeTh0jc2PTTcr/OiPP3CtlopQIH+lQrsqabCuvwf7gwqPYRxRUlvBK01eIGppVTq4TyK/TaK6/LqPcXSrmhVhdSxuJSq0D4Oxpl6drf+5SFkaXupdNdBA2hT1KwHEnalswNcYsaRF59Qn/TqthtNKfZ/raGSy83QHV9ziHg60nJ7AYhRTGM07dy1oVUaUB/fbE40YyqGCom3ByqEy70WmdISzBOZfw5y3S1YNgVRoufvmnBFtc9os2T+XB32G3/x0HUCuCFPwhCVdtlO/7CY5hTtz3i6vPdQe2DYF4aWjxw7rhPux47SNaIYlkf+9uucR8NR3l8p64/jIbc9gRU+rWvoJ+FKgaoVuvC4VJCcCGl50VktbzzZGin9lKySRH7hZE3OX0E4VdHhYeiB/jb+zHVyXn7L6JjXVK490XHzF6IOrw0f1cpRjXqrXt8cD8J+p5WCACxG1O9SVy/AhQgJ8NwEJR1QQr5fso6QDRG01JqyE/CdMJ2TewPWSPGPdbBlXOz3yF2/IXKqEALiWV8fVY2m+X7B38l5Df8GzbP5tcxvJBdcEEh0v+gK7zHEQPJ4+C36VJmrUyIc1GBGjCGGx62doILKn5MDCKujPRcShUA1CEhQTM2SySaWrfOqDbsKB4d+v+M0JBaDs9NUM44pXIBJYrRNftP1ORBtGqfEb54YAepAZfVNa7x+vtsPKs8VGS1ee8rDmg7GSkesZEYI/mecc4UqCtwrc/IC5N6ttp1zrvvL0BpGYtdAn2Q9ZGbukqKJrxu2/iMQk9HmWsz8GLve42/6wfZSuwmUgzdiIwZOJPN9m46rle1jKAjDmwMjTIyFVDqRTOlAU//ZVYYpRV1VWCiXm3 ufc7gD4Q Nggu55AJxU2mnJfbmP7thVnVjK30v7DyZDFBcIuJEUHHICjNRE+ybuuPNNGEAmlUFN5PkZ2qA2MCthCxPuAto3Pe7mrndLmTkzJ3f4h0s07ODnTLq7UOfQNp2NJE5RMKwCugBAKgLTW9jBjdQlWKQUDg1NEahe0NWxdheJIBFIkoJyktwYgGwUp1YBu9eEAodtMtTdzgg/VRPDUzdNWoE5wMw2XpXcifVjMjAkm/8OVbilESvXGVdkEh1TX91C/Yk6lDT 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: On 2023/3/31 13:41, HORIGUCHI NAOYA(堀口 直也) wrote: > On Thu, Mar 30, 2023 at 03:45:00PM +0800, Longlong Xia wrote: >> 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) > > Hi, Longlong, > > The new argument addr seems to be used only from add_to_kill_ksm(), > so you can name the argument as such (like ksm_addr), as we do > for fsdax_pgoff (which is clear to be used only for fsdax)? Another option, move page_address_in_vma() from __add_to_kill() into add_to_kill_[anon_file/fsdax](), but use ksm_addr is fine with me, Reviewed-by: Kefeng Wang > > Thanks, > Naoya Horiguchi