{"id":808752,"url":"http://patchwork.ozlabs.org/api/1.0/patches/808752/?format=json","project":{"id":2,"url":"http://patchwork.ozlabs.org/api/1.0/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/"},"msgid":"<1df8eebb-8313-dbcd-5be1-d0fa26293589@linux.vnet.ibm.com>","date":"2017-09-01T15:48:12","name":"[V13,3/4] powerpc/hotplug: Improve responsiveness of hotplug change","commit_ref":null,"pull_url":null,"state":"superseded","archived":true,"hash":"63df0d0407cd1fa4956bd7d413bef45f6f7cd2fb","submitter":{"id":65104,"url":"http://patchwork.ozlabs.org/api/1.0/people/65104/?format=json","name":"Michael Bringmann","email":"mwb@linux.vnet.ibm.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/1df8eebb-8313-dbcd-5be1-d0fa26293589@linux.vnet.ibm.com/mbox/","series":[{"id":1053,"url":"http://patchwork.ozlabs.org/api/1.0/series/1053/?format=json","date":"2017-09-01T15:47:31","name":"powerpc/vphn: Update CPU topology when VPHN enabled","version":13,"mbox":"http://patchwork.ozlabs.org/series/1053/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/808752/checks/","tags":{},"headers":{"Return-Path":"<linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org>","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 [103.22.144.68])\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 3xkP1Y6mLJz9sPk\n\tfor <patchwork-incoming@ozlabs.org>;\n\tSat,  2 Sep 2017 01:54:09 +1000 (AEST)","from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 3xkP1Y5t8QzDqZC\n\tfor <patchwork-incoming@ozlabs.org>;\n\tSat,  2 Sep 2017 01:54:09 +1000 (AEST)","from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com\n\t[148.163.158.5])\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 3xkNts0HplzDqk7\n\tfor <linuxppc-dev@lists.ozlabs.org>;\n\tSat,  2 Sep 2017 01:48:20 +1000 (AEST)","from pps.filterd (m0098420.ppops.net [127.0.0.1])\n\tby mx0b-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id\n\tv81FjiVZ003690\n\tfor <linuxppc-dev@lists.ozlabs.org>; Fri, 1 Sep 2017 11:48:18 -0400","from e34.co.us.ibm.com (e34.co.us.ibm.com [32.97.110.152])\n\tby mx0b-001b2d01.pphosted.com with ESMTP id 2cqa0k297k-1\n\t(version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT)\n\tfor <linuxppc-dev@lists.ozlabs.org>; Fri, 01 Sep 2017 11:48:17 -0400","from localhost\n\tby e34.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use\n\tOnly! Violators will be prosecuted\n\tfor <linuxppc-dev@lists.ozlabs.org> from <mwb@linux.vnet.ibm.com>;\n\tFri, 1 Sep 2017 09:48:17 -0600","from b03cxnp08028.gho.boulder.ibm.com (9.17.130.20)\n\tby e34.co.us.ibm.com (192.168.1.134) with IBM ESMTP SMTP Gateway:\n\tAuthorized Use Only! Violators will be prosecuted; \n\tFri, 1 Sep 2017 09:48:13 -0600","from b03ledav004.gho.boulder.ibm.com\n\t(b03ledav004.gho.boulder.ibm.com [9.17.130.235])\n\tby b03cxnp08028.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with\n\tESMTP id v81FmDr131260876; Fri, 1 Sep 2017 08:48:13 -0700","from b03ledav004.gho.boulder.ibm.com (unknown [127.0.0.1])\n\tby IMSVA (Postfix) with ESMTP id 0A1CB78037;\n\tFri,  1 Sep 2017 09:48:13 -0600 (MDT)","from oc1554177480.ibm.com (unknown [9.53.92.230])\n\tby b03ledav004.gho.boulder.ibm.com (Postfix) with ESMTP id ADD7778038;\n\tFri,  1 Sep 2017 09:48:12 -0600 (MDT)"],"To":"linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org","From":"Michael Bringmann <mwb@linux.vnet.ibm.com>","Subject":"[PATCH V13 3/4] powerpc/hotplug: Improve responsiveness of hotplug\n\tchange","Organization":"IBM Linux Technology Center","In-Reply-To":"<fc21bb6f-9df8-ab7d-5987-6bdce5d39842@linux.vnet.ibm.com>","Date":"Fri, 1 Sep 2017 10:48:12 -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":"17090115-0016-0000-0000-000007740332","X-IBM-SpamModules-Scores":"","X-IBM-SpamModules-Versions":"BY=3.00007647; HX=3.00000241; KW=3.00000007;\n\tPH=3.00000004; SC=3.00000226; SDB=6.00910745; UDB=6.00456897;\n\tIPR=6.00691026; \n\tBA=6.00005563; 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.00016962;\n\tXFM=3.00000015; UTC=2017-09-01 15:48:15","X-IBM-AV-DETECTION":"SAVI=unused REMOTE=unused XFE=unused","x-cbparentid":"17090115-0017-0000-0000-00003B4C360A","Message-Id":"<1df8eebb-8313-dbcd-5be1-d0fa26293589@linux.vnet.ibm.com>","X-Proofpoint-Virus-Version":"vendor=fsecure engine=2.50.10432:, ,\n\tdefinitions=2017-09-01_04:, , 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-1709010225","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<linuxppc-dev.lists.ozlabs.org>","List-Unsubscribe":"<https://lists.ozlabs.org/options/linuxppc-dev>,\n\t<mailto:linuxppc-dev-request@lists.ozlabs.org?subject=unsubscribe>","List-Archive":"<http://lists.ozlabs.org/pipermail/linuxppc-dev/>","List-Post":"<mailto:linuxppc-dev@lists.ozlabs.org>","List-Help":"<mailto:linuxppc-dev-request@lists.ozlabs.org?subject=help>","List-Subscribe":"<https://lists.ozlabs.org/listinfo/linuxppc-dev>,\n\t<mailto:linuxppc-dev-request@lists.ozlabs.org?subject=subscribe>","Cc":"Nathan Fontenot <nfont@linux.vnet.ibm.com>,\n\tMichael Bringmann <mwb@linux.vnet.ibm.com>,\n\tJohn Allen <jallen@linux.vnet.ibm.com>","Errors-To":"linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org","Sender":"\"Linuxppc-dev\"\n\t<linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org>"},"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 <mwb@linux.vnet.ibm.com>\n---\n arch/powerpc/include/asm/topology.h          |    8 ++++++++\n arch/powerpc/mm/numa.c                       |   21 ++++++++++++++++++++-\n arch/powerpc/platforms/pseries/hotplug-cpu.c |    2 ++\n 3 files changed, 30 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 <asm-generic/topology.h>\n \n #ifdef CONFIG_SMP\ndiff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c\nindex c08d736..3a5b334 100644\n--- a/arch/powerpc/mm/numa.c\n+++ b/arch/powerpc/mm/numa.c\n@@ -1148,15 +1148,34 @@ 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 (nsecs > 0)\n+\t\ttopology_timer_secs = nsecs;\n+\telse\n+\t\ttopology_timer_secs = TOPOLOGY_DEF_TIMER_SECS;\n+\n+\tif (vphn_enabled)\n+\t\treset_topology_timer();\n+\n+\treturn 0;\n+}\n+\n+/*\n  * Store the current values of the associativity change counters in the\n  * hypervisor.\n  */\n@@ -1489,7 +1508,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":["V13","3/4"]}