From patchwork Wed Feb 24 10:30:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincenzo Maffione X-Patchwork-Id: 8404391 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E5BBAC0553 for ; Wed, 24 Feb 2016 10:33:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2A63120274 for ; Wed, 24 Feb 2016 10:33:37 +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 51C1B20270 for ; Wed, 24 Feb 2016 10:33:36 +0000 (UTC) Received: from localhost ([::1]:34979 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYWlD-0004Kq-Ov for patchwork-qemu-devel@patchwork.kernel.org; Wed, 24 Feb 2016 05:33:35 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52265) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYWkN-0003Ra-AC for qemu-devel@nongnu.org; Wed, 24 Feb 2016 05:32:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aYWkK-0007L2-HB for qemu-devel@nongnu.org; Wed, 24 Feb 2016 05:32:43 -0500 Received: from mail-wm0-x231.google.com ([2a00:1450:400c:c09::231]:38359) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYWkK-0007Kr-6y for qemu-devel@nongnu.org; Wed, 24 Feb 2016 05:32:40 -0500 Received: by mail-wm0-x231.google.com with SMTP id a4so23046129wme.1 for ; Wed, 24 Feb 2016 02:32:40 -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=Cfiw80Unl+FsnoxNT9mendC4f+pS0FlbNei/S/rlTSo=; b=UsiiFOKPhMcgIP+NRebV/Z/0QF3ehSGw0FtD+pFxRIMbziCy6mQo98gEsLgzdVjSgA eTMQtQcry0L5MJcvNfezGfgrQp07Gs5QbH7Wf8JvKSTMHZtwVDZ+04nX40qyPJ0LLGvY LfSJ4m9Yb44R452m+sEF65ct4o42l0cUyfGCQ5eKS91mgbD8bYwinIMALDh1pnifwejh HjYpmLXPGsKh9qYNLzTCbfVPJkeJ1lZ6rGdmq+E+7FAYjoFC52hSc724Zz/qYJ/G7FFg cGXqNoqZdLB/klu9Aq27eiKsLwhYQYIrne6U4tQ6t8mBKFP0h51qXwapZQ7qZXpIPCR0 xmKQ== 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=Cfiw80Unl+FsnoxNT9mendC4f+pS0FlbNei/S/rlTSo=; b=BZm2QdW4VPnNiwqPkPZHg5ADVATctbnhUS/E3QzWxdxbL4mXZ/QxCQVjOT5fvntW92 rcyBjP/E8YrJMBrIoGB9kJdKOiTxCmMpQ1NWw24cvfSstqPYeD9gH+bFi6oMlfWLVf8L UF9jjrVig9i05LBMFKLpnQpII4uR/d8DqKTwhGueJb4Ud3rHHs3m+6X2w5I2FSi2pnSk yChoPF8oMYAR1Hp4iRvipOuOQLuzXD067bEOzhdxkEOm6RpkYHgF0xFHjgTx9TfgYOEY /M20kbAomFzoWgmUAcF70ZYjzTR3MhgkwCXELrSSLZcM30GfSUjHb2MttwE8EsgxCXZd b/Iw== X-Gm-Message-State: AG10YOTjbo1iWwuHFQcUCckNRrJeCKkjURGGctPRuw4Omu8BuE876P37Zht4N4624Uz6Dw== X-Received: by 10.28.14.140 with SMTP id 134mr22382341wmo.39.1456309959620; Wed, 24 Feb 2016 02:32:39 -0800 (PST) Received: from localhost.localdomain (prova.iet.unipi.it. [131.114.58.86]) by smtp.gmail.com with ESMTPSA id ys9sm2301095wjc.35.2016.02.24.02.32.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 24 Feb 2016 02:32:38 -0800 (PST) From: Vincenzo Maffione To: qemu-devel@nongnu.org Date: Wed, 24 Feb 2016 11:30:41 +0100 Message-Id: <3771b88a644a11d152238d5a7063b9da217679b7.1456309481.git.v.maffione@gmail.com> 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::231 Cc: jasowang@redhat.com, rizzo@iet.unipi.it, g.lettieri@iet.unipi.it, Vincenzo Maffione Subject: [Qemu-devel] [PATCH v3] 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 | 59 ++++++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 38 insertions(+), 21 deletions(-) diff --git a/net/netmap.c b/net/netmap.c index 9710321..1b42728 100644 --- a/net/netmap.c +++ b/net/netmap.c @@ -323,20 +323,47 @@ static void netmap_cleanup(NetClientState *nc) } /* Offloading manipulation support callbacks. */ -static bool netmap_has_ufo(NetClientState *nc) +static int netmap_fd_set_vnet_hdr_len(NetmapState *s, int len) { - return true; + 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; + + return ioctl(s->nmd->fd, NIOCREGIF, &req); } -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_fd_set_vnet_hdr_len(s, len)) { + return false; + } + + /* Restore the previous length. */ + if (netmap_fd_set_vnet_hdr_len(s, prev_len)) { + error_report("Failed to restore vnet-hdr length %d on %s: %s", + prev_len, s->ifname, strerror(errno)); + abort(); + } + 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,20 +374,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_fd_set_vnet_hdr_len(s, len); if (err) { - error_report("Unable to execute NETMAP_BDG_VNET_HDR on %s: %s", - s->ifname, strerror(errno)); + error_report("Unable to set vnet-hdr length %d on %s: %s", + len, s->ifname, strerror(errno)); } else { /* Keep track of the current length. */ s->vnet_hdr_len = len; @@ -373,8 +391,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 +405,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,