From patchwork Tue Aug 14 16:45:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 43711 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E14264F98; Tue, 14 Aug 2018 18:45:30 +0200 (CEST) Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by dpdk.org (Postfix) with ESMTP id B6FFB4F93 for ; Tue, 14 Aug 2018 18:45:29 +0200 (CEST) Received: by mail-pg1-f194.google.com with SMTP id z8-v6so9343610pgu.8 for ; Tue, 14 Aug 2018 09:45:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=+k1K7zn2qKyDj9SRxWz/Enc7TYWV81d0VYfP8R675q4=; b=jSgrkrpclu9fZobvYjwojkZXbJer2yAb8oYFH313K1P6WdjjOtVSJiDFYULhHfVNvr WkBpljjyVP/lzcqmWe45fYaVZSz4Li3Y5y2gcOI5XVWnPleDXCr8kD2zFh4dbwpZCDku qWPL67F4rOCOAN8VBXfUZmArwjZJ2ZzW6GcIRRMU6cjgH6lScL9hv6sm0dy6NL++UCDI CG+LQ+9Y1oiZOrGnCWGZx5Ff9CnDVkLbAAI8Ffaz09yaA5bxqYoUoADy89XQ/hG37JAu 7RiL39x61bq0PjvnKbvk/qvV42Ek9CjdAiwOlz5GEF2mWgSFPJOpVAyt5zjEM60EFlWU RRiw== 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; bh=+k1K7zn2qKyDj9SRxWz/Enc7TYWV81d0VYfP8R675q4=; b=sRkoZ81tFa6F3ZTvu05PAJn6dGCVC+mWEIqwhIdy4VEl9RewO1CDq1QnNLD00Kg1v5 YDdZHeAwxWHhZ4XLcz2S2tvTOKY2VD0Wf9QKJ5MVrc8LnY6bvGQyU0qNdlCNdjYfMej7 igwiDvdC3D+m7pwTz+zqfQeJSlIo56RihQRGWFDOtWCda+nPlwnJpYT/lcFvh4iouvox xk61v7iFc94/pvafWdh7Bf4TsWKsXSqcp8uPxUtZBaYn1bGz2JqME3xgMUcD83JeV4lb Ws7AvxzM6KAjhgig4BSxSe5vao1fz/hQK8xyJwlTDKnmpFQ9kQim+PO9x6nyXFNfnS6i pUcQ== X-Gm-Message-State: AOUpUlE4DMW2ZC7bSYJI/0jtGP8HfGyxrsJ+0jIMHS9npyAePDtNuCY4 tfYXhEyWDgEprz7mvKjPprE7xEnfQel/Dg== X-Google-Smtp-Source: AA+uWPzPz2368QTqsz4+vcOJoEpcgchVkgMlb+FYrIC8E6J0Fag5iwXlS+smvBjhw8RMFDSwvwcx5g== X-Received: by 2002:aa7:83cd:: with SMTP id j13-v6mr24298858pfn.236.1534265128588; Tue, 14 Aug 2018 09:45:28 -0700 (PDT) Received: from xeon-e3.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id 1-v6sm50409328pfm.145.2018.08.14.09.45.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Aug 2018 09:45:27 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Stephen Hemminger Date: Tue, 14 Aug 2018 09:45:25 -0700 Message-Id: <20180814164525.10703-1-stephen@networkplumber.org> X-Mailer: git-send-email 2.18.0 Subject: [dpdk-dev] [PATCH v3] netvsc: resize event buffer as needed X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The event buffer was changed to be a fixed size value, had a couple of issues. The big one is that rte_free was still being called for a pointer that was not setup with rte_malloc(). The event buffer was also too small to handle heavy receive traffic; and running the event buffer out would crash the application. Fix by going back to a dynamically resized event buffer. And grow it by 25% to avoid lots of realloc's. Fixes: 530af95a7849 ("bus/vmbus: avoid signalling host on read") Signed-off-by: Stephen Hemminger --- v3 - use rte_malloc since event_buf needs to be shared with secondary process (if queue is shared between primary/secondary) drivers/net/netvsc/hn_rxtx.c | 50 ++++++++++++++++++++++++++---------- drivers/net/netvsc/hn_var.h | 2 +- 2 files changed, 38 insertions(+), 14 deletions(-) diff --git a/drivers/net/netvsc/hn_rxtx.c b/drivers/net/netvsc/hn_rxtx.c index 02ef27e363cc..9b394d261b37 100644 --- a/drivers/net/netvsc/hn_rxtx.c +++ b/drivers/net/netvsc/hn_rxtx.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include @@ -718,16 +719,24 @@ struct hn_rx_queue *hn_rx_queue_alloc(struct hn_data *hv, { struct hn_rx_queue *rxq; - rxq = rte_zmalloc_socket("HN_RXQ", - sizeof(*rxq) + HN_RXQ_EVENT_DEFAULT, + rxq = rte_zmalloc_socket("HN_RXQ", sizeof(*rxq), RTE_CACHE_LINE_SIZE, socket_id); - if (rxq) { - rxq->hv = hv; - rxq->chan = hv->channels[queue_id]; - rte_spinlock_init(&rxq->ring_lock); - rxq->port_id = hv->port_id; - rxq->queue_id = queue_id; + if (!rxq) + return NULL; + + rxq->hv = hv; + rxq->chan = hv->channels[queue_id]; + rte_spinlock_init(&rxq->ring_lock); + rxq->port_id = hv->port_id; + rxq->queue_id = queue_id; + rxq->event_sz = HN_RXQ_EVENT_DEFAULT; + rxq->event_buf = rte_malloc_socket("HN_EVENTS", HN_RXQ_EVENT_DEFAULT, + RTE_CACHE_LINE_SIZE, socket_id); + if (!rxq->event_buf) { + rte_free(rxq); + return NULL; } + return rxq; } @@ -853,19 +862,34 @@ void hn_process_events(struct hn_data *hv, uint16_t queue_id) for (;;) { const struct vmbus_chanpkt_hdr *pkt; - uint32_t len = HN_RXQ_EVENT_DEFAULT; + uint32_t len = rxq->event_sz; const void *data; +retry: ret = rte_vmbus_chan_recv_raw(rxq->chan, rxq->event_buf, &len); if (ret == -EAGAIN) break; /* ring is empty */ - else if (ret == -ENOBUFS) - rte_exit(EXIT_FAILURE, "event buffer not big enough (%u < %u)", - HN_RXQ_EVENT_DEFAULT, len); - else if (ret <= 0) + if (unlikely(ret == -ENOBUFS)) { + /* event buffer not large enough to read ring */ + + PMD_DRV_LOG(DEBUG, + "event buffer expansion (need %u)", len); + rxq->event_sz = len + len / 4; + rxq->event_buf = rte_realloc(rxq->event_buf, rxq->event_sz, + RTE_CACHE_LINE_SIZE); + if (rxq->event_buf) + goto retry; + /* out of memory, no more events now */ + rxq->event_sz = 0; + break; + } + + if (unlikely(ret <= 0)) { + /* This indicates a failure to communicate (or worse) */ rte_exit(EXIT_FAILURE, "vmbus ring buffer error: %d", ret); + } bytes_read += ret; pkt = (const struct vmbus_chanpkt_hdr *)rxq->event_buf; diff --git a/drivers/net/netvsc/hn_var.h b/drivers/net/netvsc/hn_var.h index f7ff8585bc1c..0430f450cf37 100644 --- a/drivers/net/netvsc/hn_var.h +++ b/drivers/net/netvsc/hn_var.h @@ -77,7 +77,7 @@ struct hn_rx_queue { struct hn_stats stats; uint64_t ring_full; - uint8_t event_buf[]; + void *event_buf; };