From: Wen Congyang <wency@cn.fujitsu.com>
To: xen devel <xen-devel@lists.xen.org>
Cc: Ian Campbell <Ian.Campbell@citrix.com>,
Wen Congyang <wency@cn.fujitsu.com>,
Ian Jackson <Ian.Jackson@eu.citrix.com>,
Jiang Yunhong <yunhong.jiang@intel.com>,
Dong Eddie <eddie.dong@intel.com>,
Shriram Rajagopalan <rshriram@cs.ubc.ca>,
Yang Hongyang <yanghy@cn.fujitsu.com>,
Lai Jiangshan <laijs@cn.fujitsu.com>
Subject: [RFC Patch v2 10/17] blktap2: use correct way to get free event id
Date: Fri, 8 Aug 2014 16:19:57 +0800 [thread overview]
Message-ID: <1407486004-23487-11-git-send-email-wency@cn.fujitsu.com> (raw)
In-Reply-To: <1407486004-23487-1-git-send-email-wency@cn.fujitsu.com>
If we register/unregister event too many times, and we use event id
from 1 again. But we don't check it if it is used.
Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
Cc: Shriram Rajagopalan <rshriram@cs.ubc.ca>
---
tools/blktap2/drivers/scheduler.c | 33 ++++++++++++++++++++++++++++++---
1 file changed, 30 insertions(+), 3 deletions(-)
diff --git a/tools/blktap2/drivers/scheduler.c b/tools/blktap2/drivers/scheduler.c
index 6b8d009..dd608dd 100644
--- a/tools/blktap2/drivers/scheduler.c
+++ b/tools/blktap2/drivers/scheduler.c
@@ -160,6 +160,31 @@ scheduler_run_events(scheduler_t *s)
}
}
+static int
+get_free_id(scheduler_t *s)
+{
+ event_t *event, *tmp;
+ int old_uuid = s->uuid;
+ int id = s->uuid++;
+
+ if (!s->uuid)
+ s->uuid++;
+
+retry:
+ scheduler_for_each_event(s, event, tmp)
+ if (event->id == id) {
+ id = s->uuid++;
+ if (!s->uuid)
+ s->uuid++;
+ if (id == old_uuid)
+ return 0;
+
+ goto retry;
+ }
+
+ return id;
+}
+
int
scheduler_register_event(scheduler_t *s, char mode, int fd,
int timeout, event_cb_t cb, void *private)
@@ -187,10 +212,12 @@ scheduler_register_event(scheduler_t *s, char mode, int fd,
event->deadline = now.tv_sec + timeout;
event->cb = cb;
event->private = private;
- event->id = s->uuid++;
+ event->id = get_free_id(s);
- if (!s->uuid)
- s->uuid++;
+ if (!event->id) {
+ free(event);
+ return -EBUSY;
+ }
list_add_tail(&event->next, &s->events);
--
1.9.3
next prev parent reply other threads:[~2014-08-08 8:19 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-08 8:19 [RFC Patch v2 00/17] Some bugfix patches Wen Congyang
2014-08-08 8:19 ` [RFC Patch v2 01/17] copy the correct page to memory Wen Congyang
2014-08-08 8:19 ` [RFC Patch v2 02/17] csum the correct page Wen Congyang
2014-08-08 8:19 ` [RFC Patch v2 03/17] don't zero out ioreq page Wen Congyang
2014-08-08 9:08 ` Andrew Cooper
2014-08-08 9:43 ` Wen Congyang
2014-08-08 8:19 ` [RFC Patch v2 04/17] blktap2: dynamic allocate aio_requests to avoid -EBUSY error Wen Congyang
2014-08-08 8:19 ` [RFC Patch v2 05/17] block-remus: fix memory leak Wen Congyang
2014-08-08 8:19 ` [RFC Patch v2 06/17] block-remus: pass uuid to the callback td_open Wen Congyang
2014-08-08 8:19 ` [RFC Patch v2 07/17] blktap2: return the correct dev path Wen Congyang
2014-08-08 8:19 ` [RFC Patch v2 08/17] block-remus: use correct way to get remus_image Wen Congyang
2014-08-08 8:19 ` [RFC Patch v2 09/17] block-remus: fix bug in tdremus_close() Wen Congyang
2014-08-08 8:19 ` Wen Congyang [this message]
2014-08-08 8:19 ` [RFC Patch v2 11/17] blktap2: don't return negative event id Wen Congyang
2014-08-08 8:19 ` [RFC Patch v2 12/17] blktap2: use correct way to define array Wen Congyang
2014-08-08 8:20 ` [RFC Patch v2 13/17] don't call client_flush() when switching to unprotected mode Wen Congyang
2014-08-08 8:20 ` [RFC Patch v2 14/17] pass correct file to qemu if we use blktap2 Wen Congyang
2014-08-08 8:20 ` [RFC Patch v2 15/17] support blktap remus in xl Wen Congyang
2014-08-08 8:20 ` [RFC Patch v2 16/17] update libxl__device_disk_from_xs_be() to support blktap device Wen Congyang
2014-08-08 8:20 ` [RFC Patch v2 17/17] x86/hvm: Always set pending event injection when loading VMC[BS] state Wen Congyang
-- strict thread matches above, loose matches on Subject: below --
2014-08-08 8:10 [RFC Patch v2 00/17] Some bugfix patches Wen Congyang
2014-08-08 8:10 ` [RFC Patch v2 10/17] blktap2: use correct way to get free event id Wen Congyang
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=1407486004-23487-11-git-send-email-wency@cn.fujitsu.com \
--to=wency@cn.fujitsu.com \
--cc=Ian.Campbell@citrix.com \
--cc=Ian.Jackson@eu.citrix.com \
--cc=eddie.dong@intel.com \
--cc=laijs@cn.fujitsu.com \
--cc=rshriram@cs.ubc.ca \
--cc=xen-devel@lists.xen.org \
--cc=yanghy@cn.fujitsu.com \
--cc=yunhong.jiang@intel.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).