From owner-svn-src-head@freebsd.org Mon Oct 30 22:40:50 2017 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 A9265E2533C; Mon, 30 Oct 2017 22:40:50 +0000 (UTC) (envelope-from andrew@fubar.geek.nz) Received: from fry.fubar.geek.nz (fry.fubar.geek.nz [139.59.165.16]) by mx1.freebsd.org (Postfix) with ESMTP id 78C5274AEB; Mon, 30 Oct 2017 22:40:49 +0000 (UTC) (envelope-from andrew@fubar.geek.nz) Received: from [IPv6:2a02:c7f:1e13:cf00:a53a:b754:fef3:58ee] (unknown [IPv6:2a02:c7f:1e13:cf00:a53a:b754:fef3:58ee]) by fry.fubar.geek.nz (Postfix) with ESMTPSA id 6DDD14E6DC; Mon, 30 Oct 2017 22:40:42 +0000 (UTC) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 10.3 \(3273\)) Subject: Re: svn commit: r325167 - head/sys/net From: Andrew Turner In-Reply-To: <201710302114.v9ULEVHh075576@repo.freebsd.org> Date: Mon, 30 Oct 2017 22:40:39 +0000 Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <045AD4A3-D46B-4B27-9A75-4C8BBB55DAD8@fubar.geek.nz> References: <201710302114.v9ULEVHh075576@repo.freebsd.org> To: Stephen Hurd X-Mailer: Apple Mail (2.3273) 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: Mon, 30 Oct 2017 22:40:50 -0000 > On 30 Oct 2017, at 21:14, Stephen Hurd wrote: >=20 > Author: shurd > Date: Mon Oct 30 21:14:31 2017 > New Revision: 325167 > URL: https://svnweb.freebsd.org/changeset/base/325167 >=20 > Log: > Fix PR222744 - netmap errors with iflib em driver >=20 > Fix error when refilling netmap buffers that resulted in the first > buffer of the successive passes through ifl_bus_addrs[] leaving the > first value unset (tmp_pidx started at 1, not zero after the first = time > through the loop). >=20 > Leave the one unused buffer required by some NICs visible in the = netmap > ring rather than hidden. There will always be a buffer in use by the > kernel now when an iflib driver is used via netmap. >=20 > Always get the netmap slot index via netmap_idx_n2k() to account for > nkr_hwofs in a consistent way. >=20 > Split shared functionality into new functions. > iru_init(): shared by _iflib_fl_refill() and netmap_fl_refill() > netmap_fl_refill(): shared by iflib_netmap_rxsync() and > iflib_netmap_rxq_init() >=20 > PR: 222744 > Reported by: Shirkdog > Reviewed by: sbruno > Approved by: sbruno (mentor) > Sponsored by: Limelight Networks > Differential Revision: https://reviews.freebsd.org/D12769 This breaks building without netmap as iru_init is within an #ifdef = DEV_NETMAP block, but is declared and used outside this: --- iflib.o --- = /jenkins/workspace/FreeBSD-arm64-head/freebsd-head/sys/net/iflib.c:140:13:= error: function 'iru_init' has internal linkage but is not defined = [-Werror,-Wundefined-internal] static void iru_init(if_rxd_update_t iru, iflib_rxq_t rxq, uint8_t = flid); ^ = /jenkins/workspace/FreeBSD-arm64-head/freebsd-head/sys/net/iflib.c:1841:2:= note: used here iru_init(&iru, fl->ifl_rxq, fl->ifl_id); ^ 1 error generated. Andrew