From patchwork Thu Mar 5 10:20:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boaz Harrosh X-Patchwork-Id: 5944481 Return-Path: X-Original-To: patchwork-linux-nvdimm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 6D17A9F36A for ; Thu, 5 Mar 2015 10:20:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 620B9202F8 for ; Thu, 5 Mar 2015 10:20:14 +0000 (UTC) Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 619D02037F for ; Thu, 5 Mar 2015 10:20:13 +0000 (UTC) Received: from ml01.vlan14.01.org (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 43CCB81193; Thu, 5 Mar 2015 02:20:13 -0800 (PST) X-Original-To: linux-nvdimm@lists.01.org Delivered-To: linux-nvdimm@lists.01.org Received: from mail-wg0-f42.google.com (mail-wg0-f42.google.com [74.125.82.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id DC36481193 for ; Thu, 5 Mar 2015 02:20:11 -0800 (PST) Received: by wggx13 with SMTP id x13so12190882wgg.4 for ; Thu, 05 Mar 2015 02:20:10 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:date:from:user-agent:mime-version:to :cc:subject:references:in-reply-to:content-type :content-transfer-encoding; bh=j+hY9PMa8l22LABHPqgIXyfANEyPVcutxJoLa19nLjU=; b=G7XhYmBBkdbuosoOSYtA1rIwDTWDRHqdtpSgXiChDZUGfhV+L8MSqdTvGOtJUEEdj4 8xttmAHM6cLmgupzg3UaBzaereGRs+zQ426y/G6P77vvESHxu7xqxfE7nt5FhA4AY63a +3kbhE2yuvcgjTpmbS2Qd1SBqVFWeNgAqHuaPpyPKmyPjO7TdhY1pHZMezqNaGmVrDeL laSNExLxUdQsNSO4+XDFPGmQNRN7hix5MZ683hJe3uKGRRLAY1Iz/Q3rqoGrb8QwCiHW GL7YsIRPFYPDB3OUq2SxPjLTmHL1O1MXrHgK0OdMgfTJvrucYHCDADiEhJA68P0QOPOu 17ug== X-Gm-Message-State: ALoCoQmzF+h3EJuuCNtPg+T2qDEyZFTztpASAfMDmJ2tBsQ8JUrBJR29ZqnvS+DP/0nk+FLrXmEo X-Received: by 10.194.89.163 with SMTP id bp3mr16365120wjb.145.1425550810386; Thu, 05 Mar 2015 02:20:10 -0800 (PST) Received: from [10.0.0.5] ([207.232.55.62]) by mx.google.com with ESMTPSA id dj5sm9823655wjb.28.2015.03.05.02.20.08 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Mar 2015 02:20:09 -0800 (PST) Message-ID: <54F82DD7.90600@plexistor.com> Date: Thu, 05 Mar 2015 12:20:07 +0200 From: Boaz Harrosh User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0 MIME-Version: 1.0 To: Ingo Molnar , x86@kernel.org, linux-kernel , "Roger C. Pao" , Dan Williams , Thomas Gleixner , linux-nvdimm , "H. Peter Anvin" , Matthew Wilcox , Andy Lutomirski , Christoph Hellwig References: <54F82CE0.4040502@plexistor.com> In-Reply-To: <54F82CE0.4040502@plexistor.com> Subject: [Linux-nvdimm] [PATCH 1/3] e820: Don't let unknown DIMM type come out BUSY X-BeenThere: linux-nvdimm@lists.01.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Linux-nvdimm developer list." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP There is something not very nice (Gentlemen nice) In current e820.c code. At Multiple places for example @memblock_x86_fill() it will add the different memory resources *except the E820_RESERVED type* Then at e820_reserve_resources() it will mark all !E820_RESERVED as busy. This is all fine when we have only the known types one of: E820_RESERVED_KERN: E820_RAM: E820_ACPI: E820_NVS: E820_UNUSABLE: E820_RESERVED: But if the system encounters a brand new memory type it will not add it to any memory list, But will proceed to mark it BUSY. So now any other Driver in the system that does know how to deal with this new type, is not able to call request_mem_region_exclusive() on this new type because it is hard coded BUSY even though nothing really uses it. So make any unknown type behave like E820_RESERVED memory, it will show up as available to first caller of request_mem_region_exclusive(). I Also change the string representation of an unknown type from "reserved" (So to not confuse with memmap "reserved" region). And call it "reserved-unknown" I wish I could return "reserved-type-X" But this is not possible because one must return a constant, code-segment, string. (NOTE: These unknown-types where called "reserved" in /proc/iomem and in dmesg but behaved differently. What this patch does is name them differently but let them behave the same) By Popular demand An Extra WARNING message is printed if an "UNKNOWN" is found. It will look like this: e820: WARNING [mem 0x100000000-0x1ffffffff] is unknown type 12 An example of such "UNKNOWN" type is the not Standard type-12 DDR3-NvDIMM which is used by multiple vendors for a while now. (Estimated 100ds of thousands sold world wide) CC: Thomas Gleixner CC: Ingo Molnar CC: "H. Peter Anvin" CC: x86@kernel.org CC: Dan Williams CC: Matthew Wilcox CC: Christoph Hellwig CC: Andy Lutomirski Signed-off-by: Boaz Harrosh --- arch/x86/kernel/e820.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c index 46201de..c3a11cd 100644 --- a/arch/x86/kernel/e820.c +++ b/arch/x86/kernel/e820.c @@ -104,6 +104,21 @@ int __init e820_all_mapped(u64 start, u64 end, unsigned type) return 0; } +static bool _is_unknown_type(int e820_type) +{ + switch (e820_type) { + case E820_RESERVED_KERN: + case E820_RAM: + case E820_ACPI: + case E820_NVS: + case E820_UNUSABLE: + case E820_RESERVED: + return false; + default: + return true; + } +} + /* * Add a memory region to the kernel e820 map. */ @@ -119,6 +134,11 @@ static void __init __e820_add_region(struct e820map *e820x, u64 start, u64 size, return; } + if (unlikely(_is_unknown_type(type))) + pr_warn("e820: WARNING [mem %#010llx-%#010llx] is unknown type %d\n", + (unsigned long long) start, + (unsigned long long) (start + size - 1), type); + e820x->map[x].addr = start; e820x->map[x].size = size; e820x->map[x].type = type; @@ -907,10 +927,16 @@ static inline const char *e820_type_to_string(int e820_type) case E820_ACPI: return "ACPI Tables"; case E820_NVS: return "ACPI Non-volatile Storage"; case E820_UNUSABLE: return "Unusable memory"; - default: return "reserved"; + case E820_RESERVED: return "reserved"; + default: return "reserved-unknown"; } } +static bool _is_reserved_type(int e820_type) +{ + return (e820_type == E820_RESERVED) || _is_unknown_type(e820_type); +} + /* * Mark e820 reserved areas as busy for the resource manager. */ @@ -940,7 +966,8 @@ void __init e820_reserve_resources(void) * pci device BAR resource and insert them later in * pcibios_resource_survey() */ - if (e820.map[i].type != E820_RESERVED || res->start < (1ULL<<20)) { + if (!_is_reserved_type(e820.map[i].type) || + res->start < (1ULL<<20)) { res->flags |= IORESOURCE_BUSY; insert_resource(&iomem_resource, res); }