From patchwork Mon Jun 24 18:01:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 11013905 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 6449F1398 for ; Mon, 24 Jun 2019 18:03:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 536CE28BBE for ; Mon, 24 Jun 2019 18:03:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 47E0928BCF; Mon, 24 Jun 2019 18:03:50 +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 A67A528BBE for ; Mon, 24 Jun 2019 18:03:49 +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 1hfTHf-000714-Ti; Mon, 24 Jun 2019 18:01:39 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hfTHe-00070z-Km for xen-devel@lists.xenproject.org; Mon, 24 Jun 2019 18:01:38 +0000 X-Inumbo-ID: 1b8f2146-96aa-11e9-8980-bc764e045a96 Received: from esa4.hc3370-68.iphmx.com (unknown [216.71.155.144]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id 1b8f2146-96aa-11e9-8980-bc764e045a96; Mon, 24 Jun 2019 18:01:36 +0000 (UTC) Authentication-Results: esa4.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 (esa4.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=esa4.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="andrew.cooper3@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa4.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=esa4.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 (esa4.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=esa4.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: NWmnsHNpKqb7UJbR0aoYgDSObe7MrrvVJprpbP/PSaVjKe9ILHxGLkJMrT0AihgWRS206sC/Qz jelUPnyl8yBO/aaCUO6LZlbNn54etZfEhLhlVDmv8YG4kAKf6NRCpFf0M0wa2H3xPcY5Zr7bDG nWIjQlvbYMwFlDI8q3wfbsMHzWrLyVO7Qz04AqjW8D80RPBQL0ERCjJLMajl2MpB3pHlvWpUjQ EXQHWp9KKpUb4dDTKd+bM6UETalQPRgmG3zw0IW+cSdvvSzfUa1iBm1jUqEAC+lpfO6fhpMLyD CEw= X-SBRS: 2.7 X-MesageID: 2180712 X-Ironport-Server: esa4.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.63,412,1557201600"; d="scan'208";a="2180712" From: Andrew Cooper To: Xen-devel Date: Mon, 24 Jun 2019 19:01:27 +0100 Message-ID: <20190624180128.5328-1-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 Subject: [Xen-devel] [PATCH] page-alloc: Clamp get_free_buddy() to online nodes 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 d->node_affinity defaults to NODE_MASK_ALL which has bits set outside of node_online_map. This in turn causes the loop in get_free_buddy() to waste effort iterating over offline nodes. Always clamp d->node_affinity to node_online_map when in use. This in turn involves implementing nodes_copy() which was previously missing. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- CC: Jan Beulich CC: Wei Liu CC: Roger Pau Monné CC: Stefano Stabellini CC: Julien Grall CC: George Dunlap This patch hides the issue identified in the "UBSAN report in find_next_bit()" so probably doesn't want applying until that is resolved. A lower overhead option would be to do: nodes_and(nodemask, node_online_map, d ? d->node_affinity : node_online_map); however this doesn't work because the nodeset_t API has a hidden &(param) throughout the API. I've got half a mind to undo this nonsense and have nodemask_t work in exactly the same way as cpumask_t. --- xen/common/page_alloc.c | 7 ++++++- xen/include/xen/nodemask.h | 6 ++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 7825fd8c42..cec1b15d5b 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -811,11 +811,16 @@ static struct page_info *get_free_buddy(unsigned int zone_lo, const struct domain *d) { nodeid_t first_node, node = MEMF_get_node(memflags), req_node = node; - nodemask_t nodemask = d ? d->node_affinity : node_online_map; + nodemask_t nodemask; unsigned int j, zone, nodemask_retry = 0; struct page_info *pg; bool use_unscrubbed = (memflags & MEMF_no_scrub); + /* Clamp nodemask to node_online_map and optionally d->node_affinity. */ + nodes_copy(nodemask, node_online_map); + if ( d ) + nodes_and(nodemask, nodemask, d->node_affinity); + if ( node == NUMA_NO_NODE ) { if ( d != NULL ) diff --git a/xen/include/xen/nodemask.h b/xen/include/xen/nodemask.h index e287399352..e83cfe2439 100644 --- a/xen/include/xen/nodemask.h +++ b/xen/include/xen/nodemask.h @@ -189,6 +189,12 @@ static inline int __nodes_weight(const nodemask_t *srcp, int nbits) return bitmap_weight(srcp->bits, nbits); } +#define nodes_copy(dst, src) __nodes_copy(&(dst), &(src)) +static inline void __nodes_copy(nodemask_t *dst, nodemask_t *src) +{ + return bitmap_copy(dst->bits, src->bits, MAX_NUMNODES); +} + #define nodes_shift_right(dst, src, n) \ __nodes_shift_right(&(dst), &(src), (n), MAX_NUMNODES) static inline void __nodes_shift_right(nodemask_t *dstp,