From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pd0-f178.google.com (mail-pd0-f178.google.com [209.85.192.178]) by dpdk.org (Postfix) with ESMTP id 88C15C370 for ; Wed, 15 Apr 2015 17:20:20 +0200 (CEST) Received: by pdbqa5 with SMTP id qa5so55938072pdb.1 for ; Wed, 15 Apr 2015 08:20:20 -0700 (PDT) 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; bh=4mZesJ1ec+1p9HYglUuNFZuPA+CcppCtWTsjnRBXRD4=; b=RACB1X5Bn0/AZ3locO3rZSkEVLUjdQbaFNuUEnCjF/0GIl64+G9ZPnKk59DxrkEC7P Ng7NxJbWjrLqRgvDJrtrhUEWivJWTteBkyCbff+Dc9lf3oP6sk5PO8rfqj5i/oXmchFb u7gEBmN9mIDdfWT6riX+yiIv2t3f5r1lQ6/PXX8IJAu0+5MgFGAkEUm02t0As+Mw7tTj gJIYrPCJf16+UJQxIcye/FIbn4nTzyv/4HKiU3bqWav6JAIgKURgG7AMw10ZvZt29Ugk 4CCQVFsoVAKJyxldtXofxwdN+YW2b30uAtWqCPNKwIBsY49y/QaypFi8CC5rTM00hELy vuQw== X-Gm-Message-State: ALoCoQn640/okbKITySgZXnjnGBabHaSiWMs7wOAOI42dTj/wOPKo4zs7wBkB5XlwiQmPt6LYrqQ X-Received: by 10.70.44.100 with SMTP id d4mr47502638pdm.36.1429111219966; Wed, 15 Apr 2015 08:20:19 -0700 (PDT) Received: from urahara.home.lan (static-50-53-82-155.bvtn.or.frontiernet.net. [50.53.82.155]) by mx.google.com with ESMTPSA id sm7sm4459057pac.45.2015.04.15.08.20.18 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 15 Apr 2015 08:20:19 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Date: Wed, 15 Apr 2015 08:20:18 -0700 Message-Id: <1429111219-8789-5-git-send-email-stephen@networkplumber.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1429111219-8789-1-git-send-email-stephen@networkplumber.org> References: <1429111219-8789-1-git-send-email-stephen@networkplumber.org> Subject: [dpdk-dev] [PATCH 4/5] virtio: fix ring size negotiation X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Apr 2015 15:20:21 -0000 This fixes another of the issues with running virtio on non-KVM envirionments. For example, Google Compute Engine reports a ring size of 16K. If guest virtio requests more slots than available then the queue should just be initialized to the smaller value. Conversely, if the number of descriptors requested exceeds the virtio host queue size, then just silently use the smaller host size. Signed-off-by: Stephen Hemminger --- lib/librte_pmd_virtio/virtio_ethdev.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/lib/librte_pmd_virtio/virtio_ethdev.c b/lib/librte_pmd_virtio/virtio_ethdev.c index 3cb9c6a..db0232e 100644 --- a/lib/librte_pmd_virtio/virtio_ethdev.c +++ b/lib/librte_pmd_virtio/virtio_ethdev.c @@ -267,13 +267,21 @@ int virtio_dev_queue_setup(struct rte_eth_dev *dev, if (vq_size == 0) { PMD_INIT_LOG(ERR, "%s: virtqueue does not exist", __func__); return -EINVAL; - } else if (!rte_is_power_of_2(vq_size)) { + } + + if (!rte_is_power_of_2(vq_size)) { PMD_INIT_LOG(ERR, "%s: virtqueue size is not powerof 2", __func__); return -EINVAL; - } else if (nb_desc != vq_size) { - PMD_INIT_LOG(ERR, "Warning: nb_desc(%d) is not equal to vq size (%d), fall to vq size", - nb_desc, vq_size); - nb_desc = vq_size; + } + + if (nb_desc < vq_size) { + if (!rte_is_power_of_2(nb_desc)) { + PMD_INIT_LOG(ERR, + "nb_desc(%u) size is not powerof 2", + nb_desc); + return -EINVAL; + } + vq_size = nb_desc; } if (queue_type == VTNET_RQ) { -- 2.1.4