From owner-svn-src-head@freebsd.org Sat Oct 8 17:47:22 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B393DC062DC; Sat, 8 Oct 2016 17:47:22 +0000 (UTC) (envelope-from cy.schubert@komquats.com) Received: from smtp-out-no.shaw.ca (smtp-out-no.shaw.ca [64.59.134.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 583E1123; Sat, 8 Oct 2016 17:47:21 +0000 (UTC) (envelope-from cy.schubert@komquats.com) Received: from spqr.komquats.com ([96.50.22.10]) by shaw.ca with SMTP id sviJbAdZoFfiXsviKbxD2M; Sat, 08 Oct 2016 11:47:14 -0600 X-Authority-Analysis: v=2.2 cv=Qb8khYTv c=1 sm=1 tr=0 a=jvE2nwUzI0ECrNeyr98KWA==:117 a=jvE2nwUzI0ECrNeyr98KWA==:17 a=L9H7d07YOLsA:10 a=9cW_t1CCXrUA:10 a=s5jvgZ67dGcA:10 a=CH0kA5CcgfcA:10 a=SAfkavq5AAAA:8 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=FXDZoWYHE00IIdgZMLQA:9 a=CjuIK1q_8ugA:10 a=QZZ0i9YZlR7GoCpEi5UP:22 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTPS id 8FB80C19; Sat, 8 Oct 2016 10:47:11 -0700 (PDT) Received: from slippy (localhost [127.0.0.1]) by slippy.cwsent.com (8.15.2/8.15.2) with ESMTP id u98HlBtG006509; Sat, 8 Oct 2016 10:47:11 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <201610081747.u98HlBtG006509@slippy.cwsent.com> X-Mailer: exmh version 2.8.0 04/21/2012 with nmh-1.6 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Kevin Lo cc: Gleb Smirnoff , rwatson@FreeBSD.org, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r305824 - in head/sys: contrib/ipfilter/netinet kern net netinet netinet6 netipsec sys In-Reply-To: Message from Kevin Lo of "Sat, 08 Oct 2016 22:59:09 +0800." <20161008145909.GA5225@ns.kevlo.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Sat, 08 Oct 2016 10:47:11 -0700 X-CMAE-Envelope: MS4wfAtWlEhFwGrfRf/atIVLQnjAR+Pvs7gEZTIblNvuNgzRZCi0rigy8uoXQV5jldx6YIT8DfsTjtRP20Q+YA/Lke8TtxXyU/hP8aB9Z9GoD7c9+DzbcVuF +7qRixRovcXsEjRdFd4eHDAkXTxNsB7i4aJvk78wrFE7WtyvqFGJKX1tEMmKfm2rkgNRtn7BZHtJ7Y/Heqf2FqthvXAFfhQ8fOQ6BvNIUIsI7sLT5Mu7yL3T 3RdQN98CL1iEnz4AOB9sXZaOTTcEjeMLQOVfWVvQ52+8kgCQvrrklYMWFQURSigiCX/u2GBWy/EMGEnn/+Qbl0odsJiG79g9RSWhyQ77k6N5E5oSBDC7OyIf OoWMyUkA X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 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: Sat, 08 Oct 2016 17:47:22 -0000 In message <20161008145909.GA5225@ns.kevlo.org>, Kevin Lo writes: > On Wed, Oct 05, 2016 at 04:14:42PM -0700, Gleb Smirnoff wrote: > > > > On Wed, Oct 05, 2016 at 11:20:58AM +0800, Kevin Lo wrote: > > K> > On Thu, Sep 15, 2016 at 07:41:48AM +0000, Kevin Lo wrote: > > K> > K> Log: > > K> > K> Remove the 4.3BSD compatible macro m_copy(), use m_copym() instea > d. > > K> > ... > > K> > K> Modified: head/sys/contrib/ipfilter/netinet/fil.c > > K> > K> =================================================================== > =========== > > K> > K> --- head/sys/contrib/ipfilter/netinet/fil.c Thu Sep 15 02:48:56 201 > 6 (r305823) > > K> > K> +++ head/sys/contrib/ipfilter/netinet/fil.c Thu Sep 15 07:41:48 201 > 6 (r305824) > > K> > K> @@ -3226,7 +3226,7 @@ filterdone: > > K> > K> fdp = fin->fin_dif; > > K> > K> if ((fdp != NULL) && (fdp->fd_ptr != NULL) && > > K> > K> (fdp->fd_ptr != (void *)-1)) { > > K> > K> - mc = M_COPY(fin->fin_m); > > K> > K> + mc = M_COPYM(fin->fin_m); > > K> > K> if (mc != NULL) > > K> > K> ipf_fastroute(mc, &mc, fin, fdp); > > K> > K> } > > K> > K> > > K> > K> Modified: head/sys/contrib/ipfilter/netinet/ip_compat.h > > K> > K> =================================================================== > =========== > > K> > K> --- head/sys/contrib/ipfilter/netinet/ip_compat.h Thu Sep 15 02:4 > 8:56 2016 (r305823) > > K> > K> +++ head/sys/contrib/ipfilter/netinet/ip_compat.h Thu Sep 15 07:4 > 1:48 2016 (r305824) > > K> > K> @@ -211,7 +211,7 @@ struct ether_addr { > > K> > K> # define MSGDSIZE(m) mbufchainlen(m) > > K> > K> # define M_LEN(m) (m)->m_len > > K> > K> # define M_ADJ(m,x) m_adj(m, x) > > K> > K> -# define M_COPY(x) m_copy((x), 0, M_COPYALL) > > K> > K> +# define M_COPYM(x) m_copym((x), 0, M_COPYALL, M_NOWAIT) > > K> > K> # define M_DUP(m) m_dup(m, M_NOWAIT) > > K> > K> # define IPF_PANIC(x,y) if (x) { printf y; panic("ipf_panic"); > } > > K> > K> typedef struct mbuf mb_t; > > K> > K> @@ -366,7 +366,7 @@ typedef struct mb_s { > > K> > K> # define MSGDSIZE(m) msgdsize(m) > > K> > K> # define M_LEN(m) (m)->mb_len > > K> > K> # define M_ADJ(m,x) (m)->mb_len += x > > K> > K> -# define M_COPY(m) dupmbt(m) > > K> > K> +# define M_COPYM(m) dupmbt(m) > > K> > K> # define M_DUP(m) dupmbt(m) > > K> > K> # define GETKTIME(x) gettimeofday((struct timeval *)(x), NUL > L) > > K> > K> # define MTOD(m, t) ((t)(m)->mb_data) > > K> > > > K> > IMHO, for contributed ipfilter we should only modify ip_compat.h and i > p_fil_freebsd.c. > > K> > In case of removal of m_copy() the macro should remain named M_COPY(), > but it should be > > K> > defined to call to function of m_copym(). So fil.c can be left unmodif > ied, and ip_compat.h > > K> > will have only 1 line change. The userland part of ip_compat.h which d > efines M_COPY() to > > K> > dupmbt() doesn't need to be renamed as well. > > K> > > K> Actually your comments were addressed in my original patch, but rwatson@ > > K> pointed out that switching M_COPY() to M_COPYM() for consistency: > > K> https://reviews.freebsd.org/D7878#163304 > > > > This looks more like a general comment, not comment to ipfilter part. Rober > t, > > can you confirm please? > > > > The ipfilter part should have modifications only in ip_compat.h and ip_fil_ > freebsd.c. > > Fixed in r306849, thanks. Thank you Kevin. -- Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few.