From patchwork Tue Feb 23 08:46:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincenzo Maffione X-Patchwork-Id: 8389101 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0B4AA9F88A for ; Tue, 23 Feb 2016 08:48:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 47D90206BE for ; Tue, 23 Feb 2016 08:48:52 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 72010206BC for ; Tue, 23 Feb 2016 08:48:51 +0000 (UTC) Received: from localhost ([::1]:54973 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aY8eI-0001ec-V3 for patchwork-qemu-devel@patchwork.kernel.org; Tue, 23 Feb 2016 03:48:50 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43067) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aY8eA-0001c1-2X for qemu-devel@nongnu.org; Tue, 23 Feb 2016 03:48:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aY8e5-0000CM-D9 for qemu-devel@nongnu.org; Tue, 23 Feb 2016 03:48:42 -0500 Received: from mail-wm0-x22c.google.com ([2a00:1450:400c:c09::22c]:35024) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aY8e5-0000CI-3I for qemu-devel@nongnu.org; Tue, 23 Feb 2016 03:48:37 -0500 Received: by mail-wm0-x22c.google.com with SMTP id c200so208781283wme.0 for ; Tue, 23 Feb 2016 00:48:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=Wyb4DHisrs1IK28DAeY1qgGytxFTlfiUHaiBcWF4Nos=; b=0/rCMg5XHZmU4w2qF/eXlUzmaFs4i1SIPTM+VUI4m+JiVfCAsLyd7JcBDjzHTFpYhI VkR223DfRgEYPWxf+0GyuRefdE0JZrhktDY+RTQuxhSVREthJlvn0GPS0AWT5Bn3VPJS Y5f1JBrau+y/N3XCL3slCQSK3BxrWWIjtpN+gfaw9YKlj5NGPjFi242iqEraDLSD3SOg USXwAbMwGjk/NK4zacUK40MYoTY/8lhush3mG+GISmi41D7Ve+PrbC4q5rmien1Zi7HL OOdJ2TImee0IJpBnpf9XzRMyeZXxumGLOEIZqXk5e4TrHBCs33N+ak/8VM4OPWJ3dTlU 6L2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=Wyb4DHisrs1IK28DAeY1qgGytxFTlfiUHaiBcWF4Nos=; b=S22yXjA3r8CczPaLSBcCHkJ8NNsd4+WcH5Jw+1ZUcjUTmMnskxjMoWCRCZEWM1/HBm XzGKS+1IBEGXq44ahgYshcaAeTJcNGYo7KS1qd/570uobqm9bI9WDTXWjB2eyJu6T+0f ayu4Z4yrubAqeasSs/PHPSjHfycVhLsoi03wNMRbgtBycOSVh7P811/xcAqVcIcj03lH T2qR2vBaiea1yAX7txLwuqAioTIav+VHiRpManHe9eOVrUbTKdk1WyIm1KTmh1uRcdua BgiqvP/K2HXa9szg6GDQF6tvITYPDNilykO349w4LTNOHuuQOopZEWGnBJnj5Z/asL/+ 8zMw== X-Gm-Message-State: AG10YORY30p7qp5Hm3S1akuc/FV+kfcP5+vzwOl2JTVTe+N9phZVnDdl9TyWgAdjPEbseQ== X-Received: by 10.194.71.46 with SMTP id r14mr36319088wju.100.1456217316474; Tue, 23 Feb 2016 00:48:36 -0800 (PST) Received: from localhost.localdomain (prova.iet.unipi.it. [131.114.58.86]) by smtp.gmail.com with ESMTPSA id q129sm25201571wmd.14.2016.02.23.00.48.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 23 Feb 2016 00:48:35 -0800 (PST) From: Vincenzo Maffione To: qemu-devel@nongnu.org Date: Tue, 23 Feb 2016 09:46:59 +0100 Message-Id: X-Mailer: git-send-email 2.7.1 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::22c Cc: jasowang@redhat.com, rizzo@iet.unipi.it, g.lettieri@iet.unipi.it, Vincenzo Maffione Subject: [Qemu-devel] [PATCH v2] net: netmap: probe netmap interface for virtio-net header X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Previous implementation of has_ufo, has_vnet_hdr, has_vnet_hdr_len, etc. did not really probe for virtio-net header support for the netmap interface attached to the backend. These callbacks were correct for VALE ports, but incorrect for hardware NICs, pipes, monitors, etc. This patch fixes the implementation to work properly with all kinds of netmap ports. Signed-off-by: Vincenzo Maffione --- net/netmap.c | 62 +++++++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 40 insertions(+), 22 deletions(-) diff --git a/net/netmap.c b/net/netmap.c index 9710321..ef64be0 100644 --- a/net/netmap.c +++ b/net/netmap.c @@ -323,20 +323,51 @@ static void netmap_cleanup(NetClientState *nc) } /* Offloading manipulation support callbacks. */ -static bool netmap_has_ufo(NetClientState *nc) +static int netmap_do_set_vnet_hdr_len(NetmapState *s, int len) { - return true; + struct nmreq req; + int err; + + /* Issue a NETMAP_BDG_VNET_HDR command to change the virtio-net header + * length for the netmap adapter associated to 's->ifname'. + */ + memset(&req, 0, sizeof(req)); + pstrcpy(req.nr_name, sizeof(req.nr_name), s->ifname); + req.nr_version = NETMAP_API; + req.nr_cmd = NETMAP_BDG_VNET_HDR; + req.nr_arg1 = len; + err = ioctl(s->nmd->fd, NIOCREGIF, &req); + if (err) { + return err; + } + + /* Keep track of the current length. */ + s->vnet_hdr_len = len; + + return 0; } -static bool netmap_has_vnet_hdr(NetClientState *nc) +static bool netmap_has_vnet_hdr_len(NetClientState *nc, int len) { + NetmapState *s = DO_UPCAST(NetmapState, nc, nc); + int prev_len = s->vnet_hdr_len; + + /* Check that we can set the new length. */ + if (netmap_do_set_vnet_hdr_len(s, len)) { + return false; + } + + /* Restore the previous length. */ + netmap_do_set_vnet_hdr_len(s, prev_len); + return true; } -static bool netmap_has_vnet_hdr_len(NetClientState *nc, int len) +/* A netmap interface that supports virtio-net headers always + * supports UFO, so we use this callback also for the has_ufo hook. */ +static bool netmap_has_vnet_hdr(NetClientState *nc) { - return len == 0 || len == sizeof(struct virtio_net_hdr) || - len == sizeof(struct virtio_net_hdr_mrg_rxbuf); + return netmap_has_vnet_hdr_len(nc, sizeof(struct virtio_net_hdr)); } static void netmap_using_vnet_hdr(NetClientState *nc, bool enable) @@ -347,23 +378,11 @@ static void netmap_set_vnet_hdr_len(NetClientState *nc, int len) { NetmapState *s = DO_UPCAST(NetmapState, nc, nc); int err; - struct nmreq req; - /* Issue a NETMAP_BDG_VNET_HDR command to change the virtio-net header - * length for the netmap adapter associated to 's->ifname'. - */ - memset(&req, 0, sizeof(req)); - pstrcpy(req.nr_name, sizeof(req.nr_name), s->ifname); - req.nr_version = NETMAP_API; - req.nr_cmd = NETMAP_BDG_VNET_HDR; - req.nr_arg1 = len; - err = ioctl(s->nmd->fd, NIOCREGIF, &req); + err = netmap_do_set_vnet_hdr_len(s, len); if (err) { error_report("Unable to execute NETMAP_BDG_VNET_HDR on %s: %s", s->ifname, strerror(errno)); - } else { - /* Keep track of the current length. */ - s->vnet_hdr_len = len; } } @@ -373,8 +392,7 @@ static void netmap_set_offload(NetClientState *nc, int csum, int tso4, int tso6, NetmapState *s = DO_UPCAST(NetmapState, nc, nc); /* Setting a virtio-net header length greater than zero automatically - * enables the offloadings. - */ + * enables the offloadings. */ if (!s->vnet_hdr_len) { netmap_set_vnet_hdr_len(nc, sizeof(struct virtio_net_hdr)); } @@ -388,7 +406,7 @@ static NetClientInfo net_netmap_info = { .receive_iov = netmap_receive_iov, .poll = netmap_poll, .cleanup = netmap_cleanup, - .has_ufo = netmap_has_ufo, + .has_ufo = netmap_has_vnet_hdr, .has_vnet_hdr = netmap_has_vnet_hdr, .has_vnet_hdr_len = netmap_has_vnet_hdr_len, .using_vnet_hdr = netmap_using_vnet_hdr,