From owner-svn-src-all@freebsd.org Fri Dec 6 22:22:03 2019 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B2F2C1B8D2D; Fri, 6 Dec 2019 22:22:03 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47V6Wv3knkz40CQ; Fri, 6 Dec 2019 22:22:03 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mx1.sbone.de (mx1.sbone.de [IPv6:2a01:4f8:13b:39f::9f:25]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mx1.sbone.de", Issuer "SBone.DE" (not verified)) (Authenticated sender: bz/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4DD1B1327; Fri, 6 Dec 2019 22:22:03 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:31::2013:587]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.sbone.de (Postfix) with ESMTPS id 43AD18D4A25E; Fri, 6 Dec 2019 22:22:01 +0000 (UTC) Received: from content-filter.sbone.de (content-filter.sbone.de [IPv6:fde9:577b:c1a9:31::2013:2742]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id B3CA4E707D5; Fri, 6 Dec 2019 22:22:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:31::2013:587]) by content-filter.sbone.de (content-filter.sbone.de [fde9:577b:c1a9:31::2013:2742]) (amavisd-new, port 10024) with ESMTP id 9tpLqsmy4EN5; Fri, 6 Dec 2019 22:21:59 +0000 (UTC) Received: from [192.168.2.110] (unknown [IPv6:fde9:577b:c1a9:31:cd01:97c2:711b:1d46]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id 1C504E707AC; Fri, 6 Dec 2019 22:21:59 +0000 (UTC) From: "Bjoern A. Zeeb" To: "Gleb Smirnoff" Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r355449 - head/sys/netinet Date: Fri, 06 Dec 2019 22:21:58 +0000 X-Mailer: MailMate (2.0BETAr6146) Message-ID: <128F09FF-8F61-4967-9558-1C7F8976204F@FreeBSD.org> In-Reply-To: <20191206220925.GJ2706@FreeBSD.org> References: <201912061635.xB6GZmpS042391@repo.freebsd.org> <20191206220925.GJ2706@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Dec 2019 22:22:03 -0000 On 6 Dec 2019, at 22:09, Gleb Smirnoff wrote: > Hi, > > there is a functional change here: > > On Fri, Dec 06, 2019 at 04:35:48PM +0000, Bjoern A. Zeeb wrote: > B> URL: https://svnweb.freebsd.org/changeset/base/355449 > B> > B> Log: > B> carp: replace caddr_t with char * > B> > B> Change the remaining caddr_t usages to char * following the > removal > B> of the KAME macros > B> > B> No functional change. > ... > B> @@ -978,6 +978,7 @@ carp_send_ad_locked(struct carp_softc *sc) > B> #endif /* INET */ > B> #ifdef INET6 > B> if (sc->sc_naddrs6) { > B> + struct epoch_tracker et; > B> struct ip6_hdr *ip6; > B> > B> m = m_gethdr(M_NOWAIT, MT_DATA); > B> @@ -1031,8 +1032,10 @@ carp_send_ad_locked(struct carp_softc *sc) > B> > B> CARPSTATS_INC(carps_opackets6); > B> > B> + NET_EPOCH_ENTER(et); > B> carp_send_ad_error(sc, ip6_output(m, NULL, NULL, 0, > B> &sc->sc_carpdev->if_carp->cif_im6o, NULL, NULL)); > B> + NET_EPOCH_EXIT(et); > B> } > B> #endif /* INET6 */ > > This could be correct change, just needs some explanation. Sorry. My bad. I had a patch from a different branch applied in between review and commit and forgot to clean up before committing. I’ll put the epoch changes up for review the next hours/days. I have reverted this part in the meantime in 355466. Thanks for catching this. /bz