From patchwork Tue Jun 25 14:58:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 11015881 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 060E71398 for ; Tue, 25 Jun 2019 15:00:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E31882894D for ; Tue, 25 Jun 2019 15:00:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E0F1328C07; Tue, 25 Jun 2019 15:00:05 +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=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8711D28BB6 for ; Tue, 25 Jun 2019 15:00:05 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hfmty-0004GQ-AG; Tue, 25 Jun 2019 14:58:30 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hfmtx-0004GL-0h for xen-devel@lists.xenproject.org; Tue, 25 Jun 2019 14:58:29 +0000 X-Inumbo-ID: aff776a3-9759-11e9-8980-bc764e045a96 Received: from esa6.hc3370-68.iphmx.com (unknown [216.71.155.175]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id aff776a3-9759-11e9-8980-bc764e045a96; Tue, 25 Jun 2019 14:58:27 +0000 (UTC) Authentication-Results: esa6.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=andrew.cooper3@citrix.com; spf=Pass smtp.mailfrom=Andrew.Cooper3@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: None (esa6.hc3370-68.iphmx.com: no sender authenticity information available from domain of andrew.cooper3@citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa6.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="andrew.cooper3@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa6.hc3370-68.iphmx.com: domain of Andrew.Cooper3@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa6.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="Andrew.Cooper3@citrix.com"; x-conformance=sidf_compatible; x-record-type="v=spf1"; x-record-text="v=spf1 ip4:209.167.231.154 ip4:178.63.86.133 ip4:195.66.111.40/30 ip4:85.115.9.32/28 ip4:199.102.83.4 ip4:192.28.146.160 ip4:192.28.146.107 ip4:216.52.6.88 ip4:216.52.6.188 ip4:162.221.158.21 ip4:162.221.156.83 ~all" Received-SPF: None (esa6.hc3370-68.iphmx.com: no sender authenticity information available from domain of postmaster@mail.citrix.com) identity=helo; client-ip=162.221.158.21; receiver=esa6.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: DzvAelj4n+h43jA4j0B7rABQjUoixDYL20gdqWreUao6lSml24KfvJizOpkvFj9eEd93AfIGW5 cxtD2/ojmFw+QEIlRT5w8BriSj3xdDWxjRsUbE6rOnP4yk2dCQF2CU5vT2YLeIUjsz9sIBsvFF 2m3DMyOWZmMhcIeE9nuEGbcXZu7kOhP/OsBOsNT3Dr81PdLIHQLbRSJ6Ve4H7vOr0ncfDBlFTP E3Jvl/QQuOrfV5llPn4hi4nJTnUMg9UcnzmVH7u21kqgG91NGpg+4aTjF4ejlyBggP1WOxKm22 D/A= X-SBRS: 2.7 X-MesageID: 2205519 X-Ironport-Server: esa6.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.63,416,1557201600"; d="scan'208";a="2205519" From: Andrew Cooper To: Xen-devel Date: Tue, 25 Jun 2019 15:58:23 +0100 Message-ID: <20190625145823.17544-1-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190625144350.6176-1-andrew.cooper3@citrix.com> References: <20190625144350.6176-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [PATCH 4/3] nodemask: Don't opencode cycle_node() X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Stefano Stabellini , Wei Liu , George Dunlap , Andrew Cooper , Julien Grall , Jan Beulich , =?utf-8?q?Roger_Pau_Monn=C3=A9?= Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- CC: Jan Beulich CC: Wei Liu CC: Roger Pau Monné CC: Stefano Stabellini CC: Julien Grall CC: George Dunlap --- xen/arch/x86/numa.c | 4 +--- xen/common/page_alloc.c | 7 ++----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/numa.c b/xen/arch/x86/numa.c index c36c69e842..f7d320f207 100644 --- a/xen/arch/x86/numa.c +++ b/xen/arch/x86/numa.c @@ -192,9 +192,7 @@ void __init numa_init_array(void) if ( cpu_to_node[i] != NUMA_NO_NODE ) continue; numa_set_node(i, rr); - rr = next_node(rr, &node_online_map); - if ( rr == MAX_NUMNODES ) - rr = first_node(&node_online_map); + rr = cycle_node(rr, &node_online_map); } } diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index fe1159b352..8858766c97 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -823,11 +823,8 @@ static struct page_info *get_free_buddy(unsigned int zone_lo, if ( node == NUMA_NO_NODE ) { if ( d != NULL ) - { - node = next_node(d->last_alloc_node, &nodemask); - if ( node >= MAX_NUMNODES ) - node = first_node(&nodemask); - } + node = cycle_node(d->last_alloc_node, &nodemask); + if ( node >= MAX_NUMNODES ) node = cpu_to_node(smp_processor_id()); }