From: "Anton V. Boyarshinov" <boyarsh@altlinux.org>
To: DRI mailing list <dri-devel@lists.freedesktop.org>
Subject: [PATCH] xf86drm.c: add counter for ioctl restarting
Date: Fri, 13 Apr 2012 17:26:42 +0400 [thread overview]
Message-ID: <20120413172642.4c423352@boyarsh.office.altlinux.ru> (raw)
In some cases ioclt->alarm->ioctl loop can be infinite:
ioctl(7, 0x40086482, 0xbfb62738) = ? ERESTARTSYS (To be restarted)
--- SIGALRM (Alarm clock) @ 0 (0) ---
sigreturn() = ? (mask now [])
ioctl(7, 0x40086482, 0xbfb62738) = ? ERESTARTSYS (To be restarted)
and forever.
It seems, that limiting ioctl restarting by some resonable number of trys
is a dirty but working way to prevent Xorg lockups.
Signed-off-by: Anton V. Boyarshinov <boyarsh@altlinux.org>
---
xf86drm.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/xf86drm.c b/xf86drm.c
index 6ea068f..9663f21 100644
--- a/xf86drm.c
+++ b/xf86drm.c
@@ -162,10 +162,11 @@ int
drmIoctl(int fd, unsigned long request, void *arg)
{
int ret;
+ int count=0;
do {
ret = ioctl(fd, request, arg);
- } while (ret == -1 && (errno == EINTR || errno == EAGAIN));
+ } while (ret == -1 && (errno == EINTR || errno == EAGAIN) && ++count < 100 );
return ret;
}
--
1.7.5.4
next reply other threads:[~2012-04-13 13:36 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-13 13:26 Anton V. Boyarshinov [this message]
2012-04-13 13:40 ` [PATCH] xf86drm.c: add counter for ioctl restarting Chris Wilson
2012-04-16 8:45 ` Anton V. Boyarshinov
2012-04-13 13:42 ` Daniel Vetter
2012-04-13 14:45 ` Ville Syrjälä
2012-04-16 8:54 ` Anton V. Boyarshinov
2012-04-16 14:12 ` Adam Jackson
2012-04-16 15:05 ` Anton V. Boyarshinov
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=20120413172642.4c423352@boyarsh.office.altlinux.ru \
--to=boyarsh@altlinux.org \
--cc=dri-devel@lists.freedesktop.org \
/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