From patchwork Wed Jul 6 21:15:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: sergey.fedorov@linaro.org X-Patchwork-Id: 645599 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rlDWF70wSz9sDk for ; Thu, 7 Jul 2016 07:32:57 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b=dGuafQ3Z; dkim-atps=neutral Received: from localhost ([::1]:35950 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKuRD-00081X-89 for incoming@patchwork.ozlabs.org; Wed, 06 Jul 2016 17:32:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48529) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKuAH-00046S-Np for qemu-devel@nongnu.org; Wed, 06 Jul 2016 17:15:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bKuAF-0007Ls-M1 for qemu-devel@nongnu.org; Wed, 06 Jul 2016 17:15:24 -0400 Received: from mail-lf0-x229.google.com ([2a00:1450:4010:c07::229]:34701) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKuAF-0007Ll-E3 for qemu-devel@nongnu.org; Wed, 06 Jul 2016 17:15:23 -0400 Received: by mail-lf0-x229.google.com with SMTP id h129so162915422lfh.1 for ; Wed, 06 Jul 2016 14:15:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=an2SS1almpXq0zDgKKG0JGgkxlFCuGKF5g5Xp67qnBs=; b=dGuafQ3ZupMmoUK8TDTPEfwYsXPSXHg6vDwQXiAsnCeG+eNJGpv+W2wezV9wRt+WaW VlTYp9vTZu6zSVwpnguEym9M62UPzDpmbSZ33fHZqsi7+AzD/7figwNO8t0dvGa+qTP4 GLWNum0l8G24hgaByhlGfV5cvyGE+bff9fV5s= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=an2SS1almpXq0zDgKKG0JGgkxlFCuGKF5g5Xp67qnBs=; b=gMc7agSBZ33dO1BLDcVRyBMdyrpdjdo5DAr8MDzz0zOAKw2bhUWJ3kZc3XNT5jJoYk XsXDkO5bRZCpn1IqhskUhO2LF1Qz8prmxos9af+SCqerE+ArTzaetfjn02O9MLZPQVJn Q/i4fi1J5WZe8LlMA8IGS2u/g1Gq+D7sWltouZ+Fjb1zKjpmcbdpCdUnGwUNkAKzY7YL OZpLT2YIN9d0oCtIqI187XE3xDYtcFIkmxiLPTHK6bONDedrzIfWEqgKpPgOkmqOvfdH +JGE3WiEijNQNTufK81SuwbtxqVw1Rb+vMVgqZx54x7RiaX2SRVXHJI7aL4aHQwvvPVD 7Y5w== X-Gm-Message-State: ALyK8tIL9p2apdBOWVkbePTEfsM4v3iKUKZJeWWy3Tl75poe/9ecvmE3ugNi3nUnkryjtVtJ X-Received: by 10.25.23.215 with SMTP id 84mr7264681lfx.200.1467839722738; Wed, 06 Jul 2016 14:15:22 -0700 (PDT) Received: from sergey-laptop.Dlink (broadband-46-188-120-37.2com.net. [46.188.120.37]) by smtp.gmail.com with ESMTPSA id l79sm4420028lfi.40.2016.07.06.14.15.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 06 Jul 2016 14:15:21 -0700 (PDT) From: Sergey Fedorov To: qemu-devel@nongnu.org Date: Thu, 7 Jul 2016 00:15:03 +0300 Message-Id: <1467839703-11733-12-git-send-email-sergey.fedorov@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1467839703-11733-1-git-send-email-sergey.fedorov@linaro.org> References: <1467839703-11733-1-git-send-email-sergey.fedorov@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:4010:c07::229 Subject: [Qemu-devel] [RFC v2 11/11] tcg: Make tb_flush() thread safe 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: MTTCG Devel , Peter Maydell , Sergey Fedorov , Peter Crosthwaite , Alvise Rigo , "Emilio G. Cota" , Sergey Fedorov , Paolo Bonzini , Richard Henderson , =?UTF-8?Q?Alex_Benn=c3=a9e?= , =?UTF-8?B?S09OUkFEIEZyw6lkw6lyaWM=?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Sergey Fedorov Use async_safe_run_on_cpu() to make tb_flush() thread safe. Signed-off-by: Sergey Fedorov Signed-off-by: Sergey Fedorov Tested-by: Alex Bennée Reviewed-by: Alex Bennée --- Changes in v2: - stale comment about unsafe tb_flush() removed --- translate-all.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/translate-all.c b/translate-all.c index eaa95e4cd7dc..e69b5d4e889e 100644 --- a/translate-all.c +++ b/translate-all.c @@ -831,8 +831,7 @@ static void page_flush_tb(void) } /* flush all the translation blocks */ -/* XXX: tb_flush is currently not thread safe */ -void tb_flush(CPUState *cpu) +static void do_tb_flush(CPUState *cpu, void *data) { #if defined(DEBUG_FLUSH) printf("qemu: flush code_size=%ld nb_tbs=%d avg_tb_size=%ld\n", @@ -861,6 +860,11 @@ void tb_flush(CPUState *cpu) tcg_ctx.tb_ctx.tb_flush_count++; } +void tb_flush(CPUState *cpu) +{ + async_safe_run_on_cpu(cpu, do_tb_flush, NULL); +} + #ifdef DEBUG_TB_CHECK static void @@ -1163,9 +1167,8 @@ TranslationBlock *tb_gen_code(CPUState *cpu, buffer_overflow: /* flush must be done */ tb_flush(cpu); - /* cannot fail at this point */ - tb = tb_alloc(pc); - assert(tb != NULL); + mmap_unlock(); + cpu_loop_exit(cpu); } gen_code_buf = tcg_ctx.code_gen_ptr;