From patchwork Mon Apr 15 15:16:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Busch X-Patchwork-Id: 10901029 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 0C22014DB for ; Mon, 15 Apr 2019 15:15:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E02EC28941 for ; Mon, 15 Apr 2019 15:15:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D44F428947; Mon, 15 Apr 2019 15:15:34 +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 5208928929 for ; Mon, 15 Apr 2019 15:15:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 91E156B0003; Mon, 15 Apr 2019 11:15:31 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 8CF4C6B0007; Mon, 15 Apr 2019 11:15:31 -0400 (EDT) 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 79BD66B0008; Mon, 15 Apr 2019 11:15:31 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) by kanga.kvack.org (Postfix) with ESMTP id 432986B0003 for ; Mon, 15 Apr 2019 11:15:31 -0400 (EDT) Received: by mail-pl1-f197.google.com with SMTP id p11so11508123plr.3 for ; Mon, 15 Apr 2019 08:15:31 -0700 (PDT) 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=dnEZfooHStwnMmAgeATkp6v8buJAv5PcJuj4rl9P134=; b=gEMPeyLxyq50kkOtr//Wh4bN+xSahUpANKtoORO+nVTdhBItbtZmgQC6TO1eoK30Mf 8zWZP+In7kLF9jcv+4Bu26P++x0oqjc/gX08kZhI5wK+2prdzyJYzSFOb29b+gMF6Wh3 82tsePh/ZMGOmnPUCZdN/ZBOSQjLNZBQly4vHhVVq/vGFfa5OMzpBONVFn1D3XB2urEj wTKtGs/irkb1EM9XFIZyc7nwgI7HTPQ8+6lzeltRfakQwf9DBJKW6fExzirZVgeXJMN0 ERs+c5CgkgAiF6Kz8zAVWYpAk85ZiuJaSvcFTPJWKrDD+Rps9b3+x2hn4uecG5DZwhvr biSQ== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of keith.busch@intel.com designates 134.134.136.20 as permitted sender) smtp.mailfrom=keith.busch@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Gm-Message-State: APjAAAWSUqRu+k2gRVT63nH2XRJMchtSKNbQdOxHChVN5YtluatiUITH xTNylyc0UJQEk5/g0njE+WHEIAadXwMnc4YYK32lZHsVT40qi4k17mCJ3417OmNVDJ7djISAkuu AuoLhcy/o4Tmz1671gSyteurPl7pWfBoovEm98WplytXWpH9+RHvPqr4MMertaSsdPA== X-Received: by 2002:a17:902:599c:: with SMTP id p28mr13697901pli.70.1555341330927; Mon, 15 Apr 2019 08:15:30 -0700 (PDT) X-Google-Smtp-Source: APXvYqwSn/1XNh25TMbiOKzGvxg5fIvg1L26zChtOlxSIWDG/NKfSjcCaKdD8LAI5djYlBGwZrcR X-Received: by 2002:a17:902:599c:: with SMTP id p28mr13697818pli.70.1555341330007; Mon, 15 Apr 2019 08:15:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555341330; cv=none; d=google.com; s=arc-20160816; b=TL1vbPIrRsBiv71ATLya9vkJ3y0UL3yEJUBOgG+1h5hQl27JhfIeqleXzXZWCexXMl WfytczWmvNxglbwcSPHGkJoLrKF/QwP2Ndr8N4dmFwk9rYOGqUL1tfSvtByZr67xQts2 HXAyPH2hkC5GqkF1gb8YeAfdnP6UqFGdFLXXH2VxFKnOAfFHE3Bs/zD8LrhM/e7n1+yV AwyP2axFm5w8nquPZvkuKMGjQ9HhvskYYe6wEFE1Sphmylya3dxMInht4R0w97v9XABX W1PKq+kmKa87jX1rp/URjfdj4WUxGQXyxWwo1AMwXXghkLNhcqN9lE75ZP7W/wJYc1So rmSA== 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=dnEZfooHStwnMmAgeATkp6v8buJAv5PcJuj4rl9P134=; b=qq5YhSA8kLQ6glbLCCstAbwIdXQE9TwJZdy9lO1T2ZNM+M2anhiSmxseMeuoV6RNaA mMu9uh2KPJtjHViBzRiI4QsGtgVTYja7wgJVr5a6Fq3PwIIUVEbdQxDz9vHlLd/870e2 i2RlcT+tASatL4B/NMp5Jxz5Nnf3q63mT1mXP7Dvg4RHEiHDRlHo7mQJ/PlaUuG0dAOF M8pf3iklUmydX8HEBR+TL25W3JdXJjA3X6havl7R+9LlaQSWq61ab5qTQTuE7+gy8SIP VukUkdlDhYWEyNjVOPAwyNmKdhGeDP56HDjO3DORSPqNV3r+gd32hJlROqxVNJMlo78F 0luA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of keith.busch@intel.com designates 134.134.136.20 as permitted sender) smtp.mailfrom=keith.busch@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga02.intel.com (mga02.intel.com. [134.134.136.20]) by mx.google.com with ESMTPS id z72si44535592pgd.401.2019.04.15.08.15.29 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Apr 2019 08:15:29 -0700 (PDT) Received-SPF: pass (google.com: domain of keith.busch@intel.com designates 134.134.136.20 as permitted sender) client-ip=134.134.136.20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of keith.busch@intel.com designates 134.134.136.20 as permitted sender) smtp.mailfrom=keith.busch@intel.com; dmarc=pass (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 fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 15 Apr 2019 08:15:29 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,354,1549958400"; d="scan'208";a="149585858" Received: from unknown (HELO localhost.lm.intel.com) ([10.232.112.69]) by FMSMGA003.fm.intel.com with ESMTP; 15 Apr 2019 08:15:28 -0700 From: Keith Busch To: linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, linux-mm@kvack.org Cc: Rafael Wysocki , Dave Hansen , Dan Williams , Brice Goglin , Keith Busch Subject: [PATCHv2 1/2] hmat: Register memory-side cache after parsing Date: Mon, 15 Apr 2019 09:16:53 -0600 Message-Id: <20190415151654.15913-2-keith.busch@intel.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20190415151654.15913-1-keith.busch@intel.com> References: <20190415151654.15913-1-keith.busch@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 Instead of registering the hmat cache attributes in line with parsing the table, save the attributes in the memory target and register them after parsing completes. This will make it easier to register the attributes later when hot add is supported. Signed-off-by: Keith Busch --- drivers/acpi/hmat/hmat.c | 48 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 33 insertions(+), 15 deletions(-) diff --git a/drivers/acpi/hmat/hmat.c b/drivers/acpi/hmat/hmat.c index b7824a0309f7..bdb167c026ff 100644 --- a/drivers/acpi/hmat/hmat.c +++ b/drivers/acpi/hmat/hmat.c @@ -41,6 +41,7 @@ struct memory_target { unsigned int memory_pxm; unsigned int processor_pxm; struct node_hmem_attrs hmem_attrs; + struct node_cache_attrs cache_attrs; }; struct memory_initiator { @@ -314,7 +315,7 @@ static __init int hmat_parse_cache(union acpi_subtable_headers *header, const unsigned long end) { struct acpi_hmat_cache *cache = (void *)header; - struct node_cache_attrs cache_attrs; + struct memory_target *target; u32 attrs; if (cache->header.length < sizeof(*cache)) { @@ -328,37 +329,40 @@ static __init int hmat_parse_cache(union acpi_subtable_headers *header, cache->memory_PD, cache->cache_size, attrs, cache->number_of_SMBIOShandles); - cache_attrs.size = cache->cache_size; - cache_attrs.level = (attrs & ACPI_HMAT_CACHE_LEVEL) >> 4; - cache_attrs.line_size = (attrs & ACPI_HMAT_CACHE_LINE_SIZE) >> 16; + target = find_mem_target(cache->memory_PD); + if (!target) + return 0; + + target->cache_attrs.size = cache->cache_size; + target->cache_attrs.level = (attrs & ACPI_HMAT_CACHE_LEVEL) >> 4; + target->cache_attrs.line_size = (attrs & ACPI_HMAT_CACHE_LINE_SIZE) >> 16; switch ((attrs & ACPI_HMAT_CACHE_ASSOCIATIVITY) >> 8) { case ACPI_HMAT_CA_DIRECT_MAPPED: - cache_attrs.indexing = NODE_CACHE_DIRECT_MAP; + target->cache_attrs.indexing = NODE_CACHE_DIRECT_MAP; break; case ACPI_HMAT_CA_COMPLEX_CACHE_INDEXING: - cache_attrs.indexing = NODE_CACHE_INDEXED; + target->cache_attrs.indexing = NODE_CACHE_INDEXED; break; case ACPI_HMAT_CA_NONE: default: - cache_attrs.indexing = NODE_CACHE_OTHER; + target->cache_attrs.indexing = NODE_CACHE_OTHER; break; } switch ((attrs & ACPI_HMAT_WRITE_POLICY) >> 12) { case ACPI_HMAT_CP_WB: - cache_attrs.write_policy = NODE_CACHE_WRITE_BACK; + target->cache_attrs.write_policy = NODE_CACHE_WRITE_BACK; break; case ACPI_HMAT_CP_WT: - cache_attrs.write_policy = NODE_CACHE_WRITE_THROUGH; + target->cache_attrs.write_policy = NODE_CACHE_WRITE_THROUGH; break; case ACPI_HMAT_CP_NONE: default: - cache_attrs.write_policy = NODE_CACHE_WRITE_OTHER; + target->cache_attrs.write_policy = NODE_CACHE_WRITE_OTHER; break; } - node_add_cache(pxm_to_node(cache->memory_PD), &cache_attrs); return 0; } @@ -577,20 +581,34 @@ static __init void hmat_register_target_initiators(struct memory_target *target) } } +static __init void hmat_register_target_cache(struct memory_target *target) +{ + unsigned mem_nid = pxm_to_node(target->memory_pxm); + node_add_cache(mem_nid, &target->cache_attrs); +} + static __init void hmat_register_target_perf(struct memory_target *target) { unsigned mem_nid = pxm_to_node(target->memory_pxm); node_set_perf_attrs(mem_nid, &target->hmem_attrs, 0); } +static __init void hmat_register_target(struct memory_target *target) +{ + if (!node_online(pxm_to_node(target->memory_pxm))) + return; + + hmat_register_target_initiators(target); + hmat_register_target_cache(target); + hmat_register_target_perf(target); +} + static __init void hmat_register_targets(void) { struct memory_target *target; - list_for_each_entry(target, &targets, node) { - hmat_register_target_initiators(target); - hmat_register_target_perf(target); - } + list_for_each_entry(target, &targets, node) + hmat_register_target(target); } static __init void hmat_free_structures(void) From patchwork Mon Apr 15 15:16:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Busch X-Patchwork-Id: 10901031 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 E1D7A1669 for ; Mon, 15 Apr 2019 15:15:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B6AA228956 for ; Mon, 15 Apr 2019 15:15:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AAEF52898D; Mon, 15 Apr 2019 15:15:37 +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 D814328981 for ; Mon, 15 Apr 2019 15:15:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E02016B0007; Mon, 15 Apr 2019 11:15:32 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id DD8A16B0008; Mon, 15 Apr 2019 11:15:32 -0400 (EDT) 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 CA2DB6B000A; Mon, 15 Apr 2019 11:15:32 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) by kanga.kvack.org (Postfix) with ESMTP id 8C9AF6B0007 for ; Mon, 15 Apr 2019 11:15:32 -0400 (EDT) Received: by mail-pf1-f200.google.com with SMTP id l74so12012552pfb.23 for ; Mon, 15 Apr 2019 08:15:32 -0700 (PDT) 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=ur6Byu3Rimd0aZkjVP49efczYHdI5+wCW7mi8aUocG0=; b=B12lpWx5g9S9QnDg9xf0wcLJGjB0xTIvZIWWT5AVzhLsrBxAKQvfLb7wtc4E+G2nlL f8JsVR/BAjQOp0WYKWsI/bf1Bcb0KNKfF5ZYX7HfIvmaYWiwhHtlznXnPVMEg7npGxHA CIpxogcO9uIIpOwa07E0+SVqADfBW1t/PH132w+F46kwam952x3SZkjvlToj2n9V2tMN FfhPpSRg96WXsXqh4UD1F8nWn6R+bpMjHNBG3x67Uc1KWroNCcU47Y5+CEOkqETDUl47 D/sYNbTeDbOYEK4SuUkT/Lq36gzQPcqlFmC84Ky+2NychZ2mrr+J2C0x+cFVwRyi+D7/ VagA== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of keith.busch@intel.com designates 134.134.136.20 as permitted sender) smtp.mailfrom=keith.busch@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Gm-Message-State: APjAAAV5QW1PeBWYObg8yDJnMYcNj7iHRwjO+Jy9WjnphkzMl/tqSAMo QjfWan26xSTkQtLsTLDrBiHAZo2GRgTPNmkd+jIXGTg8tNrFG+7x5oIOsFCdVI+rO74qkf1RS5o N6RDycY7rtTKPlhre+s7yT/xqTMdfusrTpIDSO5r0q/eaHmEnOHH7vNeRgooYcNqikA== X-Received: by 2002:a63:8e:: with SMTP id 136mr66072065pga.367.1555341332204; Mon, 15 Apr 2019 08:15:32 -0700 (PDT) X-Google-Smtp-Source: APXvYqwWLBR6quxXGqdSHoLPxWx0Rbn9Fuhj2ftD4tge2HSluBSzB4agf5UfRsALR6eRS9c5s/DA X-Received: by 2002:a63:8e:: with SMTP id 136mr66071897pga.367.1555341330395; Mon, 15 Apr 2019 08:15:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555341330; cv=none; d=google.com; s=arc-20160816; b=mvuRbdyZJHWS1y1VBBiMeT8ruCvVsrQlsnmbNmwjjXqMnmBGbpEBvZe10tzCwTEYx3 yCNa3rzpOAyi8PBbwPjQc+ZaZLyUqujEOTpRAqkdP6skkVn0U6l/PDuke7DwlLnByoB2 BxXPzZCqvwjY6rVcMCQ6zoyUTBnPBPpPioMU/YCNqZUym0ah3G4vixqVTVctN1WArpai cxGvGsJiCthsWrZzsHbV23BXJbtfaauN/7BM5v2zwRBOkTrlS4rjHw+KRRxUG8rU6Ubf 1UZKRFq6iGUaw5xLwee58A8gxqd48eX4vbHvwZ/r/P7ybzo3QUza236f67b7vaRr4fjV C7dw== 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=ur6Byu3Rimd0aZkjVP49efczYHdI5+wCW7mi8aUocG0=; b=uF+Cfz50Hccw40UOrW4VLiAHEN7Y1bGtK6BbRwc6Q0HEo8oroJWfHfdy9jiWgBsUAU 8CxyxQcplzr4NVhUFvjvdYUTSji355HAp2OZPKtN4x/cVgdZ1qZjplS9+I3YU97RPkKP CZ2BxKAZEuyNvJFp6NDw6MTyVHE3L3OcGahtrrNBETlBNyegcp/HyRGoLEvDm7qyUQL/ ejg2fQ7OL4O5lwvVlVdY+PROsV+JF+RZU29cPBVXZ+yuRn6npkRcLq6CcEhs4LmNd9u0 Wcw2Y51bKXxGj45DPtl91VBtLXmfSgOrvOITAH0UiabeB9pc8TWzFNtkCYsz/NFxmAHk o9ZQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of keith.busch@intel.com designates 134.134.136.20 as permitted sender) smtp.mailfrom=keith.busch@intel.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga02.intel.com (mga02.intel.com. [134.134.136.20]) by mx.google.com with ESMTPS id z72si44535592pgd.401.2019.04.15.08.15.30 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Apr 2019 08:15:30 -0700 (PDT) Received-SPF: pass (google.com: domain of keith.busch@intel.com designates 134.134.136.20 as permitted sender) client-ip=134.134.136.20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of keith.busch@intel.com designates 134.134.136.20 as permitted sender) smtp.mailfrom=keith.busch@intel.com; dmarc=pass (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 fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 15 Apr 2019 08:15:29 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,354,1549958400"; d="scan'208";a="149585862" Received: from unknown (HELO localhost.lm.intel.com) ([10.232.112.69]) by FMSMGA003.fm.intel.com with ESMTP; 15 Apr 2019 08:15:29 -0700 From: Keith Busch To: linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, linux-mm@kvack.org Cc: Rafael Wysocki , Dave Hansen , Dan Williams , Brice Goglin , Keith Busch Subject: [PATCHv2 2/2] hmat: Register attributes for memory hot add Date: Mon, 15 Apr 2019 09:16:54 -0600 Message-Id: <20190415151654.15913-3-keith.busch@intel.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20190415151654.15913-1-keith.busch@intel.com> References: <20190415151654.15913-1-keith.busch@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 Some memory nodes described in HMAT may not be online at the time the we parse the subtables. Should the node be set to online later, as can happen when using PMEM as RAM after boot, the nodes will be missing their initiator links and performance attributes. Register a memory notifier callback and register the memory attributes the first time its node is brought online if it wasn't registered, ensuring a node's attributes may be registered only once. Reported-by: Brice Goglin Signed-off-by: Keith Busch Signed-off-by: Brice Goglin Signed-off-by: Brice Goglin <Brice.Goglin@inria.fr> --- drivers/acpi/hmat/hmat.c | 72 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 55 insertions(+), 17 deletions(-) diff --git a/drivers/acpi/hmat/hmat.c b/drivers/acpi/hmat/hmat.c index bdb167c026ff..4fcfad6c2181 100644 --- a/drivers/acpi/hmat/hmat.c +++ b/drivers/acpi/hmat/hmat.c @@ -14,14 +14,18 @@ #include #include #include +#include +#include #include #include -static __initdata u8 hmat_revision; +static u8 hmat_revision; -static __initdata LIST_HEAD(targets); -static __initdata LIST_HEAD(initiators); -static __initdata LIST_HEAD(localities); +static LIST_HEAD(targets); +static LIST_HEAD(initiators); +static LIST_HEAD(localities); + +static DEFINE_MUTEX(target_lock); /* * The defined enum order is used to prioritize attributes to break ties when @@ -42,6 +46,7 @@ struct memory_target { unsigned int processor_pxm; struct node_hmem_attrs hmem_attrs; struct node_cache_attrs cache_attrs; + bool registered; }; struct memory_initiator { @@ -54,7 +59,7 @@ struct memory_locality { struct acpi_hmat_locality *hmat_loc; }; -static __init struct memory_initiator *find_mem_initiator(unsigned int cpu_pxm) +static struct memory_initiator *find_mem_initiator(unsigned int cpu_pxm) { struct memory_initiator *initiator; @@ -64,7 +69,7 @@ static __init struct memory_initiator *find_mem_initiator(unsigned int cpu_pxm) return NULL; } -static __init struct memory_target *find_mem_target(unsigned int mem_pxm) +static struct memory_target *find_mem_target(unsigned int mem_pxm) { struct memory_target *target; @@ -149,7 +154,7 @@ static __init const char *hmat_data_type_suffix(u8 type) } } -static __init u32 hmat_normalize(u16 entry, u64 base, u8 type) +static u32 hmat_normalize(u16 entry, u64 base, u8 type) { u32 value; @@ -184,7 +189,7 @@ static __init u32 hmat_normalize(u16 entry, u64 base, u8 type) return value; } -static __init void hmat_update_target_access(struct memory_target *target, +static void hmat_update_target_access(struct memory_target *target, u8 type, u32 value) { switch (type) { @@ -439,7 +444,7 @@ static __init int srat_parse_mem_affinity(union acpi_subtable_headers *header, return 0; } -static __init u32 hmat_initiator_perf(struct memory_target *target, +static u32 hmat_initiator_perf(struct memory_target *target, struct memory_initiator *initiator, struct acpi_hmat_locality *hmat_loc) { @@ -477,7 +482,7 @@ static __init u32 hmat_initiator_perf(struct memory_target *target, hmat_loc->data_type); } -static __init bool hmat_update_best(u8 type, u32 value, u32 *best) +static bool hmat_update_best(u8 type, u32 value, u32 *best) { bool updated = false; @@ -521,7 +526,7 @@ static int initiator_cmp(void *priv, struct list_head *a, struct list_head *b) return ia->processor_pxm - ib->processor_pxm; } -static __init void hmat_register_target_initiators(struct memory_target *target) +static void hmat_register_target_initiators(struct memory_target *target) { static DECLARE_BITMAP(p_nodes, MAX_NUMNODES); struct memory_initiator *initiator; @@ -581,13 +586,13 @@ static __init void hmat_register_target_initiators(struct memory_target *target) } } -static __init void hmat_register_target_cache(struct memory_target *target) +static void hmat_register_target_cache(struct memory_target *target) { unsigned mem_nid = pxm_to_node(target->memory_pxm); node_add_cache(mem_nid, &target->cache_attrs); } -static __init void hmat_register_target_perf(struct memory_target *target) +static void hmat_register_target_perf(struct memory_target *target) { unsigned mem_nid = pxm_to_node(target->memory_pxm); node_set_perf_attrs(mem_nid, &target->hmem_attrs, 0); @@ -598,12 +603,17 @@ static __init void hmat_register_target(struct memory_target *target) if (!node_online(pxm_to_node(target->memory_pxm))) return; - hmat_register_target_initiators(target); - hmat_register_target_cache(target); - hmat_register_target_perf(target); + mutex_lock(&target_lock); + if (!target->registered) { + hmat_register_target_initiators(target); + hmat_register_target_cache(target); + hmat_register_target_perf(target); + target->registered = true; + } + mutex_unlock(&target_lock); } -static __init void hmat_register_targets(void) +static void hmat_register_targets(void) { struct memory_target *target; @@ -611,6 +621,30 @@ static __init void hmat_register_targets(void) hmat_register_target(target); } +static int hmat_callback(struct notifier_block *self, + unsigned long action, void *arg) +{ + struct memory_target *target; + struct memory_notify *mnb = arg; + int pxm, nid = mnb->status_change_nid; + + if (nid == NUMA_NO_NODE || action != MEM_ONLINE) + return NOTIFY_OK; + + pxm = node_to_pxm(nid); + target = find_mem_target(pxm); + if (!target) + return NOTIFY_OK; + + hmat_register_target(target); + return NOTIFY_OK; +} + +static struct notifier_block hmat_callback_nb = { + .notifier_call = hmat_callback, + .priority = 2, +}; + static __init void hmat_free_structures(void) { struct memory_target *target, *tnext; @@ -676,6 +710,10 @@ static __init int hmat_init(void) } } hmat_register_targets(); + + /* Keep the table and structures if the notifier may use them */ + if (!register_hotmemory_notifier(&hmat_callback_nb)) + return 0; out_put: hmat_free_structures(); acpi_put_table(tbl);