From patchwork Mon Jun 19 13:04:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haifeng Xu X-Patchwork-Id: 13284431 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 3517DEB64DB for ; Mon, 19 Jun 2023 13:05:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BB8038D000A; Mon, 19 Jun 2023 09:05:25 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B682C8D0001; Mon, 19 Jun 2023 09:05:25 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A08A38D000A; Mon, 19 Jun 2023 09:05:25 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 8D1D58D0001 for ; Mon, 19 Jun 2023 09:05:25 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 512091608CD for ; Mon, 19 Jun 2023 13:05:25 +0000 (UTC) X-FDA: 80919518610.15.2D7193A Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by imf04.hostedemail.com (Postfix) with ESMTP id 23BA840062 for ; Mon, 19 Jun 2023 13:05:10 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=shopee.com header.s=shopee.com header.b=UA8q5LtB; spf=pass (imf04.hostedemail.com: domain of haifeng.xu@shopee.com designates 209.85.214.176 as permitted sender) smtp.mailfrom=haifeng.xu@shopee.com; dmarc=pass (policy=reject) header.from=shopee.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1687179911; 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=XbDj0tuIsqmd9Jb0jvnKqTFsbroelomAP4JxfiYyGMc=; b=6T8hBEakACwV3B6o0ZGxaRyvCKLlrfkuBb8Kt5sbREZCExRZ36w70nL4CKiJX6AH1TfDpZ 0UC/ASnnn+zSLxX9DgiB315WGyhm7oqAvJkuxbxwZKgI92YCQqKPh0tQtewW5B6c+RadfA 9/FCZ4WzVoxhhTnesC0YsrSvAuQdYAs= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687179911; a=rsa-sha256; cv=none; b=GtWSwnIMk7p+acv/F3Q/DeUSCoQ1dZQtDxIDmDKUcnkmjfyXbaHNKpqMlKe7RRWkHTPqLf 4Ofje0FDgB/y5vVXT0IxoPGj3kvjytk63Sts2EEFOFvVj/TXBk7B41ZxtgZmZtEP1Ejhi6 NOpLREw24dpJzKrWwnS0ty+2Uqs1hlk= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=shopee.com header.s=shopee.com header.b=UA8q5LtB; spf=pass (imf04.hostedemail.com: domain of haifeng.xu@shopee.com designates 209.85.214.176 as permitted sender) smtp.mailfrom=haifeng.xu@shopee.com; dmarc=pass (policy=reject) header.from=shopee.com Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-1b52bf6e669so28393585ad.2 for ; Mon, 19 Jun 2023 06:05:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=shopee.com; s=shopee.com; t=1687179909; x=1689771909; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=XbDj0tuIsqmd9Jb0jvnKqTFsbroelomAP4JxfiYyGMc=; b=UA8q5LtBb0Ykh3MFbdGnfMFxTLoX6PI5I+bsDyEpHus9uTAEWP2yotngxINlDm3Dai 3YiYw+uTYqOMlR+98nC7buF9L6dLMJJ2p5v6+CrjpvFnkzP4vSq2/lfRGGSkgB13awG/ ehipcwsazCyFrhWw0vE/vjdkponpzHJ1JraXQLaShlRvGwMX0/tX5GrX5Ry8CNlY68Sj ka5N5zANVdqW+vGGUWiFIGzH1rZZKPxxGWTIBq3BrFDiXuL1eYUKLnWUwnVUXSgvChQq M6GBny0MHWbHYsnohmZfLj2MnkgepVQAYLHrrlooxS2jbH5m1n6EI4jIGWomLvJ4C3yp llAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687179909; x=1689771909; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XbDj0tuIsqmd9Jb0jvnKqTFsbroelomAP4JxfiYyGMc=; b=TTQGsf3RciGeApTfpJEwL0tK/SVgfrva/svzvGpxF9e38gy/z3nYwklZ6POUIWOLTg j8dwWBDRGKgPK+cAh7vrfLjUBSrz9c+yWyQw2Yx4o4JGU14JLKwqOF5Lrow6003Q6x47 9a/rBrCTvlPiDt3IRdEHpbEYcDyatj4EE7icLkidQvGrnZVWIkE1SXdfn/jpnEkBniOP y131Fzer1RW7WiRBAg04hK5UTAb6d4/77oG3efMUEUpkUKVD/7ViEK18eL/3bKzBIIGy Yid1QyJBIRd2ezMBtGUvok8/9MkI42aIRYGWk0x2ILBKLveWY+vjaNb8whbLvO60t+Lq D8bw== X-Gm-Message-State: AC+VfDw0tMXSFSwDqjF4apufAbdnZzNfgjmPQ2p52kk0M+vcDrDEFRXu MmahwQBwbO2HLiWhHvRVgxd0Pw== X-Google-Smtp-Source: ACHHUZ61V3ZMnYG41ClCRZ+rfd2TfsBGK3nyq4MLTfcXQzlnSEZTBbraxSM5XwAVEsYRCan4M+gbYA== X-Received: by 2002:a17:902:ea8a:b0:1aa:d545:462e with SMTP id x10-20020a170902ea8a00b001aad545462emr9637270plb.13.1687179909415; Mon, 19 Jun 2023 06:05:09 -0700 (PDT) Received: from ubuntu-hf2.default.svc.cluster.local ([101.127.248.173]) by smtp.gmail.com with ESMTPSA id l13-20020a170903120d00b001b53953f306sm5236052plh.178.2023.06.19.06.05.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Jun 2023 06:05:09 -0700 (PDT) From: Haifeng Xu To: mhocko@suse.com Cc: akpm@linux-foundation.org, cgroups@vger.kernel.org, hannes@cmpxchg.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, roman.gushchin@linux.dev, shakeelb@google.com, Haifeng Xu Subject: [PATCH v2] mm/memcontrol: do not tweak node in mem_cgroup_init() Date: Mon, 19 Jun 2023 13:04:42 +0000 Message-Id: <20230619130442.2487-1-haifeng.xu@shopee.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Queue-Id: 23BA840062 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: ysyp47jo45tjiin3411ysu64z9f54xoa X-HE-Tag: 1687179910-186437 X-HE-Meta: U2FsdGVkX19Oautj0m26QDEAWYXe7j0nnZm4TXD/0SrqQczA6EM43ElX3iTYra00sRFEwXxSH4y/gmv0vtHH7o0Uy4MZU/ff62kDXEEosbzkC0A90MX/g462DihxgrFRDu5SrYMyJcGmojUNMi/g8Ub+ZOUdGGkGfo2pX8TwFRQQxIsq9x1aMlLYEn9RyXW+Jh94rGHy6Zm2OOaD17jpOV5z/3TvVJfZK6JuYCEvXqAiER1qaJGg+kr1rR4btB+yHe4TxOgKYHLj0Zw0MmmVWQfazymrrf/3I19i3AO32SCjlq7UKqUYV2/tVFiin/U/724z8VdtaK/parik6SSb4q3RGP35uXjvTyV2NWSX1siXzcRlDkolcDg74TNU0C3epNfCx0XkbewASGktANmyMtkwxnHujkzPOdP34sH2VrtvpK9wTbXcxgBNL+blwZMnchlhvmTTb4ENepaUP6f6yQ6yrEHcK3a2QtW52DuaS0gpRAQ0Tjga8hPNbMnV+7VlD8fcCZMQwkdXzWD4JsitA1thv+sutT844dPqvEeV0VmGYkiubuPxjJNdP/pLriT6MqUws4pxcGd2YmCP/HaBfV6HB7jb1D9rk/IR+WgMluhQCZqIP5Toa7mpPlPR8yxwrVyS8YkM/ZN/AbcsLIxmZcpUnqVYATTUQv6droJL1pzCDuNiuNUzwe6uhT9vJn67CtskUsDpyJ0gQn5jzXnuFg3UZwt5xEJ607hGR7EgYkik/DSIjVSIS8iQt9Opy534djZ7Ui4wwgOAEZMLGiboi+SJJlxsiPJPivQdEq6teLiSWAp7BxQwKEqs9mFaWJ8qadgGfXY1p1sQ1aVRIhqsmuxuQW5oK2HoLSJXWlBHcaXNMQ/TJL+NMmRgm3KOKytjlEbsP61RppTSqa/KhunaNT9IZU1m0IRZ7+Bapkuwqqf/OgjnR2kwvoSNMX/ya80kVJfATy2ubsVEL/z0dp3 0YS8Lftk wx3yTDItmNCSHPZkQz5Bii2XfpoN0Oh9QJVsht3g+HUHdsJOnsQEEnCFvedl1ZHUlFl0eCQHsjW+H566MOE9WaNzei5MP0d+HfwE8b8w9vdotwX9QoTaS40/sRbD8DOoe6UBBCWaBFSVU6Iyj4r/wjxmygHiIqlzhH+qYE7I9pHG+HDt/j648+oedOkC3BmPrBT8sXyXh8feqb+uK5hkTxoBAgjHajIJDYjzwDKM+TnbbveVv+lrqM0lPHWI43NoB3fXwzdcYKQDReu90b8fT7W01jbOe2g7axH91NMIcGL9tISzWFpkBCE1Fp4gmdGFa3/fACMKfl8Iy8tcphaSEHS4WMWuZuWCroz9wjJDliM4j/yIzPK0GnPzOVVBNmq84hck0Jlwjfa4vYSuXwA5yO5Hd8ulUOyVXFcy/meBwN6eYqnW+ywtz6bu9LTLSDrLZ9xtC 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: mem_cgroup_init() request for allocations from each possible node, and it's used to be a problem because NODE_DATA is not allocated for offline node. Things have already changed since commit 09f49dca570a9 ("mm: handle uninitialized numa nodes gracefully"), so it's unnecessary to check for !node_online nodes here. How to test? qemu-system-x86_64 \ -kernel vmlinux \ -initrd full.rootfs.cpio.gz \ -append "console=ttyS0,115200 root=/dev/ram0 nokaslr earlyprintk=serial oops=panic panic_on_warn" \ -drive format=qcow2,file=vm_disk.qcow2,media=disk,if=ide \ -enable-kvm \ -cpu host \ -m 8G,slots=2,maxmem=16G \ -smp cores=4,threads=1,sockets=2 \ -object memory-backend-ram,id=mem0,size=4G \ -object memory-backend-ram,id=mem1,size=4G \ -numa node,memdev=mem0,cpus=0-3,nodeid=0 \ -numa node,memdev=mem1,cpus=4-7,nodeid=1 \ -numa node,nodeid=2 \ -net nic,model=virtio,macaddr=52:54:00:12:34:58 \ -net user \ -nographic \ -rtc base=localtime \ -gdb tcp::6000 Guest state when booting: [ 0.048881] NUMA: Node 0 [mem 0x00000000-0x0009ffff] + [mem 0x00100000-0xbfffffff] -> [mem 0x00000000-0xbfffffff] [ 0.050489] NUMA: Node 0 [mem 0x00000000-0xbfffffff] + [mem 0x100000000-0x13fffffff] -> [mem 0x00000000-0x13fffffff] [ 0.052173] NODE_DATA(0) allocated [mem 0x13fffc000-0x13fffffff] [ 0.053164] NODE_DATA(1) allocated [mem 0x23fffa000-0x23fffdfff] [ 0.054187] Zone ranges: [ 0.054587] DMA [mem 0x0000000000001000-0x0000000000ffffff] [ 0.055551] DMA32 [mem 0x0000000001000000-0x00000000ffffffff] [ 0.056515] Normal [mem 0x0000000100000000-0x000000023fffffff] [ 0.057484] Movable zone start for each node [ 0.058149] Early memory node ranges [ 0.058705] node 0: [mem 0x0000000000001000-0x000000000009efff] [ 0.059679] node 0: [mem 0x0000000000100000-0x00000000bffdffff] [ 0.060659] node 0: [mem 0x0000000100000000-0x000000013fffffff] [ 0.061649] node 1: [mem 0x0000000140000000-0x000000023fffffff] [ 0.062638] Initmem setup node 0 [mem 0x0000000000001000-0x000000013fffffff] [ 0.063745] Initmem setup node 1 [mem 0x0000000140000000-0x000000023fffffff] [ 0.064855] DMA zone: 158 reserved pages exceeds freesize 0 [ 0.065746] Initializing node 2 as memoryless [ 0.066437] Initmem setup node 2 as memoryless [ 0.067132] DMA zone: 158 reserved pages exceeds freesize 0 [ 0.068037] On node 0, zone DMA: 1 pages in unavailable ranges [ 0.068265] On node 0, zone DMA: 97 pages in unavailable ranges [ 0.124755] On node 0, zone Normal: 32 pages in unavailable ranges cat /sys/devices/system/node/online 0-1 cat /sys/devices/system/node/possible 0-2 Signed-off-by: Haifeng Xu Acked-by: Michal Hocko --- v2: - extend changelog by test steps --- mm/memcontrol.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 4b27e245a055..c73c5fb33f65 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -7421,8 +7421,7 @@ static int __init mem_cgroup_init(void) for_each_node(node) { struct mem_cgroup_tree_per_node *rtpn; - rtpn = kzalloc_node(sizeof(*rtpn), GFP_KERNEL, - node_online(node) ? node : NUMA_NO_NODE); + rtpn = kzalloc_node(sizeof(*rtpn), GFP_KERNEL, node); rtpn->rb_root = RB_ROOT; rtpn->rb_rightmost = NULL;