Page MenuHomeFreeBSD
Differential D57299

vtnet: move offload functions to virtio_net.h to share them
ClosedPublic
Actions

Authored by timo.voelker_fh-muenster.de on May 28 2026, 12:21 PM.
Tags
None
Referenced Files
F170866120: D57299.id181526.diff
Mon, Sep 7, 3:25 AM
F170852331: D57299.id185203.diff
Mon, Sep 7, 1:24 AM
F170832956: D57299.id185203.diff
Sun, Sep 6, 10:15 PM
F170828278: D57299.id179039.diff
Sun, Sep 6, 9:26 PM
F170783946: D57299.id184248.diff
Sun, Sep 6, 2:54 PM
F170783636: D57299.id181526.diff
Sun, Sep 6, 2:51 PM
F170730994: D57299.id185203.diff
Sun, Sep 6, 6:46 AM
Unknown Object (File)
Sun, Sep 6, 5:15 AM
View All Files
Subscribers
ae
melifaro

Details

Reviewers
tuexen
vmaffione
bryanv
imp
glebius
Commits
rGbb50bb45f5f6: vtnet: move offload functions to virtio_net.h
rG44cddaa99dee: vtnet: move offload functions to virtio_net.h to share them
Summary

Move the functions vtnet_rxq_csum() and vtnet_txq_offload() and the subfunctions they call from if_vtnet.c to virtio_net.h. This allows us to call these functions from if_tuntap.c and if_ptnet.c.

virtio_net.h already contained a copy of these functions, but a copy of an outdated version. The functions evolved in if_vtnet.c. In if_vtnet.c, the copy has never been used because it increments counters in their own functions.

This patch removes the outdated copy from virtio_net.h and moves the new version of the functions from if_vtnet.c to virtio_net.h. if_tuntap.c, if_ptnet.c, and if_vtnet.c just call these functions, and if_vtnet.c increments its counters depending on the return value.

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Skipped
Unit
Tests Skipped

Event Timeline

timo.voelker_fh-muenster.de created this revision.May 28 2026, 12:21 PM
Herald added subscribers: melifaro, ae. · View Herald TranscriptMay 28 2026, 12:21 PM
timo.voelker_fh-muenster.de requested review of this revision.May 28 2026, 12:21 PM
timo.voelker_fh-muenster.de updated this revision to Diff 179039.May 31 2026, 6:52 PM

Call virtio_net_rx_csum() only if VIRTIO_NET_HDR_F_NEEDS_CSUM or VIRTIO_NET_HDR_F_DATA_VALID is set.

timo.voelker_fh-muenster.de mentioned this in D57988: tests: fix checksum computation.Jul 4 2026, 8:23 AM
timo.voelker_fh-muenster.de updated this revision to Diff 181526.Jul 8 2026, 9:14 AM

Rebased the patch on the current FreeBSD main branch.

timo.voelker_fh-muenster.de updated this revision to Diff 183781.Mon, Aug 10, 4:00 PM

Changes how virtio_net.h does byte conversion. Instead of using virtio_gtoh16, which is unintuitive when called from the host, it uses the new macro VIRTIO_NET_TX_MODERN_LE.

timo.voelker_fh-muenster.de added a child revision: D51688: bhyve: add checksum offloading for tap.Wed, Aug 12, 11:38 AM
tuexen accepted this revision.Tue, Aug 18, 12:54 PM
This revision is now accepted and ready to land.Tue, Aug 18, 12:54 PM
Closed by commit rG44cddaa99dee: vtnet: move offload functions to virtio_net.h to share them (authored by timo.voelker_fh-muenster.de, committed by tuexen). · Explain WhyTue, Aug 18, 12:55 PM
This revision was automatically updated to reflect the committed changes.
tuexen added a commit: rG44cddaa99dee: vtnet: move offload functions to virtio_net.h to share them.
tuexen added a reverting change: rG8bea280f4325: Revert "vtnet: move offload functions to virtio_net.h to share them".Fri, Aug 21, 8:17 PM
timo.voelker_fh-muenster.de updated this revision to Diff 184733.Sat, Aug 22, 9:18 AM

vtnet defined the receive-side offload functions only if INET or INET6 were defined. While I copied this to virtio_net.h, I missed checking if INET or INET6 was defined when calling one of these functions from tuntap.

Now, I enclosed the transmit-side offload function in the INET or INET6 defined section in virtio_net.h too and added a check for INET or INET6 before calling the transmit-side offload function in if_vtnet.c and both offload functions in if_tuntap.c. A check in if_ptnet.c is not necessary, because this file is included in the build process only with INET.

timo.voelker_fh-muenster.de reopened this revision.Sat, Aug 22, 9:19 AM
tuexen accepted this revision.Thu, Aug 27, 12:41 PM
This revision is now accepted and ready to land.Thu, Aug 27, 12:41 PM
Closed by commit rGbb50bb45f5f6: vtnet: move offload functions to virtio_net.h (authored by timo.voelker_fh-muenster.de, committed by tuexen). · Explain WhyThu, Aug 27, 12:44 PM
This revision was automatically updated to reflect the committed changes.
tuexen added a commit: rGbb50bb45f5f6: vtnet: move offload functions to virtio_net.h.

Revision Contents
Changeset List

PathSize
sys/
dev/
netmap/
16 lines
virtio/
network/
345 lines
327 lines
net/
15 lines

Diff 178810

View Options

sys/dev/netmap/if_ptnet.c

Loading...
View Options

sys/dev/virtio/network/if_vtnet.c

Loading...
View Options

sys/dev/virtio/network/virtio_net.h

Loading...
View Options

sys/net/if_tuntap.c

Loading...