{"id":804187,"url":"http://patchwork.ozlabs.org/api/1.2/patches/804187/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/9a2f448d-0a5d-95e7-5ec1-b7bac1cb1f75@linux.vnet.ibm.com/","project":{"id":2,"url":"http://patchwork.ozlabs.org/api/1.2/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":"<9a2f448d-0a5d-95e7-5ec1-b7bac1cb1f75@linux.vnet.ibm.com>","list_archive_url":"https://lore.kernel.org/linuxppc-dev/9a2f448d-0a5d-95e7-5ec1-b7bac1cb1f75@linux.vnet.ibm.com/","date":"2017-08-21T21:44:43","name":"[V9,1/2] powerpc/numa: Update CPU topology when VPHN enabled","commit_ref":null,"pull_url":null,"state":"superseded","archived":true,"hash":"8687c89119ff54bb0fffb49aaf0b3e1b93b6e881","submitter":{"id":65104,"url":"http://patchwork.ozlabs.org/api/1.2/people/65104/?format=json","name":"Michael Bringmann","email":"mwb@linux.vnet.ibm.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/9a2f448d-0a5d-95e7-5ec1-b7bac1cb1f75@linux.vnet.ibm.com/mbox/","series":[],"comments":"http://patchwork.ozlabs.org/api/patches/804187/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/804187/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 3xbnMW0fD9z9t1t\n\tfor ;\n\tTue, 22 Aug 2017 07:46:47 +1000 (AEST)","from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 3xbnMV6vhZzDrSR\n\tfor ;\n\tTue, 22 Aug 2017 07:46:46 +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 3xbnKG0fYGzDrK3\n\tfor ;\n\tTue, 22 Aug 2017 07:44:49 +1000 (AEST)","from pps.filterd (m0098404.ppops.net [127.0.0.1])\n\tby mx0a-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id\n\tv7LLiLRG129628\n\tfor ; Mon, 21 Aug 2017 17:44:48 -0400","from e37.co.us.ibm.com (e37.co.us.ibm.com [32.97.110.158])\n\tby mx0a-001b2d01.pphosted.com with ESMTP id 2cg3c8m9kt-1\n\t(version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT)\n\tfor ; Mon, 21 Aug 2017 17:44:47 -0400","from localhost\n\tby e37.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use\n\tOnly! Violators will be prosecuted\n\tfor from ;\n\tMon, 21 Aug 2017 15:44:47 -0600","from b03cxnp07028.gho.boulder.ibm.com (9.17.130.15)\n\tby e37.co.us.ibm.com (192.168.1.137) with IBM ESMTP SMTP Gateway:\n\tAuthorized Use Only! Violators will be prosecuted; \n\tMon, 21 Aug 2017 15:44:44 -0600","from b03ledav003.gho.boulder.ibm.com\n\t(b03ledav003.gho.boulder.ibm.com [9.17.130.234])\n\tby b03cxnp07028.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with\n\tESMTP id v7LLiiQm4260108; Mon, 21 Aug 2017 14:44:44 -0700","from b03ledav003.gho.boulder.ibm.com (unknown [127.0.0.1])\n\tby IMSVA (Postfix) with ESMTP id E81496A041;\n\tMon, 21 Aug 2017 15:44:43 -0600 (MDT)","from oc1554177480.ibm.com (unknown [9.53.92.155])\n\tby b03ledav003.gho.boulder.ibm.com (Postfix) with ESMTP id 9761C6A03D;\n\tMon, 21 Aug 2017 15:44:43 -0600 (MDT)"],"To":"linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org","From":"Michael Bringmann ","Subject":"[PATCH V9 1/2] powerpc/numa: Update CPU topology when VPHN enabled","Organization":"IBM Linux Technology Center","In-Reply-To":"<9e5050e1-e0cc-0e0e-7b31-5dcb38b307f4@linux.vnet.ibm.com>","Date":"Mon, 21 Aug 2017 16:44:43 -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":"17082121-0024-0000-0000-0000171405B1","X-IBM-SpamModules-Scores":"","X-IBM-SpamModules-Versions":"BY=3.00007587; HX=3.00000241; KW=3.00000007;\n\tPH=3.00000004; SC=3.00000223; SDB=6.00905710; UDB=6.00453879;\n\tIPR=6.00685913; \n\tBA=6.00005545; 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.00016799;\n\tXFM=3.00000015; UTC=2017-08-21 21:44:45","X-IBM-AV-DETECTION":"SAVI=unused REMOTE=unused XFE=unused","x-cbparentid":"17082121-0025-0000-0000-00004C671C15","Message-Id":"<9a2f448d-0a5d-95e7-5ec1-b7bac1cb1f75@linux.vnet.ibm.com>","X-Proofpoint-Virus-Version":"vendor=fsecure engine=2.50.10432:, ,\n\tdefinitions=2017-08-21_14:, , 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-1708210337","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/numa: Correct the currently broken capability to set the\ntopology for shared CPUs in LPARs. At boot time for shared CPU\nlpars, the topology for each shared CPU is set to node zero, however,\nthis is now updated correctly using the Virtual Processor Home Node\n(VPHN) capabilities information provided by the pHyp.\n\nAlso, update initialization checks for device-tree attributes to\nindependently recognize PRRN or VPHN usage.\n\nSigned-off-by: Michael Bringmann \n---\n arch/powerpc/include/asm/topology.h | 14 ++++++\n arch/powerpc/mm/numa.c | 64 +++++++++++++++++++++++---\n arch/powerpc/platforms/pseries/dlpar.c | 2 +\n arch/powerpc/platforms/pseries/hotplug-cpu.c | 2 +\n 4 files changed, 75 insertions(+), 7 deletions(-)","diff":"diff --git a/arch/powerpc/include/asm/topology.h b/arch/powerpc/include/asm/topology.h\nindex dc4e159..85d6428 100644\n--- a/arch/powerpc/include/asm/topology.h\n+++ b/arch/powerpc/include/asm/topology.h\n@@ -98,6 +98,20 @@ 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)\t0\n+#endif /* CONFIG_PPC_SPLPAR */\n+#endif /* CONFIG_HOTPLUG_CPU || CONFIG_NEED_MULTIPLE_NODES */\n+\n+#if defined(CONFIG_PPC_SPLPAR)\n+extern void shared_topology_update(void);\n+#else\n+#define\tshared_topology_update()\t0\n+#endif /* CONFIG_PPC_SPLPAR */\n+\n #include \n \n #ifdef CONFIG_SMP\ndiff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c\nindex b95c584..3fd4536 100644\n--- a/arch/powerpc/mm/numa.c\n+++ b/arch/powerpc/mm/numa.c\n@@ -29,6 +29,7 @@\n #include \n #include \n #include \n+#include \n #include \n #include \n #include \n@@ -906,7 +907,7 @@ void __init initmem_init(void)\n \n \t/*\n \t * Reduce the possible NUMA nodes to the online NUMA nodes,\n-\t * since we do not support node hotplug. This ensures that we\n+\t * since we do not support node hotplug. This ensures that we\n \t * lower the maximum NUMA node ID to what is actually present.\n \t */\n \tnodes_and(node_possible_map, node_possible_map, node_online_map);\n@@ -1148,11 +1149,32 @@ struct topology_update_data {\n \tint new_nid;\n };\n \n+#define\tTOPOLOGY_DEF_TIMER_SECS\t\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 = TOPOLOGY_DEF_TIMER_SECS;\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@@ -1246,6 +1268,12 @@ static long vphn_get_associativity(unsigned long cpu,\n \t\t\t\"hcall_vphn() experienced a hardware fault \"\n \t\t\t\"preventing VPHN. Disabling polling...\\n\");\n \t\tstop_topology_update();\n+\t\tbreak;\n+\tcase H_SUCCESS:\n+\t\tprintk(KERN_INFO\n+\t\t\t\"VPHN hcall succeeded. Reset polling...\\n\");\n+\t\ttimed_topology_update(0);\n+\t\tbreak;\n \t}\n \n \treturn rc;\n@@ -1323,8 +1351,11 @@ int numa_update_cpu_topology(bool cpus_locked)\n \tstruct device *dev;\n \tint weight, new_nid, i = 0;\n \n-\tif (!prrn_enabled && !vphn_enabled)\n+\tif (!prrn_enabled && !vphn_enabled) {\n+\t\tif (!topology_inited)\n+\t\t\ttopology_update_needed = 1;\n \t\treturn 0;\n+\t}\n \n \tweight = cpumask_weight(&cpu_associativity_changes_mask);\n \tif (!weight)\n@@ -1363,6 +1394,8 @@ int numa_update_cpu_topology(bool cpus_locked)\n \t\t\tcpumask_andnot(&cpu_associativity_changes_mask,\n \t\t\t\t\t&cpu_associativity_changes_mask,\n \t\t\t\t\tcpu_sibling_mask(cpu));\n+\t\t\tpr_info(\"Assoc chg gives same node %d for cpu%d\\n\",\n+\t\t\t\t\tnew_nid, cpu);\n \t\t\tcpu = cpu_last_thread_sibling(cpu);\n \t\t\tcontinue;\n \t\t}\n@@ -1379,6 +1412,9 @@ int numa_update_cpu_topology(bool cpus_locked)\n \t\tcpu = cpu_last_thread_sibling(cpu);\n \t}\n \n+\tif (i)\n+\t\tupdates[i-1].next = NULL;\n+\n \tpr_debug(\"Topology update for the following CPUs:\\n\");\n \tif (cpumask_weight(&updated_cpus)) {\n \t\tfor (ud = &updates[0]; ud; ud = ud->next) {\n@@ -1433,6 +1469,7 @@ int numa_update_cpu_topology(bool cpus_locked)\n \n out:\n \tkfree(updates);\n+\ttopology_update_needed = 0;\n \treturn changed;\n }\n \n@@ -1453,6 +1490,14 @@ static void topology_schedule_update(void)\n \tschedule_work(&topology_work);\n }\n \n+void shared_topology_update(void)\n+{\n+\tif (firmware_has_feature(FW_FEATURE_VPHN) &&\n+\t\t lppaca_shared_proc(get_lppaca()))\n+\t\ttopology_schedule_update();\n+}\n+EXPORT_SYMBOL(shared_topology_update);\n+\n static void topology_timer_fn(unsigned long ignored)\n {\n \tif (prrn_enabled && cpumask_weight(&cpu_associativity_changes_mask))\n@@ -1469,7 +1514,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 \n@@ -1519,15 +1564,14 @@ int start_topology_update(void)\n \tif (firmware_has_feature(FW_FEATURE_PRRN)) {\n \t\tif (!prrn_enabled) {\n \t\t\tprrn_enabled = 1;\n-\t\t\tvphn_enabled = 0;\n #ifdef CONFIG_SMP\n \t\t\trc = of_reconfig_notifier_register(&dt_update_nb);\n #endif\n \t\t}\n-\t} else if (firmware_has_feature(FW_FEATURE_VPHN) &&\n+\t}\n+\tif (firmware_has_feature(FW_FEATURE_VPHN) &&\n \t\t lppaca_shared_proc(get_lppaca())) {\n \t\tif (!vphn_enabled) {\n-\t\t\tprrn_enabled = 0;\n \t\t\tvphn_enabled = 1;\n \t\t\tsetup_cpu_associativity_change_counters();\n \t\t\tinit_timer_deferrable(&topology_timer);\n@@ -1550,7 +1594,8 @@ int stop_topology_update(void)\n #ifdef CONFIG_SMP\n \t\trc = of_reconfig_notifier_unregister(&dt_update_nb);\n #endif\n-\t} else if (vphn_enabled) {\n+\t}\n+\tif (vphn_enabled) {\n \t\tvphn_enabled = 0;\n \t\trc = del_timer_sync(&topology_timer);\n \t}\n@@ -1616,6 +1661,11 @@ static int topology_update_init(void)\n \tif (!proc_create(\"powerpc/topology_updates\", 0644, NULL, &topology_ops))\n \t\treturn -ENOMEM;\n \n+\ttopology_inited = 1;\n+\tif (topology_update_needed)\n+\t\tbitmap_fill(cpumask_bits(&cpu_associativity_changes_mask),\n+\t\t\t\t\tnr_cpumask_bits);\n+\n \treturn 0;\n }\n device_initcall(topology_update_init);\ndiff --git a/arch/powerpc/platforms/pseries/dlpar.c b/arch/powerpc/platforms/pseries/dlpar.c\nindex 3918769..ba9a4a0 100644\n--- a/arch/powerpc/platforms/pseries/dlpar.c\n+++ b/arch/powerpc/platforms/pseries/dlpar.c\n@@ -592,6 +592,8 @@ static ssize_t dlpar_show(struct class *class, struct class_attribute *attr,\n \n static int __init pseries_dlpar_init(void)\n {\n+\tshared_topology_update();\n+\n \tpseries_hp_wq = alloc_workqueue(\"pseries hotplug workqueue\",\n \t\t\t\t\tWQ_UNBOUND, 1);\n \treturn sysfs_create_file(kernel_kobj, &class_attr_dlpar.attr);\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":["V9","1/2"]}