From patchwork Wed Aug 22 09:32:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oscar Salvador X-Patchwork-Id: 10572777 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C155D112E for ; Wed, 22 Aug 2018 09:32:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B2FC5298D3 for ; Wed, 22 Aug 2018 09:32:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A70D62AAEC; Wed, 22 Aug 2018 09:32:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 20BC9298D3 for ; Wed, 22 Aug 2018 09:32:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4596E6B23AE; Wed, 22 Aug 2018 05:32:36 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 3BD6B6B23B0; Wed, 22 Aug 2018 05:32:36 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1E8746B23B1; Wed, 22 Aug 2018 05:32:36 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by kanga.kvack.org (Postfix) with ESMTP id ADC8E6B23AE for ; Wed, 22 Aug 2018 05:32:35 -0400 (EDT) Received: by mail-wr1-f70.google.com with SMTP id v11-v6so733186wrn.19 for ; Wed, 22 Aug 2018 02:32:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references; bh=jYkTykqTIEVYyBeQj0aD08ILz0lDkebKvUInR6uiJsg=; b=AfdzSlhYV98XuWPoHex8Ui22xklUafDoHOPQoSM7wKt5UjpVzotoXSLN47DQh6cCG5 tdA9BhUi0JqD1XtA+5SNbzJsrLl3RPq8yAnjtaCeUSURrBWPvhEdIxfW9/7sX74EVvBi 7yYW+AJsfJRBvXNlw+f+fRnS/4yjnMc17HWzrh841SOMVTterphGX6Y+7KDks4WKl8Mu XvALqexRrQwlLpXLUTMHE7/im9QYpeLyygYu7Enyitm81NpONi954a64yJnib77dtmB2 GDRNYTbL06tvwubf0iHehUONyLJobf3ww2S0757eXb4GJUyuQ6bwgxPZ0HTxdfWpr/70 1wNA== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of osalvador.vilardaga@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=osalvador.vilardaga@gmail.com X-Gm-Message-State: APzg51C+OBuA4N00LqjFWfG5o4est8NvqYJ0opvbwb55gHdYt3hu1xon WXkrzgN5Dr4BXaQo31nfBThuGkILRXEcWZzeMXietJULgL1s16I4/sfDANbiJmigrU2ipCVQfKP J7B9fT4V3TMwk2XaVrcl+qNlub5u7/6c0t1Ov5XmJDqQDCcfST5Vtff1Q+n+XF3CSY9HUYcukTg z5XMLoFkS9IqVE5ANPWHiRZlzA/coqPOH7xvYWS2dnDWBU+3X0Xp/LefN+1nENTFs0s6T3z7Qm3 NQguchBy3maT0zlm2ro+fpntFxfq44PRz62oyhAihwxelHVFz4J5E18tmDRmpyM3xIeKfmPKJjb YEufFefz0ajxf18xbXuHE4S/cgSl32dwOqwSM0PmUS6nNTuJ8EVro2DOVEyyWA3vZ3DzymKcew= = X-Received: by 2002:a1c:b406:: with SMTP id d6-v6mr1849250wmf.126.1534930355222; Wed, 22 Aug 2018 02:32:35 -0700 (PDT) X-Received: by 2002:a1c:b406:: with SMTP id d6-v6mr1849217wmf.126.1534930354332; Wed, 22 Aug 2018 02:32:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534930354; cv=none; d=google.com; s=arc-20160816; b=t1wX96ZJ2anHsbJ8Og+6+G+lZeFUbV4s+0qK0fc58XozcNRRTvylA7Map31z0cggd+ fMmD9WNGB/WLgEOidlfY5LVXjJO89MhWu6hH0zxp3cK+eD1DTZsxZWMghc6VsFt3CYW3 s1jf+Wuz3wKOkunX62gYzs3QZKFKU925EmPvL9Tl9Ta96Ly2tHpAJOAdeH5NXInw2iB6 vZQr1Q3I6IbOyASZxq08Za0Yf/KuX9omOJyDssV+PqsEiaB0XoaaQHqQTDhtkRKj5m94 FTxGol2cf6oUO7p4ad8X8H6MJNgKsQGtF//FHBo0gQ2vr7T90neTmjFaqk6ngGg1Boq0 hgxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=jYkTykqTIEVYyBeQj0aD08ILz0lDkebKvUInR6uiJsg=; b=cO1A8PNNMG3o+qKyIQejXxZ8a35mDribwbJIvr/AX447j6O2IAo9JlMI1ueeLkqXxJ 6q34AYHXTHxzokHBiMU5Y1/i0BuQyuU+08QtJzHmgQQzmXbas/i324amuAsEb8TJnHuG MxSkKRrSsKtEo+V4vnWDjZ5Po3S9sHciAXk7wnau72066lLXOHxFQK1ZisUxpq2xz/cP CuwQJBBN6w/UlH0Na1T94pzg49y8pqHg2O7xqh6cE1dftOK0Se2/uyVkkBtVWOuXQV8o uIYooRdBAkroL7/nvVrvf0riq7A8SVtFqdBUybBa4jdNhU+YwQBlkEZ9XGwGVEtUtYs5 ZDfw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of osalvador.vilardaga@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=osalvador.vilardaga@gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id h19-v6sor299891wmb.88.2018.08.22.02.32.34 for (Google Transport Security); Wed, 22 Aug 2018 02:32:34 -0700 (PDT) Received-SPF: pass (google.com: domain of osalvador.vilardaga@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; spf=pass (google.com: domain of osalvador.vilardaga@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=osalvador.vilardaga@gmail.com X-Google-Smtp-Source: ANB0VdaUAKPFzkNQNeYtkQHN9lzSGtEOWGUbTss5CpGcInT9fj+ZMgr64iQyCVEGHsbK+DSdocUFSA== X-Received: by 2002:a1c:a401:: with SMTP id n1-v6mr1926217wme.125.1534930353964; Wed, 22 Aug 2018 02:32:33 -0700 (PDT) Received: from techadventures.net (techadventures.net. [62.201.165.239]) by smtp.gmail.com with ESMTPSA id f132-v6sm1260349wme.24.2018.08.22.02.32.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Aug 2018 02:32:32 -0700 (PDT) Received: from d104.suse.de (nat.nue.novell.com [195.135.221.2]) by techadventures.net (Postfix) with ESMTPA id 65EE8124A15; Wed, 22 Aug 2018 11:32:31 +0200 (CEST) From: Oscar Salvador To: akpm@linux-foundation.org Cc: mhocko@suse.com, dan.j.williams@intel.com, malat@debian.org, david@redhat.com, Pavel.Tatashin@microsoft.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Oscar Salvador Subject: [RFC PATCH 3/5] mm/memory_hotplug: Simplify node_states_check_changes_online Date: Wed, 22 Aug 2018 11:32:24 +0200 Message-Id: <20180822093226.25987-4-osalvador@techadventures.net> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180822093226.25987-1-osalvador@techadventures.net> References: <20180822093226.25987-1-osalvador@techadventures.net> X-Bogosity: Ham, tests=bogofilter, spamicity=0.000002, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP From: Oscar Salvador While looking at node_states_check_changes_online, I saw some confusing things I am not sure how it was supposed to work. Right after entering the function, we find this: if (N_MEMORY == N_NORMAL_MEMORY) zone_last = ZONE_MOVABLE; This, unless I am missing something really obvious, is wrong. N_MEMORY cannot really be equal to N_NORMAL_MEMORY. My guess is that this wanted to be something like: if (N_NORMAL_MEMORY == N_HIGH_MEMORY) to check if we have CONFIG_HIGHMEM. Later on, in the CONFIG_HICHMEM block, we have: if (N_MEMORY == N_HIGH_MEMORY) zone_last = ZONE_MOVABLE; This is also wrong, and will never be evaluated to true. The thing is that besides this, the function can be simplified a bit. - If the zone is whithin (0..ZONE_NORMAL], we need to set the node for node_state[N_NORMAL_MEMORY] - If we have CONFIG_HIGHMEM, and the zone is within (0..ZONE_NORMAL], we need to set the node for node_state[N_HIGH_MEMORY], as N_HIGH_MEMORY stands for regular or high memory. - Finally, we set the node for node_states[N_MEMORY]. ZONE_MOVABLE ends up there. Signed-off-by: Oscar Salvador --- mm/memory_hotplug.c | 44 +++++++++++++------------------------------- 1 file changed, 13 insertions(+), 31 deletions(-) diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 1cfd0b5a9cc7..0f2cf6941224 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -680,46 +680,28 @@ static void node_states_check_changes_online(unsigned long nr_pages, struct zone *zone, struct memory_notify *arg) { int nid = zone_to_nid(zone); - enum zone_type zone_last = ZONE_NORMAL; /* - * If we have HIGHMEM or movable node, node_states[N_NORMAL_MEMORY] - * contains nodes which have zones of 0...ZONE_NORMAL, - * set zone_last to ZONE_NORMAL. - * - * If we don't have HIGHMEM nor movable node, - * node_states[N_NORMAL_MEMORY] contains nodes which have zones of - * 0...ZONE_MOVABLE, set zone_last to ZONE_MOVABLE. - */ - if (N_MEMORY == N_NORMAL_MEMORY) - zone_last = ZONE_MOVABLE; - - /* - * if the memory to be online is in a zone of 0...zone_last, and - * the zones of 0...zone_last don't have memory before online, we will - * need to set the node to node_states[N_NORMAL_MEMORY] after - * the memory is online. + * node_states[N_NORMAL_MEMORY] contains nodes which have + * zones from (0..ZONE_NORMAL] + * We can start checking if the current zone is in that range + * and if so, if the node needs to be set to node_states[N_NORMAL_MEMORY] + * after memory is online. */ - if (zone_idx(zone) <= zone_last && !node_state(nid, N_NORMAL_MEMORY)) + if (zone_idx(zone) <= ZONE_NORMAL && !node_state(nid, N_NORMAL_MEMORY)) arg->status_change_nid_normal = nid; else arg->status_change_nid_normal = -1; #ifdef CONFIG_HIGHMEM /* - * If we have movable node, node_states[N_HIGH_MEMORY] - * contains nodes which have zones of 0...ZONE_HIGHMEM, - * set zone_last to ZONE_HIGHMEM. - * - * If we don't have movable node, node_states[N_NORMAL_MEMORY] - * contains nodes which have zones of 0...ZONE_MOVABLE, - * set zone_last to ZONE_MOVABLE. + * The current zone cannot be ZONE_HIGHMEM, as zone_for_pfn_range + * can only return (0..ZONE_NORMAL] or ZONE_MOVABLE. + * N_HIGH_MEMORY stands for regular or high memory, so if the zone + * is within the range (0..ZONE_NORMAL], we have to set the node + * for N_HIGH_MEMORY as well. */ - zone_last = ZONE_HIGHMEM; - if (N_MEMORY == N_HIGH_MEMORY) - zone_last = ZONE_MOVABLE; - - if (zone_idx(zone) <= zone_last && !node_state(nid, N_HIGH_MEMORY)) + if (zone_idx(zone) < ZONE_HIGHMEM && !node_state(nid, N_HIGH_MEMORY)) arg->status_change_nid_high = nid; else arg->status_change_nid_high = -1; @@ -732,7 +714,7 @@ static void node_states_check_changes_online(unsigned long nr_pages, #endif /* - * if the node don't have memory befor online, we will need to + * if the node don't have memory before online, we will need to * set the node to node_states[N_MEMORY] after the memory * is online. */