From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pa0-f49.google.com (mail-pa0-f49.google.com [209.85.220.49]) by dpdk.org (Postfix) with ESMTP id C72C59372 for ; Fri, 13 Nov 2015 06:22:37 +0100 (CET) Received: by pacdm15 with SMTP id dm15so88643595pac.3 for ; Thu, 12 Nov 2015 21:22:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=igel_co_jp.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=aN7+3Z6443ztOMAYyt6pQUIetoD2unT+MMau5j9PKw0=; b=Qy1yRpPFKQRgeelbHo4tg9p8tEwi07V2W4ZhadPJ6h2mUDPhu81OIf5v45BCPh/zlP vhV/zKDrjLt3avyk3Zy3hsfzIj0M++wUYFDIiv+TyCODnsCBTTo7zE+vdw3GKkhXgkI+ Y3U4vw228kOLvvShEmfQR0dS4Sin+qjthYrPOxviQyHtGATSgmZIBJOqyuehELcCoOJC SgA30qPqS6YuWGMJ9kZGNNkZ4ES8NNVRpdM1OOWXg3oPHP0TsHmFCnAsQtFGiR0WXh8l AYv0nEjjQdoZ7mUYswwiPckwhB0KWHWD/I99OsOWz1bgZoBPJtRwCbwwwsQ2hHJy90BT OVpw== 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=aN7+3Z6443ztOMAYyt6pQUIetoD2unT+MMau5j9PKw0=; b=HoHx9D+NlUT5vF+TenQJMrWRJpjBv6azXCrhUEBKlDq4ydn49xAs2ItS7RCf7uvz28 lYzOlMxH8v1/NmlbK/UVLUG/GHcbkGCdGBsI7NrkGAO76hgR1rdRlPo28dLB4j/5N5AZ WRBMNwnWjY6THofWE/fWE1wDw2aSFSuIVRRqeCzOiR32rAOpHs42/DBSapQmslfFFEY/ 8eBkMeqW+PWKiRtkSO/GmDRbX82Uk2eEXh73qr3I1IgTxXmZdnyPJ/Cx9ORdConXmzr6 SXF0akseIb9dizgdnP7Vd3z5ko1RVcrdrl03WtWT+ZYXKeh/zMba0k7+FcH5BNgoWAEb uREQ== X-Gm-Message-State: ALoCoQleUSZEMir/vfQKXfKRbaBZtOjsfTDttVudODFUyfouIEEK/7nt7fft83NBXbVrSB0CKBYI X-Received: by 10.68.161.194 with SMTP id xu2mr29219317pbb.86.1447392157207; Thu, 12 Nov 2015 21:22:37 -0800 (PST) Received: from localhost.localdomain (napt.igel.co.jp. [219.106.231.132]) by smtp.gmail.com with ESMTPSA id by6sm17891282pab.25.2015.11.12.21.22.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 12 Nov 2015 21:22:36 -0800 (PST) From: Tetsuya Mukawa To: dev@dpdk.org, zhihong.wang@intel.com, yuanhan.liu@intel.com Date: Fri, 13 Nov 2015 14:20:30 +0900 Message-Id: <1447392031-24970-2-git-send-email-mukawa@igel.co.jp> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1447392031-24970-1-git-send-email-mukawa@igel.co.jp> References: <1447046221-20811-3-git-send-email-mukawa@igel.co.jp> <1447392031-24970-1-git-send-email-mukawa@igel.co.jp> Cc: ann.zhuangyanying@huawei.com Subject: [dpdk-dev] [PATCH v4 1/2] vhost: Add callback and private data for vhost PMD 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: Fri, 13 Nov 2015 05:22:38 -0000 These variables are needed to be able to manage one of virtio devices using both vhost library APIs and vhost PMD. For example, if vhost PMD uses current callback handler and private data provided by vhost library, A DPDK application that links vhost library cannot use some of vhost library APIs. To avoid it, callback and private data for vhost PMD are needed. Signed-off-by: Tetsuya Mukawa --- lib/librte_vhost/rte_vhost_version.map | 6 +++ lib/librte_vhost/rte_virtio_net.h | 3 ++ lib/librte_vhost/vhost_user/virtio-net-user.c | 13 +++--- lib/librte_vhost/virtio-net.c | 60 +++++++++++++++++++++++++-- lib/librte_vhost/virtio-net.h | 4 +- 5 files changed, 73 insertions(+), 13 deletions(-) diff --git a/lib/librte_vhost/rte_vhost_version.map b/lib/librte_vhost/rte_vhost_version.map index 3d8709e..00a9ce5 100644 --- a/lib/librte_vhost/rte_vhost_version.map +++ b/lib/librte_vhost/rte_vhost_version.map @@ -20,3 +20,9 @@ DPDK_2.1 { rte_vhost_driver_unregister; } DPDK_2.0; + +DPDK_2.2 { + global: + + rte_vhost_driver_pmd_callback_register; +} DPDK_2.1; diff --git a/lib/librte_vhost/rte_virtio_net.h b/lib/librte_vhost/rte_virtio_net.h index 5687452..3ef6e58 100644 --- a/lib/librte_vhost/rte_virtio_net.h +++ b/lib/librte_vhost/rte_virtio_net.h @@ -128,6 +128,7 @@ struct virtio_net { char ifname[IF_NAME_SZ]; /**< Name of the tap device or socket path. */ uint32_t virt_qp_nb; /**< number of queue pair we have allocated */ void *priv; /**< private context */ + void *pmd_priv; /**< private context for vhost PMD */ struct vhost_virtqueue *virtqueue[VHOST_MAX_QUEUE_PAIRS * 2]; /**< Contains all virtqueue information. */ } __rte_cache_aligned; @@ -224,6 +225,8 @@ int rte_vhost_driver_unregister(const char *dev_name); /* Register callbacks. */ int rte_vhost_driver_callback_register(struct virtio_net_device_ops const * const); +/* Register callbacks for vhost PMD (Only for internal). */ +int rte_vhost_driver_pmd_callback_register(struct virtio_net_device_ops const * const); /* Start vhost driver session blocking loop. */ int rte_vhost_driver_session_start(void); diff --git a/lib/librte_vhost/vhost_user/virtio-net-user.c b/lib/librte_vhost/vhost_user/virtio-net-user.c index d07452a..d8ae2fc 100644 --- a/lib/librte_vhost/vhost_user/virtio-net-user.c +++ b/lib/librte_vhost/vhost_user/virtio-net-user.c @@ -111,7 +111,7 @@ user_set_mem_table(struct vhost_device_ctx ctx, struct VhostUserMsg *pmsg) /* Remove from the data plane. */ if (dev->flags & VIRTIO_DEV_RUNNING) - notify_ops->destroy_device(dev); + notify_destroy_device(dev); if (dev->mem) { free_mem_region(dev); @@ -272,7 +272,7 @@ user_set_vring_kick(struct vhost_device_ctx ctx, struct VhostUserMsg *pmsg) if (virtio_is_ready(dev) && !(dev->flags & VIRTIO_DEV_RUNNING)) - notify_ops->new_device(dev); + notify_new_device(dev); } /* @@ -288,7 +288,7 @@ user_get_vring_base(struct vhost_device_ctx ctx, return -1; /* We have to stop the queue (virtio) if it is running. */ if (dev->flags & VIRTIO_DEV_RUNNING) - notify_ops->destroy_device(dev); + notify_destroy_device(dev); /* Here we are safe to get the last used index */ ops->get_vring_base(ctx, state->index, state); @@ -324,10 +324,7 @@ user_set_vring_enable(struct vhost_device_ctx ctx, "set queue enable: %d to qp idx: %d\n", enable, state->index); - if (notify_ops->vring_state_changed) { - notify_ops->vring_state_changed(dev, base_idx / VIRTIO_QNUM, - enable); - } + notify_vring_state_changed(dev, base_idx / VIRTIO_QNUM, enable); dev->virtqueue[base_idx + VIRTIO_RXQ]->enabled = enable; dev->virtqueue[base_idx + VIRTIO_TXQ]->enabled = enable; @@ -341,7 +338,7 @@ user_destroy_device(struct vhost_device_ctx ctx) struct virtio_net *dev = get_device(ctx); if (dev && (dev->flags & VIRTIO_DEV_RUNNING)) - notify_ops->destroy_device(dev); + notify_destroy_device(dev); if (dev && dev->mem) { free_mem_region(dev); diff --git a/lib/librte_vhost/virtio-net.c b/lib/librte_vhost/virtio-net.c index cc917da..886c104 100644 --- a/lib/librte_vhost/virtio-net.c +++ b/lib/librte_vhost/virtio-net.c @@ -65,6 +65,8 @@ struct virtio_net_config_ll { /* device ops to add/remove device to/from data core. */ struct virtio_net_device_ops const *notify_ops; +/* device ops for vhost PMD to add/remove device to/from data core. */ +struct virtio_net_device_ops const *pmd_notify_ops; /* root address of the linked list of managed virtio devices */ static struct virtio_net_config_ll *ll_root; @@ -81,6 +83,45 @@ static struct virtio_net_config_ll *ll_root; static uint64_t VHOST_FEATURES = VHOST_SUPPORTED_FEATURES; +int +notify_new_device(struct virtio_net *dev) +{ + if ((pmd_notify_ops != NULL) && (pmd_notify_ops->new_device != NULL)) { + int ret = pmd_notify_ops->new_device(dev); + + if (ret != 0) + return ret; + } + if ((notify_ops != NULL) && (notify_ops->new_device != NULL)) + return notify_ops->new_device(dev); + + return 0; +} + +void +notify_destroy_device(volatile struct virtio_net *dev) +{ + if ((pmd_notify_ops != NULL) && (pmd_notify_ops->destroy_device != NULL)) + pmd_notify_ops->destroy_device(dev); + if ((notify_ops != NULL) && (notify_ops->destroy_device != NULL)) + notify_ops->destroy_device(dev); +} + +int +notify_vring_state_changed(struct virtio_net *dev, uint16_t queue_id, int enable) +{ + if ((pmd_notify_ops != NULL) && (pmd_notify_ops->vring_state_changed != NULL)) { + int ret = pmd_notify_ops->vring_state_changed(dev, queue_id, enable); + + if (ret != 0) + return ret; + } + if ((notify_ops != NULL) && (notify_ops->vring_state_changed != NULL)) + return notify_ops->vring_state_changed(dev, queue_id, enable); + + return 0; +} + /* * Converts QEMU virtual address to Vhost virtual address. This function is * used to convert the ring addresses to our address space. @@ -374,7 +415,7 @@ destroy_device(struct vhost_device_ctx ctx) * the function to remove it from the data core. */ if ((ll_dev_cur->dev.flags & VIRTIO_DEV_RUNNING)) - notify_ops->destroy_device(&(ll_dev_cur->dev)); + notify_destroy_device(&(ll_dev_cur->dev)); ll_dev_cur = rm_config_ll_entry(ll_dev_cur, ll_dev_last); } else { @@ -432,7 +473,7 @@ reset_owner(struct vhost_device_ctx ctx) return -1; if (dev->flags & VIRTIO_DEV_RUNNING) - notify_ops->destroy_device(dev); + notify_destroy_device(dev); cleanup_device(dev); reset_device(dev); @@ -790,12 +831,12 @@ set_backend(struct vhost_device_ctx ctx, struct vhost_vring_file *file) if (!(dev->flags & VIRTIO_DEV_RUNNING)) { if (((int)dev->virtqueue[VIRTIO_TXQ]->backend != VIRTIO_DEV_STOPPED) && ((int)dev->virtqueue[VIRTIO_RXQ]->backend != VIRTIO_DEV_STOPPED)) { - return notify_ops->new_device(dev); + return notify_new_device(dev); } /* Otherwise we remove it. */ } else if (file->fd == VIRTIO_DEV_STOPPED) - notify_ops->destroy_device(dev); + notify_destroy_device(dev); return 0; } @@ -879,3 +920,14 @@ rte_vhost_driver_callback_register(struct virtio_net_device_ops const * const op return 0; } + +/* + * Register ops so that we can add/remove device to data core. + */ +int +rte_vhost_driver_pmd_callback_register(struct virtio_net_device_ops const * const ops) +{ + pmd_notify_ops = ops; + + return 0; +} diff --git a/lib/librte_vhost/virtio-net.h b/lib/librte_vhost/virtio-net.h index 75fb57e..0816e71 100644 --- a/lib/librte_vhost/virtio-net.h +++ b/lib/librte_vhost/virtio-net.h @@ -37,7 +37,9 @@ #include "vhost-net.h" #include "rte_virtio_net.h" -struct virtio_net_device_ops const *notify_ops; struct virtio_net *get_device(struct vhost_device_ctx ctx); +int notify_new_device(struct virtio_net *dev); +void notify_destroy_device(volatile struct virtio_net *dev); +int notify_vring_state_changed(struct virtio_net *dev, uint16_t queue_id, int enable); #endif -- 2.1.4