From owner-svn-src-all@freebsd.org Thu Aug 24 23:09:40 2017 Return-Path: Delivered-To: svn-src-all@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 48C42DE9FA8; Thu, 24 Aug 2017 23:09:40 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from cell.glebi.us (glebi.us [96.95.210.25]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "cell.glebi.us", Issuer "cell.glebi.us" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 31D2069DA6; Thu, 24 Aug 2017 23:09:39 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from cell.glebi.us (localhost [127.0.0.1]) by cell.glebi.us (8.15.2/8.15.2) with ESMTPS id v7ON9cx3017856 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 24 Aug 2017 16:09:38 -0700 (PDT) (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by cell.glebi.us (8.15.2/8.15.2/Submit) id v7ON9bJ4017855; Thu, 24 Aug 2017 16:09:38 -0700 (PDT) (envelope-from glebius@FreeBSD.org) X-Authentication-Warning: cell.glebi.us: glebius set sender to glebius@FreeBSD.org using -f Date: Thu, 24 Aug 2017 16:09:37 -0700 From: Gleb Smirnoff To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r322866 - head/sys/net Message-ID: <20170824230937.GI1071@FreeBSD.org> References: <201708242308.v7ON8CBq034653@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201708242308.v7ON8CBq034653@repo.freebsd.org> User-Agent: Mutt/1.8.3 (2017-05-23) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 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: Thu, 24 Aug 2017 23:09:40 -0000 Hi, On Thu, Aug 24, 2017 at 11:08:12PM +0000, Gleb Smirnoff wrote: T> Log: T> Garbage collect RT_NORTREF, which is no longer in use after FLOWTABLE removal. T> T> Modified: T> head/sys/net/route.h T> T> Modified: head/sys/net/route.h T> ============================================================================== T> --- head/sys/net/route.h Thu Aug 24 22:56:22 2017 (r322865) T> +++ head/sys/net/route.h Thu Aug 24 23:08:12 2017 (r322866) T> @@ -67,8 +67,6 @@ struct route { T> #define RT_MAY_LOOP_BIT 3 /* dst may require loop copy */ T> #define RT_HAS_HEADER_BIT 4 /* mbuf already have its header prepended */ T> T> -#define RT_CACHING_CONTEXT 0x1 /* XXX: not used anywhere */ T> -#define RT_NORTREF 0x2 /* doesn't hold reference on ro_rt */ T> #define RT_L2_ME (1 << RT_L2_ME_BIT) /* 0x0004 */ T> #define RT_MAY_LOOP (1 << RT_MAY_LOOP_BIT) /* 0x0008 */ T> #define RT_HAS_HEADER (1 << RT_HAS_HEADER_BIT) /* 0x0010 */ T> @@ -411,14 +409,8 @@ struct rt_addrinfo { T> T> #define RO_RTFREE(_ro) do { \ T> if ((_ro)->ro_rt) { \ T> - if ((_ro)->ro_flags & RT_NORTREF) { \ T> - (_ro)->ro_flags &= ~RT_NORTREF; \ T> - (_ro)->ro_rt = NULL; \ T> - (_ro)->ro_lle = NULL; \ T> - } else { \ T> - RT_LOCK((_ro)->ro_rt); \ T> - RTFREE_LOCKED((_ro)->ro_rt); \ T> - } \ T> + RT_LOCK((_ro)->ro_rt); \ T> + RTFREE_LOCKED((_ro)->ro_rt); \ T> } \ T> } while (0) It may also make sense to unroll all instances of RO_RTFREE into two lines of code and remove RO_RTFREE() as well. But I don't have solid opinion on that. Anyone to support me on this as well? -- Totus tuus, Glebius.