From patchwork Wed Jan 16 18:19:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Hansen X-Patchwork-Id: 10766693 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 556C41880 for ; Wed, 16 Jan 2019 18:26:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 47CF72F3E1 for ; Wed, 16 Jan 2019 18:26:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3BBFC2F3F5; Wed, 16 Jan 2019 18:26:06 +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=unavailable 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 C1C772F3E1 for ; Wed, 16 Jan 2019 18:26:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 18B3F8E0016; Wed, 16 Jan 2019 13:25:44 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 10ED08E0004; Wed, 16 Jan 2019 13:25:44 -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 EA2818E0016; Wed, 16 Jan 2019 13:25:43 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f200.google.com (mail-pg1-f200.google.com [209.85.215.200]) by kanga.kvack.org (Postfix) with ESMTP id A8DBE8E0004 for ; Wed, 16 Jan 2019 13:25:43 -0500 (EST) Received: by mail-pg1-f200.google.com with SMTP id q62so4395703pgq.9 for ; Wed, 16 Jan 2019 10:25:43 -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:subject:to:cc :from:date:references:in-reply-to:message-id; bh=Cw56qJD87uy/pg1Cu85XBjBCwAnxWxaIy0eAzSm3c2Q=; b=GtMc/KHbdMjTrqsuPy1LxkL2x3fOM3zrwW0zLLPtgvZ2lK71afEhWlxY3D1U0VYiyS prFcn7/GLpfp6lypfE3I3vh5azjE6GhB9Uo+fRGzk7kH8eGpHnMOzZhlngp/SyuZJTdY MWK2bmlUQufvdBwtU4VxJzicl0q/Dzw2f1SBx+pz6xocESmWTPDXef3zxblbstZiZs9i 9gaTkjP/qrGItIbrC3uBWrunBMeY0nvmuZzv9ar3MsUIse80WxWjhjLH1gWHwuCDUZ1D a9BJ2B4Pj0b1CURPKzwV1Ryn13SVNed7mwrNAXJ72Avhhlvc70AYilFEZZODYtCcbsZM AXzQ== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of dave.hansen@linux.intel.com designates 134.134.136.31 as permitted sender) smtp.mailfrom=dave.hansen@linux.intel.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Gm-Message-State: AJcUukcYsONShj/ZAsXLJuhmXNOGLs4l3ldeQK5cZXpZriAsJeQjEySV SkSGIs1hfC99RwYORMv6KyzvCY4eSyxjXkUuYjntgc3dn9BgQnj7jdj9ohPqlDuUb3cQNQ+B6a1 r2BRJXooF1em3FS4OV38+O1A0cnOI8Rt6Ih+lP6rls3ZkWZjwbyLwra7ISpEo+8oVjg== X-Received: by 2002:a65:448a:: with SMTP id l10mr10055659pgq.387.1547663143334; Wed, 16 Jan 2019 10:25:43 -0800 (PST) X-Google-Smtp-Source: ALg8bN6xZiRVyx0HcxbV1FdnxIELbr4jg9BigWRJnMMx7JitARLAJ6m19cssJ/FF7I/Rc9Ws1zjS X-Received: by 2002:a65:448a:: with SMTP id l10mr10055613pgq.387.1547663142418; Wed, 16 Jan 2019 10:25:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547663142; cv=none; d=google.com; s=arc-20160816; b=G7mF2EVHRS+51kVZlVMw+F/7sMESPheRIHgHoCwCzzn6dknjp17jN/wSoApOUYGiBd lM596a29824q1HsvqBgHTG0T2bNzDdLZDcBns7eUObouBQTGNL+RfMuW3XBwKFbKO/Nn JcgsLvy/YOsAAvfk+fA4WGMGfoURnKIzpr6Pia9ynsjvJ7Oo71rJWSbZCCTznU4BXYdH ZATKdyiOuKjEygxyy46+fW7jm1IUYFo0kIPtp5FoEprPihWmavYFkdlD9nFnRy1O2kdu AkFKMCMb/0Z84/pA3swltLQn10dM5r+IHnRvswdE8gMNzBAnpj4sHYaAymhMX62f3Kk+ oYoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:in-reply-to:references:date:from:cc:to:subject; bh=Cw56qJD87uy/pg1Cu85XBjBCwAnxWxaIy0eAzSm3c2Q=; b=Lz/KDA4yElljhMgghx0VgMxWzSlEVc4LjolwuHMSz4MgJs2y/Z9WByCWBpDtdnc3KB P2put/K08wja0zFf2/suaolw2gGP808gTzgzZeCYjl/am0fcvQphQuPH8RhJx21dLNy2 FMWY0PHqEmxpxFnUONdlFWXIBuQDWG2U4yXummPm33JxO519tYyXF7yxbXPkTDK1a1KL OEu8dv6F1h7gRG2w3te8Kw7GtYebCjzBKms8rkhCiG/Qyp5TQppmEuhDHfeyUN5L8UXq 21zezuNSOXb+0X/Y5BCWS4Vuo38RGUyUP/FB5IQPe2mah7ENCgM7ZRmfhySxbv6dkFPa 5P5w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of dave.hansen@linux.intel.com designates 134.134.136.31 as permitted sender) smtp.mailfrom=dave.hansen@linux.intel.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga06.intel.com (mga06.intel.com. [134.134.136.31]) by mx.google.com with ESMTPS id v20si6754250pgk.103.2019.01.16.10.25.42 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Jan 2019 10:25:42 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dave.hansen@linux.intel.com designates 134.134.136.31 as permitted sender) client-ip=134.134.136.31; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of dave.hansen@linux.intel.com designates 134.134.136.31 as permitted sender) smtp.mailfrom=dave.hansen@linux.intel.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 16 Jan 2019 10:25:41 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,487,1539673200"; d="scan'208";a="292082790" Received: from viggo.jf.intel.com (HELO localhost.localdomain) ([10.54.77.144]) by orsmga005.jf.intel.com with ESMTP; 16 Jan 2019 10:25:41 -0800 Subject: [PATCH 3/4] dax/kmem: let walk_system_ram_range() search child resources To: dave@sr71.net Cc: Dave Hansen ,dan.j.williams@intel.com,dave.jiang@intel.com,zwisler@kernel.org,vishal.l.verma@intel.com,thomas.lendacky@amd.com,akpm@linux-foundation.org,mhocko@suse.com,linux-nvdimm@lists.01.org,linux-kernel@vger.kernel.org,linux-mm@kvack.org,ying.huang@intel.com,fengguang.wu@intel.com,bp@suse.de,bhelgaas@google.com,baiyaowei@cmss.chinamobile.com,tiwai@suse.de From: Dave Hansen Date: Wed, 16 Jan 2019 10:19:04 -0800 References: <20190116181859.D1504459@viggo.jf.intel.com> In-Reply-To: <20190116181859.D1504459@viggo.jf.intel.com> Message-Id: <20190116181904.D24AF5FE@viggo.jf.intel.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 From: Dave Hansen In the process of onlining memory, we use walk_system_ram_range() to find the actual RAM areas inside of the area being onlined. However, it currently only finds memory resources which are "top-level" iomem_resources. Children are not currently searched which causes it to skip System RAM in areas like this (in the format of /proc/iomem): a0000000-bfffffff : Persistent Memory (legacy) a0000000-afffffff : System RAM Changing the true->false here allows children to be searched as well. We need this because we add a new "System RAM" resource underneath the "persistent memory" resource when we use persistent memory in a volatile mode. Cc: Dan Williams Cc: Dave Jiang Cc: Ross Zwisler Cc: Vishal Verma Cc: Tom Lendacky Cc: Andrew Morton Cc: Michal Hocko Cc: linux-nvdimm@lists.01.org Cc: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org Cc: Huang Ying Cc: Fengguang Wu Signed-off-by: Dave Hansen --- b/kernel/resource.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff -puN kernel/resource.c~mm-walk_system_ram_range-search-child-resources kernel/resource.c --- a/kernel/resource.c~mm-walk_system_ram_range-search-child-resources 2018-12-20 11:48:42.824771932 -0800 +++ b/kernel/resource.c 2018-12-20 11:48:42.827771932 -0800 @@ -445,6 +445,9 @@ int walk_mem_res(u64 start, u64 end, voi * This function calls the @func callback against all memory ranges of type * System RAM which are marked as IORESOURCE_SYSTEM_RAM and IORESOUCE_BUSY. * It is to be used only for System RAM. + * + * This will find System RAM ranges that are children of top-level resources + * in addition to top-level System RAM resources. */ int walk_system_ram_range(unsigned long start_pfn, unsigned long nr_pages, void *arg, int (*func)(unsigned long, unsigned long, void *)) @@ -460,7 +463,7 @@ int walk_system_ram_range(unsigned long flags = IORESOURCE_SYSTEM_RAM | IORESOURCE_BUSY; while (start < end && !find_next_iomem_res(start, end, flags, IORES_DESC_NONE, - true, &res)) { + false, &res)) { pfn = (res.start + PAGE_SIZE - 1) >> PAGE_SHIFT; end_pfn = (res.end + 1) >> PAGE_SHIFT; if (end_pfn > pfn)