Author: np
Date: Tue Feb 4 01:09:02 2020
New Revision: 357483
URL: https://svnweb.freebsd.org/changeset/base/357483
Log:
cxgbe(4): Add pfil(9) hooks to the driver's rx.
MFC after: 1 week
Sponsored by: Chelsio Communications
Modified:
head/sys/dev/cxgbe/adapter.h
head/sys/dev/cxgbe/t4_main.c
head/sys/dev/cxgbe/t4_sge.c
Modified: head/sys/dev/cxgbe/adapter.h
==============================================================================
--- head/sys/dev/cxgbe/adapter.h Tue Feb 4 01:01:35 2020
(r357482)
+++ head/sys/dev/cxgbe/adapter.h Tue Feb 4 01:09:02 2020
(r357483)
@@ -54,6 +54,7 @@
#include <net/if.h>
#include <net/if_var.h>
#include <net/if_media.h>
+#include <net/pfil.h>
#include <netinet/in.h>
#include <netinet/tcp_lro.h>
@@ -191,6 +192,7 @@ struct vi_info {
struct port_info *pi;
struct ifnet *ifp;
+ struct pfil_head *pfil;
unsigned long flags;
int if_flags;
Modified: head/sys/dev/cxgbe/t4_main.c
==============================================================================
--- head/sys/dev/cxgbe/t4_main.c Tue Feb 4 01:01:35 2020
(r357482)
+++ head/sys/dev/cxgbe/t4_main.c Tue Feb 4 01:09:02 2020
(r357483)
@@ -1673,6 +1673,7 @@ cxgbe_vi_attach(device_t dev, struct vi_info *vi)
{
struct ifnet *ifp;
struct sbuf *sb;
+ struct pfil_head_args pa;
vi->xact_addr_filt = -1;
callout_init(&vi->tick, 1);
@@ -1768,6 +1769,12 @@ cxgbe_vi_attach(device_t dev, struct vi_info *vi)
vi_sysctls(vi);
+ pa.pa_version = PFIL_VERSION;
+ pa.pa_flags = PFIL_IN;
+ pa.pa_type = PFIL_TYPE_ETHERNET;
+ pa.pa_headname = ifp->if_xname;
+ vi->pfil = pfil_head_register(&pa);
+
return (0);
}
@@ -1807,6 +1814,11 @@ static void
cxgbe_vi_detach(struct vi_info *vi)
{
struct ifnet *ifp = vi->ifp;
+
+ if (vi->pfil != NULL) {
+ pfil_head_unregister(vi->pfil);
+ vi->pfil = NULL;
+ }
ether_ifdetach(ifp);
Modified: head/sys/dev/cxgbe/t4_sge.c
==============================================================================
--- head/sys/dev/cxgbe/t4_sge.c Tue Feb 4 01:01:35 2020 (r357482)
+++ head/sys/dev/cxgbe/t4_sge.c Tue Feb 4 01:09:02 2020 (r357483)
@@ -1851,12 +1851,73 @@ get_segment:
}
static int
+skip_scatter_segment(struct adapter *sc, struct sge_fl *fl, int fr_offset,
+ int remaining)
+{
+ struct fl_sdesc *sd = &fl->sdesc[fl->cidx];
+ struct rx_buf_info *rxb = &sc->sge.rx_buf_info[sd->zidx];
+ int len, blen;
+
+ if (fl->flags & FL_BUF_PACKING) {
+ u_int l, pad;
+
+ blen = rxb->size2 - fl->rx_offset; /* max possible in this
buf */
+ len = min(remaining, blen);
+
+ l = fr_offset + len;
+ pad = roundup2(l, fl->buf_boundary) - l;
+ if (fl->rx_offset + len + pad < rxb->size2)
+ blen = len + pad;
+ fl->rx_offset += blen;
+ MPASS(fl->rx_offset <= rxb->size2);
+ if (fl->rx_offset < rxb->size2)
+ return (len); /* without advancing the cidx */
+ } else {
+ MPASS(fl->rx_offset == 0); /* not packing */
+ blen = rxb->size1;
+ len = min(remaining, blen);
+ }
+ move_to_next_rxbuf(fl);
+ return (len);
+}
+
+static inline void
+skip_fl_payload(struct adapter *sc, struct sge_fl *fl, int plen)
+{
+ int remaining, fr_offset, len;
+
+ fr_offset = 0;
+ remaining = plen;
+ while (remaining > 0) {
+ len = skip_scatter_segment(sc, fl, fr_offset, remaining);
+ fr_offset += len;
+ remaining -= len;
+ }
+}
+
+static inline int
+get_segment_len(struct adapter *sc, struct sge_fl *fl, int plen)
+{
+ int len;
+ struct fl_sdesc *sd = &fl->sdesc[fl->cidx];
+ struct rx_buf_info *rxb = &sc->sge.rx_buf_info[sd->zidx];
+
+ if (fl->flags & FL_BUF_PACKING)
+ len = rxb->size2 - fl->rx_offset;
+ else
+ len = rxb->size1;
+
+ return (min(plen, len));
+}
+
+static int
eth_rx(struct adapter *sc, struct sge_rxq *rxq, const struct iq_desc *d,
u_int plen)
{
struct mbuf *m0;
struct ifnet *ifp = rxq->ifp;
struct sge_fl *fl = &rxq->fl;
+ struct vi_info *vi = ifp->if_softc;
const struct cpl_rx_pkt *cpl;
#if defined(INET) || defined(INET6)
struct lro_ctrl *lro = &rxq->lro;
@@ -1869,6 +1930,30 @@ eth_rx(struct adapter *sc, struct sge_rxq *rxq, const
};
MPASS(plen > sc->params.sge.fl_pktshift);
+ if (vi->pfil != NULL && PFIL_HOOKED_IN(vi->pfil) &&
+ __predict_true((fl->flags & FL_BUF_RESUME) == 0)) {
+ struct fl_sdesc *sd = &fl->sdesc[fl->cidx];
+ caddr_t frame;
+ int rc, slen;
+
+ slen = get_segment_len(sc, fl, plen) -
+ sc->params.sge.fl_pktshift;
+ frame = sd->cl + fl->rx_offset + sc->params.sge.fl_pktshift;
+ CURVNET_SET_QUIET(ifp->if_vnet);
+ rc = pfil_run_hooks(vi->pfil, frame, ifp,
+ slen | PFIL_MEMPTR | PFIL_IN, NULL);
+ CURVNET_RESTORE();
+ if (rc == PFIL_DROPPED || rc == PFIL_CONSUMED) {
+ skip_fl_payload(sc, fl, plen);
+ return (0);
+ }
+ if (rc == PFIL_REALLOCED) {
+ skip_fl_payload(sc, fl, plen);
+ m0 = pfil_mem2mbuf(frame);
+ goto have_mbuf;
+ }
+ }
+
m0 = get_fl_payload(sc, fl, plen);
if (__predict_false(m0 == NULL))
return (ENOMEM);
@@ -1877,6 +1962,7 @@ eth_rx(struct adapter *sc, struct sge_rxq *rxq, const
m0->m_len -= sc->params.sge.fl_pktshift;
m0->m_data += sc->params.sge.fl_pktshift;
+have_mbuf:
m0->m_pkthdr.rcvif = ifp;
M_HASHTYPE_SET(m0, sw_hashtype[d->rss.hash_type][d->rss.ipv6]);
m0->m_pkthdr.flowid = be32toh(d->rss.hash_val);
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
