From patchwork Mon Nov 25 07:57:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Donet Tom X-Patchwork-Id: 13884478 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 508C6D3B7E8 for ; Mon, 25 Nov 2024 07:57:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D6E116B0089; Mon, 25 Nov 2024 02:57:46 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D1E586B008A; Mon, 25 Nov 2024 02:57:46 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B95F96B008C; Mon, 25 Nov 2024 02:57:46 -0500 (EST) 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 9ACC76B0089 for ; Mon, 25 Nov 2024 02:57:46 -0500 (EST) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 41CE4160754 for ; Mon, 25 Nov 2024 07:57:46 +0000 (UTC) X-FDA: 82823863290.28.480113C Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by imf08.hostedemail.com (Postfix) with ESMTP id 743BB160006 for ; Mon, 25 Nov 2024 07:57:40 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=gGyxOn7m; spf=pass (imf08.hostedemail.com: domain of donettom@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=donettom@linux.ibm.com; dmarc=pass (policy=none) header.from=ibm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1732521459; 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:references:dkim-signature; bh=+298vbJ03oxsX1u8hV5uc77KWHGmqlCVmI7gA7UzfcA=; b=Zo78Aiv+NorvP1eyyRWy6quTO3LLg6NcmdwcS2B0qvY1590V2MMDa73U49pPIUk5q3dxyD myoD4tLiFxg31U4Y9wvG7rEiTI/FN18FqpuFJx18L3nubFfNUbRpJAj2wWtrSYzFLOVmwS PFQ2HuoRYFDXRgy+XnKb8u8IUPj9RbA= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=gGyxOn7m; spf=pass (imf08.hostedemail.com: domain of donettom@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=donettom@linux.ibm.com; dmarc=pass (policy=none) header.from=ibm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1732521459; a=rsa-sha256; cv=none; b=mc+Mgh0nLqgppanGLSiZ7st89nx6E0mhksuAGviE+Lj8dcchMOt7//f4G3KHcMi0IljIXx AD2ZYmAB16RSChId06tNM32pN+e+1Iql8FJrEeBdrUuzt5XAwnyVTRTCzgrVLY0mwiDmbU 47i9qGUH+WNENvqc4AnwizDOj9uPuOw= Received: from pps.filterd (m0356517.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 4AP17GER025594; Mon, 25 Nov 2024 07:57:39 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:message-id:mime-version :subject:to; s=pp1; bh=+298vbJ03oxsX1u8hV5uc77KWHGmqlCVmI7gA7Uzf cA=; b=gGyxOn7m3JL8tdeftcP6AyYp5L2lE3FtMaXtnYlrQw7usR7PbA0pAlUUf Mqf76C20MJtDhGPpP+QaL2/cmeCdzkH0AQYbfixctAQu0uI8Xn/CG5aVaC2CJgVQ SbzF2oNJseqAJt6MWYN90FCl1n8XjFhYQth3Dk8Q8lVVYBMgZUCC7lNlxFKNOLLp YnibgBHy+/b72tlsWCVJxwgebrvSSpzPCj7BT6dRJTaCU/FmkID5lYQONgh2fgSY GdIJd4iElfsYzqB4OT8BwMes0zRnxpqG5oqkM+R1CtCPZp9eNOwnO8sacbbDG9tT g7Asc6Gjs+NNyrAecqG0YutVg3sHg== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 43386n75kq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 25 Nov 2024 07:57:39 +0000 (GMT) Received: from m0356517.ppops.net (m0356517.ppops.net [127.0.0.1]) by pps.reinject (8.18.0.8/8.18.0.8) with ESMTP id 4AP7f6sB028665; Mon, 25 Nov 2024 07:57:38 GMT Received: from ppma23.wdc07v.mail.ibm.com (5d.69.3da9.ip4.static.sl-reverse.com [169.61.105.93]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 43386n75kh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 25 Nov 2024 07:57:38 +0000 (GMT) Received: from pps.filterd (ppma23.wdc07v.mail.ibm.com [127.0.0.1]) by ppma23.wdc07v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 4AP69k7H025320; Mon, 25 Nov 2024 07:57:36 GMT Received: from smtprelay03.fra02v.mail.ibm.com ([9.218.2.224]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 433tvjv7nc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 25 Nov 2024 07:57:36 +0000 Received: from smtpav01.fra02v.mail.ibm.com (smtpav01.fra02v.mail.ibm.com [10.20.54.100]) by smtprelay03.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 4AP7vYsc59113958 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 25 Nov 2024 07:57:34 GMT Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 12D2320043; Mon, 25 Nov 2024 07:57:34 +0000 (GMT) Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id CA9D920040; Mon, 25 Nov 2024 07:57:32 +0000 (GMT) Received: from ltczz402-lp1.aus.stglabs.ibm.com (unknown [9.40.194.31]) by smtpav01.fra02v.mail.ibm.com (Postfix) with ESMTP; Mon, 25 Nov 2024 07:57:32 +0000 (GMT) From: Donet Tom To: Andrew Morton , linux-mm@kvack.org, linux-kernel@vger.kernel.org, David Hildenbrand Cc: Ritesh Harjani , Baolin Wang , Zi Yan Subject: [PATCH] Removed unused argument vma from migrate_misplaced_folio Date: Mon, 25 Nov 2024 01:57:31 -0600 Message-ID: <20241125075731.176573-1-donettom@linux.ibm.com> X-Mailer: git-send-email 2.43.5 MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: XnqdJN7g93ah7a-rHYl2rZsSg83xyFbY X-Proofpoint-ORIG-GUID: on-jaLuYUAhKykQAHhqnoVJ5zU5MaF2f X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1051,Hydra:6.0.680,FMLib:17.12.62.30 definitions=2024-10-15_01,2024-10-11_01,2024-09-30_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 mlxscore=0 mlxlogscore=900 suspectscore=0 impostorscore=0 malwarescore=0 spamscore=0 clxscore=1011 adultscore=0 lowpriorityscore=0 bulkscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2409260000 definitions=main-2411250067 X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 743BB160006 X-Stat-Signature: ucwytoi8xsqepjr9iewiz6qb1qiefe3b X-Rspam-User: X-HE-Tag: 1732521460-680480 X-HE-Meta: U2FsdGVkX19G/KLpQxJUrmpz4gwAgSHTeFMw7nM414b1wmDAA1a+laCnw7tHkWgXTMe7U/1U6Z+GmQqlrBVv4N1irdyLkcpCZ0oMjCx4gaP78VtNeMTQ+yTtZNpEgcbHzohzAiwj/W0Gv4oTE4hZl2rc6kjJIbgZLkVdr3yYovkL0tJhpo5xlkNXeZ1/5pYVcmoaHJiVkBoPhG7g3OSinihJb3sMkTOS7OjH+M3owgG6v3iXwCfJ6tr/ktr77eMpmfFQ8XyW5CC/+TwUbwMWqiE29pNeK/Ouetadz8IF/xm5nzWEIJ1cRCudN2f/pY1/rBE6oDyYJ7DpIJvLE05z4G+O9SQ4K+zLsiELIe+h9PRRiDhQ0KA6A/ZB6CmSEC7w2K2IyxUZ1XubYECEWJKy53QNyLXltPkxhrN6oV89pFfZU94G8HekkBfIWhsULHjn8d45gG/O88Kwv0SwTGwhfnpJyxbfsJsJnIR1Afp9MSG2uLRgg0ONAN6vfLJ9IAWQeobcVvyNOkplw7UwmKLl+skyTK0cvYSsN84SeRYKanBTCVjhRW2lyvhjYjfxsw2KNlkr101nyIHl7dFiaODIzC7tPcQP6jFuORDSfjpeP4zvKVzksL8/JCD9p7iLqq0wZ+fdgP25JCBUs/N2/7QnIWenuA4jKsP4+eN4vtBvBzUil/fyYk6o4hmzNXAUwpxqvNi1qkPV2hMgSvgLm2zxbaVV8cxSUUglC1+YwYHpHYLZUauHYqIhRPiptsCuJkf8nDPqTLCoTZddyCJlHl4mXBDVe5fqzR6f6sBJz0cSctE4E2cNr8UulnwnDW01JLGt7K65ffohT5kIc2hM9gKLjz2s7hvvOWxR///SsFgHESfNNDRoZxrSTutRwzZfqdUCwQWdcY6yydj77br0EI7RUHrUUPS/+Km3aytZ8cbNrKGaVeW3o4tv8AvMkU46lRvqnqFxjee5QGyizA/nu1A Z1xpQxo8 hNvaS8+6/pE/tq/UwAro1b7EKvJoydbmPlWx+c90xJ+16Kw0YOLALKVOe97djk4p2CeLTWGsAGaTdsj4VwyiV0I9IagQOU+MkMG4LCTwEoqreJNX52MFL50eUE6pohuE1b968Thm6t+A7w4/6lPIqoTsfRLejm+O5abrVVyAZyz8kbbfb8H/TkBRQ05U0y5jYCiIYn0yZqEfswPz9lOY0vzGy/NIODKef4zGuQFJJ8ysm6NkN63UmUM2rABGmvZ5bjNZ3zL8SUyxE6s7AOLOHKAkdU2xSvJvQ+H/TBAbUgO6cKRBhaW5B7uhHkMOQw6XO4QPH 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: Commit ee86814b0562 ("mm/migrate: move NUMA hinting fault folio isolation + checks under PTL") removed the code that had used the vma argument in migrate_misplaced_folio. Since the vma argument was no longer used in migrate_misplaced_folio, this patch removed it. Signed-off-by: Donet Tom --- include/linux/migrate.h | 6 ++---- mm/huge_memory.c | 2 +- mm/memory.c | 2 +- mm/migrate.c | 3 +-- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/include/linux/migrate.h b/include/linux/migrate.h index 002e49b2ebd9..29919faea2f1 100644 --- a/include/linux/migrate.h +++ b/include/linux/migrate.h @@ -144,16 +144,14 @@ const struct movable_operations *page_movable_ops(struct page *page) #ifdef CONFIG_NUMA_BALANCING int migrate_misplaced_folio_prepare(struct folio *folio, struct vm_area_struct *vma, int node); -int migrate_misplaced_folio(struct folio *folio, struct vm_area_struct *vma, - int node); +int migrate_misplaced_folio(struct folio *folio, int node); #else static inline int migrate_misplaced_folio_prepare(struct folio *folio, struct vm_area_struct *vma, int node) { return -EAGAIN; /* can't migrate now */ } -static inline int migrate_misplaced_folio(struct folio *folio, - struct vm_area_struct *vma, int node) +static inline int migrate_misplaced_folio(struct folio *folio, int node) { return -EAGAIN; /* can't migrate now */ } diff --git a/mm/huge_memory.c b/mm/huge_memory.c index ee335d96fc39..ab46ef718b44 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2002,7 +2002,7 @@ vm_fault_t do_huge_pmd_numa_page(struct vm_fault *vmf) spin_unlock(vmf->ptl); writable = false; - if (!migrate_misplaced_folio(folio, vma, target_nid)) { + if (!migrate_misplaced_folio(folio, target_nid)) { flags |= TNF_MIGRATED; nid = target_nid; task_numa_fault(last_cpupid, nid, HPAGE_PMD_NR, flags); diff --git a/mm/memory.c b/mm/memory.c index 75c2dfd04f72..12bb79d4df72 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -5625,7 +5625,7 @@ static vm_fault_t do_numa_page(struct vm_fault *vmf) ignore_writable = true; /* Migrate to the requested node */ - if (!migrate_misplaced_folio(folio, vma, target_nid)) { + if (!migrate_misplaced_folio(folio, target_nid)) { nid = target_nid; flags |= TNF_MIGRATED; task_numa_fault(last_cpupid, nid, nr_pages, flags); diff --git a/mm/migrate.c b/mm/migrate.c index 2ce6b4b814df..411b378dd39f 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -2683,8 +2683,7 @@ int migrate_misplaced_folio_prepare(struct folio *folio, * elevated reference count on the folio. This function will un-isolate the * folio, dereferencing the folio before returning. */ -int migrate_misplaced_folio(struct folio *folio, struct vm_area_struct *vma, - int node) +int migrate_misplaced_folio(struct folio *folio, int node) { pg_data_t *pgdat = NODE_DATA(node); int nr_remaining;