svn commit: r315333 - in stable/10/sys: conf dev/ixgbe modules/ix modules/ixv

[Eric Joyner]

Ngie,

It looks like what's in the commit is using an older version of netmap, so
I think we're okay on that. I think the naming conflict may be due to
splitting the ixgbe_netmap.c file into ixgbe_netmap.c & ixv_netmap.c, and
not having the functions in ixv_netmap.c be renamed.

I don't think the PCI_IOV stuff should be left in there. At least from what
I gathered in D4767, it's probably abandoned in 10.

Cy,

Are you using special options in your kernel config file? "device ixgbe"
works for me, so I want to assume you have "device netmap" in your config
file, unless you're missing INET and/or INET6.

On Thu, Mar 16, 2017 at 10:00 AM Ngie Cooper <yaneurabeya at gmail.com> wrote:

>
> On Mar 16, 2017, at 09:29, Eric Joyner <erj at freebsd.org> wrote:
>
> I'm looking at this now.
>
> Cy, in your case it sounds like the "device ixgbe" option is broken. I'll
> work on getting that to build again.
>
> The LINT build error looks like a netmap linking issue (probably due to
> Jeb moving/copying netmap stuff into the driver folder), so that'll be fun
> to root cause.
>
>
> Hi Eric,
>     One sandtrap to be aware of is r307394 (and corresponding commits)
> not being MFCed, along with a host of PCI-IOV, etc changes not being easily
> backportable.
>     If you can, look for commits from me in the r29xxxx series citing
> ix_crcstrip (it was a backport from bz@ to unbreak LINT on head that also
> fixed stable/10).
> Thanks!
> -Ngie
>
> On Thu, Mar 16, 2017 at 7:10 AM Cy Schubert <Cy.Schubert at komquats.com>
> wrote:
>
> In message <62C8A9FD-1EE0-4DEF-A28A-843DBBB4972A at gmail.com>, "Ngie Cooper
> (yane
> urabeya)" writes:
> >
> > --Apple-Mail=_BD9D96B3-A5E1-4DF6-8A1A-EEC15F03AFC5
> > Content-Transfer-Encoding: quoted-printable
> > Content-Type: text/plain;
> >       charset=us-ascii
> >
> >
> > > On Mar 15, 2017, at 14:20, Eric Joyner <erj at FreeBSD.org> wrote:
> > >=20
> > > Author: erj
> > > Date: Wed Mar 15 21:20:17 2017
> > > New Revision: 315333
> > > URL: https://svnweb.freebsd.org/changeset/base/315333
> > >=20
> > > Log:
> > >  ixgbe(4): Update to 3.2.11-k
> > >=20
> > >  Includes:
> > >=20
> > >  1. Support for X553 (Denverton) Ethernet devices.
> > >  2. Initialization code refactoring.
> > >  3. ixgbe-specific netmap code moved to ixgbe folder
> > >     (but not removed from dev/netmap/).
> > >  4. VF driver full split. Some cleanup can be had due to redundant =
> > code,
> > >     but this split goes inline with the refactoring.
> > >=20
> > >  NOTE: This is a direct commit to stable/10. Newer branches will =
> > receive an
> > >  iflib-converted version of ixgbe, with these updates included, =
> > instead.
> > >=20
> > >  Differential Revision: https://reviews.freebsd.org/D9310
> > >  Submitted by: Jeb Cramer (jeb.j.cramer at intel.com)
> > >  Tested by: Jeffrey Pieper (jeffrey.e.pieper at intel.com)
> > >  Sponsored by:      Intel Corporation
> >
> > Hi Eric,
> >       This commit broke amd64/LINT, further (there are other issues =
> > preventing it from passing): =
> > https://ci.freebsd.org/job/FreeBSD-stable-10-amd64-LINT/543/console .
>
> It also broke buildkernel while building the ixgbe module in my
> stable10/amd64 VM.
>
>
> --
> Cheers,
> Cy Schubert <Cy.Schubert at cschubert.com>
> FreeBSD UNIX:  <cy at FreeBSD.org>   Web:  http://www.FreeBSD.org
>
>         The need of the many outweighs the greed of the few.
>
>
>