From patchwork Mon Jan 8 17:32:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Bringmann X-Patchwork-Id: 856957 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zFjCP41KHz9t0m for ; Tue, 9 Jan 2018 04:37:37 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3zFjCP1LZ5zF0cp for ; Tue, 9 Jan 2018 04:37:37 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=linux.vnet.ibm.com (client-ip=148.163.156.1; helo=mx0a-001b2d01.pphosted.com; envelope-from=mwb@linux.vnet.ibm.com; receiver=) 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 3zFj622NM2zF0T0 for ; Tue, 9 Jan 2018 04:32:58 +1100 (AEDT) Received: from pps.filterd (m0098394.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.21) with SMTP id w08HWRfB001330 for ; Mon, 8 Jan 2018 12:32:56 -0500 Received: from e38.co.us.ibm.com (e38.co.us.ibm.com [32.97.110.159]) by mx0a-001b2d01.pphosted.com with ESMTP id 2fccfkswt3-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Mon, 08 Jan 2018 12:32:55 -0500 Received: from localhost by e38.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 8 Jan 2018 10:32:54 -0700 Received: from b03cxnp08028.gho.boulder.ibm.com (9.17.130.20) by e38.co.us.ibm.com (192.168.1.138) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 8 Jan 2018 10:32:53 -0700 Received: from b03ledav004.gho.boulder.ibm.com (b03ledav004.gho.boulder.ibm.com [9.17.130.235]) by b03cxnp08028.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w08HWqkl10223996; Mon, 8 Jan 2018 10:32:52 -0700 Received: from b03ledav004.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A8E8578037; Mon, 8 Jan 2018 10:32:52 -0700 (MST) Received: from oc5000245537.ibm.com (unknown [9.53.92.226]) by b03ledav004.gho.boulder.ibm.com (Postfix) with ESMTP id 40F7F7803F; Mon, 8 Jan 2018 10:32:52 -0700 (MST) To: linuxppc-dev@lists.ozlabs.org From: Michael Bringmann Organization: IBM Linux Technology Center Subject: [PATCH V3 1/3] hotplug/mobility: Apply assoc updates for Post Migration Topo In-Reply-To: <0658ebca-aa3c-9251-9d74-b645633a750a@linux.vnet.ibm.com> Date: Mon, 8 Jan 2018 11:32:25 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 Content-Language: en-US X-TM-AS-GCONF: 00 x-cbid: 18010817-0028-0000-0000-000008F59432 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00008342; HX=3.00000241; KW=3.00000007; PH=3.00000004; SC=3.00000245; SDB=6.00972101; UDB=6.00492442; IPR=6.00752052; MB=3.00018927; MTD=3.00000007; XFM=3.00000015; UTC=2018-01-08 17:32:54 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18010817-0029-0000-0000-0000390CB273 Message-Id: <991e6ef3-f1b9-acf6-4f71-ccf00aaeea24@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2018-01-08_11:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1709140000 definitions=main-1801080250 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.24 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Nathan Fontenot , Michael Bringmann Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" 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 V3: -- 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'. --- 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..64e29d76 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(pr->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;