From owner-svn-src-all@FreeBSD.ORG Mon Jun 21 20:46:17 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 72B201065675; Mon, 21 Jun 2010 20:46:17 +0000 (UTC) (envelope-from mavbsd@gmail.com) Received: from mail-fx0-f54.google.com (mail-fx0-f54.google.com [209.85.161.54]) by mx1.freebsd.org (Postfix) with ESMTP id 9FC748FC13; Mon, 21 Jun 2010 20:46:16 +0000 (UTC) Received: by fxm7 with SMTP id 7so2535105fxm.13 for ; Mon, 21 Jun 2010 13:46:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:message-id:date:from :user-agent:mime-version:to:cc:subject:references:in-reply-to :x-enigmail-version:content-type:content-transfer-encoding; bh=JIvd8FIKKbJK88VVyxK+uai7aEzONeN75i+hp7vELNw=; b=LT7kdukop5J+FeFG1Eyv9fC53hPtHk0yfMieWj+uOC+KJ16sxmvsWHCATWBOtbtX5N 8nvvM/7jCSQ+LOolaOECUt4/duyzt3Vw0iY7FdDGLaBYs8uJgk31hUjuMe8KE9RKQJOd fbn9vWrRqfTBRHocNllCb2Xg2XX5F0SyIUVmc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:x-enigmail-version:content-type :content-transfer-encoding; b=VJc0nDJEomYGlxQ8/fWfQ4nZup1QfPmYe8XXV8nYD2scjRZ4mlzpEa0Yv6PYJydLfv W+3GFra0JjCYTel9UF2rGcgni/hJIUJlBIcL3aXXelOWc5k46Ec64yaueUQwVvRnkY1E 0mcBPmOr1+IYyYv4PVQTtN4SXz3OPuegov+9w= Received: by 10.223.66.21 with SMTP id l21mr5388110fai.90.1277153175330; Mon, 21 Jun 2010 13:46:15 -0700 (PDT) Received: from mavbook.mavhome.dp.ua (pc.mavhome.dp.ua [212.86.226.226]) by mx.google.com with ESMTPS id e11sm28246108fak.17.2010.06.21.13.46.14 (version=SSLv3 cipher=RC4-MD5); Mon, 21 Jun 2010 13:46:14 -0700 (PDT) Sender: Alexander Motin Message-ID: <4C1FCF93.9000703@FreeBSD.org> Date: Mon, 21 Jun 2010 23:46:11 +0300 From: Alexander Motin User-Agent: Thunderbird 2.0.0.24 (X11/20100402) MIME-Version: 1.0 To: Kostik Belousov References: <201006202133.o5KLXTG1023067@svn.freebsd.org> <20100621195838.GJ13238@deviant.kiev.zoral.com.ua> <4C1FC6C1.5060800@FreeBSD.org> <4C1FC6E1.4080001@FreeBSD.org> <20100621203419.GK13238@deviant.kiev.zoral.com.ua> In-Reply-To: <20100621203419.GK13238@deviant.kiev.zoral.com.ua> X-Enigmail-Version: 0.96.0 Content-Type: text/plain; charset=KOI8-R Content-Transfer-Encoding: 7bit Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org Subject: Re: svn commit: r209371 - in head/sys: amd64/amd64 amd64/include conf dev/acpica i386/i386 i386/include isa kern pc98/cbus sys x86/isa x86/x86 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 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: Mon, 21 Jun 2010 20:46:17 -0000 Kostik Belousov wrote: > On Mon, Jun 21, 2010 at 11:09:05PM +0300, Alexander Motin wrote: >> Alexander Motin wrote: >>> Kostik Belousov wrote: >>>> On Sun, Jun 20, 2010 at 09:33:29PM +0000, Alexander Motin wrote: >>>>> Author: mav >>>>> Date: Sun Jun 20 21:33:29 2010 >>>>> New Revision: 209371 >>>>> URL: http://svn.freebsd.org/changeset/base/209371 >>>>> >>>>> Log: >>>>> Implement new event timers infrastructure. It provides unified APIs for >>>>> writing event timer drivers, for choosing best possible drivers by machine >>>>> independent code and for operating them to supply kernel with hardclock(), >>>>> statclock() and profclock() events in unified fashion on various hardware. >>>> This broke QEMU for me. I cannot boot FreeBSD guest under QEMU anymore. >>>> QEMU (not FreeBSD kernel) panics with >>>> qemu: level-triggered hpet not supported >>>> message. >>> According to specification, it is not optional. No more cookies! > Is there a way to disable hpet at all ? It would be fine with me. > Does hint below supposed to do this ? Yes. Hint below disables HPET event timers, leaving only time counter part, almost same as it was before. >>>> Setting kern.eventtimer.timer1 to LAPIC or i8254, and timer2 to NONE >>>> does not help. >>> Try `hint.apic.0.clock=0` and send me verbose dmesg, I'll try to make >>> workaround if possible. >> Sorry, 'hint.hpet.0.clock=0'. >> > Setting the hint results in > panic: lock (time lock) sleep mutex does not match earlier (spin mutex) lock, > with the backtrace > enroll() > witness_init() > lock_init() > mtx_init() > initclocks() > mi_startup() > (transribed by hand). I am surprised that none of my systems fired it. Try this: --- subr_witness.c.prev 2010-06-17 14:07:36.000000000 +0300 +++ subr_witness.c 2010-06-21 23:43:14.000000000 +0300 @@ -495,6 +495,7 @@ static struct witness_order_list_entry o #ifdef HWPMC_HOOKS { "pmc-sleep", &lock_class_mtx_sleep }, #endif + { "time lock", &lock_class_mtx_sleep }, { NULL, NULL }, /* * Sockets @@ -654,7 +655,6 @@ static struct witness_order_list_entry o { "callout", &lock_class_mtx_spin }, { "entropy harvest mutex", &lock_class_mtx_spin }, { "syscons video lock", &lock_class_mtx_spin }, - { "time lock", &lock_class_mtx_spin }, #ifdef SMP { "smp rendezvous", &lock_class_mtx_spin }, #endif -- Alexander Motin