From owner-svn-src-all@freebsd.org Sun Jun 26 21:08:50 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 19103B815C5 for ; Sun, 26 Jun 2016 21:08:50 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: from mail-wm0-x231.google.com (mail-wm0-x231.google.com [IPv6:2a00:1450:400c:c09::231]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9367F2C06 for ; Sun, 26 Jun 2016 21:08:49 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: by mail-wm0-x231.google.com with SMTP id v199so77876421wmv.0 for ; Sun, 26 Jun 2016 14:08:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd-org.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=Yj3klIjK4sxjXUAdvdcTDqeZlb3pO83nJpEXrC80aCg=; b=LBokRETdgK+gdDF5R8FjbDadMUelrVhb4SqAvDE73XzeSRaRuFJ0TxrFwbS3QsAZ1T veCVMq8zgVp7JysXwlJgzlBkMnHbE1f+P38MTgjTj+2C080Ss6iB+3BqoPnFOshukN/P j5LXOfQ4BV45r5JckbcGzAd1jVClViOlq063Y6UskwkX1Tyk9VsjiJwNNZ3UKAV4Gfoe hRtNOaIURdsxNF9qiv2joMxCnvkAvKrs6ysnOlglf9WKQTqXEQKSOYCMLwbrhDtWa+fm 9FXbVn+USHITA9OLKQac3C9Ybpy4EdhujDTP5BlMoMCvDCUI/l2g7TZ5FabFCL/Z0TRE dFWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=Yj3klIjK4sxjXUAdvdcTDqeZlb3pO83nJpEXrC80aCg=; b=Tb127w6i36WAFRz86wR96/8a1QRiMCCA4QbA1VHvv6lLU5fCQJbhHgu/d2IzfC/4vA t7ytlGgDKqAa5hGlsf0SYXvQkVpEMnLzAWkI1XK5b1+cR9MgrSUvKy3boulAnJpYajHk F5zf2KuooC+4yoOhpyYlmy5wKMcg38yOFQ0Aia2cSbWd0YZ7pwez/keSin8ZgHGPAWoi t7sMtt6bOOQwBaBMO8kgL8159Rxat4niTjBBBZy7Bh66kqq4RAk92iiiAhwOl+HcVv9I 4ZM+umtpD3hky+2FyevmTTjK6Iwf769I7aVFiRXFRvRr7X5WIeNlt8Oxh2OzGVUzZVv2 ldYw== X-Gm-Message-State: ALyK8tKWA3+mgrGFB9HppVjFScD0GzqASNnyfs/kNm4Jj1fCkNXtNmx+p+Jm3oo1f3comEELGtSghMHD43o7Wv3U X-Received: by 10.28.30.149 with SMTP id e143mr7141492wme.81.1466975327740; Sun, 26 Jun 2016 14:08:47 -0700 (PDT) MIME-Version: 1.0 Received: by 10.194.45.33 with HTTP; Sun, 26 Jun 2016 14:08:46 -0700 (PDT) In-Reply-To: References: <201606210451.u5L4ptYP082074@repo.freebsd.org> From: Oliver Pinter Date: Sun, 26 Jun 2016 23:08:46 +0200 Message-ID: Subject: Re: svn commit: r302041 - in stable/10/sys: amd64/amd64 amd64/conf conf dev/hyperv/vmbus dev/hyperv/vmbus/amd64 dev/hyperv/vmbus/i386 i386/conf i386/i386 modules/hyperv/vmbus To: Sepherosa Ziehau Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Jun 2016 21:08:50 -0000 And the possible fix: diff --git a/sys/dev/hyperv/vmbus/vmbus.c b/sys/dev/hyperv/vmbus/vmbus.c index 0430952..4ad96d7 100644 --- a/sys/dev/hyperv/vmbus/vmbus.c +++ b/sys/dev/hyperv/vmbus/vmbus.c @@ -404,7 +404,7 @@ vmbus_vector_alloc(void) /* * Search backwards form the highest IDT vector available for use - * as vmbus channel callback vector. We install 'hv_vmbus_callback' + * as vmbus channel callback vector. We install 'vmbus_isr' * handler at that vector and use it to interrupt vcpus. */ vector = APIC_SPURIOUS_INT; @@ -443,7 +443,7 @@ vmbus_vector_free(int vector) ip = &idt[vector]; func = ((long)ip->gd_hioffset << 16 | ip->gd_looffset); - KASSERT(func == (uintptr_t)&IDTVEC(hv_vmbus_callback), + KASSERT(func == (uintptr_t)&IDTVEC(vmbus_isr), ("invalid vector %d", vector)); setidt(vector, IDTVEC(rsvd), SDT_SYSIGT, SEL_KPL, 0); On 6/26/16, Oliver Pinter wrote: > Hi all! > > Some from these hyper-v commits breaks the build with INVARIANTS > enabled kernel on 10-STABLE: > > ~~~ > /vmbus.c:446:30: error: use of undeclared identifier 'Xhv_vmbus_callback' > 14:13:13 KASSERT(func == (uintptr_t)&IDTVEC(hv_vmbus_callback), > ~~~ > > For more details please see this jenkins log: > http://jenkins.hardenedbsd.org:8180/jenkins/job/HardenedBSD-10-STABLE-amd64/462/console > > Btw, does anybody build an INVARIANTS enabled kernel in FreeBSD's > jenkins cluster with 10-STABLE? There are some other issues with > INVARIANTS, for example ZFS + GELI + 10-STABLE : > https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=209580 > > On 6/21/16, Sepherosa Ziehau wrote: >> Author: sephe >> Date: Tue Jun 21 04:51:55 2016 >> New Revision: 302041 >> URL: https://svnweb.freebsd.org/changeset/base/302041 >> >> Log: >> MFC 297931,298022 >> >> 297931 >> Expose doreti as a global symbol on amd64 and i386. >> >> doreti provides the common code path for returning from interrupt >> andlers on x86. Exposing doreti as a global symbol allows kernel >> modules to include low-level interrupt handlers instead of >> requiring >> all low-level handlers to be statically compiled into the kernel. >> >> Submitted by: Howard Su >> Reviewed by: kib >> >> 298022 >> hyperv: Deprecate HYPERV option by moving Hyper-V IDT vector into >> vmbus >> >> Submitted by: Jun Su >> Reviewed by: jhb, kib, sephe >> Sponsored by: Microsoft OSTC >> Differential Revision: https://reviews.freebsd.org/D5910 >> >> Added: >> stable/10/sys/dev/hyperv/vmbus/amd64/ >> - copied from r298022, head/sys/dev/hyperv/vmbus/amd64/ >> stable/10/sys/dev/hyperv/vmbus/i386/ >> - copied from r298022, head/sys/dev/hyperv/vmbus/i386/ >> Modified: >> stable/10/sys/amd64/amd64/apic_vector.S >> stable/10/sys/amd64/amd64/exception.S >> stable/10/sys/amd64/conf/GENERIC >> stable/10/sys/conf/files.amd64 >> stable/10/sys/conf/files.i386 >> stable/10/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c >> stable/10/sys/i386/conf/GENERIC >> stable/10/sys/i386/i386/apic_vector.s >> stable/10/sys/i386/i386/exception.s >> stable/10/sys/modules/hyperv/vmbus/Makefile >> Directory Properties: >> stable/10/ (props changed) >> >> Modified: stable/10/sys/amd64/amd64/apic_vector.S >> ============================================================================== >> --- stable/10/sys/amd64/amd64/apic_vector.S Tue Jun 21 02:36:03 >> 2016 (r302040) >> +++ stable/10/sys/amd64/amd64/apic_vector.S Tue Jun 21 04:51:55 >> 2016 (r302041) >> @@ -150,22 +150,6 @@ IDTVEC(xen_intr_upcall) >> jmp doreti >> #endif >> >> -#ifdef HYPERV >> -/* >> - * This is the Hyper-V vmbus channel direct callback interrupt. >> - * Only used when it is running on Hyper-V. >> - */ >> - .text >> - SUPERALIGN_TEXT >> -IDTVEC(hv_vmbus_callback) >> - PUSH_FRAME >> - FAKE_MCOUNT(TF_RIP(%rsp)) >> - movq %rsp, %rdi >> - call hv_vector_handler >> - MEXITCOUNT >> - jmp doreti >> -#endif >> - >> #ifdef SMP >> /* >> * Global address space TLB shootdown. >> >> Modified: stable/10/sys/amd64/amd64/exception.S >> ============================================================================== >> --- stable/10/sys/amd64/amd64/exception.S Tue Jun 21 02:36:03 >> 2016 (r302040) >> +++ stable/10/sys/amd64/amd64/exception.S Tue Jun 21 04:51:55 >> 2016 (r302041) >> @@ -661,6 +661,7 @@ MCOUNT_LABEL(eintr) >> .text >> SUPERALIGN_TEXT >> .type doreti,@function >> + .globl doreti >> doreti: >> FAKE_MCOUNT($bintr) /* init "from" bintr -> doreti */ >> /* >> >> Modified: stable/10/sys/amd64/conf/GENERIC >> ============================================================================== >> --- stable/10/sys/amd64/conf/GENERIC Tue Jun 21 02:36:03 2016 (r302040) >> +++ stable/10/sys/amd64/conf/GENERIC Tue Jun 21 04:51:55 2016 (r302041) >> @@ -353,7 +353,6 @@ device virtio_scsi # VirtIO SCSI devic >> device virtio_balloon # VirtIO Memory Balloon device >> >> # HyperV drivers and enchancement support >> -# NOTE: HYPERV depends on hyperv. They must be added or removed >> together. >> options HYPERV # Hyper-V kernel infrastructure >> device hyperv # HyperV drivers >> >> >> Modified: stable/10/sys/conf/files.amd64 >> ============================================================================== >> --- stable/10/sys/conf/files.amd64 Tue Jun 21 02:36:03 2016 (r302040) >> +++ stable/10/sys/conf/files.amd64 Tue Jun 21 04:51:55 2016 (r302041) >> @@ -278,6 +278,7 @@ dev/hyperv/vmbus/hv_hv.c optional hyp >> dev/hyperv/vmbus/hv_et.c optional hyperv >> dev/hyperv/vmbus/hv_ring_buffer.c optional hyperv >> dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c optional hyperv >> +dev/hyperv/vmbus/amd64/hv_vector.S optional hyperv >> dev/kbd/kbd.c optional atkbd | sc | ukbd | vt >> dev/lindev/full.c optional lindev >> dev/lindev/lindev.c optional lindev >> >> Modified: stable/10/sys/conf/files.i386 >> ============================================================================== >> --- stable/10/sys/conf/files.i386 Tue Jun 21 02:36:03 2016 (r302040) >> +++ stable/10/sys/conf/files.i386 Tue Jun 21 04:51:55 2016 (r302041) >> @@ -254,6 +254,7 @@ dev/hyperv/vmbus/hv_hv.c optional hyp >> dev/hyperv/vmbus/hv_et.c optional hyperv >> dev/hyperv/vmbus/hv_ring_buffer.c optional hyperv >> dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c optional hyperv >> +dev/hyperv/vmbus/i386/hv_vector.S optional hyperv >> dev/ichwd/ichwd.c optional ichwd >> dev/if_ndis/if_ndis.c optional ndis >> dev/if_ndis/if_ndis_pccard.c optional ndis pccard >> >> Modified: stable/10/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c >> ============================================================================== >> --- stable/10/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c Tue Jun 21 >> 02:36:03 2016 (r302040) >> +++ stable/10/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c Tue Jun 21 >> 04:51:55 2016 (r302041) >> @@ -370,7 +370,6 @@ vmbus_probe(device_t dev) { >> return (BUS_PROBE_DEFAULT); >> } >> >> -#ifdef HYPERV >> extern inthand_t IDTVEC(rsvd), IDTVEC(hv_vmbus_callback); >> >> /** >> @@ -430,21 +429,6 @@ vmbus_vector_free(int vector) >> setidt(vector, IDTVEC(rsvd), SDT_SYSIGT, SEL_KPL, 0); >> } >> >> -#else /* HYPERV */ >> - >> -static int >> -vmbus_vector_alloc(void) >> -{ >> - return(0); >> -} >> - >> -static void >> -vmbus_vector_free(int vector) >> -{ >> -} >> - >> -#endif /* HYPERV */ >> - >> static void >> vmbus_cpuset_setthread_task(void *xmask, int pending __unused) >> { >> >> Modified: stable/10/sys/i386/conf/GENERIC >> ============================================================================== >> --- stable/10/sys/i386/conf/GENERIC Tue Jun 21 02:36:03 2016 (r302040) >> +++ stable/10/sys/i386/conf/GENERIC Tue Jun 21 04:51:55 2016 (r302041) >> @@ -362,7 +362,6 @@ device virtio_scsi # VirtIO SCSI devic >> device virtio_balloon # VirtIO Memory Balloon device >> >> # HyperV drivers and enchancement support >> -# NOTE: HYPERV depends on hyperv. They must be added or removed >> together. >> options HYPERV # Hyper-V kernel infrastructure >> device hyperv # HyperV drivers >> >> >> Modified: stable/10/sys/i386/i386/apic_vector.s >> ============================================================================== >> --- stable/10/sys/i386/i386/apic_vector.s Tue Jun 21 02:36:03 >> 2016 (r302040) >> +++ stable/10/sys/i386/i386/apic_vector.s Tue Jun 21 04:51:55 >> 2016 (r302041) >> @@ -157,25 +157,6 @@ IDTVEC(xen_intr_upcall) >> jmp doreti >> #endif >> >> -#ifdef HYPERV >> -/* >> - * This is the Hyper-V vmbus channel direct callback interrupt. >> - * Only used when it is running on Hyper-V. >> - */ >> - .text >> - SUPERALIGN_TEXT >> -IDTVEC(hv_vmbus_callback) >> - PUSH_FRAME >> - SET_KERNEL_SREGS >> - cld >> - FAKE_MCOUNT(TF_EIP(%esp)) >> - pushl %esp >> - call hv_vector_handler >> - add $4, %esp >> - MEXITCOUNT >> - jmp doreti >> -#endif >> - >> #ifdef SMP >> /* >> * Global address space TLB shootdown. >> >> Modified: stable/10/sys/i386/i386/exception.s >> ============================================================================== >> --- stable/10/sys/i386/i386/exception.s Tue Jun 21 02:36:03 >> 2016 (r302040) >> +++ stable/10/sys/i386/i386/exception.s Tue Jun 21 04:51:55 >> 2016 (r302041) >> @@ -344,6 +344,7 @@ MCOUNT_LABEL(eintr) >> .text >> SUPERALIGN_TEXT >> .type doreti,@function >> + .globl doreti >> doreti: >> FAKE_MCOUNT($bintr) /* init "from" bintr -> doreti */ >> doreti_next: >> >> Modified: stable/10/sys/modules/hyperv/vmbus/Makefile >> ============================================================================== >> --- stable/10/sys/modules/hyperv/vmbus/Makefile Tue Jun 21 02:36:03 >> 2016 (r302040) >> +++ stable/10/sys/modules/hyperv/vmbus/Makefile Tue Jun 21 04:51:55 >> 2016 (r302041) >> @@ -1,7 +1,7 @@ >> # $FreeBSD$ >> >> .PATH: ${.CURDIR}/../../../dev/hyperv/vmbus \ >> - ${.CURDIR}/../../../dev/hyperv/utilities >> + ${.CURDIR}/../../../dev/hyperv/vmbus/${MACHINE_CPUARCH} >> >> KMOD= hv_vmbus >> SRCS= hv_channel.c \ >> @@ -14,8 +14,17 @@ SRCS= hv_channel.c \ >> hv_vmbus_priv.h >> SRCS+= acpi_if.h bus_if.h device_if.h opt_acpi.h >> >> +# XXX: for assym.s >> +SRCS+= opt_kstack_pages.h opt_nfs.h opt_apic.h opt_hwpmc_hooks.h >> opt_compat.h >> + >> +SRCS+= assym.s \ >> + hv_vector.S >> + >> +hv_vector.o: >> + ${CC} -c -x assembler-with-cpp -DLOCORE ${CFLAGS} \ >> + ${.IMPSRC} -o ${.TARGET} >> + >> CFLAGS+= -I${.CURDIR}/../../../dev/hyperv/include \ >> - -I${.CURDIR}/../../../dev/hyperv/vmbus \ >> - -I${.CURDIR}/../../../dev/hyperv/utilities >> + -I${.CURDIR}/../../../dev/hyperv/vmbus >> >> .include >> _______________________________________________ >> svn-src-stable-10@freebsd.org mailing list >> https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10 >> To unsubscribe, send any mail to >> "svn-src-stable-10-unsubscribe@freebsd.org" >> >