From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3zjCVb0w65zF1Kd for ; Fri, 16 Feb 2018 10:42:14 +1100 (AEDT) Received: from pps.filterd (m0098410.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w1FNeVOs049953 for ; Thu, 15 Feb 2018 18:42:12 -0500 Received: from e34.co.us.ibm.com (e34.co.us.ibm.com [32.97.110.152]) by mx0a-001b2d01.pphosted.com with ESMTP id 2g5kec19y6-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Thu, 15 Feb 2018 18:42:12 -0500 Received: from localhost by e34.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 15 Feb 2018 16:42:11 -0700 To: linuxppc-dev@lists.ozlabs.org Cc: Michael Bringmann , Nathan Fontenot , John Allen , Tyrel Datwyler , Thomas Falcon From: Michael Bringmann Subject: [RFC 1/3] hotplug/mobility: Apply assoc updates for Post Migration Topo In-Reply-To: <80574cd2-9cef-9724-d6ce-9ff38a7e0677@linux.vnet.ibm.com> Date: Thu, 15 Feb 2018 17:41:24 -0600 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Message-Id: <4a9d303c-1a01-2d48-65f2-77e98779807b@linux.vnet.ibm.com> List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , hotplug/mobility: Recognize more changes to the associativity of memory blocks described by the 'ibm,dynamic-memory' and 'cpu' properties when processing the topology of LPARS in Post Migration events. Previous efforts only recognized whether a memory block's assignment had changed in the property. Changes here include: * Checking the aa_index values of the old/new properties and 'readd' any block for which the setting has changed. * Checking for changes in cpu associativity and making 'readd' calls when differences are observed. Signed-off-by: Michael Bringmann --- Changes in RFC: -- Simplify code to update CPU nodes during mobility checks. Remove functions to generate extra HP_ELOG messages in favor of direct function calls to dlpar_cpu_readd_by_index. -- Move check for "cpu" node type from pseries_update_cpu to pseries_smp_notifier in 'hotplug-cpu.c' -- Remove functions 'pseries_memory_readd_by_index' and 'pseries_cpu_readd_by_index' as no longer needed outside of 'mobility.c'. -- Update patch for recent checking compatibility -- Resubmit as RFC pending further integration with LMB changes by Nathan Fontenot --- arch/powerpc/platforms/pseries/hotplug-cpu.c | 69 +++++++++++++++++++++++ arch/powerpc/platforms/pseries/hotplug-memory.c | 7 ++ 2 files changed, 76 insertions(+) diff --git a/arch/powerpc/platforms/pseries/hotplug-cpu.c b/arch/powerpc/platforms/pseries/hotplug-cpu.c index a7d14aa7..91ef22a 100644 --- a/arch/powerpc/platforms/pseries/hotplug-cpu.c +++ b/arch/powerpc/platforms/pseries/hotplug-cpu.c @@ -636,6 +636,27 @@ static int dlpar_cpu_remove_by_index(u32 drc_index) return rc; } +static int dlpar_cpu_readd_by_index(u32 drc_index) +{ + int rc = 0; + + pr_info("Attempting to update CPU, drc index %x\n", drc_index); + + if (dlpar_cpu_remove_by_index(drc_index)) + rc = -EINVAL; + else if (dlpar_cpu_add(drc_index)) + rc = -EINVAL; + + if (rc) + pr_info("Failed to update cpu at drc_index %lx\n", + (unsigned long int)drc_index); + else + pr_info("CPU at drc_index %lx was updated\n", + (unsigned long int)drc_index); + + return rc; +} + static int find_dlpar_cpus_to_remove(u32 *cpu_drcs, int cpus_to_remove) { struct device_node *dn; @@ -826,6 +847,9 @@ int dlpar_cpu(struct pseries_hp_errorlog *hp_elog) else rc = -EINVAL; break; + case PSERIES_HP_ELOG_ACTION_READD: + rc = dlpar_cpu_readd_by_index(drc_index); + break; default: pr_err("Invalid action (%d) specified\n", hp_elog->action); rc = -EINVAL; @@ -876,12 +900,53 @@ static ssize_t dlpar_cpu_release(const char *buf, size_t count) #endif /* CONFIG_ARCH_CPU_PROBE_RELEASE */ +static int pseries_update_cpu(struct of_reconfig_data *pr) +{ + u32 old_entries, new_entries; + __be32 *p, *old_assoc, *new_assoc; + int rc = 0; + + /* So far, we only handle the 'ibm,associativity' property, + * here. + * The first int of the property is the number of domains + * described. This is followed by an array of level values. + */ + p = (__be32 *) pr->old_prop->value; + if (!p) + return -EINVAL; + old_entries = be32_to_cpu(*p++); + old_assoc = p; + + p = (__be32 *)pr->prop->value; + if (!p) + return -EINVAL; + new_entries = be32_to_cpu(*p++); + new_assoc = p; + + if (old_entries == new_entries) { + int sz = old_entries * sizeof(int); + + if (!memcmp(old_assoc, new_assoc, sz)) + rc = dlpar_cpu_readd_by_index( + be32_to_cpu(pr->dn->phandle)); + + } else { + rc = dlpar_cpu_readd_by_index( + be32_to_cpu(pr->dn->phandle)); + } + + return rc; +} + static int pseries_smp_notifier(struct notifier_block *nb, unsigned long action, void *data) { struct of_reconfig_data *rd = data; int err = 0; + if (strcmp(rd->dn->type, "cpu")) + return notifier_from_errno(err); + switch (action) { case OF_RECONFIG_ATTACH_NODE: err = pseries_add_processor(rd->dn); @@ -889,6 +954,10 @@ static int pseries_smp_notifier(struct notifier_block *nb, case OF_RECONFIG_DETACH_NODE: pseries_remove_processor(rd->dn); break; + case OF_RECONFIG_UPDATE_PROPERTY: + if (!strcmp(rd->prop->name, "ibm,associativity")) + err = pseries_update_cpu(rd); + break; } return notifier_from_errno(err); } diff --git a/arch/powerpc/platforms/pseries/hotplug-memory.c b/arch/powerpc/platforms/pseries/hotplug-memory.c index 1d48ab4..0e2ae20 100644 --- a/arch/powerpc/platforms/pseries/hotplug-memory.c +++ b/arch/powerpc/platforms/pseries/hotplug-memory.c @@ -1160,6 +1160,13 @@ static int pseries_update_drconf_memory(struct of_reconfig_data *pr) memblock_size); rc = (rc < 0) ? -EINVAL : 0; break; + } else if ((be32_to_cpu(old_drmem[i].aa_index) != + be32_to_cpu(new_drmem[i].aa_index)) && + (be32_to_cpu(new_drmem[i].flags) & + DRCONF_MEM_ASSIGNED)) { + rc = dlpar_memory_readd_by_index( + be32_to_cpu(new_drmem[i].drc_index), + pr->prop); } } return rc;