Re: vm_page_t related KBI [Was: Re: panic at vm_page_wire with FreeBSD 9.0 Beta 3]

It looks good to me.

Attilio

2011/11/20 Kostik Belousov <kostikbel_at_gmail.com>:
> On Sun, Nov 20, 2011 at 07:02:14PM +0100, Attilio Rao wrote:
>> 2011/11/20 Kostik Belousov <kostikbel_at_gmail.com>:
>> > +#define        vm_page_lock_assert(m, a)       \
>> > +    vm_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        vm_page_lock_assert(m, a)
>> > +#endif
>> > +#else  /* KLD_MODULE */
>>
>> This should be /* !KLD_MODULE */, I guess?
> Changed.
>
>>
>> >  #define        vm_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.html
>
> 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
> _at__at_ -2843,6 +2843,34 _at__at_ vm_page_test_dirty(vm_page_t m)
>                vm_page_dirty(m);
>  }
>
> +void
> +vm_page_lock_KBI(vm_page_t m, const char *file, int line)
> +{
> +
> +       mtx_lock_flags_(vm_page_lockptr(m), 0, file, line);
> +}
> +
> +void
> +vm_page_unlock_KBI(vm_page_t m, const char *file, int line)
> +{
> +
> +       mtx_unlock_flags_(vm_page_lockptr(m), 0, file, line);
> +}
> +
> +int
> +vm_page_trylock_KBI(vm_page_t m, const char *file, int line)
> +{
> +
> +       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)
> +{
> +
> +       mtx_assert_(vm_page_lockptr(m), a, file, line);
> +}
> +
>  int so_zerocp_fullpage = 0;
>
>  /*
> 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
> _at__at_ -218,11 +218,23 _at__at_ extern struct vpglocks pa_lock[];
>
>  #define        PA_LOCK_ASSERT(pa, a)   mtx_assert(PA_LOCKPTR(pa), (a))
>
> +#ifdef KLD_MODULE
> +#define        vm_page_lock(m)         vm_page_lock_KBI((m), LOCK_FILE, LOCK_LINE)
> +#define        vm_page_unlock(m)       vm_page_unlock_KBI((m), LOCK_FILE, LOCK_LINE)
> +#define        vm_page_trylock(m)      vm_page_trylock_KBI((m), LOCK_FILE, LOCK_LINE)
> +#ifdef INVARIANTS
> +#define        vm_page_lock_assert(m, a)               \
> +    vm_page_lock_assert_KBI((m), (a), __FILE__, __LINE__)
> +#else
> +#define        vm_page_lock_assert(m, a)
> +#endif
> +#else  /* !KLD_MODULE */
>  #define        vm_page_lockptr(m)      (PA_LOCKPTR(VM_PAGE_TO_PHYS((m))))
>  #define        vm_page_lock(m)         mtx_lock(vm_page_lockptr((m)))
>  #define        vm_page_unlock(m)       mtx_unlock(vm_page_lockptr((m)))
>  #define        vm_page_trylock(m)      mtx_trylock(vm_page_lockptr((m)))
>  #define        vm_page_lock_assert(m, a)       mtx_assert(vm_page_lockptr((m)), (a))
> +#endif
>
>  #define        vm_page_queue_free_mtx  vm_page_queue_free_lock.data
>  /*
> _at__at_ -405,6 +417,11 _at__at_ void vm_page_cowfault (vm_page_t);
>  int vm_page_cowsetup(vm_page_t);
>  void 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 line);
> +
>  #ifdef INVARIANTS
>  void vm_page_object_lock_assert(vm_page_t m);
>  #define        VM_PAGE_OBJECT_LOCK_ASSERT(m)   vm_page_object_lock_assert(m)
>



-- 
Peace can only be achieved by understanding - A. Einstein