svn commit: r334375 - in head/sys: net netpfil/pf

[Kristof Provost]

On 30 May 2018, at 14:33, Hartmann, O. wrote:
> On Wed, 30 May 2018 14:17:30 +0200
> "Kristof Provost" <kp at FreeBSD.org> wrote:
>
>> On 30 May 2018, at 14:13, Hartmann, O. wrote:
>>> On Wed, 30 May 2018 07:11:34 +0000 (UTC)
>>> Kristof Provost <kp at FreeBSD.org> wrote:
>>>
>>>> Author: kp
>>>> Date: Wed May 30 07:11:33 2018
>>>> New Revision: 334375
>>>> URL: https://svnweb.freebsd.org/changeset/base/334375
>>>>
>>>> Log:
>>>>   pf: Replace rwlock on PF_RULES_LOCK with rmlock
>>>>
>>>>   Given that PF_RULES_LOCK is a mostly read lock, replace the
>>>> rwlock with rmlock. This change improves packet processing rate in
>>>> high pps environments. Benchmarking by olivier@ shows a 65%
>>>> improvement in pps.
>>>>
>>>>   While here, also eliminate all appearances of "sys/rwlock.h"
>>>> includes since it is not used anymore.
>>>>
>>>>   Submitted by:	farrokhi@
>>>>   Differential Revision:
>>>> https://reviews.freebsd.org/D15502
>>>
>>> It seems, this commit issues an error while compiling the kernel:
>>>
>>>
>>> [...]
>>> --- all_subdir_pf ---
>>> --- pf_ruleset.o ---
>>> In file included from /usr/src/sys/netpfil/pf/pf_ruleset.c:57:
>>> In file included from /usr/src/sys/net/pfvar.h:44:
>>> In file included from /usr/src/sys/sys/rmlock.h:37:
>>> /usr/src/sys/sys/mutex.h:96:52: error: expected ')'
>>> int     _mtx_trylock_flags_int(struct mtx *m, int opts
>>> LOCK_FILE_LINE_ARG_DEF); ^
>>> /usr/src/sys/sys/mutex.h:96:27: note: to match this '('
>>> int     _mtx_trylock_flags_int(struct mtx *m, int opts
>>> LOCK_FILE_LINE_ARG_DEF); ^
>>> /usr/src/sys/sys/mutex.h:100:5: error: 'LOCK_DEBUG' is not defined,
>>> evaluates to 0 [-Werror,-Wundef] #if LOCK_DEBUG > 0
>>>     ^
>>> /usr/src/sys/sys/mutex.h:111:5: error: 'LOCK_DEBUG' is not defined,
>>> evaluates to 0 [-Werror,-Wundef] #if LOCK_DEBUG > 0
>>
>> Just to confirm: are you building for mips?
>>
>> Regards,
>> Kristof
>
>
> No, the hardware is a Lenovo E540 notebook equipted with a Intel 4200M
> CPU (Haswell) -> amd64.
>
Odd. The other reports I got were mips only. I did test amd64.
Are you using gcc to build perhaps?

r334379 should fix it.

Regards,
Kristof