From owner-svn-soc-all@freebsd.org  Fri Jun 17 16:26:21 2016
Return-Path: <owner-svn-soc-all@freebsd.org>
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 7E240A7781C
 for <svn-soc-all@mailman.ysv.freebsd.org>;
 Fri, 17 Jun 2016 16:26:21 +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 71CD42694
 for <svn-soc-all@FreeBSD.org>; Fri, 17 Jun 2016 16:26:21 +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 u5HGQL28027451
 for <svn-soc-all@FreeBSD.org>; Fri, 17 Jun 2016 16:26:21 GMT
 (envelope-from vincenzo@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id u5HGQKau027448
 for svn-soc-all@FreeBSD.org; Fri, 17 Jun 2016 16:26:20 GMT
 (envelope-from vincenzo@FreeBSD.org)
Date: Fri, 17 Jun 2016 16:26:20 GMT
Message-Id: <201606171626.u5HGQKau027448@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: r305303 - 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
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all/>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 17 Jun 2016 16:26:21 -0000

Author: vincenzo
Date: Fri Jun 17 16:26:20 2016
New Revision: 305303
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=305303

Log:
   freebsd: ptnet_transmit: drop if no available space in the ring

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:26:11 2016	(r305302)
+++ soc2016/vincenzo/head/sys/dev/netmap/if_ptnet.c	Fri Jun 17 16:26:20 2016	(r305303)
@@ -764,6 +764,14 @@
 	nmbuf = NMB(na, slot);
 	nmbuf_bytes = 0;
 
+	if (head == ring->tail) {
+		device_printf(sc->dev, "%s: Drop, no free slots\n", __func__);
+		m_freem(m);
+		ptring->guest_need_kick = 1;
+
+		return 0;
+	}
+
 	for (mf = m; mf; mf = mf->m_next) {
 		uint8_t *mdata = mf->m_data;
 		int mlen = mf->m_len;