 @@ -1,14 +1,14 @@
-/*	$NetBSD: subr_cpu.c,v 1.10 2020/01/13 02:18:13 mrg Exp $	*/
+/*	$NetBSD: subr_cpu.c,v 1.11 2020/01/13 20:30:08 ad Exp $	*/
 /*-
  * Copyright (c) 2007, 2008, 2009, 2010, 2012, 2019, 2020
  *     The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -51,27 +51,27 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 /*
  * CPU related routines shared with rump.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_cpu.c,v 1.10 2020/01/13 02:18:13 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_cpu.c,v 1.11 2020/01/13 20:30:08 ad Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sched.h>
 #include <sys/conf.h>
 #include <sys/cpu.h>
 #include <sys/proc.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 static void	cpu_topology_fake1(struct cpu_info *);
 kmutex_t	cpu_lock		__cacheline_aligned;
 @@ -226,104 +226,109 @@ cpu_topology_fake1(struct cpu_info *ci)
+{
 	enum cpu_rel rel;
 	for (rel = 0; rel < __arraycount(ci->ci_sibling); rel++) {
 		ci->ci_sibling[rel] = ci;
 		ci->ci_nsibling[rel] = 1;
+	}
 	if (!cpu_topology_present) {
 		ci->ci_package_id = cpu_index(ci);
+	}
 	ci->ci_schedstate.spc_flags |=
 	    (SPCF_CORE1ST | SPCF_PACKAGE1ST | SPCF_1STCLASS);
 	ci->ci_package1st = ci;
 	ci->ci_is_slow = false;
 	cpu_topology_haveslow = false;
+}
 /*
  * Fake up topology info if we have none, or if what we got was bogus.
  * Don't override ci_package_id, etc, if cpu_topology_present is set.
  * MD code also uses these.
  */
 static void
 cpu_topology_fake(void)
+{
 	CPU_INFO_ITERATOR cii;
 	struct cpu_info *ci;
 	for (CPU_INFO_FOREACH(cii, ci)) {
 		cpu_topology_fake1(ci);
 		/* Undo (early boot) flag set so everything links OK. */
 		ci->ci_schedstate.spc_flags &=
 		    ~(SPCF_CORE1ST | SPCF_PACKAGE1ST | SPCF_1STCLASS);
+	}
 	cpu_topology_dump();
 /*
  * Fix up basic CPU topology info.  Right now that means attach each CPU to
  * circular lists of its siblings in the same core, and in the same package.
  */
 void
 cpu_topology_init(void)
+{
 	CPU_INFO_ITERATOR cii, cii2;
 	struct cpu_info *ci, *ci2, *ci3;
 	u_int minsmt, mincore;
 	if (!cpu_topology_present) {
 		cpu_topology_fake();
-		return;
+		goto linkit;
+	}
 	/* Find siblings in same core and package. */
 	for (CPU_INFO_FOREACH(cii, ci)) {
 		ci->ci_schedstate.spc_flags &=
 		    ~(SPCF_CORE1ST | SPCF_PACKAGE1ST | SPCF_1STCLASS);
 		for (CPU_INFO_FOREACH(cii2, ci2)) {
 			/* Avoid bad things happening. */
 			if (ci2->ci_package_id == ci->ci_package_id &&
 			    ci2->ci_core_id == ci->ci_core_id &&
 			    ci2->ci_smt_id == ci->ci_smt_id &&
 			    ci2 != ci) {
 #ifdef DEBUG
 				printf("cpu%u %p pkg %u core %u smt %u same as "
 				       "cpu%u %p pkg %u core %u smt %u\n",
 				       cpu_index(ci), ci, ci->ci_package_id,
 				       ci->ci_core_id, ci->ci_smt_id,
 				       cpu_index(ci2), ci2, ci2->ci_package_id,
 				       ci2->ci_core_id, ci2->ci_smt_id);
 #endif
 			    	printf("cpu_topology_init: info bogus, "
 			    	    "faking it\n");
 			    	cpu_topology_fake();
-			    	return;
+			    	goto linkit;
+			}
 			if (ci2 == ci ||
 			    ci2->ci_package_id != ci->ci_package_id) {
 				continue;
+			}
 			/* Find CPUs in the same core. */
 			if (ci->ci_nsibling[CPUREL_CORE] == 1 &&
 			    ci->ci_core_id == ci2->ci_core_id) {
 			    	cpu_topology_link(ci, ci2, CPUREL_CORE);
+			}
 			/* Find CPUs in the same package. */
 			if (ci->ci_nsibling[CPUREL_PACKAGE] == 1) {
 			    	cpu_topology_link(ci, ci2, CPUREL_PACKAGE);
+			}
 			if (ci->ci_nsibling[CPUREL_CORE] > 1 &&
 			    ci->ci_nsibling[CPUREL_PACKAGE] > 1) {
 				break;
+			}
+		}
+	}
  linkit:
 	/* Identify lowest numbered SMT in each core. */
 	for (CPU_INFO_FOREACH(cii, ci)) {
 		ci2 = ci3 = ci;
 		minsmt = ci->ci_smt_id;
 		do {
 			if (ci2->ci_smt_id < minsmt) {
 				ci3 = ci2;
 				minsmt = ci2->ci_smt_id;
+			}
 			ci2 = ci2->ci_sibling[CPUREL_CORE];
 		} while (ci2 != ci);
 		ci3->ci_schedstate.spc_flags |= SPCF_CORE1ST;
+	}
 @@ -348,27 +353,27 @@ cpu_topology_init(void)
 		if ((ci3->ci_schedstate.spc_flags & SPCF_PACKAGE1ST) != 0) {
 			/* Already identified - nothing more to do. */
 			continue;
+		}
 		ci3->ci_schedstate.spc_flags |= SPCF_PACKAGE1ST;
 		/* Walk through all CPUs in package and point to first. */
 		ci2 = ci3;
 		do {
 			ci2->ci_package1st = ci3;
 			ci2->ci_sibling[CPUREL_PACKAGE1ST] = ci3;
 			ci2 = ci2->ci_sibling[CPUREL_PACKAGE];
-		} while (ci2 != ci);
+		} while (ci2 != ci3);
 		/* Now look for somebody else to link to. */
 		for (CPU_INFO_FOREACH(cii2, ci2)) {
 			if ((ci2->ci_schedstate.spc_flags & SPCF_PACKAGE1ST)
 			    != 0 && ci2 != ci3) {
 			    	cpu_topology_link(ci3, ci2, CPUREL_PACKAGE1ST);
 			    	break;
+			}
+		}
+	}
 	/* Walk through all packages, starting with value of ci3 from above. */
 	KASSERT(ci3 != NULL);