From patchwork Thu Dec 6 16:59:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincenzo Maffione X-Patchwork-Id: 10716437 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2F93915A6 for ; Thu, 6 Dec 2018 17:07:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 193002F110 for ; Thu, 6 Dec 2018 17:07:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0D4912F174; Thu, 6 Dec 2018 17:07:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id A272B2F110 for ; Thu, 6 Dec 2018 17:07:04 +0000 (UTC) Received: from localhost ([::1]:42143 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gUx79-0007rV-MZ for patchwork-qemu-devel@patchwork.kernel.org; Thu, 06 Dec 2018 12:07:03 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52262) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gUx1e-0003Zo-CD for qemu-devel@nongnu.org; Thu, 06 Dec 2018 12:01:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gUx1a-0006pQ-6z for qemu-devel@nongnu.org; Thu, 06 Dec 2018 12:01:21 -0500 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:42049) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gUx1W-0006jT-FZ for qemu-devel@nongnu.org; Thu, 06 Dec 2018 12:01:16 -0500 Received: by mail-wr1-x442.google.com with SMTP id q18so1187080wrx.9 for ; Thu, 06 Dec 2018 09:01:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tK2BZqLuzZ+VCr08SBXY+JNTW67/Sq6+s7tBpxJovR4=; b=bjqSFOYAofz5r0ruUn6O+6MTijjM4X0QIvJg2viZWu1Jb3CAl5SsrZk0gnvIcsGN0B JdK/+ZRuws33RMKqFrcnx6WpFL3xNSz4d8rpn8s8CZtFWzm1gcpkrAC6Zs4v746CqLy4 xKLNKXKoOzufcMlHItQZSKHVWBAhv8Va20Bkz6DxcDgvgn7NkBbbVH2hVkc0EoqSXLy9 CmwwdFq1HZpWAA6emE8K/xX5FyXCB3Ea82HJKDMe2Ly2MCkIfh7Z+qWrkybtcQU+VZXW m9AiqjEFrtoS0S7JpdWIJATtJWS/M1NKrYSfJ8ZDbbGy4HiEvYrJiy7F24RKiaLlZxVF 49Vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tK2BZqLuzZ+VCr08SBXY+JNTW67/Sq6+s7tBpxJovR4=; b=QCM2bMhozwKV86mkmjxTZ9LvgXtKj7L2NyYpEIWO3TOyGHxITWQx3Cs/Ui/TxE51oM ryTlzDAkO5IF+sqUi3ai++afzQx7l0C8dmv9HrkitM0Vnrrg+GwmvuWt/DX1lIkdRdV1 Sqoiurncp4Jj/ywUFuxwSHTgDiWEKqlSZrq4wpAKQCuiMyvaWBe8DjR+x+XpI9+Z4oFM RK3J4wu5YmGsodEP2SEQAszrYxG7Ra2gwcR9PC5AKXwlVOrgnEb2a78LE87GTgNnmMSG pxxQJQOuzX2OIiXtgRR/E5Ct1zS5rWakoTXvNYGBVYI6/eiqsdEFHGEL6JcSI1gr+H8N E9kw== X-Gm-Message-State: AA+aEWZ6KZjxRFsAstt8fdMczpaWi9TBEwvJkoamD839wqsiVbWfwgoz Jz+y4dEAiUtC0jkT9zuxExQsZmwfLZ4= X-Google-Smtp-Source: AFSGD/WPjiIUNVOGzz8VSXaTv0a0MBHr8enImNafG6Hwq22ZDTwi9+ueOE0Cj2z1Vcif+t7u+As7iw== X-Received: by 2002:a5d:63c3:: with SMTP id c3mr25702469wrw.215.1544115668503; Thu, 06 Dec 2018 09:01:08 -0800 (PST) Received: from localhost.localdomain (prova.iet.unipi.it. [131.114.58.86]) by smtp.gmail.com with ESMTPSA id d4sm467556wrp.89.2018.12.06.09.01.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Dec 2018 09:01:07 -0800 (PST) From: Vincenzo Maffione To: qemu-devel@nongnu.org Date: Thu, 6 Dec 2018 17:59:05 +0100 Message-Id: <20181206165907.23465-2-v.maffione@gmail.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181206165907.23465-1-v.maffione@gmail.com> References: <20181206165907.23465-1-v.maffione@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 Subject: [Qemu-devel] [PATCH v1 1/3] net: netmap: small improvements netmap_send() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: g.lettieri@iet.unipi.it, jasowang@redhat.com, Vincenzo Maffione Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP This change improves the handling of incomplete multi-slot packets (e.g. with the NS_MOREFRAG set), by advancing ring->head only on complete packets. The ring->cur pointer is advanced in any case in order to acknowledge the kernel and move the wake-up point (thus avoiding repeated wake-ups). Also don't be verbose when incomplete packets are found. Signed-off-by: Vincenzo Maffione --- net/netmap.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/net/netmap.c b/net/netmap.c index 2d11a8f4be..71a8122bdd 100644 --- a/net/netmap.c +++ b/net/netmap.c @@ -272,39 +272,46 @@ static void netmap_send(void *opaque) { NetmapState *s = opaque; struct netmap_ring *ring = s->rx; + unsigned int tail = ring->tail; - /* Keep sending while there are available packets into the netmap + /* Keep sending while there are available slots in the netmap RX ring and the forwarding path towards the peer is open. */ - while (!nm_ring_empty(ring)) { - uint32_t i; + while (ring->head != tail) { + uint32_t i = ring->head; uint32_t idx; bool morefrag; int iovcnt = 0; int iovsize; + /* Get a (possibly multi-slot) packet. */ do { - i = ring->cur; idx = ring->slot[i].buf_idx; morefrag = (ring->slot[i].flags & NS_MOREFRAG); - s->iov[iovcnt].iov_base = (u_char *)NETMAP_BUF(ring, idx); + s->iov[iovcnt].iov_base = (void *)NETMAP_BUF(ring, idx); s->iov[iovcnt].iov_len = ring->slot[i].len; iovcnt++; + i = nm_ring_next(ring, i); + } while (i != tail && morefrag); - ring->cur = ring->head = nm_ring_next(ring, i); - } while (!nm_ring_empty(ring) && morefrag); + /* Advance ring->cur to tell the kernel that we have seen the slots. */ + ring->cur = i; - if (unlikely(nm_ring_empty(ring) && morefrag)) { - RD(5, "[netmap_send] ran out of slots, with a pending" - "incomplete packet\n"); + if (unlikely(morefrag)) { + /* This is a truncated packet, so we can stop without releasing the + * incomplete slots by updating ring->head. We will hopefully + * re-read the complete packet the next time we are called. */ + break; } iovsize = qemu_sendv_packet_async(&s->nc, s->iov, iovcnt, netmap_send_completed); + /* Release the slots to the kernel. */ + ring->head = i; + if (iovsize == 0) { /* The peer does not receive anymore. Packet is queued, stop - * reading from the backend until netmap_send_completed() - */ + * reading from the backend until netmap_send_completed(). */ netmap_read_poll(s, false); break; } From patchwork Thu Dec 6 16:59:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincenzo Maffione X-Patchwork-Id: 10716425 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 485A915A6 for ; Thu, 6 Dec 2018 17:03:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 344A32F195 for ; Thu, 6 Dec 2018 17:03:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 27E102F197; Thu, 6 Dec 2018 17:03:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id 89C9A2F195 for ; Thu, 6 Dec 2018 17:03:09 +0000 (UTC) Received: from localhost ([::1]:42092 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gUx3K-0004sI-WE for patchwork-qemu-devel@patchwork.kernel.org; Thu, 06 Dec 2018 12:03:07 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52261) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gUx1e-0003Zn-CB for qemu-devel@nongnu.org; Thu, 06 Dec 2018 12:01:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gUx1Z-0006of-18 for qemu-devel@nongnu.org; Thu, 06 Dec 2018 12:01:21 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:40616) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gUx1U-0006k0-Ie for qemu-devel@nongnu.org; Thu, 06 Dec 2018 12:01:15 -0500 Received: by mail-wr1-x444.google.com with SMTP id p4so1203196wrt.7 for ; Thu, 06 Dec 2018 09:01:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YZaWVhK9aZlYPe4Lk3s5yHZyVQRqkzdyzjMy8grX3mw=; b=ij6pIFEyy9FN2doDJcAPAcqAhO13jVm5z/nv59L6hoFBEJnZ4sPWsmxQ6QhxxEaPnH 6la/xate+4iCYXt511EJ6m3hNCkLGtLFL5LDYCqC1P5OSSn1BK//xRpVc2hqBS7lOWxM qZY+5zM+ZyKgzcGKfU8kkseCGFZT7b+oULkSXrCOJ9/S7UOa2INVG13EA0A+GkzeIagB TwqbbHGIlgV6+kdLfF18DjM7+7VOrH1d71AHAZbL4iop8ZI4/QI36buyFR5btIgnRBgY gRjqlNnYG88oOYLjUHeI/Gop6D14vtaGjxbdQyRDLLyGjgy0fJ0/bNzZLnhcF/Z19XxD nMog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YZaWVhK9aZlYPe4Lk3s5yHZyVQRqkzdyzjMy8grX3mw=; b=qwLrk+X14y+EGSv5f5/bIM1he3btJ20imbNij2gcVpqIiBBRKdDhYdnEYua4jXgng9 ck22jOh/e1NkmoiBtsFGuAORLUtB/r3vthlzBhhBA100jhOfiZeQ0fT9lfI+zxQKtWW1 xFR6Mp7Icc5VV6NI0OBB6MsGp3jS8v8dul5lKw96bHxYipF1qaS2E9zh/woEaIF35uga 859VXQTfkCOvNkDflUW2nj+KXOSMnBcw34ea0gSMHaAh+foBc2yv9jr/l0Fwnpjh4BK3 NaB78twPg+G/gMZ2AgItSaNy8kS4LfM4oW3pEqZFT3G8C+PQGGftEyZW2x3gEBRh0f7S jtOw== X-Gm-Message-State: AA+aEWZyAo635eHcTd/s6SkQqr7Zs+ubOBJxao+DN8Th7akCJ5oIwa6J ZqOX6SNKsE8k9FofZ2FY4zlVVN9vZ6E= X-Google-Smtp-Source: AFSGD/VcsSE8bq8nYs6qDFyQVCDuK/n1ASfSPmEYa9M4EIKv2HrYZBUWbSMpiI6GAQHrl0WLkhXqZg== X-Received: by 2002:a5d:4c8a:: with SMTP id z10mr25316378wrs.75.1544115669256; Thu, 06 Dec 2018 09:01:09 -0800 (PST) Received: from localhost.localdomain (prova.iet.unipi.it. [131.114.58.86]) by smtp.gmail.com with ESMTPSA id d4sm467556wrp.89.2018.12.06.09.01.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Dec 2018 09:01:08 -0800 (PST) From: Vincenzo Maffione To: qemu-devel@nongnu.org Date: Thu, 6 Dec 2018 17:59:06 +0100 Message-Id: <20181206165907.23465-3-v.maffione@gmail.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181206165907.23465-1-v.maffione@gmail.com> References: <20181206165907.23465-1-v.maffione@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 Subject: [Qemu-devel] [PATCH v1 2/3] net: netmap: simplify netmap_receive() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: g.lettieri@iet.unipi.it, jasowang@redhat.com, Vincenzo Maffione Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Improve code reuse by implementing netmap_receive() with a call to netmap_receive_iov(). Signed-off-by: Vincenzo Maffione --- net/netmap.c | 50 +++++++++++--------------------------------------- 1 file changed, 11 insertions(+), 39 deletions(-) diff --git a/net/netmap.c b/net/netmap.c index 71a8122bdd..852106af29 100644 --- a/net/netmap.c +++ b/net/netmap.c @@ -154,45 +154,6 @@ static void netmap_writable(void *opaque) qemu_flush_queued_packets(&s->nc); } -static ssize_t netmap_receive(NetClientState *nc, - const uint8_t *buf, size_t size) -{ - NetmapState *s = DO_UPCAST(NetmapState, nc, nc); - struct netmap_ring *ring = s->tx; - uint32_t i; - uint32_t idx; - uint8_t *dst; - - if (unlikely(!ring)) { - /* Drop. */ - return size; - } - - if (unlikely(size > ring->nr_buf_size)) { - RD(5, "[netmap_receive] drop packet of size %d > %d\n", - (int)size, ring->nr_buf_size); - return size; - } - - if (nm_ring_empty(ring)) { - /* No available slots in the netmap TX ring. */ - netmap_write_poll(s, true); - return 0; - } - - i = ring->cur; - idx = ring->slot[i].buf_idx; - dst = (uint8_t *)NETMAP_BUF(ring, idx); - - ring->slot[i].len = size; - ring->slot[i].flags = 0; - pkt_copy(buf, dst, size); - ring->cur = ring->head = nm_ring_next(ring, i); - ioctl(s->nmd->fd, NIOCTXSYNC, NULL); - - return size; -} - static ssize_t netmap_receive_iov(NetClientState *nc, const struct iovec *iov, int iovcnt) { @@ -259,6 +220,17 @@ static ssize_t netmap_receive_iov(NetClientState *nc, return iov_size(iov, iovcnt); } +static ssize_t netmap_receive(NetClientState *nc, + const uint8_t *buf, size_t size) +{ + struct iovec iov; + + iov.iov_base = (void *)buf; + iov.iov_len = size; + + return netmap_receive_iov(nc, &iov, 1); +} + /* Complete a previous send (backend --> guest) and enable the fd_read callback. */ static void netmap_send_completed(NetClientState *nc, ssize_t len) From patchwork Thu Dec 6 16:59:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincenzo Maffione X-Patchwork-Id: 10716443 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9EA921923 for ; Thu, 6 Dec 2018 17:10:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 817DC2F17A for ; Thu, 6 Dec 2018 17:10:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7096B2F182; Thu, 6 Dec 2018 17:10:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id D0D622F17A for ; Thu, 6 Dec 2018 17:10:04 +0000 (UTC) Received: from localhost ([::1]:42158 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gUxA3-0001qu-1E for patchwork-qemu-devel@patchwork.kernel.org; Thu, 06 Dec 2018 12:10:03 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52329) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gUx1v-0003mc-C9 for qemu-devel@nongnu.org; Thu, 06 Dec 2018 12:01:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gUx1e-0006t6-ST for qemu-devel@nongnu.org; Thu, 06 Dec 2018 12:01:35 -0500 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:34208) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gUx1e-0006kp-99 for qemu-devel@nongnu.org; Thu, 06 Dec 2018 12:01:22 -0500 Received: by mail-wr1-x443.google.com with SMTP id j2so1243119wrw.1 for ; Thu, 06 Dec 2018 09:01:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=iUAg6dfrLALQcG1YgGKEexk7hL/v84hmTmLvr6abT14=; b=pZVPGIvsqGb+m6U/u0ubq0peSKp4DW0Hgg8vUt5p+mkkfvctRamudbUayPSsSeK0S0 Gi0mfEWrAxtYKyl/VrPk5U7Deycy0NuFpwwatlc4nqYErcCt0bWwx5N9SxeUrJh5oLpa SO3/CrdECyeEdTK2Rk79wzcHERS4ETrWTtCFaZp9cpL/arT4SApG3Lu+/8BEfgytUtZS 6UPp3UiynmuipOfFe7d9O7Gmf/KV+yZynnptO7w1OwwIXle/QGlktZE4fSlfldjggvml iHHe6muUp2og+28Oia0HRxGuYhG4xqiOTtadNsuy+KEU6Z+JlbstI+8S0cT5RUZGEXKo zgTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=iUAg6dfrLALQcG1YgGKEexk7hL/v84hmTmLvr6abT14=; b=jRUkiLvagqMagcy5p7zAxih15eFowi8lWo5vvz54kwUQMMp5optxRQlJ/X6Z196WN7 /jg/0StwJ2/4sc8xmo518EF6B9l/g2VKUDLUV3fIkuL/3VXBnLEooTjoy4ZdJXeJDKw0 n1F8kUIG4S/quK5I31j1ej+4v2N3ydDQPKrI5vkqwzPpaV8QtZJDKWV1JsSNFExQeVAM 67qfHu09+3NfKP+Zt/paNhcV3wzp7KdmNXiF2mVVJ+QPB4KJYgaM4Ttj+wT2Lyd5XWRi +JENsL/V6TI+5kHQYrhDyGjE2+HHle82eR21UpE0HzygQUF4FH7GemvYmXAp1Q1oK8+H lBaw== X-Gm-Message-State: AA+aEWaCo8wwlosDhUGip9adsT7kmZcHh3/utYMVZQzbJj77UVjzNSZ/ NcqONPvhSwCSsOae9T8XWZjxoYWSiVE= X-Google-Smtp-Source: AFSGD/XYSgEGimH4SjDLyuswwpiYDeR0VqzCaTnaUcm9O4bpIYqqyiJDkahdq1b3pGpD13uA/2d1vQ== X-Received: by 2002:a5d:454f:: with SMTP id p15mr27719537wrr.39.1544115670435; Thu, 06 Dec 2018 09:01:10 -0800 (PST) Received: from localhost.localdomain (prova.iet.unipi.it. [131.114.58.86]) by smtp.gmail.com with ESMTPSA id d4sm467556wrp.89.2018.12.06.09.01.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Dec 2018 09:01:09 -0800 (PST) From: Vincenzo Maffione To: qemu-devel@nongnu.org Date: Thu, 6 Dec 2018 17:59:07 +0100 Message-Id: <20181206165907.23465-4-v.maffione@gmail.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181206165907.23465-1-v.maffione@gmail.com> References: <20181206165907.23465-1-v.maffione@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 Subject: [Qemu-devel] [PATCH v1 3/3] net: netmap: improve netmap_receive_iov() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: g.lettieri@iet.unipi.it, jasowang@redhat.com, Vincenzo Maffione Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Changes: - Save CPU cycles by computing the return value while scanning the input iovec, rather than calling iov_size() at the end. - Remove check for s->tx != NULL, because it cannot happen. - Cache ring->tail in a local variable and use it to check for space in the TX ring. The use of nm_ring_empty() was invalid, because nobody is updating ring->cur and ring->head at that point. - In case we run out of netmap slots in the middle of a packet, move the wake-up point by advancing ring->cur, but do not expose the incomplete packet (i.e., by updating also ring->head). Signed-off-by: Vincenzo Maffione --- net/netmap.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/net/netmap.c b/net/netmap.c index 852106af29..0cc8f545c5 100644 --- a/net/netmap.c +++ b/net/netmap.c @@ -159,21 +159,22 @@ static ssize_t netmap_receive_iov(NetClientState *nc, { NetmapState *s = DO_UPCAST(NetmapState, nc, nc); struct netmap_ring *ring = s->tx; + unsigned int tail = ring->tail; + ssize_t totlen = 0; uint32_t last; uint32_t idx; uint8_t *dst; int j; uint32_t i; - if (unlikely(!ring)) { - /* Drop the packet. */ - return iov_size(iov, iovcnt); - } - - last = i = ring->cur; + last = i = ring->head; if (nm_ring_space(ring) < iovcnt) { - /* Not enough netmap slots. */ + /* Not enough netmap slots. Tell the kernel that we have seen the new + * available slots (so that it notifies us again when it has more + * ones), but without publishing any new slots to be processed + * (e.g., we don't advance ring->head). */ + ring->cur = tail; netmap_write_poll(s, true); return 0; } @@ -183,14 +184,17 @@ static ssize_t netmap_receive_iov(NetClientState *nc, int offset = 0; int nm_frag_size; + totlen += iov_frag_size; + /* Split each iovec fragment over more netmap slots, if necessary. */ while (iov_frag_size) { nm_frag_size = MIN(iov_frag_size, ring->nr_buf_size); - if (unlikely(nm_ring_empty(ring))) { - /* We run out of netmap slots while splitting the + if (unlikely(i == tail)) { + /* We ran out of netmap slots while splitting the iovec fragments. */ + ring->cur = tail; netmap_write_poll(s, true); return 0; } @@ -212,12 +216,13 @@ static ssize_t netmap_receive_iov(NetClientState *nc, /* The last slot must not have NS_MOREFRAG set. */ ring->slot[last].flags &= ~NS_MOREFRAG; - /* Now update ring->cur and ring->head. */ - ring->cur = ring->head = i; + /* Now update ring->head and ring->cur to publish the new slots and + * the new wakeup point. */ + ring->head = ring->cur = i; ioctl(s->nmd->fd, NIOCTXSYNC, NULL); - return iov_size(iov, iovcnt); + return totlen; } static ssize_t netmap_receive(NetClientState *nc,