From patchwork Thu Jun 16 09:31:42 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 100611 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 188D0B6FA4 for ; Thu, 16 Jun 2011 19:34:59 +1000 (EST) Received: from localhost ([::1]:49537 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QX8yU-0008Ui-Fb for incoming@patchwork.ozlabs.org; Thu, 16 Jun 2011 05:34:54 -0400 Received: from eggs.gnu.org ([140.186.70.92]:60755) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QX8vX-0008OE-FV for qemu-devel@nongnu.org; Thu, 16 Jun 2011 05:31:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QX8vU-0003eC-Um for qemu-devel@nongnu.org; Thu, 16 Jun 2011 05:31:51 -0400 Received: from david.siemens.de ([192.35.17.14]:23004) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QX8vU-0003do-Bl for qemu-devel@nongnu.org; Thu, 16 Jun 2011 05:31:48 -0400 Received: from mail1.siemens.de (localhost [127.0.0.1]) by david.siemens.de (8.13.6/8.13.6) with ESMTP id p5G9Vgo6018334; Thu, 16 Jun 2011 11:31:42 +0200 Received: from mchn199C.mchp.siemens.de ([139.25.109.49]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id p5G9VgfX028985; Thu, 16 Jun 2011 11:31:42 +0200 Message-ID: <4DF9CD7E.5020509@siemens.com> Date: Thu, 16 Jun 2011 11:31:42 +0200 From: Jan Kiszka User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 To: qemu-devel , Anthony Liguori X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 192.35.17.14 Cc: Paolo Bonzini , Sasha Levin , kvm Subject: [Qemu-devel] [RFC][PATCH] Register Linux dyntick timer as per-thread signal X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Ingo Molnar pointed out that sending the timer signal to the whole process, just blocking it everywhere, is suboptimal with an increasing number of threads. QEMU is using this pattern so far. But Linux provides a (non-portable) way to restrict the signal to a single thread: Use SIGEV_THREAD_ID unless we are forced to emulate signalfd via an additional thread. That case could theoretically be optimized as well, but it doesn't look worth bothering. Signed-off-by: Jan Kiszka --- compatfd.c | 11 +++++++++++ compatfd.h | 1 + qemu-timer.c | 12 +++++++++++- 3 files changed, 23 insertions(+), 1 deletions(-) diff --git a/compatfd.c b/compatfd.c index 41586ce..31654c6 100644 --- a/compatfd.c +++ b/compatfd.c @@ -115,3 +115,14 @@ int qemu_signalfd(const sigset_t *mask) return qemu_signalfd_compat(mask); } + +bool qemu_signalfd_available(void) +{ +#ifdef CONFIG_SIGNALFD + errno = 0; + syscall(SYS_signalfd, -1, NULL, _NSIG / 8); + return errno != ENOSYS; +#else + return false; +#endif +} diff --git a/compatfd.h b/compatfd.h index fc37915..6b04877 100644 --- a/compatfd.h +++ b/compatfd.h @@ -39,5 +39,6 @@ struct qemu_signalfd_siginfo { }; int qemu_signalfd(const sigset_t *mask); +bool qemu_signalfd_available(void); #endif diff --git a/qemu-timer.c b/qemu-timer.c index 72066c7..09e6f17 100644 --- a/qemu-timer.c +++ b/qemu-timer.c @@ -803,6 +803,8 @@ static int64_t qemu_next_alarm_deadline(void) #if defined(__linux__) +#include "compatfd.h" + static int dynticks_start_timer(struct qemu_alarm_timer *t) { struct sigevent ev; @@ -821,8 +823,16 @@ static int dynticks_start_timer(struct qemu_alarm_timer *t) */ memset(&ev, 0, sizeof(ev)); ev.sigev_value.sival_int = 0; - ev.sigev_notify = SIGEV_SIGNAL; ev.sigev_signo = SIGALRM; +#ifdef SIGEV_THREAD_ID + if (qemu_signalfd_available()) { + ev.sigev_notify = SIGEV_THREAD_ID; + ev._sigev_un._tid = qemu_get_thread_id(); + } else +#endif /* SIGEV_THREAD_ID */ + { + ev.sigev_notify = SIGEV_SIGNAL; + } if (timer_create(CLOCK_REALTIME, &ev, &host_timer)) { perror("timer_create");