From patchwork Wed Jul 31 06:42:12 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wanlong Gao X-Patchwork-Id: 263593 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C80C12C009F for ; Wed, 31 Jul 2013 16:43:02 +1000 (EST) Received: from localhost ([::1]:54663 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V4Q7g-0002fS-Oa for incoming@patchwork.ozlabs.org; Wed, 31 Jul 2013 02:43:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56210) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V4Q71-0002YN-Hc for qemu-devel@nongnu.org; Wed, 31 Jul 2013 02:42:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V4Q6w-0002Mu-SJ for qemu-devel@nongnu.org; Wed, 31 Jul 2013 02:42:19 -0400 Received: from [222.73.24.84] (port=40916 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V4Q6w-0002Jh-GU for qemu-devel@nongnu.org; Wed, 31 Jul 2013 02:42:14 -0400 X-IronPort-AV: E=Sophos;i="4.89,785,1367942400"; d="scan'208";a="8074952" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 31 Jul 2013 14:39:03 +0800 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id r6V6g28H009396; Wed, 31 Jul 2013 14:42:03 +0800 Received: from G08FNSTD121251.fnst.cn.fujitsu.com ([10.167.226.75]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2013073114395006-281719 ; Wed, 31 Jul 2013 14:39:50 +0800 From: Wanlong Gao To: qemu-devel@nongnu.org Date: Wed, 31 Jul 2013 14:42:12 +0800 Message-Id: <1375252936-28496-8-git-send-email-gaowanlong@cn.fujitsu.com> X-Mailer: git-send-email 1.8.4.rc0.11.g35f5eaa In-Reply-To: <1375252936-28496-1-git-send-email-gaowanlong@cn.fujitsu.com> References: <1375252936-28496-1-git-send-email-gaowanlong@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/07/31 14:39:50, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/07/31 14:39:51, Serialize complete at 2013/07/31 14:39:51 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 222.73.24.84 Cc: aliguori@us.ibm.com, ehabkost@redhat.com, lersek@redhat.com, peter.huangpeng@huawei.com, lcapitulino@redhat.com, bsd@redhat.com, hutao@cn.fujitsu.com, y-goto@jp.fujitsu.com, pbonzini@redhat.com, afaerber@suse.de, gaowanlong@cn.fujitsu.com Subject: [Qemu-devel] [PATCH V7 07/11] NUMA: set guest numa nodes memory policy X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Set the guest numa nodes memory policies using the mbind(2) system call node by node. After this patch, we are able to set guest nodes memory policies through the QEMU options, this arms to solve the guest cross nodes memory access performance issue. And as you all know, if PCI-passthrough is used, direct-attached-device uses DMA transfer between device and qemu process. All pages of the guest will be pinned by get_user_pages(). KVM_ASSIGN_PCI_DEVICE ioctl kvm_vm_ioctl_assign_device() =>kvm_assign_device() => kvm_iommu_map_memslots() => kvm_iommu_map_pages() => kvm_pin_pages() So, with direct-attached-device, all guest page's page count will be +1 and any page migration will not work. AutoNUMA won't too. So, we should set the guest nodes memory allocation policies before the pages are really mapped. Signed-off-by: Andre Przywara Signed-off-by: Wanlong Gao --- numa.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/numa.c b/numa.c index 436b8e0..b2c0048 100644 --- a/numa.c +++ b/numa.c @@ -28,6 +28,16 @@ #include "qapi-visit.h" #include "qapi/opts-visitor.h" #include "qapi/dealloc-visitor.h" +#include "exec/memory.h" + +#ifdef CONFIG_NUMA +#include +#include +#ifndef MPOL_F_RELATIVE_NODES +#define MPOL_F_RELATIVE_NODES (1 << 14) +#define MPOL_F_STATIC_NODES (1 << 15) +#endif +#endif QemuOptsList qemu_numa_opts = { .name = "numa", @@ -209,6 +219,78 @@ void set_numa_nodes(void) } } +#ifdef CONFIG_NUMA +static int node_parse_bind_mode(unsigned int nodeid) +{ + int bind_mode; + + switch (numa_info[nodeid].policy) { + case NUMA_NODE_POLICY_MEMBIND: + bind_mode = MPOL_BIND; + break; + case NUMA_NODE_POLICY_INTERLEAVE: + bind_mode = MPOL_INTERLEAVE; + break; + case NUMA_NODE_POLICY_PREFERRED: + bind_mode = MPOL_PREFERRED; + break; + case NUMA_NODE_POLICY_DEFAULT: + default: + bind_mode = MPOL_DEFAULT; + return bind_mode; + } + + bind_mode |= numa_info[nodeid].relative ? + MPOL_F_RELATIVE_NODES : MPOL_F_STATIC_NODES; + + return bind_mode; +} +#endif + +static int set_node_mem_policy(int nodeid) +{ +#ifdef CONFIG_NUMA + void *ram_ptr; + RAMBlock *block; + ram_addr_t len, ram_offset = 0; + int bind_mode; + int i; + + QTAILQ_FOREACH(block, &ram_list.blocks, next) { + if (!strcmp(block->mr->name, "pc.ram")) { + break; + } + } + + if (block->host == NULL) { + return -1; + } + + ram_ptr = block->host; + for (i = 0; i < nodeid; i++) { + len = numa_info[i].node_mem; + ram_offset += len; + } + + len = numa_info[i].node_mem; + bind_mode = node_parse_bind_mode(i); + + /* This is a workaround for a long standing bug in Linux' + * mbind implementation, which cuts off the last specified + * node. To stay compatible should this bug be fixed, we + * specify one more node and zero this one out. + */ + clear_bit(numa_num_configured_nodes() + 1, numa_info[i].host_mem); + if (mbind(ram_ptr + ram_offset, len, bind_mode, + numa_info[i].host_mem, numa_num_configured_nodes() + 1, 0)) { + perror("mbind"); + return -1; + } +#endif + + return 0; +} + void set_numa_modes(void) { CPUState *cpu; @@ -221,4 +303,11 @@ void set_numa_modes(void) } } } + + for (i = 0; i < nb_numa_nodes; i++) { + if (set_node_mem_policy(i) == -1) { + fprintf(stderr, + "qemu: can not set host memory policy for node%d\n", i); + } + } }