Date: Sun, 20 Nov 2011 19:02:14 +0100 From: Attilio Rao <attilio@freebsd.org> To: Kostik Belousov <kostikbel@gmail.com> Cc: mdf@freebsd.org, "K. Macy" <kmacy@freebsd.org>, Alan Cox <alc@rice.edu>, Andriy Gapon <avg@freebsd.org>, freebsd-current@freebsd.org, Benjamin Kaduk <kaduk@mit.edu>, Penta Upa <bsdboot@gmail.com> Subject: Re: vm_page_t related KBI [Was: Re: panic at vm_page_wire with FreeBSD 9.0 Beta 3] Message-ID: <CAJ-FndCz_77A_uVjCiUKvaqfUk%2Byo3zuy5uf85AGZCNRP-yyqw@mail.gmail.com> In-Reply-To: <20111120173855.GX50300@deviant.kiev.zoral.com.ua> References: <20111106124331.GP50300@deviant.kiev.zoral.com.ua> <4EB81942.70501@rice.edu> <20111107193516.GA50300@deviant.kiev.zoral.com.ua> <CAJ-FndDsrVk7EjjtE=QuhaJE1_k7Q1BvQ%2BxriJPnGzLXJQr1sg@mail.gmail.com> <20111116084542.GY50300@deviant.kiev.zoral.com.ua> <CAJ-FndAwWzFJgpCdaaE=YkipZSCtE6Vb8-LEK2_qS=bVhRM3OQ@mail.gmail.com> <20111118105224.GB50300@deviant.kiev.zoral.com.ua> <CAJ-FndAULb9r-FVaBparSJVtoSEQuX7%2BwhCoBNdQi7n%2B=UpEdA@mail.gmail.com> <CAJ-FndCZqwvbi2N=f=5TxkHH3gaKAGxipPoHBCFLqF=sLOTqdQ@mail.gmail.com> <CAJ-FndD%2Bj6WKmsLW9Kv2nDKEJePe=js3xmmj6m6NW3eS1RZD-w@mail.gmail.com> <20111120173855.GX50300@deviant.kiev.zoral.com.ua>
next in thread | previous in thread | raw e-mail | index | archive | help
2011/11/20 Kostik Belousov <kostikbel@gmail.com>: > On Sun, Nov 20, 2011 at 05:37:33PM +0100, Attilio Rao wrote: >> 2011/11/18 Attilio Rao <attilio@freebsd.org>: >> > Please consider: >> > http://www.freebsd.org/~attilio/mutexfileline2.patch >> >> This is now committed as r227758,227759, you can update your patch now. > Here is it. > > 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..fe0295b 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=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?). > +#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? > =C2=A0#define =C2=A0 =C2=A0 =C2=A0 =C2=A0vm_page_lockptr(m) This is not defined for the KLD_MODULE case? Attilio --=20 Peace can only be achieved by understanding - A. Einstein
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAJ-FndCz_77A_uVjCiUKvaqfUk%2Byo3zuy5uf85AGZCNRP-yyqw>