From patchwork Fri Apr 18 07:52:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ye Liu X-Patchwork-Id: 14057026 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 26383C369C9 for ; Fri, 18 Apr 2025 07:52:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D16CB680004; Fri, 18 Apr 2025 03:52:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C7253680001; Fri, 18 Apr 2025 03:52:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AC809680004; Fri, 18 Apr 2025 03:52:39 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 884B2680001 for ; Fri, 18 Apr 2025 03:52:39 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id BE5A7141522 for ; Fri, 18 Apr 2025 07:52:40 +0000 (UTC) X-FDA: 83346397680.11.D937F17 Received: from out-180.mta0.migadu.com (out-180.mta0.migadu.com [91.218.175.180]) by imf13.hostedemail.com (Postfix) with ESMTP id 1BC542000B for ; Fri, 18 Apr 2025 07:52:38 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b="b7/nnHZn"; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf13.hostedemail.com: domain of ye.liu@linux.dev designates 91.218.175.180 as permitted sender) smtp.mailfrom=ye.liu@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744962759; a=rsa-sha256; cv=none; b=IhaMzNFqNxzpzglTSXd0qzEvQSdbBBDOz/Cok4edf2f7qgNb1pBp722QCllzXLhs8P9wqP 7+UsCJEe9//3OESWI6rMyd5eBg2hg8TJ+55PQCPlO6IJyIT9/VliEA/QohuKsgtYIX53e3 n9RlH7cGSKnxE5GMedirD6PfxoF3b9Q= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b="b7/nnHZn"; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf13.hostedemail.com: domain of ye.liu@linux.dev designates 91.218.175.180 as permitted sender) smtp.mailfrom=ye.liu@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744962759; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=jfNHyiDXaAMkKJ+cGlnyxg4krHqlNBlOgidwEUdtskI=; b=JrMpE/Al5VTVqt4GLfUZTals+LQ7JxZ8lN3R8rK7zsEj633xKJcIz2jFgD4nXgw7JD6qho 2LooWOMpcx7gjjW7PmXeSAqe9gR8rFSLVhSvpdaIh6PuLH4rjLHARM0VodyqMXni1RrIO5 rGr7uDtF0BkxHi3XksnDCwFRyFGRB5M= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1744962757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jfNHyiDXaAMkKJ+cGlnyxg4krHqlNBlOgidwEUdtskI=; b=b7/nnHZnclVg19ysg8Nipk7mI3Dp+HjYg3vRA6vsim5CIgnseKXebJaEIpxWaY4n0930wX GDOn9Pn1bjFYUYeTA36963vnoeK1r+hPAbO1TLk5jyhwJkFrbsyneOEJFqwrvY8MOpYnQd yW9TPKizdK/bSXv+e8B0k2dGaldeIF8= From: Ye Liu To: akpm@linux-foundation.org, linmiaohe@huawei.com, nao.horiguchi@gmail.com Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Ye Liu Subject: [PATCH 3/3] mm/memory-failure: inline add_to_kill_anon_file() logic at call sites Date: Fri, 18 Apr 2025 15:52:26 +0800 Message-Id: <20250418075226.695014-4-ye.liu@linux.dev> In-Reply-To: <20250418075226.695014-1-ye.liu@linux.dev> References: <20250418075226.695014-1-ye.liu@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 1BC542000B X-Stat-Signature: 4pp9m81rp9mr9bee89rz5pmg1upzpu7s X-Rspam-User: X-HE-Tag: 1744962758-948941 X-HE-Meta: U2FsdGVkX190lwZebxF0YpOFEcrieCUZp/+9QtjHayVUQyB0OwiBFBsn00CgenyYjsB4BNWNYZZpvtlDJWjuxPFOw6O5wr7kuTG+DiVdlJf9/rB2cPlrc7MjI5OlRXyJRj3I1te7RlF7UAs9jT+u/y1JY+68qW2DYiSuVGl53z0/PXN0NShgcqcYkMT1UfN+1DT1LdGvqfQGws03ISJYF5tHGnRcmRsMsDcxZ8ibrRdgU/0WnTLhbgL4FBQoOHkXtQ6iEcKXJUOGTg49ojXK1B1b4j8dbSU8nZUcn1HkyKNu90tqcbKWO9hjE9jwQTnrIdnBjsPC6bvh4v6MW86K3DOOfYeJ+r9bl19gZ2OWYQr50qTQpPDuZ2tnX2Qs9ToY7Zn849zAgJvZEuxvtiKmlkd0FCfvDA+yX6Ei9cdouMwhaL8FuyYec6GxbwOHNuwu3Cuj3oYEceNpIFIvBnWy9/9Xo5p1gdUSSSYfpnbINWxo9u5kFUh/USDLPTyHHErG34MN+r9tUnex09dpgh94ZwaWqn3n5YEs+gx32aJ5Y3vnHkUmSiDI9V34dm/TxVPbT3LuELYc0zBtuVoN6Kg5q507ZPFtPmlsWmEpnDJ8GADgRYWPWjH2SD5iiqZUjUwDvKUWYcOdRfjQVcoXAfU966kox7eDYaVNS4hcM0j8bF+FIr+zkkSm+xuqE5DDt6JwAHrUPIxf2CRyLGHnFVcugDzks4SOHfofhDASe0GGBCD50UqGC26zCoFcVGjgHD9JyTp/p3bS6XBCLFi56Y9fCJLfRfNBYYgoAtsdmdUe3BHBc/q6MZ8cXqO2uTo6D+sm01Wy9XtdxfIjMX1li13t9GVeZXXrcSBGvDSmI+mNz4M3J/aT0HA5A3NiYBcs2mxrZzMkth3GybynRu2EBrji+wFFTs3647n3aXFRWRxNXAHNIzvrsfGSaFk8FQZAdX5szgthK/889cfEidSuNDt dpqtBqZy Q9Pzs7W3zoLLqeF2WsCIDAUViyWWCSn3DOsYpG4nAeeReQ5CpBpxHKL2FbI+qTS6QYyOqCxvKhPRPBz+kgu8+0n4D3kXkWRpvjp3ymUqiPW21IANB6k1hhGOmQG/GOBs4OCGJi1L6R2UTbhJtcBCFL1yqiY8h4symY503F2J1ymhGt48ykPy/YhCSQ+cGDedTVV77Ed1CMk8KNWoblDUAra5+SLQo/NgrtVUMySOZkJF0LbdVfRdMYywOhMER0WLSm0BvN+22kREtctYkEekExEKozCCbNseqMzqv 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: From: Ye Liu The add_to_kill_anon_file() helper function only checked for -EFAULT return values before calling __add_to_kill(). Removes the unnecessary wrapper and moves the addr == -EFAULT checks directly into collect_procs_anon() and collect_procs_file(). This ensures that error handling is performed close to where the address is derived (via page_mapped_in_vma() or page_address_in_vma()), rather than being obscured inside a helper function. No functional changes are introduced. Signed-off-by: Ye Liu --- mm/memory-failure.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/mm/memory-failure.c b/mm/memory-failure.c index b91a33fb6c69..ec0041c95b27 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -486,15 +486,6 @@ static void __add_to_kill(struct task_struct *tsk, const struct page *p, list_add_tail(&tk->nd, to_kill); } -static void add_to_kill_anon_file(struct task_struct *tsk, const struct page *p, - struct vm_area_struct *vma, struct list_head *to_kill, - unsigned long addr) -{ - if (addr == -EFAULT) - return; - __add_to_kill(tsk, p, vma, to_kill, addr); -} - #ifdef CONFIG_KSM static bool task_in_to_kill_list(struct list_head *to_kill, struct task_struct *tsk) @@ -634,7 +625,8 @@ static void collect_procs_anon(const struct folio *folio, if (vma->vm_mm != t->mm) continue; addr = page_mapped_in_vma(page, vma); - add_to_kill_anon_file(t, page, vma, to_kill, addr); + if (addr != -EFAULT) + __add_to_kill(t, page, vma, to_kill, addr); } } rcu_read_unlock(); @@ -674,7 +666,8 @@ static void collect_procs_file(const struct folio *folio, if (vma->vm_mm != t->mm) continue; addr = page_address_in_vma(folio, page, vma); - add_to_kill_anon_file(t, page, vma, to_kill, addr); + if (addr != -EFAULT) + __add_to_kill(t, page, vma, to_kill, addr); } } rcu_read_unlock();