From owner-svn-soc-all@freebsd.org Fri Jul 8 15:45:16 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 25EB5B8260A for ; Fri, 8 Jul 2016 15:45:16 +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 1987012A1 for ; Fri, 8 Jul 2016 15:45:16 +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 u68FjFOl009333 for ; Fri, 8 Jul 2016 15:45:15 GMT (envelope-from vincenzo@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id u68FjFvA009321 for svn-soc-all@FreeBSD.org; Fri, 8 Jul 2016 15:45:15 GMT (envelope-from vincenzo@FreeBSD.org) Date: Fri, 8 Jul 2016 15:45:15 GMT Message-Id: <201607081545.u68FjFvA009321@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: r305834 - 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, 08 Jul 2016 15:45:16 -0000 Author: vincenzo Date: Fri Jul 8 15:45:14 2016 New Revision: 305834 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=305834 Log: freebsd: ptnet_attach: add optional virtio-net header negotiation 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 Jul 8 15:45:02 2016 (r305833) +++ soc2016/vincenzo/head/sys/dev/netmap/if_ptnet.c Fri Jul 8 15:45:14 2016 (r305834) @@ -94,6 +94,9 @@ #define DBG(x) #endif /* !DEBUG */ +/* Tunable parameters. */ +static bool ptnet_vnet_hdr = false; + struct ptnet_softc; struct ptnet_queue { @@ -269,6 +272,9 @@ /* Check if we are supported by the hypervisor. If not, * bail out immediately. */ + if (ptnet_vnet_hdr) { + ptfeatures |= NET_PTN_FEATURES_VNET_HDR; + } bus_write_4(sc->iomem, PTNET_IO_PTFEAT, ptfeatures); /* wanted */ ptfeatures = bus_read_4(sc->iomem, PTNET_IO_PTFEAT); /* acked */ if (!(ptfeatures & NET_PTN_FEATURES_BASE)) { @@ -410,6 +416,13 @@ sc->ptna_nm = (struct netmap_pt_guest_adapter *)NA(ifp); sc->ptna_nm->csb = sc->csb; + /* If virtio-net header was negotiated, set the virt_hdr_len field in + * the netmap adapter, to inform users that this netmap adapter requires + * the application to deal with the headers. */ + if (sc->ptfeatures & NET_PTN_FEATURES_VNET_HDR) { + sc->ptna_nm->hwup.up.virt_hdr_len = PTNET_HDR_SIZE; + } + /* Initialize a separate pass-through netmap adapter that is going to * be used by this driver only, and so never exposed to netmap. We * only need a subset of the available fields. */