From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.openvz.org (mail.openvz.org [69.168.225.77]) by lore.virtuozzo.com (Postfix) with ESMTPS id 7890F8017D for ; Tue, 17 Nov 2026 16:26:13 +0000 (UTC) Received: from mail.openvz.org (localhost [127.0.0.1]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6AHGP0Le010697; Tue, 17 Nov 2026 19:25:01 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AHGP0Le010697 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="N2w8wHgI" Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6AHGOo96010671 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Tue, 17 Nov 2026 19:24:50 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AHGOo96010671 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-4a70b42bab0so10360015e9.1 for ; Tue, 17 Nov 2026 08:24:50 -0800 (PST) X-Forwarded-Encrypted: i=2; AL+hErE1LwlttJS+PaSQTyIB7sKMCq2uaSyQVJ/AheVSYf6dGXe3LASNMzzwIGG0L55d5ClXW5dR8g==@openvz.org X-Gm-Message-State: APuU4Z8Ky4PBmgSjfLVrTev5eiZT46jp+MaL/3BUch5bLFaNoV9fCPh4 BZVpO8D21fZMGcByXs+/zkwnkomVjElzlHQblYwBqaPlhLo11v13w3F3Kdp5KGWGBcP107wgBk6 OV/rMbjhmo5r/ElEnJgQcvT404sj7vL0c0M0GqH24dO8teNZqrx1iIA== X-Gm-Gg: AYBFou31KpM1yiUaMMjTXZeGDNhYH+cpwUwXOvkcW9taRzeV9IYe2lw0yrNU4MMR7CR FE/fhUjTsvE7s5Jyz0cF3TeDys9G5A1PZs/tzEyuZ1JnQV+LrhPd7AuiE2GJUDefqhvy48xhYAJ 3Hu/sXWq7ge5p8eW1DXMyEHFzKv36xOzAuoRqA5s1dzLhosnW7Y2TulMwi3oatzsYtbDtqyKaPh /NlqKXsNQ/V9ux7GCgeVn1aLWdLprsfCDsj8SL5eEdxGpol2E7CgD4ShYdyQKFuTGT9DXPIXHEI LMwGPJZem0S5UgXSpuRaBCk1w4F2B6roNeLLlYKEYIuek/nAJuuytR7aUqsiuYj6vhsQsBehoRx OtqPl3ughOoY8V1dY X-Received: by 2002:a05:600c:6589:b0:4a2:1960:6fa with SMTP id 5b1f17b1804b1-4bb783725bdmr76367015e9.4.1794932690090; Tue, 17 Nov 2026 08:24:50 -0800 (PST) X-Received: by 2002:a05:600c:6589:b0:4a2:1960:6fa with SMTP id 5b1f17b1804b1-4bb783725bdmr76366545e9.4.1794932689426; Tue, 17 Nov 2026 08:24:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1794932689; cv=none; d=google.com; s=arc-20260327; b=puzh6xy/FDzxSt5T6Tn1iX0nQsmeBJCDbqvR6MTwNsCTg1bx+avtTKZQXU4gnrXtLo oGMWF6uruqYW/fhC6aAqAWTSol4O60GlpnjqHeDWRl3fbUMcUP/tV5aV9MB4VSzKaNQ3 jZt+rUEfdddAFdevd3Jzh+iZiBd2BogMkKfwCdE3d0lZYzrh50XSNoKvRGtt5372tlCP q69lmaXp0Sz1ZsqlNT24BKNFgMR64AQAOCxKQ5QB9vYaGIZouaHesrI9cFSWFUxLr3lx TxqVpxGBor7AYXZN5oYaba6aLx86Rguzf+2XweOdcYrh3C2m1K2cDcSYDzHoQ2iiTsNq /5+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:dkim-signature; bh=VOujsBqOtoeGUfXk6zvvcU3MKFtR4jAUnKpvJQazsFM=; fh=bRkZfFa6377EgOVW8zBDri2gGIQqe/ZeiH+ijEM/ROI=; b=lEJnUGYJZJcNzc4GSIXEysh3Z4QncbwdR8UQZ2To4GILcC08R/lsU0liwj9IUcDVRa PdT7z+1RXGp1co6FK3zDc/hiO05h3+vGubr2H0PP4DUVwjcBSkyhgyzbXz1qViEJa0Sb n8Zxc+4+2WzEOBiBRrTnfNvePlJkep6ZSZqz1jZo+/1t6Eo+Fs0SeScENbtv2a1ws6cn SuIIoq3iu8mc08fjVyVyPR39jdND/0u9uJknnj9HHLc7L2RRfZ0bq8KRgSUY1JkF1TAL N7+JYorgw36/ugLbE5JEbolDL9LFBimIVqa/yu4qNRUsPdzX4kF40oZ5oIAzlGnSbzMY l9Mw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=N2w8wHgI; spf=pass (google.com: domain of khorenko@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=khorenko@virtuozzo.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com Received: from relay.virtuozzo.com (relay.virtuozzo.com. [130.117.225.111]) by mx.google.com with ESMTPS id 5b1f17b1804b1-4bb7839cac9si62619305e9.16.2026.11.17.08.24.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Nov 2026 08:24:49 -0800 (PST) Received-SPF: pass (google.com: domain of khorenko@virtuozzo.com designates 130.117.225.111 as permitted sender) client-ip=130.117.225.111; Authentication-Results: mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=N2w8wHgI; spf=pass (google.com: domain of khorenko@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=khorenko@virtuozzo.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=virtuozzo.com; s=relay; h=Message-Id:Content-Type:MIME-Version:Subject:Date :From; bh=VOujsBqOtoeGUfXk6zvvcU3MKFtR4jAUnKpvJQazsFM=; b=N2w8wHgIgg0GrkGRZUQ sqVAhOOvNbpWJTbgFQH9MkA1sWB0mDO+d0OrjhYVDk9VciO2nrkiOrCWPT2JO7MxbcPc22jkgMgUj z9loXE34CVRQ7YLNbKIcGJHLWIOU6EdYpsnn0oZJr6WdcMs+G/oQc78S20owGe/4gN8VqheVuwSIE LvN3Y3zcvZag5scKXRKDjsnSCi/t52LK80JZdtMxsMqGegWduFwogRGBJOLebhDy0iR6soLCUfdFI uKHyhnlKT2kRNI8U4zEgmmVGhewHLf9dMU1vh+L2v8HvirzGEWxoKJmqY+mGdaGVLqY4aNtuomR6B vJsVITfWsXdGJmQ==; Received: from ch-demo-asa.virtuozzo.com ([130.117.225.8] helo=f0.sw.ru) by relay.virtuozzo.com with esmtp (Exim 4.96) (envelope-from ) id 1xTLuy-00GOHQ-1M; Tue, 17 Nov 2026 17:24:39 +0100 From: Konstantin Khorenko Date: Tue, 17 Nov 2026 17:24:44 +0100 MIME-Version: 1.0 Message-Id: <20261117-b4-prep-khorenko-vstor-152197-numa-migrate-cleanup-v2-2-1dce69bd115c@virtuozzo.com> References: <20261117-b4-prep-khorenko-vstor-152197-numa-migrate-cleanup-v2-0-1dce69bd115c@virtuozzo.com> In-Reply-To: <20261117-b4-prep-khorenko-vstor-152197-numa-migrate-cleanup-v2-0-1dce69bd115c@virtuozzo.com> To: Pavel Tikhomirov , Vasileios Almpanis X-Mailer: b4 0.16.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=3333; i=khorenko@virtuozzo.com; h=from:subject:message-id; bh=MrxpUVKe+FJaHhfOFUtI54RPu5dbLtYBvGVel0cCemo=; b=owEBbQKS/ZANAwAKAVGWCkf5YVwqAcsmYgBq/H/P1RAVNjDsIiWR7bDr/1yTZPXiHOjjO3pT5 +yDRx6qLBSJAjMEAAEKAB0WIQRWD23IPcXT0GO9CCxRlgpH+WFcKgUCavx/zwAKCRBRlgpH+WFc Kj86EACwNTVUz3W01NjHorQhDSwHqghG22Aj3JLT7QlNm5Q0UsiC76YpMNAr8rOd2NmuJz97iun GFjXGY/O2SWfcN7OILaOMhBMuQ5YIj/YDuxZxXpjgN4ZEO47swWK9/VXxknPMmpcMKM7zh12agA XZW3FhMt6uru/RijcSkFw9LCVGJGYLoBKu6c0QJO9b0YgQ45L6+tmPQf+nYX2jyrfg0GchxWhGk dQLXpL9VbJIutcIM8iV4vHmtFYmPndb+u2eC6hWtWtDx5PnHuf2Clj0sFxm9gQ/eOqZlJdhKAps w2C0Uxue4n5OKcccWjIzl178tNZA0Vmkdq1UzgbOJTxd+4MmBMeMKmpktQjyLHVTIi1+3RwqJ8e ypsmctoy5M8PjgO9WJYtMK+zsxQGdyWYJOsG5dq726jpS1d+vyFEPUbpCdqtiLDy+mG8eX3SR4i a60BgbtOiJv1zkx2OjcwHpKL5v7qWd3jm1lDQC7mZI5/ovVf+0wj3zXtN87H/fcDSGM1+SnEZcT zs3ERLImHjboVeolBtE7WpmYquDoJJUthPpCTDIQ+mPP6cfn+yQe79z8Ek2vo/3Y6PklNLoh6jI 0h7reJ4vN0Gdbe2NB2h8ulMkd2zxbw5QHxITzM5mlKZFRKITTboJz46KAFmJ526aGCw/CBusnd5 d7QVHyQIFTvmW4A== X-Developer-Key: i=khorenko@virtuozzo.com; a=openpgp; fpr=560F6DC83DC5D3D063BD082C51960A47F9615C2A X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.2 v2 2/3] mm/memcontrol: say where the numa_migrate code comes from X-BeenThere: devel@openvz.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: OpenVZ development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: devel-bounces@openvz.org Errors-To: devel-bounces@openvz.org The comment in the isolation loop tells the rebase history of the code instead of naming the upstream functions it copies, which is what a rebase has to compare against. Replace it with those names, name the original of the allocator too, and drop the leftovers of the copy: the commented-out conditions and the pre-folio name of the allocator in the comment to its private argument. No functional change. https://virtuozzo.atlassian.net/browse/VSTOR-152197 Feature: mm: interface to migrate memory between NUMA nodes upon userspace request Reviewed-by: Pavel Tikhomirov Signed-off-by: Konstantin Khorenko --- mm/memcontrol.c | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index a82d5e7bc8694..4c3c06cfcf9fc 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -3462,7 +3462,7 @@ int ve_enough_memory(long pages) #ifdef CONFIG_NUMA /* - * memcg_numa_migrate_new_page() private argument. @target_nodes specifies the + * memcg_numa_migrate_new_folio() private argument. @target_nodes specifies the * set of nodes to allocate pages from. @current_node is the current preferable * node, it gets rotated after each allocation. */ @@ -3473,7 +3473,8 @@ struct memcg_numa_migrate_struct { /* * Used as an argument for migrate_pages(). Allocated pages are spread evenly - * among destination nodes. + * among destination nodes. The order and gfp choice follow + * alloc_migration_target(). */ static struct folio *memcg_numa_migrate_new_folio(struct folio *old_folio, unsigned long private) @@ -3520,19 +3521,10 @@ static long memcg_numa_isolate_pages(struct lruvec *lruvec, scanned++; /* - * Previously here we had a call to - * __isolate_lru_page_prepare(page, ISOLATE_ASYNC_MIGRATE) - * => need to get same parts from __isolate_lru_page_prepare() - * like it's done in isolate_migratepages_block() in commit - * 89f6c88a6ab4 ("mm: __isolate_lru_page_prepare() in - * isolate_migratepages_block()") - * - * The code block below is taken from - * isolate_migratepages_block(), mode variable is defined and - * set to ISOLATE_ASYNC_MIGRATE in order to keep the original - * code unchanged where possible. - * - * Also it is switched to folio, based on isolate_lru_folios(). + * The checks below are a copy of the per-folio checks in + * isolate_migratepages_block() with mode == ISOLATE_ASYNC_MIGRATE; + * the isolation itself follows isolate_lru_folios(). Keep both + * in sync with their originals on a rebase. */ folio = lru_to_folio(src); @@ -3552,7 +3544,6 @@ static long memcg_numa_isolate_pages(struct lruvec *lruvec, is_unevictable = folio_test_unevictable(folio); /* Compaction might skip unevictable pages but CMA takes them */ - /* if (is_unevictable) */ if (!(mode & ISOLATE_UNEVICTABLE) && is_unevictable) goto isolate_fail; @@ -3567,7 +3558,6 @@ static long memcg_numa_isolate_pages(struct lruvec *lruvec, is_dirty = folio_test_dirty(folio); - /* if (is_dirty) */ if (((mode & ISOLATE_ASYNC_MIGRATE) && is_dirty) || (mapping && is_unevictable)) { bool migrate_dirty = true; -- 2.43.0 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel