Page MenuHomeFreeBSD
Differential D31907

pf.conf.5: document dummynet support
ClosedPublic
Actions

Authored by kp on Sep 10 2021, 4:25 PM.
Tags
None
Referenced Files
Unknown Object (File)
Thu, Apr 3, 2:00 PM
Unknown Object (File)
Thu, Mar 27, 1:50 PM
Unknown Object (File)
Sun, Mar 23, 2:46 AM
Unknown Object (File)
Mon, Mar 17, 7:31 AM
Unknown Object (File)
Feb 25 2025, 1:26 AM
Unknown Object (File)
Feb 24 2025, 7:48 AM
Unknown Object (File)
Feb 24 2025, 1:50 AM
Unknown Object (File)
Feb 23 2025, 9:56 PM
View All Files
Subscribers
imp

Details

Reviewers
None
Group Reviewers
network
pfsense
manpages
Commits
rG00a7a05bde84: pf.conf.5: document dummynet support
Summary

MFC after: 2 weeks
Sponsored by: Rubicon Communications, LLC ("Netgate")

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 41465
Build 38354: arc lint + arc unit

Event Timeline

kp created this revision.Sep 10 2021, 4:25 PM
Herald added a reviewer: manpages. · View Herald TranscriptSep 10 2021, 4:25 PM
Herald added a subscriber: imp. · View Herald Transcript
kp requested review of this revision.Sep 10 2021, 4:25 PM
Harbormaster completed remote builds in B41465: Diff 94961.Sep 10 2021, 4:25 PM
kp added a parent revision: D31906: man dummynet: dummynet can also be used with pf.Sep 10 2021, 4:25 PM
This revision was not accepted when it landed; it landed in state Needs Review.Sep 24 2021, 9:46 AM
Closed by commit rG00a7a05bde84: pf.conf.5: document dummynet support (authored by kp). · Explain Why
This revision was automatically updated to reflect the committed changes.
kp added a commit: rG00a7a05bde84: pf.conf.5: document dummynet support.

Revision Contents
Changeset List

PathSize
share/
man/
man5/
39 lines

Diff 94961

View Options

share/man/man5/pf.conf.5

Show First 20 Lines • Show All 727 Lines • ▼ Show 20 Lines if (IN_LOOPBACK(ntohl(ip->ip_dst.s_addr)) ||
IN_LOOPBACK(ntohl(ip->ip_src.s_addr))) { IN_LOOPBACK(ntohl(ip->ip_src.s_addr))) {
if ((ifp->if_flags & IFF_LOOPBACK) == 0) { if ((ifp->if_flags & IFF_LOOPBACK) == 0) {
IPSTAT_INC(ips_badaddr); IPSTAT_INC(ips_badaddr);
error = EADDRNOTAVAIL; error = EADDRNOTAVAIL;
goto bad; goto bad;
} }
} }
m->m_pkthdr.csum_flags |= CSUM_IP; /* Ensure the packet data is mapped if the interface requires it. */
if (m->m_pkthdr.csum_flags & CSUM_DELAY_DATA & ~ifp->if_hwassist) { if ((ifp->if_capenable & IFCAP_MEXTPG) == 0) {
m = mb_unmapped_to_ext(m); m = mb_unmapped_to_ext(m);
if (m == NULL) { if (m == NULL) {
IPSTAT_INC(ips_odropped); IPSTAT_INC(ips_odropped);
error = ENOBUFS; error = ENOBUFS;
goto bad; goto bad;
} }
}
m->m_pkthdr.csum_flags |= CSUM_IP;
if (m->m_pkthdr.csum_flags & CSUM_DELAY_DATA & ~ifp->if_hwassist) {
in_delayed_cksum(m); in_delayed_cksum(m);
m->m_pkthdr.csum_flags &= ~CSUM_DELAY_DATA; m->m_pkthdr.csum_flags &= ~CSUM_DELAY_DATA;
} else if ((ifp->if_capenable & IFCAP_MEXTPG) == 0) {
jhbUnsubmitted
Done
Inline Actions

This is now broken for an interface that doesn't support IFCAP_MEXTPG and has checksum offload disabled as we will not fall through to the else. I think the IFCAP_MEXTPG check now needs to just be its own check. If it makes the checksum calculations more optimal we should perhaps do it before doing the checksums.

jhb: This is now broken for an interface that doesn't support IFCAP_MEXTPG and has checksum offload…
markjAuthorUnsubmitted
Done
Inline Actions

Oops, thanks. I realized this when writing the patch but forgot to actually do something about it. :(

I guess m_apply() is a bit cheaper for non-extpg mbufs, so it makes some sense to do that first.

markj: Oops, thanks. I realized this when writing the patch but forgot to actually do something about…
m = mb_unmapped_to_ext(m);
if (m == NULL) {
IPSTAT_INC(ips_odropped);
error = ENOBUFS;
goto bad;
} }
}
#if defined(SCTP) || defined(SCTP_SUPPORT) #if defined(SCTP) || defined(SCTP_SUPPORT)
if (m->m_pkthdr.csum_flags & CSUM_SCTP & ~ifp->if_hwassist) { if (m->m_pkthdr.csum_flags & CSUM_SCTP & ~ifp->if_hwassist) {
sctp_delayed_cksum(m, (uint32_t)(ip->ip_hl << 2)); sctp_delayed_cksum(m, (uint32_t)(ip->ip_hl << 2));
m->m_pkthdr.csum_flags &= ~CSUM_SCTP; m->m_pkthdr.csum_flags &= ~CSUM_SCTP;
} }
#endif #endif
/* /*
▲ Show 20 Lines • Show All 127 Lines • ▼ Show 20 Linesip_fragment(struct ip *ip, struct mbuf **m_frag, int mtu,
if (len < 8) if (len < 8)
return EMSGSIZE; return EMSGSIZE;
/* /*
* If the interface will not calculate checksums on * If the interface will not calculate checksums on
* fragmented packets, then do it here. * fragmented packets, then do it here.
*/ */
if (m0->m_pkthdr.csum_flags & CSUM_DELAY_DATA) { if (m0->m_pkthdr.csum_flags & CSUM_DELAY_DATA) {
m0 = mb_unmapped_to_ext(m0);
if (m0 == NULL) {
error = ENOBUFS;
IPSTAT_INC(ips_odropped);
goto done;
}
in_delayed_cksum(m0); in_delayed_cksum(m0);
m0->m_pkthdr.csum_flags &= ~CSUM_DELAY_DATA; m0->m_pkthdr.csum_flags &= ~CSUM_DELAY_DATA;
} }
#if defined(SCTP) || defined(SCTP_SUPPORT) #if defined(SCTP) || defined(SCTP_SUPPORT)
if (m0->m_pkthdr.csum_flags & CSUM_SCTP) { if (m0->m_pkthdr.csum_flags & CSUM_SCTP) {
sctp_delayed_cksum(m0, hlen); sctp_delayed_cksum(m0, hlen);
m0->m_pkthdr.csum_flags &= ~CSUM_SCTP; m0->m_pkthdr.csum_flags &= ~CSUM_SCTP;
} }
▲ Show 20 Lines • Show All 703 Lines • Show Last 20 Lines