From nobody Sun Nov 9 23:42:57 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1552308369969489.6010282846265; Mon, 11 Mar 2019 05:46:09 -0700 (PDT) Received: from localhost ([127.0.0.1]:33032 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3KJh-0002MW-OX for importer@patchew.org; Mon, 11 Mar 2019 08:46:05 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33411) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3KE9-0006Uc-Ds for qemu-devel@nongnu.org; Mon, 11 Mar 2019 08:40:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3KE7-0001rQ-NF for qemu-devel@nongnu.org; Mon, 11 Mar 2019 08:40:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49064) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h3K9D-00062Y-Dx; Mon, 11 Mar 2019 08:35:15 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9B29236809; Mon, 11 Mar 2019 12:35:14 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-112-64.ams2.redhat.com [10.36.112.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6806919724; Mon, 11 Mar 2019 12:35:13 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 11 Mar 2019 13:35:07 +0100 Message-Id: <20190311123507.24867-4-pbonzini@redhat.com> In-Reply-To: <20190311123507.24867-1-pbonzini@redhat.com> References: <20190311123507.24867-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Mon, 11 Mar 2019 12:35:14 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 3/3] coroutine: add x86 specific coroutine backend X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, qemu-block@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" This backend is faster (100ns vs 150ns per switch on my laptop), but especially it will be possible to add CET support to it in 4.1. In the meanwhile, it is nice to have it as an experimental alternative. Signed-off-by: Paolo Bonzini --- configure | 8 ++ scripts/qemugdb/coroutine.py | 5 +- scripts/qemugdb/coroutine_x86.py | 21 +++ util/coroutine-x86.c | 213 +++++++++++++++++++++++++++++++ 4 files changed, 245 insertions(+), 2 deletions(-) create mode 100644 scripts/qemugdb/coroutine_x86.py create mode 100644 util/coroutine-x86.c diff --git a/configure b/configure index 62a2a490f2..af65edc30a 100755 --- a/configure +++ b/configure @@ -5123,6 +5123,14 @@ else error_exit "only the 'windows' coroutine backend is valid for Window= s" fi ;; + x86) + if test "$mingw32" =3D "yes"; then + error_exit "only the 'windows' coroutine backend is valid for Window= s" + fi + if test "$cpu" !=3D "x86_64"; then + error_exit "the 'x86' backend is only valid for x86_64 hosts" + fi + ;; *) error_exit "unknown coroutine backend $coroutine" ;; diff --git a/scripts/qemugdb/coroutine.py b/scripts/qemugdb/coroutine.py index db2753d949..f716db22bb 100644 --- a/scripts/qemugdb/coroutine.py +++ b/scripts/qemugdb/coroutine.py @@ -10,14 +10,15 @@ # This work is licensed under the terms of the GNU GPL, version 2 # or later. See the COPYING file in the top-level directory. =20 -from . import coroutine_ucontext +from . import coroutine_ucontext, coroutine_x86 import gdb =20 VOID_PTR =3D gdb.lookup_type('void').pointer() UINTPTR_T =3D gdb.lookup_type('uintptr_t') =20 backends =3D { - 'CoroutineUContext': coroutine_ucontext + 'CoroutineUContext': coroutine_ucontext, + 'CoroutineX86': coroutine_x86 } =20 def coroutine_backend(): diff --git a/scripts/qemugdb/coroutine_x86.py b/scripts/qemugdb/coroutine_x= 86.py new file mode 100644 index 0000000000..05f830cdb8 --- /dev/null +++ b/scripts/qemugdb/coroutine_x86.py @@ -0,0 +1,21 @@ +#!/usr/bin/python + +# GDB debugging support +# +# Copyright 2019 Red Hat, Inc. +# +# Authors: +# Paolo Bonzini +# +# This work is licensed under the terms of the GNU GPL, version 2 or +# later. See the COPYING file in the top-level directory. + +import gdb + +U64_PTR =3D gdb.lookup_type('uint64_t').pointer() + +def get_coroutine_regs(addr): + addr =3D addr.cast(gdb.lookup_type('CoroutineX86').pointer()) + rsp =3D addr['sp'].cast(U64_PTR) + return {'rsp': rsp, + 'rip': rsp.dereference()} diff --git a/util/coroutine-x86.c b/util/coroutine-x86.c new file mode 100644 index 0000000000..7f5e7d7696 --- /dev/null +++ b/util/coroutine-x86.c @@ -0,0 +1,213 @@ +/* + * x86-specific coroutine initialization code + * + * Copyright (C) 2006 Anthony Liguori + * Copyright (C) 2011 Kevin Wolf + * Copyright (C) 2019 Paolo Bonzini + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.0 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see . + */ + +/* XXX Is there a nicer way to disable glibc's stack check for longjmp? */ +#ifdef _FORTIFY_SOURCE +#undef _FORTIFY_SOURCE +#endif +#include "qemu/osdep.h" +#include "qemu-common.h" +#include "qemu/coroutine_int.h" + +#ifdef CONFIG_VALGRIND_H +#include +#endif + +#if defined(__SANITIZE_ADDRESS__) || __has_feature(address_sanitizer) +#ifdef CONFIG_ASAN_IFACE_FIBER +#define CONFIG_ASAN 1 +#include +#endif +#endif + +typedef struct { + Coroutine base; + void *stack; + size_t stack_size; + void *sp; + +#ifdef CONFIG_VALGRIND_H + unsigned int valgrind_stack_id; +#endif +} CoroutineX86; + +/** + * Per-thread coroutine bookkeeping + */ +static __thread CoroutineX86 leader; +static __thread Coroutine *current; + +static void finish_switch_fiber(void *fake_stack_save) +{ +#ifdef CONFIG_ASAN + const void *bottom_old; + size_t size_old; + + __sanitizer_finish_switch_fiber(fake_stack_save, &bottom_old, &size_ol= d); + + if (!leader.stack) { + leader.stack =3D (void *)bottom_old; + leader.stack_size =3D size_old; + } +#endif +} + +static void start_switch_fiber(void **fake_stack_save, + const void *bottom, size_t size) +{ +#ifdef CONFIG_ASAN + __sanitizer_start_switch_fiber(fake_stack_save, bottom, size); +#endif +} + +/* On entry to a coroutine, rax is "value" and rsi is the coroutine itself= . */ +#define CO_SWITCH(from, to, action, jump) ({ = \ + int ret =3D action; = \ + void *from_ =3D from; = \ + void *to_ =3D to; = \ + asm volatile( = \ + ".cfi_remember_state\n" = \ + "pushq %%rbp\n" /* save scratch register on so= urce stack */ \ + ".cfi_adjust_cfa_offset 8\n" = \ + ".cfi_rel_offset %%rbp, 0\n" = \ + "call 1f\n" /* switch continues at label 1= */ \ + ".cfi_adjust_cfa_offset 8\n" = \ + "jmp 2f\n" /* switch back continues at la= bel 2 */ \ + "1: movq (%%rsp), %%rbp\n" /* save source IP for debuggin= g */ \ + "movq %%rsp, %c[sp](%[FROM])\n" /* save source SP */ = \ + "movq %c[sp](%[TO]), %%rsp\n" /* load destination SP */ = \ + jump "\n" /* coroutine switch */ = \ + "2:" = \ + ".cfi_adjust_cfa_offset -8\n" = \ + "popq %%rbp\n" = \ + ".cfi_adjust_cfa_offset -8\n" = \ + ".cfi_restore_state\n" = \ + : "+a" (ret), [FROM] "+b" (from_), [TO] "+D" (to_) = \ + : [sp] "i" (offsetof(CoroutineX86, sp)) = \ + : "rcx", "rdx", "rsi", "r8", "r9", "r10", "r11", "r12", "r13", "r1= 4", "r15", \ + "memory"); = \ + ret; \ +}) + +static void __attribute__((__used__)) coroutine_trampoline(void *arg) +{ + CoroutineX86 *self =3D arg; + Coroutine *co =3D &self->base; + + finish_switch_fiber(NULL); + + while (true) { + qemu_coroutine_switch(co, co->caller, COROUTINE_TERMINATE); + co->entry(co->entry_arg); + } +} + +Coroutine *qemu_coroutine_new(void) +{ + CoroutineX86 *co; + void *fake_stack_save =3D NULL; + + co =3D g_malloc0(sizeof(*co)); + co->stack_size =3D COROUTINE_STACK_SIZE; + co->stack =3D qemu_alloc_stack(&co->stack_size); + co->sp =3D co->stack + co->stack_size; + +#ifdef CONFIG_VALGRIND_H + co->valgrind_stack_id =3D + VALGRIND_STACK_REGISTER(co->stack, co->stack + co->stack_size); +#endif + + /* Immediately enter the coroutine once to pass it its address as the = argument */ + co->base.caller =3D qemu_coroutine_self(); + start_switch_fiber(&fake_stack_save, co->stack, co->stack_size); + CO_SWITCH(current, co, 0, "jmp coroutine_trampoline"); + finish_switch_fiber(fake_stack_save); + co->base.caller =3D NULL; + + return &co->base; +} + +#ifdef CONFIG_VALGRIND_H +#if defined(CONFIG_PRAGMA_DIAGNOSTIC_AVAILABLE) && !defined(__clang__) +/* Work around an unused variable in the valgrind.h macro... */ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wunused-but-set-variable" +#endif +static inline void valgrind_stack_deregister(CoroutineX86 *co) +{ + VALGRIND_STACK_DEREGISTER(co->valgrind_stack_id); +} +#if defined(CONFIG_PRAGMA_DIAGNOSTIC_AVAILABLE) && !defined(__clang__) +#pragma GCC diagnostic pop +#endif +#endif + +void qemu_coroutine_delete(Coroutine *co_) +{ + CoroutineX86 *co =3D DO_UPCAST(CoroutineX86, base, co_); + +#ifdef CONFIG_VALGRIND_H + valgrind_stack_deregister(co); +#endif + + qemu_free_stack(co->stack, co->stack_size); + g_free(co); +} + +/* + * This function is marked noinline to prevent GCC from inlining it + * into coroutine_trampoline(). If we allow it to do that then it + * hoists the code to get the address of the TLS variable "current" + * out of the while() loop. This is an invalid transformation because + * qemu_coroutine_switch() may be called when running thread A but + * return in thread B, and so we might be in a different thread + * context each time round the loop. + */ +CoroutineAction __attribute__((noinline)) +qemu_coroutine_switch(Coroutine *from_, Coroutine *to_, + CoroutineAction action) +{ + CoroutineX86 *from =3D DO_UPCAST(CoroutineX86, base, from_); + CoroutineX86 *to =3D DO_UPCAST(CoroutineX86, base, to_); + void *fake_stack_save =3D NULL; + + current =3D to_; + + start_switch_fiber(action =3D=3D COROUTINE_TERMINATE ? + NULL : &fake_stack_save, to->stack, to->stack_size); + action =3D CO_SWITCH(from, to, action, "ret"); + finish_switch_fiber(fake_stack_save); + + return action; +} + +Coroutine *qemu_coroutine_self(void) +{ + if (!current) { + current =3D &leader.base; + } + return current; +} + +bool qemu_in_coroutine(void) +{ + return current && current->caller; +} --=20 2.20.1