From patchwork Tue Jul 19 08:32:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 9236387 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CFFA460574 for ; Tue, 19 Jul 2016 08:37:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BE8272074F for ; Tue, 19 Jul 2016 08:37:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B33C22521F; Tue, 19 Jul 2016 08:37:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 587322074F for ; Tue, 19 Jul 2016 08:37:31 +0000 (UTC) Received: from localhost ([::1]:53788 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bPQWw-0000zO-GO for patchwork-qemu-devel@patchwork.kernel.org; Tue, 19 Jul 2016 04:37:30 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42305) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bPQSB-0003ZG-CM for qemu-devel@nongnu.org; Tue, 19 Jul 2016 04:32:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bPQS4-0002qG-Ax for qemu-devel@nongnu.org; Tue, 19 Jul 2016 04:32:34 -0400 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:35331) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bPQS4-0002pu-5b for qemu-devel@nongnu.org; Tue, 19 Jul 2016 04:32:28 -0400 Received: by mail-wm0-x244.google.com with SMTP id i5so2011652wmg.2 for ; Tue, 19 Jul 2016 01:32:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sntIxyQEsrkF0IN2mQ5m4xMlfi8cTz/sErxwX9yzYDA=; b=qgS3NawWOz+qL12PtqOQGPigy0wHD9XQ3B7k/0D2kNCBEcEyO2BsNTAB/2GU4uddUX hb+vzPBqrWy38xn7Mw+tRsv/xcDjPvCat28AJ/7MN6rBNXtAh2tNrfg5ne3CNArEAbED /r0VSqSjw0HPUQj8tLdajix+Q3HypT7dxbxQIPOshbbiAYeyAuocR8FlGEKLHtbHysrR slY5sv05QnDPPmsxL8pSvVEi/tzuQKidygneuXLMp6tq3EFVYZnwB+g/8p37vS1a+ILy USOqnIAIFqZYF9VAMmEEwIs3OpctExh/7M7IBb6jjHbQIsQ5eztZxNglFsgxmbxEtske iB/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=sntIxyQEsrkF0IN2mQ5m4xMlfi8cTz/sErxwX9yzYDA=; b=Tmskd55Psw4rW0O0oA2qdSWYulAnOEWunQ2s1MvDNLRU8nwm8CvshTI4nSrDSk8aHe s3ytN3fQlJslY4mkjxu8F7XDZgwFrdoGzAS6e7s1m1t8ebDSD5P4FRyNTdM67cxzGZrT j/cNCHPiLuGcsnQgygqI85EQgYy/S0ui1H5TM6Umdb7/D3cUBMSfQmnV83bclyHGM4QM k/vc43jGIacnMwncUWTxUnUESo76dpaKW02XP3S7+/BvtIbzSN+4UjuNvcD0+F870mhQ LnA3jToqjDqtaK91F6q6eL1TNzYcp/i7MUrJfdbP7zb2f96ByD4cWGqhGsaUVviNogsL tIWA== X-Gm-Message-State: ALyK8tI8OaygcIh173a4EFoj8ZIcNCpMF63LpTvoXSFdkd5vypBEjDR9zzbpSYvx3kNbOA== X-Received: by 10.28.226.85 with SMTP id z82mr2488750wmg.101.1468917147608; Tue, 19 Jul 2016 01:32:27 -0700 (PDT) Received: from donizetti.lan (94-39-158-5.adsl-ull.clienti.tiscali.it. [94.39.158.5]) by smtp.gmail.com with ESMTPSA id w129sm20677087wmd.9.2016.07.19.01.32.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Jul 2016 01:32:26 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 19 Jul 2016 10:32:14 +0200 Message-Id: <1468917141-8155-4-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1468917141-8155-1-git-send-email-pbonzini@redhat.com> References: <1468917141-8155-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::244 Subject: [Qemu-devel] [PATCH 03/10] tcg: Prepare safe tb_jmp_cache lookup out of tb_lock 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: serge.fdrv@gmail.com, alex.bennee@linaro.org, sergey.fedorov@linaro.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Sergey Fedorov Ensure atomicity of CPU's 'tb_jmp_cache' access for future translation block lookup out of 'tb_lock'. Note that this patch does *not* make CPU's TLB invalidation safe if it is done from some other thread while the CPU is in its execution loop. Signed-off-by: Alex Bennée Signed-off-by: Sergey Fedorov Signed-off-by: Sergey Fedorov Reviewed-by: Alex Bennée Message-Id: <20160715175852.30749-4-sergey.fedorov@linaro.org> Signed-off-by: Paolo Bonzini --- cpu-exec.c | 4 ++-- translate-all.c | 10 +++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/cpu-exec.c b/cpu-exec.c index cf511f1..32b58ed 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -315,7 +315,7 @@ static TranslationBlock *tb_find_slow(CPUState *cpu, found: /* we add the TB in the virtual pc hash table */ - cpu->tb_jmp_cache[tb_jmp_cache_hash_func(pc)] = tb; + atomic_set(&cpu->tb_jmp_cache[tb_jmp_cache_hash_func(pc)], tb); return tb; } @@ -333,7 +333,7 @@ static inline TranslationBlock *tb_find_fast(CPUState *cpu, is executed. */ cpu_get_tb_cpu_state(env, &pc, &cs_base, &flags); tb_lock(); - tb = cpu->tb_jmp_cache[tb_jmp_cache_hash_func(pc)]; + tb = atomic_read(&cpu->tb_jmp_cache[tb_jmp_cache_hash_func(pc)]); if (unlikely(!tb || tb->pc != pc || tb->cs_base != cs_base || tb->flags != flags)) { tb = tb_find_slow(cpu, pc, cs_base, flags); diff --git a/translate-all.c b/translate-all.c index 0d47c1c..fdf520a 100644 --- a/translate-all.c +++ b/translate-all.c @@ -848,7 +848,11 @@ void tb_flush(CPUState *cpu) tcg_ctx.tb_ctx.nb_tbs = 0; CPU_FOREACH(cpu) { - memset(cpu->tb_jmp_cache, 0, sizeof(cpu->tb_jmp_cache)); + int i; + + for (i = 0; i < TB_JMP_CACHE_SIZE; ++i) { + atomic_set(&cpu->tb_jmp_cache[i], NULL); + } cpu->tb_flushed = true; } @@ -1007,8 +1011,8 @@ void tb_phys_invalidate(TranslationBlock *tb, tb_page_addr_t page_addr) /* remove the TB from the hash list */ h = tb_jmp_cache_hash_func(tb->pc); CPU_FOREACH(cpu) { - if (cpu->tb_jmp_cache[h] == tb) { - cpu->tb_jmp_cache[h] = NULL; + if (atomic_read(&cpu->tb_jmp_cache[h]) == tb) { + atomic_set(&cpu->tb_jmp_cache[h], NULL); } }