{"id":811828,"url":"http://patchwork.ozlabs.org/api/patches/811828/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/b09a89f6-325d-c1ef-07da-427e60e641cf@linux.vnet.ibm.com/","project":{"id":2,"url":"http://patchwork.ozlabs.org/api/projects/2/?format=json","name":"Linux PPC development","link_name":"linuxppc-dev","list_id":"linuxppc-dev.lists.ozlabs.org","list_email":"linuxppc-dev@lists.ozlabs.org","web_url":"https://github.com/linuxppc/wiki/wiki","scm_url":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git","webscm_url":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/","list_archive_url":"https://lore.kernel.org/linuxppc-dev/","list_archive_url_format":"https://lore.kernel.org/linuxppc-dev/{}/","commit_url_format":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/commit/?id={}"},"msgid":"","list_archive_url":"https://lore.kernel.org/linuxppc-dev/b09a89f6-325d-c1ef-07da-427e60e641cf@linux.vnet.ibm.com/","date":"2017-09-08T20:47:47","name":"[V14,3/4] powerpc/hotplug: Improve responsiveness of hotplug change","commit_ref":"cee5405da4020b0b0233bc8fb7c8da7322d2c52e","pull_url":null,"state":"accepted","archived":false,"hash":"4ab35c90bc21dd2e50152cfef7e15ceb4c625a3d","submitter":{"id":65104,"url":"http://patchwork.ozlabs.org/api/people/65104/?format=json","name":"Michael Bringmann","email":"mwb@linux.vnet.ibm.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/b09a89f6-325d-c1ef-07da-427e60e641cf@linux.vnet.ibm.com/mbox/","series":[{"id":2289,"url":"http://patchwork.ozlabs.org/api/series/2289/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/list/?series=2289","date":"2017-09-08T20:47:01","name":"powerpc/vphn: Update CPU topology when VPHN enabled","version":14,"mbox":"http://patchwork.ozlabs.org/series/2289/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/811828/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/811828/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":["patchwork-incoming@ozlabs.org","linuxppc-dev@lists.ozlabs.org"],"Delivered-To":["patchwork-incoming@ozlabs.org","linuxppc-dev@lists.ozlabs.org"],"Received":["from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\n\t(using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xpqMN56SZz9sBW\n\tfor ;\n\tSat, 9 Sep 2017 06:54:56 +1000 (AEST)","from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 3xpqMN4026zDrhL\n\tfor ;\n\tSat, 9 Sep 2017 06:54:56 +1000 (AEST)","from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com\n\t[148.163.156.1])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby lists.ozlabs.org (Postfix) with ESMTPS id 3xpqCH65HmzDrcj\n\tfor ;\n\tSat, 9 Sep 2017 06:47:55 +1000 (AEST)","from pps.filterd (m0098399.ppops.net [127.0.0.1])\n\tby mx0a-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id\n\tv88KhoJk121890\n\tfor ; Fri, 8 Sep 2017 16:47:53 -0400","from e38.co.us.ibm.com (e38.co.us.ibm.com [32.97.110.159])\n\tby mx0a-001b2d01.pphosted.com with ESMTP id 2cuuw0k4xs-1\n\t(version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT)\n\tfor ; Fri, 08 Sep 2017 16:47:53 -0400","from localhost\n\tby e38.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use\n\tOnly! Violators will be prosecuted\n\tfor from ;\n\tFri, 8 Sep 2017 14:47:52 -0600","from b03cxnp08028.gho.boulder.ibm.com (9.17.130.20)\n\tby e38.co.us.ibm.com (192.168.1.138) with IBM ESMTP SMTP Gateway:\n\tAuthorized Use Only! Violators will be prosecuted; \n\tFri, 8 Sep 2017 14:47:49 -0600","from b03ledav002.gho.boulder.ibm.com\n\t(b03ledav002.gho.boulder.ibm.com [9.17.130.233])\n\tby b03cxnp08028.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with\n\tESMTP id v88Kln9332112866; Fri, 8 Sep 2017 13:47:49 -0700","from b03ledav002.gho.boulder.ibm.com (unknown [127.0.0.1])\n\tby IMSVA (Postfix) with ESMTP id 2C93213603C;\n\tFri, 8 Sep 2017 14:47:49 -0600 (MDT)","from oc1554177480.ibm.com (unknown [9.80.201.155])\n\tby b03ledav002.gho.boulder.ibm.com (Postfix) with ESMTP id\n\t2158513603A; Fri, 8 Sep 2017 14:47:47 -0600 (MDT)"],"Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=linux.vnet.ibm.com\n\t(client-ip=148.163.156.1; helo=mx0a-001b2d01.pphosted.com;\n\tenvelope-from=mwb@linux.vnet.ibm.com; receiver=)","To":"linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org","From":"Michael Bringmann ","Subject":"[PATCH V14 3/4] powerpc/hotplug: Improve responsiveness of hotplug\n\tchange","Organization":"IBM Linux Technology Center","In-Reply-To":"<74fb879c-19bf-3abf-4491-1f0db162e7d8@linux.vnet.ibm.com>","Date":"Fri, 8 Sep 2017 15:47:47 -0500","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101\n\tThunderbird/52.2.0","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-US","Content-Transfer-Encoding":"8bit","X-TM-AS-GCONF":"00","x-cbid":"17090820-0028-0000-0000-00000854D402","X-IBM-SpamModules-Scores":"","X-IBM-SpamModules-Versions":"BY=3.00007691; HX=3.00000241; KW=3.00000007;\n\tPH=3.00000004; SC=3.00000227; SDB=6.00914193; UDB=6.00458905;\n\tIPR=6.00694451; \n\tBA=6.00005576; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009;\n\tZB=6.00000000; \n\tZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00017073;\n\tXFM=3.00000015; UTC=2017-09-08 20:47:51","X-IBM-AV-DETECTION":"SAVI=unused REMOTE=unused XFE=unused","x-cbparentid":"17090820-0029-0000-0000-0000377A3D62","Message-Id":"","X-Proofpoint-Virus-Version":"vendor=fsecure engine=2.50.10432:, ,\n\tdefinitions=2017-09-08_13:, , signatures=0","X-Proofpoint-Spam-Details":"rule=outbound_notspam policy=outbound score=0\n\tspamscore=0 suspectscore=0\n\tmalwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam\n\tadjust=0 reason=mlx scancount=1 engine=8.0.1-1707230000\n\tdefinitions=main-1709080310","X-BeenThere":"linuxppc-dev@lists.ozlabs.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"Linux on PowerPC Developers Mail List\n\t","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Nathan Fontenot ,\n\tMichael Bringmann ,\n\tJohn Allen ","Errors-To":"linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org","Sender":"\"Linuxppc-dev\"\n\t"},"content":"powerpc/hotplug: On Power systems with shared configurations of CPUs\nand memory, there are some issues with the association of additional\nCPUs and memory to nodes when hot-adding resources. During hotplug\nCPU operations, this patch resets the timer on topology update work\nfunction to a small value to better ensure that the CPU topology is\ndetected and configured sooner.\n\nSigned-off-by: Michael Bringmann \n---\nChanges in V14:\n -- Restore accidentally deleted reset of topology timer.\n---\n arch/powerpc/include/asm/topology.h | 8 ++++++++\n arch/powerpc/mm/numa.c | 23 ++++++++++++++++++++++-\n arch/powerpc/platforms/pseries/hotplug-cpu.c | 2 ++\n 3 files changed, 32 insertions(+), 1 deletion(-)","diff":"diff --git a/arch/powerpc/include/asm/topology.h b/arch/powerpc/include/asm/topology.h\nindex dc4e159..beb9bca 100644\n--- a/arch/powerpc/include/asm/topology.h\n+++ b/arch/powerpc/include/asm/topology.h\n@@ -98,6 +98,14 @@ static inline int prrn_is_enabled(void)\n }\n #endif /* CONFIG_NUMA && CONFIG_PPC_SPLPAR */\n \n+#if defined(CONFIG_HOTPLUG_CPU) || defined(CONFIG_NEED_MULTIPLE_NODES)\n+#if defined(CONFIG_PPC_SPLPAR)\n+extern int timed_topology_update(int nsecs);\n+#else\n+#define\ttimed_topology_update(nsecs)\n+#endif /* CONFIG_PPC_SPLPAR */\n+#endif /* CONFIG_HOTPLUG_CPU || CONFIG_NEED_MULTIPLE_NODES */\n+\n #include \n \n #ifdef CONFIG_SMP\ndiff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c\nindex 5f5ff46..32f5f8d 100644\n--- a/arch/powerpc/mm/numa.c\n+++ b/arch/powerpc/mm/numa.c\n@@ -1148,15 +1148,35 @@ struct topology_update_data {\n \tint new_nid;\n };\n \n+#define TOPOLOGY_DEF_TIMER_SECS\t60\n+\n static u8 vphn_cpu_change_counts[NR_CPUS][MAX_DISTANCE_REF_POINTS];\n static cpumask_t cpu_associativity_changes_mask;\n static int vphn_enabled;\n static int prrn_enabled;\n static void reset_topology_timer(void);\n+static int topology_timer_secs = 1;\n static int topology_inited;\n static int topology_update_needed;\n \n /*\n+ * Change polling interval for associativity changes.\n+ */\n+int timed_topology_update(int nsecs)\n+{\n+\tif (vphn_enabled) {\n+\t\tif (nsecs > 0)\n+\t\t\ttopology_timer_secs = nsecs;\n+\t\telse\n+\t\t\ttopology_timer_secs = TOPOLOGY_DEF_TIMER_SECS;\n+\n+\t\treset_topology_timer();\n+\t}\n+\n+\treturn 0;\n+}\n+\n+/*\n * Store the current values of the associativity change counters in the\n * hypervisor.\n */\n@@ -1251,6 +1271,7 @@ static long vphn_get_associativity(unsigned long cpu,\n \t\tbreak;\n \tcase H_SUCCESS:\n \t\tdbg(\"VPHN hcall succeeded. Reset polling...\\n\");\n+\t\ttimed_topology_update(0);\n \t\tbreak;\n \t}\n \n@@ -1481,7 +1502,7 @@ static void topology_timer_fn(unsigned long ignored)\n static void reset_topology_timer(void)\n {\n \ttopology_timer.data = 0;\n-\ttopology_timer.expires = jiffies + 60 * HZ;\n+\ttopology_timer.expires = jiffies + topology_timer_secs * HZ;\n \tmod_timer(&topology_timer, topology_timer.expires);\n }\n \ndiff --git a/arch/powerpc/platforms/pseries/hotplug-cpu.c b/arch/powerpc/platforms/pseries/hotplug-cpu.c\nindex 6afd1ef..5a7fb1e 100644\n--- a/arch/powerpc/platforms/pseries/hotplug-cpu.c\n+++ b/arch/powerpc/platforms/pseries/hotplug-cpu.c\n@@ -356,6 +356,7 @@ static int dlpar_online_cpu(struct device_node *dn)\n \t\t\tBUG_ON(get_cpu_current_state(cpu)\n \t\t\t\t\t!= CPU_STATE_OFFLINE);\n \t\t\tcpu_maps_update_done();\n+\t\t\ttimed_topology_update(1);\n \t\t\trc = device_online(get_cpu_device(cpu));\n \t\t\tif (rc)\n \t\t\t\tgoto out;\n@@ -522,6 +523,7 @@ static int dlpar_offline_cpu(struct device_node *dn)\n \t\t\t\tset_preferred_offline_state(cpu,\n \t\t\t\t\t\t\t CPU_STATE_OFFLINE);\n \t\t\t\tcpu_maps_update_done();\n+\t\t\t\ttimed_topology_update(1);\n \t\t\t\trc = device_offline(get_cpu_device(cpu));\n \t\t\t\tif (rc)\n \t\t\t\t\tgoto out;\n","prefixes":["V14","3/4"]}