From owner-p4-projects@FreeBSD.ORG Wed Oct 30 19:39:33 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D939176; Wed, 30 Oct 2013 19:39:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 9749974 for ; Wed, 30 Oct 2013 19:39:32 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 68A162DCC for ; Wed, 30 Oct 2013 19:39:32 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r9UJdWSX036296 for ; Wed, 30 Oct 2013 19:39:32 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r9UJdWtU036293 for perforce@freebsd.org; Wed, 30 Oct 2013 19:39:32 GMT (envelope-from brooks@freebsd.org) Date: Wed, 30 Oct 2013 19:39:32 GMT Message-Id: <201310301939.r9UJdWtU036293@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 1187664 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Oct 2013 19:39:33 -0000 http://p4web.freebsd.org/@@1187664?ac=10 Change 1187664 by brooks@brooks_zenith on 2013/10/30 19:38:49 Look forward to the bright day when SOAAP is something you install as a FreeBSD package and change to using SOAAP_INCLUDE_DIR and SOAAP_LIB_DIR instead of SOAAP_SOURCE_DIR/include and SOAAP_BUILD_DIR. Support but warn about the old values. Produce a helpful-ish error instead of a messy clang error when SOAAP_INCLUDE_DIR or SOAAP_LIB_DIR aren't set and can't be set via the deprecated variables. Affected files ... .. //depot/projects/ctsrd/tesla/src/share/mk/bsd.own.mk#15 edit .. //depot/projects/ctsrd/tesla/src/share/mk/sys.mk#18 edit Differences ... ==== //depot/projects/ctsrd/tesla/src/share/mk/bsd.own.mk#15 (text+ko) ==== @@ -647,7 +647,23 @@ .endif .if ${MK_SOAAP} != "no" -CFLAGS+= -DSOAAP -I${SOAAP_SOURCE_DIR}/include +.if !defined(SOAAP_INCLUDE_DIR) +.if !defined(SOAAP_SOURCE_DIR) +.error Must set one of SOAAP_INCLUDE_DIR or SOAAP_SOURCE_DIR with WITH_SOAAP +.else +.warning SOAAP_SOURCE_DIR is deprecated, use SOAAP_INCLUDE_DIR +SOAAP_INCLUDE_DIR=${SOAAP_SOURCE_DIR}/include +.endif +.endif +.if !defined(SOAAP_LIB_DIR) +.if !defined(SOAAP_BUILD_DIR) +.error Must set one of SOAAP_LIB_DIR or SOAAP_BUILD_DIR with WITH_SOAAP +.else +.warning SOAAP_BUILD_DIR is deprecated, use SOAAP_LIB_DIR +SOAAP_LIB_DIR=${SOAAP_BUILD_DIR} +.endif +.endif +CFLAGS+= -DSOAAP -I${SOAAP_INCLUDE_DIR} .if defined(WITHOUT_LLVM_INSTRUMENTED) .error WITHOUT_LLVM_INSTRUMENTED and WITH_SOAAP can't both be set. .else ==== //depot/projects/ctsrd/tesla/src/share/mk/sys.mk#18 (text+ko) ==== @@ -298,22 +298,22 @@ .endif .${LLVM_IR_TYPE}-a.soaap: - ${OPT} -load ${SOAAP_BUILD_DIR}/libsoaap.so -soaap ${SOAAP_FLAGS} \ + ${OPT} -load ${SOAAP_LIB_DIR}/libsoaap.so -soaap ${SOAAP_FLAGS} \ -o /dev/null ${.IMPSRC} .${LLVM_IR_TYPE}-a.bc_cep: - ${OPT} -load ${SOAAP_BUILD_DIR}/libcep.so -insert-call-edge-profiling \ + ${OPT} -load ${SOAAP_LIB_DIR}/libcep.so -insert-call-edge-profiling \ -o ${.TARGET} ${.IMPSRC} .bc_cep.po_cep: ${LLC} -filetype=obj ${LLCFLAGS} -o ${.TARGET} ${.IMPSRC} .po_cep.soaap_cg: - ${CC} ${.IMPSRC} -L${SOAAP_BUILD_DIR} -L${LLVM_BUILD_DIR}/lib \ + ${CC} ${.IMPSRC} -L${SOAAP_LIB_DIR} -L${LLVM_BUILD_DIR}/lib \ -lcep_rt -lprofile_rt ${LDADD} -o ${.TARGET} .${LLVM_IR_TYPE}-a.bc_soaap_perf: - ${OPT} -load ${SOAAP_BUILD_DIR}/libsoaap.so -soaap \ + ${OPT} -load ${SOAAP_LIB_DIR}/libsoaap.so -soaap \ -soaap-emulate-performance ${SOAAP_FLAGS} -o ${.TARGET} ${.IMPSRC} .bc_soaap_perf.po_soaap_perf: From owner-p4-projects@FreeBSD.ORG Fri Nov 1 18:27:08 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C310AB95; Fri, 1 Nov 2013 18:27:07 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 807C3B93 for ; Fri, 1 Nov 2013 18:27:07 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5297F2F0A for ; Fri, 1 Nov 2013 18:27:07 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id rA1IR75e076641 for ; Fri, 1 Nov 2013 18:27:07 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id rA1IR7qQ076638 for perforce@freebsd.org; Fri, 1 Nov 2013 18:27:07 GMT (envelope-from jhb@freebsd.org) Date: Fri, 1 Nov 2013 18:27:07 GMT Message-Id: <201311011827.rA1IR7qQ076638@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 1187750 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Nov 2013 18:27:08 -0000 http://p4web.freebsd.org/@@1187750?ac=10 Change 1187750 by jhb@jhb_jhbbsd on 2013/11/01 18:26:24 Use a dedicated stack for machine check exceptions. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#118 edit .. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#92 edit Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/machdep.c#118 (text+ko) ==== @@ -1046,6 +1046,8 @@ static char nmi0_stack[PAGE_SIZE] __aligned(16); CTASSERT(sizeof(struct nmi_pcpu) == 16); +static char mc0_stack[PAGE_SIZE] __aligned(16); + struct amd64tss common_tss[MAXCPU]; /* @@ -1785,7 +1787,7 @@ setidt(IDT_PF, &IDTVEC(page), SDT_SYSIGT, SEL_KPL, 0); setidt(IDT_MF, &IDTVEC(fpu), SDT_SYSIGT, SEL_KPL, 0); setidt(IDT_AC, &IDTVEC(align), SDT_SYSIGT, SEL_KPL, 0); - setidt(IDT_MC, &IDTVEC(mchk), SDT_SYSIGT, SEL_KPL, 0); + setidt(IDT_MC, &IDTVEC(mchk), SDT_SYSIGT, SEL_KPL, 3); setidt(IDT_XF, &IDTVEC(xmm), SDT_SYSIGT, SEL_KPL, 0); #ifdef KDTRACE_HOOKS setidt(IDT_DTRACE_RET, &IDTVEC(dtrace_ret), SDT_SYSIGT, SEL_UPL, 0); @@ -1851,6 +1853,9 @@ np->np_pcpu = (register_t) pc; common_tss[0].tss_ist2 = (long) np; + /* machine check stack space, runs on ist3 */ + common_tss[0].tss_ist3 = (long)&mc0_stack[sizeof(mc0_stack)]; + /* Set the IO permission bitmap (empty due to tss seg limit) */ common_tss[0].tss_iobase = sizeof(struct amd64tss) + IOPAGES * PAGE_SIZE; ==== //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#92 (text+ko) ==== @@ -98,6 +98,7 @@ /* Temporary variables for init_secondary() */ char *doublefault_stack; char *nmi_stack; +char *mc_stack; void *dpcpu; struct pcb stoppcbs[MAXCPU]; @@ -638,6 +639,7 @@ common_tss[cpu].tss_iobase = sizeof(struct amd64tss) + IOPAGES * PAGE_SIZE; common_tss[cpu].tss_ist1 = (long)&doublefault_stack[PAGE_SIZE]; + common_tss[cpu].tss_ist3 = (long)&mc_stack[PAGE_SIZE]; /* The NMI stack runs on IST2. */ np = ((struct nmi_pcpu *) &nmi_stack[PAGE_SIZE]) - 1; @@ -966,6 +968,8 @@ PAGE_SIZE, M_WAITOK | M_ZERO); nmi_stack = (char *)kmem_malloc(kernel_arena, PAGE_SIZE, M_WAITOK | M_ZERO); + mc_stack = (char *)kmem_malloc(kernel_arena, PAGE_SIZE, + M_WAITOK | M_ZERO); dpcpu = (void *)kmem_malloc(kernel_arena, DPCPU_SIZE, M_WAITOK | M_ZERO); From owner-p4-projects@FreeBSD.ORG Fri Nov 1 19:38:48 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0333C9A1; Fri, 1 Nov 2013 19:38:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id B9EE099F for ; Fri, 1 Nov 2013 19:38:47 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A6B69239E for ; Fri, 1 Nov 2013 19:38:47 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id rA1Jclca087088 for ; Fri, 1 Nov 2013 19:38:47 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id rA1JclxJ087085 for perforce@freebsd.org; Fri, 1 Nov 2013 19:38:47 GMT (envelope-from jhb@freebsd.org) Date: Fri, 1 Nov 2013 19:38:47 GMT Message-Id: <201311011938.rA1JclxJ087085@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 1187757 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Nov 2013 19:38:48 -0000 http://p4web.freebsd.org/@@1187757?ac=10 Change 1187757 by jhb@jhb_jhbbsd on 2013/11/01 19:38:28 An old patch I had lying around to export the SMAP table to userland. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#119 edit Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/machdep.c#119 (text+ko) ==== @@ -1938,6 +1938,25 @@ pcpu->pc_acpi_id = 0xffffffff; } +static int +smap_sysctl_handler(SYSCTL_HANDLER_ARGS) +{ + struct bios_smap *smapbase; + caddr_t kmdp; + uint32_t smapsize; + + /* Retrieve the system memory map from the loader. */ + kmdp = preload_search_by_type("elf kernel"); + if (kmdp == NULL) + kmdp = preload_search_by_type("elf64 kernel"); + smapbase = (struct bios_smap *)preload_search_info(kmdp, + MODINFO_METADATA | MODINFOMD_SMAP); + smapsize = *((u_int32_t *)smapbase - 1); + return (SYSCTL_OUT(req, smapbase, smapsize)); +} +SYSCTL_PROC(_machdep, OID_AUTO, smap, CTLTYPE_OPAQUE|CTLFLAG_RD, NULL, 0, + smap_sysctl_handler, "S,bios_smap", "Raw BIOS SMAP data"); + void spinlock_enter(void) {