d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cxgbe/tom: Do not use M_PROTO1 to mark rx zero-copy mbufs as special.

Browse Source 
All the M_PROTOn flags are clobbered when an mbuf is appended to the
socket buffer.

MFC after:	1 week
This commit is contained in:
np 2013-05-03 18:37:50 +00:00
parent 538159767f
commit be8e188ab1
3 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/dev/cxgbe/tom/t4_cpl_io.c
View File

@ -827,15 +827,8 @@ do_peer_close(struct sge_iq *iq, const struct rss_header *rss, struct mbuf *m)
sb = &so->so_rcv; sb = &so->so_rcv;
SOCKBUF_LOCK(sb); SOCKBUF_LOCK(sb);
if (__predict_false(toep->ddp_flags & (DDP_BUF0_ACTIVE | DDP_BUF1_ACTIVE))) { if (__predict_false(toep->ddp_flags & (DDP_BUF0_ACTIVE | DDP_BUF1_ACTIVE))) {
m = m_get(M_NOWAIT, MT_DATA); m = get_ddp_mbuf(be32toh(cpl->rcv_nxt) - tp->rcv_nxt);
if (m == NULL)
CXGBE_UNIMPLEMENTED("mbuf alloc failure");
m->m_len = be32toh(cpl->rcv_nxt) - tp->rcv_nxt;
m->m_flags |= M_DDP; /* Data is already where it should be */
m->m_data = "nothing to see here";
tp->rcv_nxt = be32toh(cpl->rcv_nxt); tp->rcv_nxt = be32toh(cpl->rcv_nxt);
toep->ddp_flags &= ~(DDP_BUF0_ACTIVE | DDP_BUF1_ACTIVE); toep->ddp_flags &= ~(DDP_BUF0_ACTIVE | DDP_BUF1_ACTIVE);
KASSERT(toep->sb_cc >= sb->sb_cc, KASSERT(toep->sb_cc >= sb->sb_cc,

41
sys/dev/cxgbe/tom/t4_ddp.c
View File

@ -217,13 +217,7 @@ insert_ddp_data(struct toepcb *toep, uint32_t n)
INP_WLOCK_ASSERT(inp); INP_WLOCK_ASSERT(inp);
SOCKBUF_LOCK_ASSERT(sb); SOCKBUF_LOCK_ASSERT(sb);
m = m_get(M_NOWAIT, MT_DATA); m = get_ddp_mbuf(n);
if (m == NULL)
CXGBE_UNIMPLEMENTED("mbuf alloc failure");
m->m_len = n;
m->m_flags |= M_DDP; /* Data is already where it should be */
m->m_data = "nothing to see here";
tp->rcv_nxt += n; tp->rcv_nxt += n;
#ifndef USE_DDP_RX_FLOW_CONTROL #ifndef USE_DDP_RX_FLOW_CONTROL
KASSERT(tp->rcv_wnd >= n, ("%s: negative window size", __func__)); KASSERT(tp->rcv_wnd >= n, ("%s: negative window size", __func__));
@ -457,13 +451,7 @@ handle_ddp_data(struct toepcb *toep, __be32 ddp_report, __be32 rcv_nxt, int len)
KASSERT(tp->rcv_wnd >= len, ("%s: negative window size", __func__)); KASSERT(tp->rcv_wnd >= len, ("%s: negative window size", __func__));
tp->rcv_wnd -= len; tp->rcv_wnd -= len;
#endif #endif
m = get_ddp_mbuf(len);
m = m_get(M_NOWAIT, MT_DATA);
if (m == NULL)
CXGBE_UNIMPLEMENTED("mbuf alloc failure");
m->m_len = len;
m->m_flags |= M_DDP; /* Data is already where it should be */
m->m_data = "nothing to see here";
SOCKBUF_LOCK(sb); SOCKBUF_LOCK(sb);
if (report & F_DDP_BUF_COMPLETE) if (report & F_DDP_BUF_COMPLETE)
@ -1022,6 +1010,29 @@ soreceive_rcvoob(struct socket *so, struct uio *uio, int flags)
CXGBE_UNIMPLEMENTED(__func__); CXGBE_UNIMPLEMENTED(__func__);
} }
static char ddp_magic_str[] = "nothing to see here";
struct mbuf *
get_ddp_mbuf(int len)
{
struct mbuf *m;
m = m_get(M_NOWAIT, MT_DATA);
if (m == NULL)
CXGBE_UNIMPLEMENTED("mbuf alloc failure");
m->m_len = len;
m->m_data = &ddp_magic_str[0];
return (m);
}
static inline int
is_ddp_mbuf(struct mbuf *m)
{
return (m->m_data == &ddp_magic_str[0]);
}
/* /*
* Copy an mbuf chain into a uio limited by len if set. * Copy an mbuf chain into a uio limited by len if set.
*/ */
@ -1040,7 +1051,7 @@ m_mbuftouio_ddp(struct uio *uio, struct mbuf *m, int len)
for (; m != NULL; m = m->m_next) { for (; m != NULL; m = m->m_next) {
length = min(m->m_len, total - progress); length = min(m->m_len, total - progress);
if (m->m_flags & M_DDP) { if (is_ddp_mbuf(m)) {
enum uio_seg segflag = uio->uio_segflg; enum uio_seg segflag = uio->uio_segflg;
uio->uio_segflg = UIO_NOCOPY; uio->uio_segflg = UIO_NOCOPY;

3
sys/dev/cxgbe/tom/t4_tom.h
View File

@ -49,8 +49,6 @@
#define DDP_RSVD_WIN (16 * 1024U) #define DDP_RSVD_WIN (16 * 1024U)
#define SB_DDP_INDICATE SB_IN_TOE /* soreceive must respond to indicate */ #define SB_DDP_INDICATE SB_IN_TOE /* soreceive must respond to indicate */
#define M_DDP M_PROTO1
#define USE_DDP_RX_FLOW_CONTROL #define USE_DDP_RX_FLOW_CONTROL
/* TOE PCB flags */ /* TOE PCB flags */
@ -279,6 +277,7 @@ void t4_init_ddp(struct adapter *, struct tom_data *);
void t4_uninit_ddp(struct adapter *, struct tom_data *); void t4_uninit_ddp(struct adapter *, struct tom_data *);
int t4_soreceive_ddp(struct socket *, struct sockaddr **, struct uio *, int t4_soreceive_ddp(struct socket *, struct sockaddr **, struct uio *,
struct mbuf **, struct mbuf **, int *); struct mbuf **, struct mbuf **, int *);
struct mbuf *get_ddp_mbuf(int);
void enable_ddp(struct adapter *, struct toepcb *toep); void enable_ddp(struct adapter *, struct toepcb *toep);
void release_ddp_resources(struct toepcb *toep); void release_ddp_resources(struct toepcb *toep);
void insert_ddp_data(struct toepcb *, uint32_t); void insert_ddp_data(struct toepcb *, uint32_t);