From patchwork Wed Jun 13 11:54:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tonghao Zhang X-Patchwork-Id: 41031 X-Patchwork-Delegate: maxime.coquelin@redhat.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 20AAD1E4B4; Wed, 13 Jun 2018 13:54:29 +0200 (CEST) Received: from mail-pl0-f65.google.com (mail-pl0-f65.google.com [209.85.160.65]) by dpdk.org (Postfix) with ESMTP id 437A31D531 for ; Wed, 13 Jun 2018 13:54:27 +0200 (CEST) Received: by mail-pl0-f65.google.com with SMTP id 6-v6so867063plb.0 for ; Wed, 13 Jun 2018 04:54:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=1/Asuwed07gqt3iQQ0be98Py5DMpRDYqVKc2DEEy6hg=; b=qdiewNMS2qEHb1cSPl3azcottS16AcpAMxsC7FG3f503xZqc8OFowSBoQSmqzRm15g N7KggKiWYiJ21r9ZstcudTrAcqHj6A+hLW/sNnY92jQ/CLnaW3n0AiojmqMG6jFOYMY/ iRTDqdPHYfKLVYj89H8C0vv+xr1GpmUHFUfwTgEQkThs1Bliha715bAtBjEptrhoYOl8 7wjCSRE+Nir4lp7vu+E1S3c36mz6AzO9q0xn4HZQ72JrWLlQY66QVCuWl4QhudAE58Db scDkN285kS3LKoZGWzseJy/q59JGDU51+EnvanUpQcSdPlcUsjBFFrMlEQshu/kIaxu5 LZ0A== 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=1/Asuwed07gqt3iQQ0be98Py5DMpRDYqVKc2DEEy6hg=; b=aGUiZb6jZCnC1tPb3Q1/M3wsg9aqUFIog4kdnH1L7HNuE57BSatokBZsLFWWqMF871 K7YlGrd1OdYzHUSVeQJmPw6AgsW+VajpXdwFeyz7gZqwb2j4hIvFq7x5BS8Qbjb6yVXV 4JyMq3OiiUTC/rcHb6aOJ44pY8HMwphcpnlDOhMSWoilCbPRx/p9BEJQ/OUBRTQ0NJj7 rC94yu0PDQJlUFVS70RvV+apKk92CsrA8JGVRkDi2W5lyjNfpNWabVh9xoZvTaVI8lZc 4xVRcSJPv4XgKOOI6+mo0yyuOpOuIn2LqP5WMlQMGJv5LhllizBSHEzGRwiiAA3qzhVK YZ3Q== X-Gm-Message-State: APt69E3r+caa2UQbl64os5HOgAF/TQuLuo/gOIAlK1SQ9FBD/wdJGOG4 uMpVomT/LSur+zZFZCjbR35XN9Ow X-Google-Smtp-Source: ADUXVKLYwkrf8S3YxQk2OsUSU24y4u9SHb6N0Hl0ScKRLEBMAnHayETP7vl4MSPNhhtp2JYFfd/ikQ== X-Received: by 2002:a17:902:7089:: with SMTP id z9-v6mr4812821plk.231.1528890866257; Wed, 13 Jun 2018 04:54:26 -0700 (PDT) Received: from local.opencloud.tech.localdomain ([13.94.31.177]) by smtp.gmail.com with ESMTPSA id u90-v6sm7751364pfa.101.2018.06.13.04.54.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Jun 2018 04:54:25 -0700 (PDT) From: xiangxia.m.yue@gmail.com To: dev@dpdk.org Cc: Tonghao Zhang Date: Wed, 13 Jun 2018 04:54:18 -0700 Message-Id: <1528890858-49222-1-git-send-email-xiangxia.m.yue@gmail.com> X-Mailer: git-send-email 1.8.3.1 Subject: [dpdk-dev] [PATCH] vhost: introduce new function helper 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" From: Tonghao Zhang Introduce an new common helper to avoid redundancy. Signed-off-by: Tonghao Zhang Reviewed-by: Maxime Coquelin --- lib/librte_vhost/vhost.c | 27 +++++++++++++++++---------- lib/librte_vhost/vhost.h | 1 + lib/librte_vhost/vhost_user.c | 23 ++--------------------- 3 files changed, 20 insertions(+), 31 deletions(-) diff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c index afded49..493b204 100644 --- a/lib/librte_vhost/vhost.c +++ b/lib/librte_vhost/vhost.c @@ -295,6 +295,22 @@ return i; } +void +vhost_destroy_device_notify(struct virtio_net *dev) +{ + struct rte_vdpa_device *vdpa_dev; + int did; + + if (dev->flags & VIRTIO_DEV_RUNNING) { + did = dev->vdpa_dev_id; + vdpa_dev = rte_vdpa_get_device(did); + if (vdpa_dev && vdpa_dev->ops->dev_close) + vdpa_dev->ops->dev_close(dev->vid); + dev->flags &= ~VIRTIO_DEV_RUNNING; + dev->notify_ops->destroy_device(dev->vid); + } +} + /* * Invoked when there is the vhost-user connection is broken (when * the virtio device is being detached). @@ -303,20 +319,11 @@ vhost_destroy_device(int vid) { struct virtio_net *dev = get_device(vid); - struct rte_vdpa_device *vdpa_dev; - int did = -1; if (dev == NULL) return; - if (dev->flags & VIRTIO_DEV_RUNNING) { - did = dev->vdpa_dev_id; - vdpa_dev = rte_vdpa_get_device(did); - if (vdpa_dev && vdpa_dev->ops->dev_close) - vdpa_dev->ops->dev_close(dev->vid); - dev->flags &= ~VIRTIO_DEV_RUNNING; - dev->notify_ops->destroy_device(vid); - } + vhost_destroy_device_notify(dev); cleanup_device(dev, 1); free_device(dev); diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h index 58c425a..cd1cfcb 100644 --- a/lib/librte_vhost/vhost.h +++ b/lib/librte_vhost/vhost.h @@ -535,6 +535,7 @@ struct virtio_net { void cleanup_device(struct virtio_net *dev, int destroy); void reset_device(struct virtio_net *dev); void vhost_destroy_device(int); +void vhost_destroy_device_notify(struct virtio_net *dev); void cleanup_vq(struct vhost_virtqueue *vq, int destroy); void free_vq(struct vhost_virtqueue *vq); diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c index 947290f..6e8d566 100644 --- a/lib/librte_vhost/vhost_user.c +++ b/lib/librte_vhost/vhost_user.c @@ -135,17 +135,7 @@ static int vhost_user_reset_owner(struct virtio_net *dev) { - struct rte_vdpa_device *vdpa_dev; - int did = -1; - - if (dev->flags & VIRTIO_DEV_RUNNING) { - did = dev->vdpa_dev_id; - vdpa_dev = rte_vdpa_get_device(did); - if (vdpa_dev && vdpa_dev->ops->dev_close) - vdpa_dev->ops->dev_close(dev->vid); - dev->flags &= ~VIRTIO_DEV_RUNNING; - dev->notify_ops->destroy_device(dev->vid); - } + vhost_destroy_device_notify(dev); cleanup_device(dev, 0); reset_device(dev); @@ -996,18 +986,9 @@ VhostUserMsg *msg) { struct vhost_virtqueue *vq = dev->virtqueue[msg->payload.state.index]; - struct rte_vdpa_device *vdpa_dev; - int did = -1; /* We have to stop the queue (virtio) if it is running. */ - if (dev->flags & VIRTIO_DEV_RUNNING) { - did = dev->vdpa_dev_id; - vdpa_dev = rte_vdpa_get_device(did); - if (vdpa_dev && vdpa_dev->ops->dev_close) - vdpa_dev->ops->dev_close(dev->vid); - dev->flags &= ~VIRTIO_DEV_RUNNING; - dev->notify_ops->destroy_device(dev->vid); - } + vhost_destroy_device_notify(dev); dev->flags &= ~VIRTIO_DEV_READY; dev->flags &= ~VIRTIO_DEV_VDPA_CONFIGURED;