From patchwork Mon Aug 13 15:51:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 43694 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 B665749CF; Mon, 13 Aug 2018 17:51:21 +0200 (CEST) Received: from mail-pl0-f66.google.com (mail-pl0-f66.google.com [209.85.160.66]) by dpdk.org (Postfix) with ESMTP id AD04CFEB for ; Mon, 13 Aug 2018 17:51:18 +0200 (CEST) Received: by mail-pl0-f66.google.com with SMTP id t17-v6so7037864ply.13 for ; Mon, 13 Aug 2018 08:51:18 -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:in-reply-to:references; bh=HdTc+aFWZnWhc7qAJyjFVaM37LaKMjz2DJGzxSf8YmI=; b=WgEj8ieiLUvLHUaS4dgfiPxxtydJ++GyCJ77mmzzpKYrxVJzYIc/E/4zzLFNgJpvUb nL+5iyr1eHPhfNngCLu9mfyU+TZ14IcDaijVjeB5TrMb4DcNbBT17AdXygVfHfUG/Ti2 6oS+Jnem9ra8M2BAAkKZJt7mwtXxtw4kkMdM5lhuO0xBSRlW6HQHMjBxXbrJSmDp7X3g SprqhK/YaVH4YqZwW/i4QNrwuZIz6JWpw25QVneBNX+Lf+OBRElaThYepuYXu1goVp0T tOMGKf5L3LbEnItH9BXRrtvA0yfCh+1cyFEtDeUKng1DppfD4jZ3EWaansTpfV/DYMCH qg7Q== 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; bh=HdTc+aFWZnWhc7qAJyjFVaM37LaKMjz2DJGzxSf8YmI=; b=MRsEnwL+P9lOkblFcftGYyxSewoOJraYm2nt78p9a/GKDvjlS4tdDQFnzUetcIDA3Z Y8jW+mL0lx+P06pl+GKAMuFkdgiaKDMSDQztm6LQBLY/4aW+9U6akZTI3HZ3+QmenkBc K7BBP0ekGw3TY2Lr0KbgbvMUdc6YQT5Ee2A8Ns4pT6XSxzUF5s2T/JNmNcO9CLWTccdL tTV9geFumXOScXXCyUmmqYnfusnOGKxgxd+LeKz4sx2c4aj4GQJNQV6jWpyF6vVgpwnX CUHVaIdZjHLaHzhAxUtySWZAv43w4tcnbQky/pAW/RLZaI+Ke5xWcaszPE4hOVwcOh6s +qWg== X-Gm-Message-State: AOUpUlG8EqjZzmsT3bfwF9r6dc9wTdvEWvaaMK2uOZahanZGL3vd7gMH BiqRt8JrwQC3jRp/7KyQwHWnUAEZlMY= X-Google-Smtp-Source: AA+uWPyG+Cm34q+wXtSXp5FKoweFaq+IRL8ZiTIoBK3duYBg6vXRDoVjx5zLCQH9lAIIEbPAKDslWA== X-Received: by 2002:a17:902:42e2:: with SMTP id h89-v6mr17162786pld.69.1534175477668; Mon, 13 Aug 2018 08:51:17 -0700 (PDT) Received: from xeon-e3.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id m30-v6sm22018241pff.121.2018.08.13.08.51.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Aug 2018 08:51:16 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Stephen Hemminger Date: Mon, 13 Aug 2018 08:51:07 -0700 Message-Id: <20180813155108.6460-2-stephen@networkplumber.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180813155108.6460-1-stephen@networkplumber.org> References: <20180813155108.6460-1-stephen@networkplumber.org> Subject: [dpdk-dev] [PATCH v2 1/2] netvsc: fix rte malloc pool corruption 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, but calls to rte_free were left. That causes bugs because it calls to rte_free() for a pointer that was not setup with rte_malloc(). Fixes: 530af95a7849 ("bus/vmbus: avoid signalling host on read") Signed-off-by: Stephen Hemminger --- drivers/net/netvsc/hn_rxtx.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/net/netvsc/hn_rxtx.c b/drivers/net/netvsc/hn_rxtx.c index 02ef27e363cc..3e52a328b152 100644 --- a/drivers/net/netvsc/hn_rxtx.c +++ b/drivers/net/netvsc/hn_rxtx.c @@ -776,7 +776,6 @@ hn_dev_rx_queue_setup(struct rte_eth_dev *dev, fail: rte_ring_free(rxq->rx_ring); - rte_free(rxq->event_buf); rte_free(rxq); return -ENOMEM; } @@ -795,10 +794,8 @@ hn_dev_rx_queue_release(void *arg) rxq->rx_ring = NULL; rxq->mb_pool = NULL; - if (rxq != rxq->hv->primary) { - rte_free(rxq->event_buf); + if (rxq != rxq->hv->primary) rte_free(rxq); - } } void From patchwork Mon Aug 13 15:51:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 43695 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 6AA984C74; Mon, 13 Aug 2018 17:51:23 +0200 (CEST) Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by dpdk.org (Postfix) with ESMTP id 3891E47CD for ; Mon, 13 Aug 2018 17:51:20 +0200 (CEST) Received: by mail-pf1-f195.google.com with SMTP id j26-v6so7830589pfi.10 for ; Mon, 13 Aug 2018 08:51:20 -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:in-reply-to:references; bh=CQqBNVj1zl2YsKBnKezORNHIF7yFfTzHWPhXMRor/jk=; b=JmffNSl4TJKK8n/h3AKwGtV4rln7XtoYFe+o67Qmc3S1JgU24lMtr3W6LAvw9TOuW8 6nK4RAClJ+yrjbmYzad3hMn3tFTkm27ADMJzeCpq6e/uRu773VXBLXhmy2tTzcxnyUEg D3SsmDNQjr4bhOnYQcedMdPwoRFIs8MvrUE516O77KMQEiafo7CETQGeiH9EUJu0qYYw GKYlN5M4eqmc31LSXygIws0kn1MBIpEJ6Z7Vg8Z+G+lfrRZ2R15pLz9tsGET1SM5eE/G tFKRAWVroqTMhBf6MG0Xu3B5gjnwwEoIB2MUnWkHJMemP5kMZexyCiEj0LtxV+cREJv4 1ILg== 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; bh=CQqBNVj1zl2YsKBnKezORNHIF7yFfTzHWPhXMRor/jk=; b=bp6fGooT5afNFfrUV8GTLznOMFnwG7wKyUTlzj02+H9STwKyZXBDsTbA05KDS/sVnE OnN3lI8pJ6qIZmztdmJBI+murDt/CjAoumbgxY5Bfq4MCmZjXjafzdJJ452VIVL4na3O YtipuXVe6+UuTEgjk8Lb6p5zMeLBgBimuiadCQt+VJiDjpY6Sae5xaOgN88tjujIc2Nl aLLBJ+8O/1aGBbI00+3MmLIU4WLJTJW7DqF+SN9Fc142SY9rBVpXZiKek0z3wjRoY2By DcajLLqQFtzkDqAN05XGhBDJ1faa2H0YByPYU/xiP1L+56pI1wUrCq74Obofzztj41Ic jkJg== X-Gm-Message-State: AOUpUlEpRWxwmTpNFPBtywyBRzt4nphQ1pnnEFzU25AkqqUiUGzAEmK1 v2i/y4u4TYIsVP6A2scDCUANrFEy9jE= X-Google-Smtp-Source: AA+uWPyu9n63kW17KQP5f0NWrH+mFFjcMu+cNf4G8xxZLE/Z285b9u0xSC9tywpVBejdUcmnmc4K7g== X-Received: by 2002:a62:87ce:: with SMTP id i197-v6mr19643437pfe.62.1534175479071; Mon, 13 Aug 2018 08:51:19 -0700 (PDT) Received: from xeon-e3.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id m30-v6sm22018241pff.121.2018.08.13.08.51.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Aug 2018 08:51:17 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Stephen Hemminger Date: Mon, 13 Aug 2018 08:51:08 -0700 Message-Id: <20180813155108.6460-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180813155108.6460-1-stephen@networkplumber.org> References: <20180813155108.6460-1-stephen@networkplumber.org> Subject: [dpdk-dev] [PATCH v2 2/2] 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, but it is not large enough for a forwarding stress test. This version of event buffer code uses malloc/realloc to size the event buffer as needed. Malloc is preferred over rte_malloc because the event buffer does not need to be used for DMA and huge page is a limited resource. Fixes: 530af95a7849 ("bus/vmbus: avoid signalling host on read") Signed-off-by: Stephen Hemminger --- drivers/net/netvsc/hn_rxtx.c | 50 ++++++++++++++++++++++++++---------- drivers/net/netvsc/hn_var.h | 2 +- 2 files changed, 37 insertions(+), 15 deletions(-) diff --git a/drivers/net/netvsc/hn_rxtx.c b/drivers/net/netvsc/hn_rxtx.c index 3e52a328b152..79bb4d587783 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,22 @@ 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_buf = malloc(HN_RXQ_EVENT_DEFAULT); + if (!rxq->event_buf) { + free(rxq); + return NULL; } + return rxq; } @@ -776,6 +783,7 @@ hn_dev_rx_queue_setup(struct rte_eth_dev *dev, fail: rte_ring_free(rxq->rx_ring); + free(rxq->event_buf); rte_free(rxq); return -ENOMEM; } @@ -794,8 +802,10 @@ hn_dev_rx_queue_release(void *arg) rxq->rx_ring = NULL; rxq->mb_pool = NULL; - if (rxq != rxq->hv->primary) + if (rxq != rxq->hv->primary) { + free(rxq->event_buf); rte_free(rxq); + } } void @@ -850,19 +860,31 @@ 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 = malloc_usable_size(rxq->event_buf); 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_buf = realloc(rxq->event_buf, len); + if (rxq->event_buf) + goto retry; + /* out of memory, no more events now */ + 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; };