From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lf0-f53.google.com (mail-lf0-f53.google.com [209.85.215.53]) by dpdk.org (Postfix) with ESMTP id 57CFB8DA9 for ; Wed, 28 Oct 2015 19:34:13 +0100 (CET) Received: by lffz202 with SMTP id z202so8056935lff.3 for ; Wed, 28 Oct 2015 11:34:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mirantis.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=sfh5R5nyKJrhkQG1PqD1hBQEzvhXrvO/JfT3MJKRxts=; b=MiblynjnNoOaaYI3wG4pcqIvD7iakQkeSp1X/2klnUksjZrCaX5A70jmaxcOTMldFm Tqvff6FAFXFetCqUtopwvn4e0CY32j2bnptLVFTzblhEaYHfCMyvEYBv7CU+q5uhAj4+ QqvqOwaDLeOCsJ2m/aNn54cvAHigFw6ihvGq4= 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:in-reply-to:references; bh=sfh5R5nyKJrhkQG1PqD1hBQEzvhXrvO/JfT3MJKRxts=; b=SLOEzUSjzUFU6Gd26qMwjToP0mu8Fgghy/Y1gc8xbGViPxCH53koIxZ/FdgEQ4AVNv stHU3TA6VLCVo4zXYIxdwBivChQFQTXmMVnSqg7vFd1P8Xrw/6lWbF4YUqSSDvyHPe5R 8z6JMXMMvLW4sM1vB31e5fDh3bKdqbk5xXvUNhhnT07rqs1y9WN5AU2PYdYvg4HIwSQd 5Hm0Rmk133hkr5ihVc4Ww2qcmVRyLVcVPjpMrAj+3mIOtKC6DEhtUBWTLHN+oS+rRsi9 keHy9qc4Z0/CHZYx36zVryYHc+ClsFd7+dbKnGtkCeFlVbiTlx4DkNQl9AXxaZfvTx8h JGDg== X-Gm-Message-State: ALoCoQmKUHM3QgJzCKGJgfV3/+UeGu3arQrH8e3VzT7r+8/uZ9Fo04l8FAOXm2Z+I6PRLeceuroC X-Received: by 10.25.144.78 with SMTP id s75mr16174296lfd.116.1446057253087; Wed, 28 Oct 2015 11:34:13 -0700 (PDT) Received: from pboldin-pc.kha.mirantis.net ([194.213.110.67]) by smtp.gmail.com with ESMTPSA id g65sm2874107lfb.11.2015.10.28.11.34.12 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 28 Oct 2015 11:34:12 -0700 (PDT) From: Pavel Boldin To: dev@dpdk.org Date: Wed, 28 Oct 2015 20:33:49 +0200 Message-Id: X-Mailer: git-send-email 1.9.1 In-Reply-To: References: In-Reply-To: <1440787880-7079-1-git-send-email-pboldin@mirantis.com> References: <1440787880-7079-1-git-send-email-pboldin@mirantis.com> Subject: [dpdk-dev] [PATCH v6 3/3] vhost: using EVENTFD_COPY2 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, 28 Oct 2015 18:34:13 -0000 Signed-off-by: Pavel Boldin --- lib/librte_vhost/vhost_cuse/eventfd_copy.c | 54 ++++++++++++++++++---------- lib/librte_vhost/vhost_cuse/eventfd_copy.h | 6 ++++ lib/librte_vhost/vhost_cuse/vhost-net-cdev.c | 3 ++ 3 files changed, 44 insertions(+), 19 deletions(-) diff --git a/lib/librte_vhost/vhost_cuse/eventfd_copy.c b/lib/librte_vhost/vhost_cuse/eventfd_copy.c index 4d697a2..154b32a 100644 --- a/lib/librte_vhost/vhost_cuse/eventfd_copy.c +++ b/lib/librte_vhost/vhost_cuse/eventfd_copy.c @@ -46,6 +46,32 @@ static const char eventfd_cdev[] = "/dev/eventfd-link"; +static int eventfd_link = -1; + +int +eventfd_init(void) +{ + if (eventfd_link >= 0) + return 0; + + eventfd_link = open(eventfd_cdev, O_RDWR); + if (eventfd_link < 0) { + RTE_LOG(ERR, VHOST_CONFIG, + "eventfd_link module is not loaded\n"); + return -1; + } + + return 0; +} + +int +eventfd_free(void) +{ + if (eventfd_link >= 0) + close(eventfd_link); + return 0; +} + /* * This function uses the eventfd_link kernel module to copy an eventfd file * descriptor provided by QEMU in to our process space. @@ -53,36 +79,26 @@ static const char eventfd_cdev[] = "/dev/eventfd-link"; int eventfd_copy(int target_fd, int target_pid) { - int eventfd_link, ret; - struct eventfd_copy eventfd_copy; - int fd = eventfd(0, EFD_NONBLOCK | EFD_CLOEXEC); + int ret; + struct eventfd_copy2 eventfd_copy2; - if (fd == -1) - return -1; /* Open the character device to the kernel module. */ /* TODO: check this earlier rather than fail until VM boots! */ - eventfd_link = open(eventfd_cdev, O_RDWR); - if (eventfd_link < 0) { - RTE_LOG(ERR, VHOST_CONFIG, - "eventfd_link module is not loaded\n"); - close(fd); + if (eventfd_init() < 0) return -1; - } - eventfd_copy.source_fd = fd; - eventfd_copy.target_fd = target_fd; - eventfd_copy.target_pid = target_pid; + eventfd_copy2.fd = target_fd; + eventfd_copy2.pid = target_pid; + eventfd_copy2.flags = O_NONBLOCK | O_CLOEXEC; /* Call the IOCTL to copy the eventfd. */ - ret = ioctl(eventfd_link, EVENTFD_COPY, &eventfd_copy); - close(eventfd_link); + ret = ioctl(eventfd_link, EVENTFD_COPY2, &eventfd_copy2); if (ret < 0) { RTE_LOG(ERR, VHOST_CONFIG, - "EVENTFD_COPY ioctl failed\n"); - close(fd); + "EVENTFD_COPY2 ioctl failed\n"); return -1; } - return fd; + return ret; } diff --git a/lib/librte_vhost/vhost_cuse/eventfd_copy.h b/lib/librte_vhost/vhost_cuse/eventfd_copy.h index 19ae30d..5f446ca 100644 --- a/lib/librte_vhost/vhost_cuse/eventfd_copy.h +++ b/lib/librte_vhost/vhost_cuse/eventfd_copy.h @@ -34,6 +34,12 @@ #define _EVENTFD_H int +eventfd_init(void); + +int +eventfd_free(void); + +int eventfd_copy(int target_fd, int target_pid); #endif diff --git a/lib/librte_vhost/vhost_cuse/vhost-net-cdev.c b/lib/librte_vhost/vhost_cuse/vhost-net-cdev.c index 1ae7c49..ae7ad8d 100644 --- a/lib/librte_vhost/vhost_cuse/vhost-net-cdev.c +++ b/lib/librte_vhost/vhost_cuse/vhost-net-cdev.c @@ -373,6 +373,9 @@ rte_vhost_driver_register(const char *dev_name) return -1; } + if (eventfd_init() < 0) + return -1; + /* * The device name is created. This is passed to QEMU so that it can * register the device with our application. -- 1.9.1