From patchwork Thu Feb 14 10:42:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?SsO8cmdlbiBHcm/Dnw==?= X-Patchwork-Id: 10812397 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 CF4FE13A4 for ; Thu, 14 Feb 2019 10:42:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BDBAD2D693 for ; Thu, 14 Feb 2019 10:42:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B19152D699; Thu, 14 Feb 2019 10:42:52 +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 2F37F2D693 for ; Thu, 14 Feb 2019 10:42:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0F34D8E0002; Thu, 14 Feb 2019 05:42:47 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 077718E0001; Thu, 14 Feb 2019 05:42:46 -0500 (EST) 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 E09A88E0002; Thu, 14 Feb 2019 05:42:46 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by kanga.kvack.org (Postfix) with ESMTP id 79D368E0001 for ; Thu, 14 Feb 2019 05:42:46 -0500 (EST) Received: by mail-ed1-f72.google.com with SMTP id y91so2304962edy.21 for ; Thu, 14 Feb 2019 02:42:46 -0800 (PST) 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=LbJTBwht9poXC7QUGnhBvoZkF3UNcARyj+Ip1dZ+wro=; b=f56Z4Duf3NsYIe44yjCcwPGdrw9z6wiaNoAG5AMueCRS9yuZ1EaoXaK5STfvMHbn33 H6XfKiyEcUT2I5stC01W6/mTdImUCr/aam2EawvusDJIxv9sERXw56pgzMWrum0kW8zO Uj/W+sfoRIiv9Q3q302BRudgzzfFgiWiEZM2DYcGvFSkKwtpN9ukK/pMPDj9H+nuQnon pHaxkGio92SlHz7QeOJiHV8dXECrm3qiQZRuZhM35+btF+YHC2PMgGnc69zMFW8+6pte R6Z52UXScrcJS+ApsF3R6FgzCsH0/xsBHMuodKlr3ktmKvftgeJkp0nV8Ag6QXyVRdIO 7jEw== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of jgross@suse.com designates 195.135.220.15 as permitted sender) smtp.mailfrom=jgross@suse.com X-Gm-Message-State: AHQUAubNLQXW+VamLOV2WMRrAoSviV+2s2iP3Hlb99zuTTdxAudV+6Kt 7ArpO1yfKblf9ett2V3WdtC/R+hl2f7INCsf/QWblCf9id7lVE1uQbniw+LVPfD+l3H27L6d3WG V0CCmp6fmrdzETDXVSM0O8H0wdwb8qxwUd3wdVi/yizkIYueenR/bFydNA1zq6Naxwg== X-Received: by 2002:a50:c2d9:: with SMTP id u25mr2532592edf.280.1550140965935; Thu, 14 Feb 2019 02:42:45 -0800 (PST) X-Google-Smtp-Source: AHgI3IaszyVfzVr88t+Q6l0KRpqcF9NaUjfTK9YqIgjmzSVbX22f/mYyLm//djar9iP+wCSiYrkZ X-Received: by 2002:a50:c2d9:: with SMTP id u25mr2532522edf.280.1550140964678; Thu, 14 Feb 2019 02:42:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550140964; cv=none; d=google.com; s=arc-20160816; b=UHjio89Uz13X7uOlaDArmM+EYf4y3kzbFj3xSj4N24ilV4ZmVT3kdI2qf5TbUdL1iu 1x6D6+75wn/SvxIIRoO6QIX4WKsCuP7cRPYudk7JmsmOIBcW6v6HsUkJcgbIMl/EwWIP aN+iflAyXTEms/hps08N06WNiT+dvPGROD+qjZcQg2KdJTBMefHjyuJUtdbgk+oKHfjT gWOdkg4HfwDtXM4Csw9URUS5R6VP6W/4gLQJLdoqbZcVX+QZSsftvBB4/8yhqIOxfTzx Lz/1CctQkyjmX41XP+kIeSZbjDymfuByrxxy7GYrAvXlfDJtKAgBR3jsV+U0iwe0lHmF U+bw== 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; bh=LbJTBwht9poXC7QUGnhBvoZkF3UNcARyj+Ip1dZ+wro=; b=EdGtNDKGG3OkzWFhzDQQZN3fLpn9ym62iSmKjuzOzgn255oQKxWNrf2kNOwJ+iN4j+ aNwj7Serzc+9/W5GYg05WwgPo0u/cROhwIcMTbEYakEYSCt6E23rlDhVJON36H0vRwix r1zkc2g39IY6svOYA5OD28kVu+RfdImjpg7fjZ5UCoENPdkczJlJalxhgyutJ56DwOpL FZN4f8OEPb0ALvBzMRmvvLrozb7kFNpBat6FvFLqBoTJBFnSj/kDSu8UvXJzQAiDSIZK VLG789uaEXYj2lp0bWPUCkBJcg1mcmpyTGgK4AqrQjx0KpEzz9bVMdM4s7sikogTYHWB AP4A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of jgross@suse.com designates 195.135.220.15 as permitted sender) smtp.mailfrom=jgross@suse.com Received: from mx1.suse.de (mx2.suse.de. [195.135.220.15]) by mx.google.com with ESMTPS id ka14si870435ejb.127.2019.02.14.02.42.44 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Feb 2019 02:42:44 -0800 (PST) Received-SPF: pass (google.com: domain of jgross@suse.com designates 195.135.220.15 as permitted sender) client-ip=195.135.220.15; Authentication-Results: mx.google.com; spf=pass (google.com: domain of jgross@suse.com designates 195.135.220.15 as permitted sender) smtp.mailfrom=jgross@suse.com X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 375FDB0BE; Thu, 14 Feb 2019 10:42:44 +0000 (UTC) From: Juergen Gross To: linux-kernel@vger.kernel.org, xen-devel@lists.xenproject.org, x86@kernel.org, linux-mm@kvack.org Cc: boris.ostrovsky@oracle.com, sstabellini@kernel.org, hpa@zytor.com, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, Juergen Gross Subject: [PATCH v3 2/2] x86/xen: dont add memory above max allowed allocation Date: Thu, 14 Feb 2019 11:42:40 +0100 Message-Id: <20190214104240.24428-3-jgross@suse.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20190214104240.24428-1-jgross@suse.com> References: <20190214104240.24428-1-jgross@suse.com> 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: X-Virus-Scanned: ClamAV using ClamSMTP Don't allow memory to be added above the allowed maximum allocation limit set by Xen. Trying to do so would result in cases like the following: [ 584.559652] ------------[ cut here ]------------ [ 584.564897] WARNING: CPU: 2 PID: 1 at ../arch/x86/xen/multicalls.c:129 xen_alloc_pte+0x1c7/0x390() [ 584.575151] Modules linked in: [ 584.578643] Supported: Yes [ 584.581750] CPU: 2 PID: 1 Comm: swapper/0 Not tainted 4.4.120-92.70-default #1 [ 584.590000] Hardware name: Cisco Systems Inc UCSC-C460-M4/UCSC-C460-M4, BIOS C460M4.4.0.1b.0.0629181419 06/29/2018 [ 584.601862] 0000000000000000 ffffffff813175a0 0000000000000000 ffffffff8184777c [ 584.610200] ffffffff8107f4e1 ffff880487eb7000 ffff8801862b79c0 ffff88048608d290 [ 584.618537] 0000000000487eb7 ffffea0000000201 ffffffff81009de7 ffffffff81068561 [ 584.626876] Call Trace: [ 584.629699] [] dump_trace+0x59/0x340 [ 584.635645] [] show_stack_log_lvl+0xea/0x170 [ 584.642391] [] show_stack+0x21/0x40 [ 584.648238] [] dump_stack+0x5c/0x7c [ 584.654085] [] warn_slowpath_common+0x81/0xb0 [ 584.660932] [] xen_alloc_pte+0x1c7/0x390 [ 584.667289] [] pmd_populate_kernel.constprop.6+0x40/0x80 [ 584.675241] [] phys_pmd_init+0x210/0x255 [ 584.681587] [] phys_pud_init+0x1da/0x247 [ 584.687931] [] kernel_physical_mapping_init+0xf5/0x1d4 [ 584.695682] [] init_memory_mapping+0x18d/0x380 [ 584.702631] [] arch_add_memory+0x59/0xf0 Signed-off-by: Juergen Gross Reviewed-by: Boris Ostrovsky --- arch/x86/xen/setup.c | 13 +++++++++++++ drivers/xen/xen-balloon.c | 11 +++++++++++ include/xen/xen.h | 4 ++++ 3 files changed, 28 insertions(+) diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c index d5f303c0e656..0e770f5e5e8c 100644 --- a/arch/x86/xen/setup.c +++ b/arch/x86/xen/setup.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include @@ -589,6 +590,14 @@ static void __init xen_align_and_add_e820_region(phys_addr_t start, if (type == E820_TYPE_RAM) { start = PAGE_ALIGN(start); end &= ~((phys_addr_t)PAGE_SIZE - 1); +#ifdef CONFIG_MEMORY_HOTPLUG + /* + * Don't allow adding memory not in E820 map while booting the + * system. Once the balloon driver is up it will remove that + * restriction again. + */ + max_mem_size = end; +#endif } e820__range_add(start, end - start, type); @@ -748,6 +757,10 @@ char * __init xen_memory_setup(void) memmap.nr_entries = ARRAY_SIZE(xen_e820_table.entries); set_xen_guest_handle(memmap.buffer, xen_e820_table.entries); +#ifdef CONFIG_MEMORY_HOTPLUG + xen_saved_max_mem_size = max_mem_size; +#endif + op = xen_initial_domain() ? XENMEM_machine_memory_map : XENMEM_memory_map; diff --git a/drivers/xen/xen-balloon.c b/drivers/xen/xen-balloon.c index 2acbfe104e46..a67236b02452 100644 --- a/drivers/xen/xen-balloon.c +++ b/drivers/xen/xen-balloon.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include @@ -50,6 +51,10 @@ #define BALLOON_CLASS_NAME "xen_memory" +#ifdef CONFIG_MEMORY_HOTPLUG +u64 xen_saved_max_mem_size = 0; +#endif + static struct device balloon_dev; static int register_balloon(struct device *dev); @@ -63,6 +68,12 @@ static void watch_target(struct xenbus_watch *watch, static bool watch_fired; static long target_diff; +#ifdef CONFIG_MEMORY_HOTPLUG + /* The balloon driver will take care of adding memory now. */ + if (xen_saved_max_mem_size) + max_mem_size = xen_saved_max_mem_size; +#endif + err = xenbus_scanf(XBT_NIL, "memory", "target", "%llu", &new_target); if (err != 1) { /* This is ok (for domain0 at least) - so just return */ diff --git a/include/xen/xen.h b/include/xen/xen.h index 0e2156786ad2..d8f1ab43ab56 100644 --- a/include/xen/xen.h +++ b/include/xen/xen.h @@ -46,4 +46,8 @@ struct bio_vec; bool xen_biovec_phys_mergeable(const struct bio_vec *vec1, const struct bio_vec *vec2); +#ifdef CONFIG_MEMORY_HOTPLUG +extern u64 xen_saved_max_mem_size; +#endif + #endif /* _XEN_XEN_H */