From owner-svn-src-head@freebsd.org Wed May 30 12:17:34 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6A58BEF61FF; Wed, 30 May 2018 12:17:34 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from smtp.freebsd.org (unknown [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1D2E38019C; Wed, 30 May 2018 12:17:34 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from venus.codepro.be (venus.codepro.be [IPv6:2a01:4f8:162:1127::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "*.codepro.be", Issuer "Gandi Standard SSL CA 2" (verified OK)) (Authenticated sender: kp) by smtp.freebsd.org (Postfix) with ESMTPSA id D667526A08; Wed, 30 May 2018 12:17:33 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from [172.28.128.1] (ptr-8ripyygk132m260h1d8.18120a2.ip6.access.telenet.be [IPv6:2a02:1811:2419:4e02:8deb:e195:6c41:992c]) (Authenticated sender: kp) by venus.codepro.be (Postfix) with ESMTPSA id D0176411AF; Wed, 30 May 2018 14:17:31 +0200 (CEST) From: "Kristof Provost" To: "Hartmann, O." Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r334375 - in head/sys: net netpfil/pf Date: Wed, 30 May 2018 14:17:30 +0200 X-Mailer: MailMate (2.0BETAr6111) Message-ID: <92B96A88-6F0C-4C5B-A924-4E4CD0777116@FreeBSD.org> In-Reply-To: <20180530141347.1bf868ac@hermann> References: <201805300711.w4U7BYjS066960@repo.freebsd.org> <20180530141347.1bf868ac@hermann> MIME-Version: 1.0 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 May 2018 12:17:34 -0000 On 30 May 2018, at 14:13, Hartmann, O. wrote: > On Wed, 30 May 2018 07:11:34 +0000 (UTC) > Kristof Provost 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