From patchwork Tue Feb 2 09:10:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keiichi Watanabe X-Patchwork-Id: 87625 X-Patchwork-Delegate: maxime.coquelin@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 42C22A052A; Tue, 2 Feb 2021 10:10:49 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 27ADC240303; Tue, 2 Feb 2021 10:10:49 +0100 (CET) Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by mails.dpdk.org (Postfix) with ESMTP id 233332402FF for ; Tue, 2 Feb 2021 10:10:47 +0100 (CET) Received: by mail-pj1-f53.google.com with SMTP id q72so469715pjq.2 for ; Tue, 02 Feb 2021 01:10:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=MFk76p3haK9No6ytb8vVnI+Uc0d8TYsYXmY1GtApZmc=; b=jo3dBjBV82BN3T5KA+S8LZtd5bhk2D2rWy+sIg7u7q9CZiNUT3gNtgUXEVSMGZee5T /efbVDSZI8jVI4uQ9GTC7iRKXDfkW3Go9UF972eVXx90zvVTIIYF8iPVJGWKNuGkOLCB LdQMNejxsXer+YPnu6AsPRUhvKWC2KVlLc/YM= 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:mime-version :content-transfer-encoding; bh=MFk76p3haK9No6ytb8vVnI+Uc0d8TYsYXmY1GtApZmc=; b=CWJ54mFeLQkwsBaXLcE2gsGzzHQEVi8f4VHzA+MuPzCtc4NVVfWNZCdyy0tSn2IeGF wZ9ERp18hESnowfQSluF8PdGNbiCaNNFQDiOD9Sa17xcbE+ZzQIKrD3eWHDl6JTfUz5p kBloqNTOCkRTwNRWnQZwiX99LkLCs/uOqdq114a9iZ51+vXjvjt6ZwT6Q3tf7Gzauc/i yvXa6hx4q2ibJN55qdGFlmxFeQpTeCGaALui18EoLCo0Q2N52BgT4fQ1wRDRUN2c5rA8 xaeDsS6PhaY0lAzODcKHD2rFNXyB2mSv2wQTts8GZVu5foKnswF1Dm9eh6MzglI5XNl1 dPWQ== X-Gm-Message-State: AOAM530s2+A3WPKs2nTOMkW2yV3AtxooTAlR5QwJ3d+PSzdpf3OtcftF +AkPOFajbSoK0o3kBJrt1NPc/Nq9oDfo8g== X-Google-Smtp-Source: ABdhPJyy77ZcHMpRSTOYL85YCUZYNm24rjSGTIg2WhzS+p867ZbAVJRhOCkDJQP45677yHT0xruqIQ== X-Received: by 2002:a17:90a:9eb:: with SMTP id 98mr3251229pjo.40.1612257045977; Tue, 02 Feb 2021 01:10:45 -0800 (PST) Received: from keiichiw1.tok.corp.google.com ([2401:fa00:8f:203:d5e2:fa45:c685:4156]) by smtp.gmail.com with ESMTPSA id l1sm14370293pgt.26.2021.02.02.01.10.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Feb 2021 01:10:45 -0800 (PST) From: Keiichi Watanabe To: dev@dpdk.org Cc: dgreid@chromium.org, chirantan@chromium.org, Keiichi Watanabe , Maxime Coquelin , Chenbo Xia Date: Tue, 2 Feb 2021 18:10:39 +0900 Message-Id: <20210202091039.3353569-1-keiichiw@chromium.org> X-Mailer: git-send-email 2.30.0.365.g02bc693789-goog MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH] examples/vhost_blk: check protocol feature before get inflight info X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 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" Avoid calling rte_vhost_get_vhost_ring_inflight() and rte_vhost_get_vring_base_from_inflight() when VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD is not set. Signed-off-by: Keiichi Watanabe --- examples/vhost_blk/vhost_blk.c | 22 +++++++++++++++++----- lib/librte_vhost/rte_vhost.h | 13 +++++++++++++ lib/librte_vhost/vhost.c | 14 ++++++++++++++ 3 files changed, 44 insertions(+), 5 deletions(-) diff --git a/examples/vhost_blk/vhost_blk.c b/examples/vhost_blk/vhost_blk.c index 7ea60863d..9f3e157a0 100644 --- a/examples/vhost_blk/vhost_blk.c +++ b/examples/vhost_blk/vhost_blk.c @@ -603,10 +603,10 @@ new_device(int vid) struct vhost_blk_ctrlr *ctrlr; struct vhost_blk_queue *vq; char path[PATH_MAX]; - uint64_t features; + uint64_t features, protocol_features; pthread_t tid; int i, ret; - bool packed_ring; + bool packed_ring, inflight_shmfd; ret = rte_vhost_get_ifname(vid, path, PATH_MAX); if (ret) { @@ -631,6 +631,15 @@ new_device(int vid) } packed_ring = !!(features & (1ULL << VIRTIO_F_RING_PACKED)); + ret = rte_vhost_get_negotiated_protocol_features( + vid, &protocol_features); + if (ret) { + fprintf(stderr, + "Failed to get the negotiated protocol features\n"); + return -1; + } + inflight_shmfd = !!(features & (1ULL << VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD)); + /* Disable Notifications and init last idx */ for (i = 0; i < NUM_OF_BLK_QUEUES; i++) { vq = &ctrlr->queues[i]; @@ -641,10 +650,13 @@ new_device(int vid) assert(rte_vhost_get_vring_base(ctrlr->vid, i, &vq->last_avail_idx, &vq->last_used_idx) == 0); - assert(rte_vhost_get_vhost_ring_inflight(ctrlr->vid, i, - &vq->inflight_ring) == 0); - if (packed_ring) { + if (inflight_shmfd) + assert(rte_vhost_get_vhost_ring_inflight( + ctrlr->vid, i, + &vq->inflight_ring) == 0); + + if (packed_ring && inflight_shmfd) { /* for the reconnection */ assert(rte_vhost_get_vring_base_from_inflight( ctrlr->vid, i, diff --git a/lib/librte_vhost/rte_vhost.h b/lib/librte_vhost/rte_vhost.h index 010f16086..2744374af 100644 --- a/lib/librte_vhost/rte_vhost.h +++ b/lib/librte_vhost/rte_vhost.h @@ -567,6 +567,19 @@ rte_vhost_driver_get_queue_num(const char *path, uint32_t *queue_num); */ int rte_vhost_get_negotiated_features(int vid, uint64_t *features); +/** + * Get the protocol feature bits after negotiation + * + * @param vid + * Vhost device ID + * @param protocol_features + * A pointer to store the queried protocol feature bits + * @return + * 0 on success, -1 on failure + */ +int rte_vhost_get_negotiated_protocol_features(int vid, + uint64_t *protocol_features); + /* Register callbacks. */ int rte_vhost_driver_callback_register(const char *path, struct vhost_device_ops const * const ops); diff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c index efb136edd..61189ce93 100644 --- a/lib/librte_vhost/vhost.c +++ b/lib/librte_vhost/vhost.c @@ -868,6 +868,20 @@ rte_vhost_get_negotiated_features(int vid, uint64_t *features) return 0; } +int +rte_vhost_get_negotiated_protocol_features(int vid, + uint64_t *protocol_features) +{ + struct virtio_net *dev; + + dev = get_device(vid); + if (dev == NULL || protocol_features == NULL) + return -1; + + *protocol_features = dev->protocol_features; + return 0; +} + int rte_vhost_get_mem_table(int vid, struct rte_vhost_memory **mem) {