From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wg0-f52.google.com (mail-wg0-f52.google.com [74.125.82.52]) by dpdk.org (Postfix) with ESMTP id 763D99A8C for ; Thu, 2 Apr 2015 19:01:40 +0200 (CEST) Received: by wgdm6 with SMTP id m6so91474880wgd.2 for ; Thu, 02 Apr 2015 10:01:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mirantis.com; s=google; h=from:to:subject:date:message-id:in-reply-to:references; bh=8VaI6stpm4bdUQKPgqxPN/BHHyVotp6kORLfgQWTZAU=; b=YpZed56SSf9syCRalM5bdEUJ7OWxTNRjhQOs4jdVnhOYEQxrCRqRR281rR/XIeJ2H+ tEzeNV1l03i5GQLjnPLlfb5I46LaAShqOa9YgiZaDXcFclOC8DT8RUYttjNIhmrFYHBX 7VyT8oRHtWg9lr7jUde1f6ZhIQSoX/yeOlObI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=8VaI6stpm4bdUQKPgqxPN/BHHyVotp6kORLfgQWTZAU=; b=ik29EPBCoBr94CB9cn2qYXpuuxTG4ID6hbjBfjKPajbrcSNurAgoTbFku+GWHFu0te cfRQsnpAXkp6jvAG7MgKuebixXl3Sx3lZEsHFDsaWGF2bvAnF1zf3jxTo4PO/YZO8Y/3 6Ml8qwmHDSsfOICm1NnrlU5z8hg+maUvR3542VLPwOjZokT0nzHSWg78NsIuQS3AELFN mII9uXMXoOBzVU+OTZlJJizBg4Eg0mYJuMd9YnN67HTzWOHarRD6/eZmqAvKLQKaGnwW a2zuRNj/4wmC+7/y8omZj6vvSgk6LHwgqCY8RGz3n4c6GsPZ+VfAxqoKeoWqJwUTsbrc MTyg== X-Gm-Message-State: ALoCoQnKV9q4+8x/UlFK8kveZKrgGypjMM18OQNa//U06UXF50fiQ6DYjNCBUn/rh7x1BN5/zfbf X-Received: by 10.194.175.202 with SMTP id cc10mr95795456wjc.27.1427994100351; Thu, 02 Apr 2015 10:01:40 -0700 (PDT) Received: from pboldin-pc.kha.mirantis.net ([194.213.110.67]) by mx.google.com with ESMTPSA id md2sm30801242wic.19.2015.04.02.10.01.39 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 02 Apr 2015 10:01:40 -0700 (PDT) From: Pavel Boldin To: dev@dpdk.org Date: Thu, 2 Apr 2015 20:01:16 +0300 Message-Id: <1427994080-10163-2-git-send-email-pboldin@mirantis.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1427994080-10163-1-git-send-email-pboldin@mirantis.com> References: <1427123731-15654-1-git-send-email-pboldin@mirantis.com> <1427994080-10163-1-git-send-email-pboldin@mirantis.com> Subject: [dpdk-dev] [PATCH v4 1/5] vhost: eventfd_link: moving ioctl to a function 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: Thu, 02 Apr 2015 17:01:40 -0000 Move ioctl `EVENTFD_COPY' handler code to an inline function. --- lib/librte_vhost/eventfd_link/eventfd_link.c | 171 ++++++++++++++------------- 1 file changed, 89 insertions(+), 82 deletions(-) diff --git a/lib/librte_vhost/eventfd_link/eventfd_link.c b/lib/librte_vhost/eventfd_link/eventfd_link.c index 62c45c8..d7cb81f 100644 --- a/lib/librte_vhost/eventfd_link/eventfd_link.c +++ b/lib/librte_vhost/eventfd_link/eventfd_link.c @@ -65,9 +65,8 @@ put_files_struct(struct files_struct *files) BUG(); } - -static long -eventfd_link_ioctl(struct file *f, unsigned int ioctl, unsigned long arg) +static inline long +eventfd_link_ioctl_copy(unsigned long arg) { void __user *argp = (void __user *) arg; struct task_struct *task_target = NULL; @@ -76,90 +75,98 @@ eventfd_link_ioctl(struct file *f, unsigned int ioctl, unsigned long arg) struct fdtable *fdt; struct eventfd_copy eventfd_copy; - switch (ioctl) { - case EVENTFD_COPY: - if (copy_from_user(&eventfd_copy, argp, - sizeof(struct eventfd_copy))) - return -EFAULT; - - /* - * Find the task struct for the target pid - */ - task_target = - pid_task(find_vpid(eventfd_copy.target_pid), PIDTYPE_PID); - if (task_target == NULL) { - pr_debug("Failed to get mem ctx for target pid\n"); - return -EFAULT; - } - - files = get_files_struct(current); - if (files == NULL) { - pr_debug("Failed to get files struct\n"); - return -EFAULT; - } - - rcu_read_lock(); - file = fcheck_files(files, eventfd_copy.source_fd); - if (file) { - if (file->f_mode & FMODE_PATH || - !atomic_long_inc_not_zero(&file->f_count)) + if (copy_from_user(&eventfd_copy, argp, + sizeof(struct eventfd_copy))) + return -EFAULT; + + /* + * Find the task struct for the target pid + */ + task_target = + pid_task(find_vpid(eventfd_copy.target_pid), PIDTYPE_PID); + if (task_target == NULL) { + pr_debug("Failed to get mem ctx for target pid\n"); + return -EFAULT; + } + + files = get_files_struct(current); + if (files == NULL) { + pr_debug("Failed to get files struct\n"); + return -EFAULT; + } + + rcu_read_lock(); + file = fcheck_files(files, eventfd_copy.source_fd); + if (file) { + if (file->f_mode & FMODE_PATH || + !atomic_long_inc_not_zero(&file->f_count)) + file = NULL; + } + rcu_read_unlock(); + put_files_struct(files); + + if (file == NULL) { + pr_debug("Failed to get file from source pid\n"); + return 0; + } + + /* + * Release the existing eventfd in the source process + */ + spin_lock(&files->file_lock); + fput(file); + filp_close(file, files); + fdt = files_fdtable(files); + fdt->fd[eventfd_copy.source_fd] = NULL; + spin_unlock(&files->file_lock); + + /* + * Find the file struct associated with the target fd. + */ + + files = get_files_struct(task_target); + if (files == NULL) { + pr_debug("Failed to get files struct\n"); + return -EFAULT; + } + + rcu_read_lock(); + file = fcheck_files(files, eventfd_copy.target_fd); + if (file) { + if (file->f_mode & FMODE_PATH || + !atomic_long_inc_not_zero(&file->f_count)) file = NULL; - } - rcu_read_unlock(); - put_files_struct(files); - - if (file == NULL) { - pr_debug("Failed to get file from source pid\n"); - return 0; - } - - /* - * Release the existing eventfd in the source process - */ - spin_lock(&files->file_lock); - fput(file); - filp_close(file, files); - fdt = files_fdtable(files); - fdt->fd[eventfd_copy.source_fd] = NULL; - spin_unlock(&files->file_lock); - - /* - * Find the file struct associated with the target fd. - */ - - files = get_files_struct(task_target); - if (files == NULL) { - pr_debug("Failed to get files struct\n"); - return -EFAULT; - } - - rcu_read_lock(); - file = fcheck_files(files, eventfd_copy.target_fd); - if (file) { - if (file->f_mode & FMODE_PATH || - !atomic_long_inc_not_zero(&file->f_count)) - file = NULL; - } - rcu_read_unlock(); - put_files_struct(files); - - if (file == NULL) { - pr_debug("Failed to get file from target pid\n"); - return 0; - } - - /* - * Install the file struct from the target process into the - * file desciptor of the source process, - */ - - fd_install(eventfd_copy.source_fd, file); + } + rcu_read_unlock(); + put_files_struct(files); + if (file == NULL) { + pr_debug("Failed to get file from target pid\n"); return 0; + } + + /* + * Install the file struct from the target process into the + * file desciptor of the source process, + */ + + fd_install(eventfd_copy.source_fd, file); + + return 0; +} - default: - return -ENOIOCTLCMD; +static long +eventfd_link_ioctl(struct file *f, unsigned int ioctl, unsigned long arg) +{ + long ret = -ENOIOCTLCMD; + + switch (ioctl) { + case EVENTFD_COPY: + ret = eventfd_link_ioctl_copy(arg); + break; } + + return ret; } static const struct file_operations eventfd_link_fops = { -- 1.9.1