From: "Xie, Huawei" <huawei.xie@intel.com>
To: Pavel Boldin <pboldin@mirantis.com>, "dev@dpdk.org" <dev@dpdk.org>
Subject: Re: [dpdk-dev] [PATCH v5 4/5] vhost: eventfd_link: replace copy-pasted sys_close
Date: Thu, 7 May 2015 06:54:12 +0000 [thread overview]
Message-ID: <C37D651A908B024F974696C65296B57B0F476567@SHSMSX101.ccr.corp.intel.com> (raw)
In-Reply-To: <1429184910-30186-5-git-send-email-pboldin@mirantis.com>
On 4/16/2015 7:48 PM, Pavel Boldin wrote:
> Replace copy-pasted `fget_from_files' -> `filp_close' with
> a `sys_close' call.
>
> Signed-off-by: Pavel Boldin <pboldin@mirantis.com>
> ---
> lib/librte_vhost/eventfd_link/eventfd_link.c | 49 +++++++---------------------
> 1 file changed, 12 insertions(+), 37 deletions(-)
>
> diff --git a/lib/librte_vhost/eventfd_link/eventfd_link.c b/lib/librte_vhost/eventfd_link/eventfd_link.c
> index 0a06594..9bc52a3 100644
> --- a/lib/librte_vhost/eventfd_link/eventfd_link.c
> +++ b/lib/librte_vhost/eventfd_link/eventfd_link.c
> @@ -88,9 +88,8 @@ eventfd_link_ioctl_copy(unsigned long arg)
> {
>
> + /* Closing the source_fd */
> + ret = sys_close(eventfd_copy.source_fd);
Pavel:
Here we close the fd and re-install a new file on this fd later.
sys_close does all cleanup.
But, for instance, if we allocate new fd later, normally it will reuse
the just freed fds by sys_close, is there issue here?
> + if (ret)
> goto out_task;
> - }
> -
> - /*
> - * 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);
> -
> - put_files_struct(files);
> + ret = -ESTALE;
>
> /*
> * Find the file struct associated with the target fd.
> */
>
> - ret = -ESTALE;
> - files = get_files_struct(task_target);
> - if (files == NULL) {
> + target_files = get_files_struct(task_target);
> + if (target_files == NULL) {
> pr_info("Failed to get target files struct\n");
> goto out_task;
> }
>
> ret = -EBADF;
> - file = fget_from_files(files, eventfd_copy.target_fd);
> - put_files_struct(files);
> + target_file = fget_from_files(target_files, eventfd_copy.target_fd);
> + put_files_struct(target_files);
>
> - if (file == NULL) {
> + if (target_file == NULL) {
> pr_info("Failed to get fd %d from target\n",
> eventfd_copy.target_fd);
> goto out_task;
> @@ -164,7 +139,7 @@ eventfd_link_ioctl_copy(unsigned long arg)
> * file desciptor of the source process,
> */
>
> - fd_install(eventfd_copy.source_fd, file);
> + fd_install(eventfd_copy.source_fd, target_file);
> ret = 0;
>
> out_task:
next prev parent reply other threads:[~2015-05-07 6:58 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-16 16:40 [dpdk-dev] [PATCH] Fix `eventfd_link' module leakages and races Pavel Boldin
2015-03-16 17:55 ` Neil Horman
2015-03-17 1:29 ` Ouyang, Changchun
2015-03-20 15:57 ` Pavel Boldin
2015-03-18 13:16 ` [dpdk-dev] [PATCH v2] " Pavel Boldin
2015-03-23 11:15 ` Thomas Monjalon
2015-03-23 11:36 ` Pavel Boldin
2015-03-23 11:44 ` Thomas Monjalon
2015-03-23 15:15 ` [dpdk-dev] [PATCH v3] vhost: Refactor module `eventfd_link' Pavel Boldin
2015-04-02 17:01 ` [dpdk-dev] [PATCH v4 0/5] " Pavel Boldin
2015-04-02 17:01 ` [dpdk-dev] [PATCH v4 1/5] vhost: eventfd_link: moving ioctl to a function Pavel Boldin
2015-05-07 7:57 ` Xie, Huawei
[not found] ` <CACf4_B8MDfkaEk5jMjMbEw9F8LsBVLA9TUWwOBU=SCAxzFmSFw@mail.gmail.com>
2015-05-18 6:06 ` Xie, Huawei
2015-05-18 9:16 ` Pavel Boldin
2015-06-18 3:08 ` Xie, Huawei
2015-04-02 17:01 ` [dpdk-dev] [PATCH v4 2/5] vhost: eventfd_link: add function fget_from_files Pavel Boldin
2015-04-02 17:01 ` [dpdk-dev] [PATCH v4 3/5] vhost: eventfd_link: fix ioctl return values Pavel Boldin
2015-04-02 17:01 ` [dpdk-dev] [PATCH v4 4/5] vhost: eventfd_link: replace copy-pasted sys_close Pavel Boldin
2015-04-02 17:01 ` [dpdk-dev] [PATCH v4 5/5] vhost: eventfd_link: removing extra #includes Pavel Boldin
2015-04-16 11:48 ` [dpdk-dev] [PATCH v5 0/5] Refactor module `eventfd_link' Pavel Boldin
2015-04-16 11:48 ` [dpdk-dev] [PATCH v5 1/5] vhost: eventfd_link: moving ioctl to a function Pavel Boldin
2015-08-28 18:51 ` [dpdk-dev] [PATCH v5 1/4] vhost: eventfd_link: refactoring EVENTFD_COPY handler Pavel Boldin
2015-09-23 20:25 ` Pavel Boldin
2015-09-29 19:42 ` Thomas Monjalon
2015-09-29 23:29 ` Pavel Boldin
2015-10-20 9:06 ` Xie, Huawei
2015-10-28 18:33 ` [dpdk-dev] [PATCH v6 0/3] vhost: eventfd_link refactoring Pavel Boldin
2015-10-29 18:33 ` Xie, Huawei
2015-10-30 19:10 ` Thomas Monjalon
2015-10-28 18:33 ` [dpdk-dev] [PATCH v6 1/3] vhost: eventfd_link: refactoring EVENTFD_COPY handler Pavel Boldin
2015-10-28 18:33 ` [dpdk-dev] [PATCH v6 2/3] vhost: add EVENTFD_COPY2 ioctl Pavel Boldin
2015-10-28 18:33 ` [dpdk-dev] [PATCH v6 3/3] vhost: using EVENTFD_COPY2 Pavel Boldin
2015-08-28 18:51 ` [dpdk-dev] [PATCH v5 2/4] vhost: add EVENTFD_COPY2 ioctl Pavel Boldin
2015-10-20 9:43 ` Xie, Huawei
2015-08-28 18:51 ` [dpdk-dev] [PATCH v5 3/4] vhost: using EVENTFD_COPY2 Pavel Boldin
2015-10-20 9:52 ` Xie, Huawei
2015-10-21 12:16 ` Pavel Boldin
2015-10-26 1:45 ` Xie, Huawei
2015-10-28 18:35 ` Pavel Boldin
2015-08-28 18:51 ` [dpdk-dev] [PATCH v5 4/4] DO NOT MERGE: Tests for new eventfd_link module Pavel Boldin
2015-04-16 11:48 ` [dpdk-dev] [PATCH v5 2/5] vhost: eventfd_link: add function fget_from_files Pavel Boldin
2015-04-16 11:48 ` [dpdk-dev] [PATCH v5 3/5] vhost: eventfd_link: fix ioctl return values Pavel Boldin
2015-04-16 11:48 ` [dpdk-dev] [PATCH v5 4/5] vhost: eventfd_link: replace copy-pasted sys_close Pavel Boldin
2015-05-07 6:54 ` Xie, Huawei [this message]
2015-06-17 15:24 ` Thomas Monjalon
2015-07-09 0:59 ` Thomas Monjalon
2015-07-10 14:27 ` Xie, Huawei
2015-07-10 14:50 ` Pavel Boldin
2015-07-10 15:32 ` Xie, Huawei
2015-07-10 15:42 ` Xie, Huawei
2015-07-10 15:49 ` Thomas Monjalon
2015-07-10 16:06 ` Xie, Huawei
2015-07-11 15:08 ` Pavel Boldin
2015-07-13 1:59 ` Xie, Huawei
2015-07-19 12:39 ` Pavel Boldin
2015-04-16 11:48 ` [dpdk-dev] [PATCH v5 5/5] vhost: eventfd_link: removing extra #includes Pavel Boldin
2015-04-28 14:35 ` [dpdk-dev] [PATCH v5 0/5] Refactor module `eventfd_link' Thomas Monjalon
2015-05-04 5:29 ` Xie, Huawei
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=C37D651A908B024F974696C65296B57B0F476567@SHSMSX101.ccr.corp.intel.com \
--to=huawei.xie@intel.com \
--cc=dev@dpdk.org \
--cc=pboldin@mirantis.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).