From owner-freebsd-current@FreeBSD.ORG Sun Nov 20 18:31:24 2011 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A8544106566B; Sun, 20 Nov 2011 18:31:24 +0000 (UTC) (envelope-from asmrookie@gmail.com) Received: from mail-ww0-f50.google.com (mail-ww0-f50.google.com [74.125.82.50]) by mx1.freebsd.org (Postfix) with ESMTP id A347A8FC18; Sun, 20 Nov 2011 18:31:23 +0000 (UTC) Received: by wwg14 with SMTP id 14so8401565wwg.31 for ; Sun, 20 Nov 2011 10:31:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=kXpnsuOSmKYlkX6ZVDiriwPYEtCWUkHxLlgjJlbCyqU=; b=miHmgQ5xxneB+GkSekdxetbvfZ8N/8HMkYn0apVYByIJjqlLWBii3/RHc6oY9iWbjL FHmJkkY5P/7xCS29UrqHrNxrm0Y4uMqCM2HyGvA7o8SQt0S073lGAXPUaRJDRzKtt/9d i4ZcLw4iPL65h+PMwNkaQLopWA/WvTdwPIq8k= MIME-Version: 1.0 Received: by 10.216.176.14 with SMTP id a14mr1593894wem.14.1321813882473; Sun, 20 Nov 2011 10:31:22 -0800 (PST) Sender: asmrookie@gmail.com Received: by 10.216.85.8 with HTTP; Sun, 20 Nov 2011 10:31:22 -0800 (PST) In-Reply-To: <20111120182718.GZ50300@deviant.kiev.zoral.com.ua> References: <20111107193516.GA50300@deviant.kiev.zoral.com.ua> <20111116084542.GY50300@deviant.kiev.zoral.com.ua> <20111118105224.GB50300@deviant.kiev.zoral.com.ua> <20111120173855.GX50300@deviant.kiev.zoral.com.ua> <20111120182718.GZ50300@deviant.kiev.zoral.com.ua> Date: Sun, 20 Nov 2011 19:31:22 +0100 X-Google-Sender-Auth: UNaOrLmAXYN0bonAU7FojWm47L8 Message-ID: From: Attilio Rao To: Kostik Belousov Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Cc: mdf@freebsd.org, "K. Macy" , Alan Cox , Andriy Gapon , freebsd-current@freebsd.org, Benjamin Kaduk , Penta Upa Subject: Re: vm_page_t related KBI [Was: Re: panic at vm_page_wire with FreeBSD 9.0 Beta 3] X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Nov 2011 18:31:24 -0000 It looks good to me. Attilio 2011/11/20 Kostik Belousov : > On Sun, Nov 20, 2011 at 07:02:14PM +0100, Attilio Rao wrote: >> 2011/11/20 Kostik Belousov : >> > +#define =C2=A0 =C2=A0 =C2=A0 =C2=A0vm_page_lock_assert(m, a) =C2=A0 = =C2=A0 =C2=A0 \ >> > + =C2=A0 =C2=A0vm_page_lock_assert_KBI((m), (a), LOCK_FILE, LOCK_LINE) >> >> I think you should put the "\" in the last tab and also, for >> consistency, you may want to use __FILE__ and __LINE__ for assert (or >> maybe I should also switch mutex.h to use LOCK_FILE and LOCK_LINE at >> some point?). > I never saw the requirement for the backslash. I am consistent with > PA_UNLOCK_COND() several lines above. > > Changed assert to use __FILE/LINE__. > >> >> > +#else >> > +#define =C2=A0 =C2=A0 =C2=A0 =C2=A0vm_page_lock_assert(m, a) >> > +#endif >> > +#else =C2=A0/* KLD_MODULE */ >> >> This should be /* !KLD_MODULE */, I guess? > Changed. > >> >> > =C2=A0#define =C2=A0 =C2=A0 =C2=A0 =C2=A0vm_page_lockptr(m) >> >> This is not defined for the KLD_MODULE case? > Yes, explicitely. This was discussed. > http://lists.freebsd.org/pipermail/freebsd-current/2011-November/029009.h= tml > > diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c > index d592ac0..74e5126 100644 > --- a/sys/vm/vm_page.c > +++ b/sys/vm/vm_page.c > @@ -2843,6 +2843,34 @@ vm_page_test_dirty(vm_page_t m) > =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0vm_page_dirty(m); > =C2=A0} > > +void > +vm_page_lock_KBI(vm_page_t m, const char *file, int line) > +{ > + > + =C2=A0 =C2=A0 =C2=A0 mtx_lock_flags_(vm_page_lockptr(m), 0, file, line)= ; > +} > + > +void > +vm_page_unlock_KBI(vm_page_t m, const char *file, int line) > +{ > + > + =C2=A0 =C2=A0 =C2=A0 mtx_unlock_flags_(vm_page_lockptr(m), 0, file, lin= e); > +} > + > +int > +vm_page_trylock_KBI(vm_page_t m, const char *file, int line) > +{ > + > + =C2=A0 =C2=A0 =C2=A0 return (mtx_trylock_flags_(vm_page_lockptr(m), 0, = file, line)); > +} > + > +void > +vm_page_lock_assert_KBI(vm_page_t m, int a, const char *file, int line) > +{ > + > + =C2=A0 =C2=A0 =C2=A0 mtx_assert_(vm_page_lockptr(m), a, file, line); > +} > + > =C2=A0int so_zerocp_fullpage =3D 0; > > =C2=A0/* > diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h > index 151710d..1fab735 100644 > --- a/sys/vm/vm_page.h > +++ b/sys/vm/vm_page.h > @@ -218,11 +218,23 @@ extern struct vpglocks pa_lock[]; > > =C2=A0#define =C2=A0 =C2=A0 =C2=A0 =C2=A0PA_LOCK_ASSERT(pa, a) =C2=A0 mtx= _assert(PA_LOCKPTR(pa), (a)) > > +#ifdef KLD_MODULE > +#define =C2=A0 =C2=A0 =C2=A0 =C2=A0vm_page_lock(m) =C2=A0 =C2=A0 =C2=A0 = =C2=A0 vm_page_lock_KBI((m), LOCK_FILE, LOCK_LINE) > +#define =C2=A0 =C2=A0 =C2=A0 =C2=A0vm_page_unlock(m) =C2=A0 =C2=A0 =C2= =A0 vm_page_unlock_KBI((m), LOCK_FILE, LOCK_LINE) > +#define =C2=A0 =C2=A0 =C2=A0 =C2=A0vm_page_trylock(m) =C2=A0 =C2=A0 =C2= =A0vm_page_trylock_KBI((m), LOCK_FILE, LOCK_LINE) > +#ifdef INVARIANTS > +#define =C2=A0 =C2=A0 =C2=A0 =C2=A0vm_page_lock_assert(m, a) =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 \ > + =C2=A0 =C2=A0vm_page_lock_assert_KBI((m), (a), __FILE__, __LINE__) > +#else > +#define =C2=A0 =C2=A0 =C2=A0 =C2=A0vm_page_lock_assert(m, a) > +#endif > +#else =C2=A0/* !KLD_MODULE */ > =C2=A0#define =C2=A0 =C2=A0 =C2=A0 =C2=A0vm_page_lockptr(m) =C2=A0 =C2=A0= =C2=A0(PA_LOCKPTR(VM_PAGE_TO_PHYS((m)))) > =C2=A0#define =C2=A0 =C2=A0 =C2=A0 =C2=A0vm_page_lock(m) =C2=A0 =C2=A0 = =C2=A0 =C2=A0 mtx_lock(vm_page_lockptr((m))) > =C2=A0#define =C2=A0 =C2=A0 =C2=A0 =C2=A0vm_page_unlock(m) =C2=A0 =C2=A0 = =C2=A0 mtx_unlock(vm_page_lockptr((m))) > =C2=A0#define =C2=A0 =C2=A0 =C2=A0 =C2=A0vm_page_trylock(m) =C2=A0 =C2=A0= =C2=A0mtx_trylock(vm_page_lockptr((m))) > =C2=A0#define =C2=A0 =C2=A0 =C2=A0 =C2=A0vm_page_lock_assert(m, a) =C2=A0= =C2=A0 =C2=A0 mtx_assert(vm_page_lockptr((m)), (a)) > +#endif > > =C2=A0#define =C2=A0 =C2=A0 =C2=A0 =C2=A0vm_page_queue_free_mtx =C2=A0vm_= page_queue_free_lock.data > =C2=A0/* > @@ -405,6 +417,11 @@ void vm_page_cowfault (vm_page_t); > =C2=A0int vm_page_cowsetup(vm_page_t); > =C2=A0void vm_page_cowclear (vm_page_t); > > +void vm_page_lock_KBI(vm_page_t m, const char *file, int line); > +void vm_page_unlock_KBI(vm_page_t m, const char *file, int line); > +int vm_page_trylock_KBI(vm_page_t m, const char *file, int line); > +void vm_page_lock_assert_KBI(vm_page_t m, int a, const char *file, int l= ine); > + > =C2=A0#ifdef INVARIANTS > =C2=A0void vm_page_object_lock_assert(vm_page_t m); > =C2=A0#define =C2=A0 =C2=A0 =C2=A0 =C2=A0VM_PAGE_OBJECT_LOCK_ASSERT(m) = =C2=A0 vm_page_object_lock_assert(m) > --=20 Peace can only be achieved by understanding - A. Einstein