Page MenuHomeFreeBSD

MFC ixgbe revision 3.1.0
ClosedPublic

Authored by sbruno on Nov 25 2015, 11:04 AM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Mar 6, 12:21 AM
Unknown Object (File)
Feb 14 2024, 4:54 PM
Unknown Object (File)
Feb 14 2024, 4:45 PM
Unknown Object (File)
Dec 28 2023, 6:54 PM
Unknown Object (File)
Dec 20 2023, 1:37 AM
Unknown Object (File)
Dec 16 2023, 9:18 AM
Unknown Object (File)
Dec 16 2023, 9:17 AM
Unknown Object (File)
Nov 26 2023, 9:41 AM

Details

Summary

This is basically a rebase of 10-STABLE against HEAD ixgbe and brings back everything I thought was possible, including whitespace/style changes that may not be correct but are in HEAD to ease future MFC. It includes RSS stuff and netmap stuff protected by #ifdef. It should stack on top of D4232 to work as a PF and VF in SR-IOV.

Test Plan
  1. Test basic NIC functionality
  2. Test SR-IOV by creating a VF with D4232 and passing it into a bhyve guest

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

kbowling retitled this revision from to MFC ixgbe .
kbowling updated this object.
kbowling edited the test plan for this revision. (Show Details)
kbowling added reviewers: erj, sbruno.
kbowling set the repository for this revision to rS FreeBSD src repository - subversion.
kbowling added subscribers: j-nitrology.com, rstone.
kbowling added a subscriber: smh.

I believe RSS support isn't being back ported to stable/10 which is why I've done a partial MFC of commits excluding RSS in https://reviews.freebsd.org/D4265.

It may well however be easier to keep things in sync by just excluding the relevant IXGBE_STANDALONE_BUILD block, as that avoids all the merge issues around the RSS blocks, although that does mean there's more dead code in the stable/10 branch.

I'm interested to see what peoples thoughts are on this as initially I went with removal of the RSS blocks but I'm now questioning that decision?

There is one actual code difference, the include for RSS is manually deleted in this current patch. I wanted to ease future intel MFCs as the rest of those features are #ifdefed. A straight diff seemed a lot easier since things seem to change a lot across many commits for new card support and refactoring. Will defer to whatever others think is right, I can easily delete the #ifdef'ed RSS stuff.

smh added a reviewer: smh.
This revision is now accepted and ready to land.Dec 4 2015, 10:10 AM
sbruno edited reviewers, added: kbowling; removed: sbruno.

Taking over as I'm about to MFC this.

sbruno edited edge metadata.
sbruno retitled this revision from MFC ixgbe to MFC ixgbe.
sbruno edited the test plan for this revision. (Show Details)

This now compiles. Need to review this against svn r283883 as I think
this is what the revision is trying to do.

This revision now requires review to proceed.Jan 14 2016, 9:17 PM
sbruno retitled this revision from MFC ixgbe to MFC ixgbe revision 3.1.0.Jan 14 2016, 9:22 PM
sbruno edited edge metadata.
kbowling edited edge metadata.
This revision is now accepted and ready to land.Jan 14 2016, 10:10 PM

Revisions considered r289238, r286238, r285592, r285591, r285590, r285528, r283893, r283883, r283882, r283881

smh edited edge metadata.

All good, any reason to update to 3.1.13-k?

sys/dev/ixgbe/if_ixv.c
173 ↗(On Diff #12330)

As a side note this will be invisible to users, so HEAD should change this and others to a SYSCTL.

sys/dev/ixgbe/ix_txrx.c
598 ↗(On Diff #12330)

This change is actually against style(9) but something that should be fixed in head.

1403 ↗(On Diff #12330)

As above.

1426 ↗(On Diff #12330)

And again

This revision was automatically updated to reflect the committed changes.
ngie added inline comments.
stable/10/sys/dev/ixgbe/if_ix.c
2692

I think this broke stable/10 on i386..

This revision is now accepted and ready to land.Jan 18 2016, 4:06 PM
sbruno edited edge metadata.

Reopen to fix build failures on stable/10.

Address if_baudrate difference on 10 vs head.

Include changes to netmap.

This revision now requires review to proceed.Jan 18 2016, 4:07 PM
sbruno edited edge metadata.

Really, really, *REALLY* fix compile with netmap enabled.

Remove duplicate ixgbe_set_sysctl_value() code block that was erroneously
included during the merge.

kbowling edited edge metadata.

I've built and booted Sean's latest patch, 12434, on an 82599ES.

This revision is now accepted and ready to land.Jan 18 2016, 8:06 PM

sbruno: could you please tell me which revisions are being MFCed and how you got the diff, so I can "replay" them and make sure everything's in the right spots (just want to make sure *just* the right amount of diff is being pulled in to stable/10 this time)?

Reopen to fix build failures on stable/10.

Address if_baudrate difference on 10 vs head.

It would probably be a good idea to commit this to the head copy of ixgbe with the relevant __FreeBSD_version and backport.

Include changes to netmap.

In D4273#105658, @ngie wrote:

sbruno: could you please tell me which revisions are being MFCed and how you got the diff, so I can "replay" them and make sure everything's in the right spots (just want to make sure *just* the right amount of diff is being pulled in to stable/10 this time)?

kevin.bowling_kev009.com added a comment.Via Web ·
Thu, Jan 14, 10:14 PM
Comment Actions

Revisions considered r289238, r286238, r285592, r285591, r285590, r285528, r283893, r283883, r283882, r283881

In D4273#105659, @ngie wrote:

Reopen to fix build failures on stable/10.

Address if_baudrate difference on 10 vs head.

It would probably be a good idea to commit this to the head copy of ixgbe with the relevant __FreeBSD_version and backport.

Hrm, when glebius fixed baudrate handling in svn R263102, there was an UPDATING entry but no #ifdefs

I'd rather not add a version check for this as it affects more than just ixgbe(4).

This revision was automatically updated to reflect the committed changes.