From patchwork Wed Mar 26 03:12:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wangchuanguo X-Patchwork-Id: 14029704 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 97367C36005 for ; Wed, 26 Mar 2025 03:12:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 31B03280052; Tue, 25 Mar 2025 23:12:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2C994280051; Tue, 25 Mar 2025 23:12:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1B9BE280052; Tue, 25 Mar 2025 23:12:41 -0400 (EDT) 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 F23B2280051 for ; Tue, 25 Mar 2025 23:12:40 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 0388DBACBB for ; Wed, 26 Mar 2025 03:12:41 +0000 (UTC) X-FDA: 83262229764.18.AF7B98B Received: from ssh248.corpemail.net (ssh248.corpemail.net [210.51.61.248]) by imf13.hostedemail.com (Postfix) with ESMTP id A229C20005 for ; Wed, 26 Mar 2025 03:12:37 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=none; spf=pass (imf13.hostedemail.com: domain of wangchuanguo@inspur.com designates 210.51.61.248 as permitted sender) smtp.mailfrom=wangchuanguo@inspur.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1742958760; 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: references; bh=fok0u3krddPbYQ3BzkY2i0XXAX3Mrw96rpAJxnFD9kc=; b=W2Y9sTSuNHHI0gcJY3PGZ/S9s1MXGVsAz8xC7tixooUxB97rL6SVedNRHQoqRdq22vZ9c9 PcTPSLZHknaCnpAQLhn9pqrupKO4sCWcCMMV2pD/iMW5jB5pkR+LO1uWjXm6/D1POCMykJ jPCEuD+++wNdT2W0vniSnU+bLWo0NII= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=none; spf=pass (imf13.hostedemail.com: domain of wangchuanguo@inspur.com designates 210.51.61.248 as permitted sender) smtp.mailfrom=wangchuanguo@inspur.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1742958760; a=rsa-sha256; cv=none; b=WS4U40I3FqlKraVRM/A1IIkaPyPvgG5Ix0p4q/ZSfQD8dvkSlvgn73IlRm6+iGj36JFxVc gaegLbHfmlz6vlsBTJirBCsqA5Q18RwIuA4Sv/z6+ad/U3W9CLZkMBjUkc8zVpMjnyUpqX BZtIsSrlMmtLpKQt4gPATpQfSj9BIL8= Received: from jtjnmail201605.home.langchao.com by ssh248.corpemail.net ((D)) with ASMTP (SSL) id 202503261112314780; Wed, 26 Mar 2025 11:12:31 +0800 Received: from localhost.localdomain (120.224.42.190) by jtjnmail201605.home.langchao.com (10.100.2.5) with Microsoft SMTP Server id 15.1.2507.39; Wed, 26 Mar 2025 11:12:31 +0800 From: wangchuanguo To: CC: , , , wangchuanguo Subject: [PATCH] mm: migrate: restore the nmask after successfully allocating on the target node Date: Wed, 26 Mar 2025 11:12:18 +0800 Message-ID: <20250326031218.487450-1-wangchuanguo@inspur.com> X-Mailer: git-send-email 2.39.3 MIME-Version: 1.0 X-Originating-IP: [120.224.42.190] tUid: 2025326111231d56feec8dbe32f716dcd6ffc18fa9dce X-Abuse-Reports-To: service@corp-email.com Abuse-Reports-To: service@corp-email.com X-Complaints-To: service@corp-email.com X-Report-Abuse-To: service@corp-email.com X-Rspamd-Queue-Id: A229C20005 X-Stat-Signature: c1ntcjjbc7ks485sh4338tdrata4t1fb X-Rspam-User: X-Rspamd-Server: rspam12 X-HE-Tag: 1742958757-195086 X-HE-Meta: U2FsdGVkX1+j8QGh2p+hV06YcbOiIU6DfHImK8AEOfIOQbuAY/Ksc61O8hZsX0pNEZHfZaoSLZ5ViPSsx8UOjBLvyhKdNSPSUx0bytfU9+1XlKuimRhICHi7jjGKKTXqb5l29b2XIblSD+9dz+tc0BNKPQPIaXHIObGK0QNLiJ4u9YfbsSDghdpmxip3FH20Zhiw9XO5fwAT7lnUPKw+6DQYJpNMijozUvrK2ol6xdvBwt1OWr5EvprLiQqf1rAtcj7FXxTCl++O9Vdpv1CRJUwxd3IUlZyMm9h55f+dF9EbLveBtXhLkErjqlcfTqXxV0q2BWDGhb9Np9callA37ssvn2ui0fQ/E9Lhl6gDZHbLkP4kh7Xv2QHSQUCWS1ZU6OECKhFHPg5o/HLB+qpv10cPadg3R0Z5sR94T6tNMsGV5F0TbG1TDIiQeQJI5nBgEANNycpQ87VuQy56xoo0NjjfwycRrNumEPxC7M4ofNh+UOOOEFU/1ZhBRJg4LZKPvcNFORFGoVip2Ki3v4zvpOK6wk4YpLfpBT6gp8f1whNqiHLW7ABIN4l4BhAdpHGXNj1k1XA4AetlyejJHxR74JYGPBlHQ1hBllOlCm0ybFUGLqmsACQvXdzvEqX2kL2OxFnmedqMBCMjgSsL6TJ+mTvHEOlxRyYmrOIZ6r9Ji8EwN+Rprd+c6P6sdLrB+jMjYtUFByFz9dHsw2gMwafMDY3OEOYzaf/hP0ydqnRVnng0WBTb4BZmd77ZLiIKX9Ygo7CUbCSPfecz0JyrluIR8WFxVf3+AjYwNFk64Ie66kQrugE+WEIAvaC++OMTP0QOknRtQvCI+pux/Uu1HMjy3lClua+Q4zRMH7skMvFH/Lw/+9eTE5eKbYu3B2LKPP4Y3lPtBeN7Jdgc5+mBAz+5reqR54Aq72oTSR2FFJllLiaH9dkiL0/4eoT7cePkq0q5tp9jc9CzTaVeySyrYwt Ax9oxRn0 6aNq38E39lgIG2sBJurWbVjhIdkngsAbuwA4DAfo0S+ey0DM3X8Q1HMwLE3BNWprcWVYKMqT3itsqmxMJCOnnuqqwwqvCSA6p0E4T2X/8NKn6m5jM///6Z6P6UIthQNUkLHIhGdSrellv7fNz/q+M3VL38g== X-Bogosity: Ham, tests=bogofilter, spamicity=0.007873, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: If memory is successfully allocated on the target node and the function directly returns without value restore for nmask, non-first migration operations in migrate_pages() by again label may ignore the nmask settings, thereby allowing new memory allocations for migration on any node. Signed-off-by: wangchuanguo --- mm/vmscan.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index b620d74b0f66..9467b2acef28 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -1026,8 +1026,10 @@ struct folio *alloc_migrate_folio(struct folio *src, unsigned long private) mtc->nmask = NULL; mtc->gfp_mask |= __GFP_THISNODE; dst = alloc_migration_target(src, (unsigned long)mtc); - if (dst) + if (dst) { + mtc->nmask = allowed_mask; return dst; + } mtc->gfp_mask &= ~__GFP_THISNODE; mtc->nmask = allowed_mask;