From owner-svn-soc-all@freebsd.org Fri Jun 17 16:23:47 2016 Return-Path: Delivered-To: svn-soc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 540BAA776F4 for ; Fri, 17 Jun 2016 16:23:47 +0000 (UTC) (envelope-from vincenzo@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 479662590 for ; Fri, 17 Jun 2016 16:23:47 +0000 (UTC) (envelope-from vincenzo@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id u5HGNllx024059 for ; Fri, 17 Jun 2016 16:23:47 GMT (envelope-from vincenzo@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id u5HGNkbP024042 for svn-soc-all@FreeBSD.org; Fri, 17 Jun 2016 16:23:46 GMT (envelope-from vincenzo@FreeBSD.org) Date: Fri, 17 Jun 2016 16:23:46 GMT Message-Id: <201606171623.u5HGNkbP024042@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to vincenzo@FreeBSD.org using -f From: vincenzo@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r305294 - soc2016/vincenzo/head/sys/dev/netmap MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jun 2016 16:23:47 -0000 Author: vincenzo Date: Fri Jun 17 16:23:46 2016 New Revision: 305294 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=305294 Log: freebsd: ptnet_rx_eof: add mbuf allocation Modified: soc2016/vincenzo/head/sys/dev/netmap/if_ptnet.c Modified: soc2016/vincenzo/head/sys/dev/netmap/if_ptnet.c ============================================================================== --- soc2016/vincenzo/head/sys/dev/netmap/if_ptnet.c Fri Jun 17 16:23:37 2016 (r305293) +++ soc2016/vincenzo/head/sys/dev/netmap/if_ptnet.c Fri Jun 17 16:23:46 2016 (r305294) @@ -1167,8 +1167,18 @@ struct netmap_slot *slot = ring->slot + head; unsigned int nmbuf_len = slot->len; uint8_t *nmbuf = NMB(na, slot); - struct mbuf *m = NULL; + struct mbuf *m; + if (unlikely(nmbuf_len > MCLBYTES)) { + RD(1, "Dropping long frame: len %u > %u", + nmbuf_len, MCLBYTES); + goto next; + } + + /* We use m_getcl() to allocate an mbuf with standard + * cluster size (MCLBYTES). In the future we could use m_getjcl() + * to choose different sizes. */ + m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR); if (unlikely(m == NULL)) { device_printf(sc->dev, "%s: failed to allocate mbuf" "(len=%d)\n", __func__, nmbuf_len); @@ -1187,7 +1197,7 @@ PTNET_Q_UNLOCK(pq); (*ifp->if_input)(ifp, m); PTNET_Q_LOCK(pq); - +next: head = nm_next(head, lim); budget--; }