From patchwork Fri May 13 00:13:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9087091 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 6C41ABF29F for ; Fri, 13 May 2016 00:23:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C569720204 for ; Fri, 13 May 2016 00:23:35 +0000 (UTC) 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.kernel.org (Postfix) with ESMTPS id 22826200D0 for ; Fri, 13 May 2016 00:23:35 +0000 (UTC) Received: from localhost ([::1]:60380 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b10tC-0008HY-0Z for patchwork-qemu-devel@patchwork.kernel.org; Thu, 12 May 2016 20:23:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38439) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b10kj-0000e8-Co for qemu-devel@nongnu.org; Thu, 12 May 2016 20:14:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b10kh-0002mU-5G for qemu-devel@nongnu.org; Thu, 12 May 2016 20:14:48 -0400 Received: from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]:35808) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b10kh-0002mG-1Q for qemu-devel@nongnu.org; Thu, 12 May 2016 20:14:47 -0400 Received: by mail-qk0-x241.google.com with SMTP id n62so1260077qkc.2 for ; Thu, 12 May 2016 17:14:47 -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; bh=q3i1ojqXqIB9vncxazo+AYnhvlzuFgg+bBvzLUCapSA=; b=asNDgbEMZ1E6ym7z7O7W39e7t/GaI3uYkZYIvJwIrCN52Q0d7+b/NHY6ubpi3CU93E 0WJKJAEjmblFEtYk1q3zh+QMcjds0ZR3P9N1Nf7Jv5cFQmXd4ADPebcA2vwV1FfXI1rT 3zuGVxC+OayZhl4I01vWQvhXw3mAkUFo9OOu+PpLP0BjivwkLnRdRczxAIpIGbLaTeQ5 lci40sohNhqGRm48ABe8VdepYY3hujzwrW5nlBhhg+zwgmojg4qyEIr1BYTOdnZ7CTxC Cc7CpSkoFDJMwIfkF60mIq+PhUJbKZhKGW243WbdK+9e1DKZf0kSfF50zT+l8b6KOqvq Z+Eg== 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; bh=q3i1ojqXqIB9vncxazo+AYnhvlzuFgg+bBvzLUCapSA=; b=SzXxFRmJOuNgM4ByjDLPCqye33cMhaA7ZC+denjO9DszftQj60W+xMvbSFPr4TG9fl WSlUyR8Tr78sb4POrjZELcjnd0p7QdVrqstmWud4vQvfu4aKMWb6QDuVvSA0zz1tVvUG QLx87YWgUKp/37sro1CWQcmaXYj8PGQn8rNe+IoOkm1bmvGQ68HiMyLmSDNEMyqiSgOD bunNjTDaQJx5IVoMkaepU2s4SXT5EF/2cD+vDh9RMXGshLtJuN5MYoena74qlF2xUsbF kFKEqdycPFOw8AxZNLEp17F/6Kl+CrP3f32TPX2RaFhVFW4ix3mOqbzSYmPK1xruOpcT 45qQ== X-Gm-Message-State: AOPr4FXk2ygwWjMJ6JaeDiz3v80l6cFRzzGaNbzlORPpP328kj0wgn8goGmW7tiak9YtWA== X-Received: by 10.55.117.143 with SMTP id q137mr13105128qkc.66.1463098486818; Thu, 12 May 2016 17:14:46 -0700 (PDT) Received: from bigtime.com ([172.56.44.137]) by smtp.gmail.com with ESMTPSA id w16sm7171321qka.35.2016.05.12.17.14.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 May 2016 17:14:46 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 12 May 2016 14:13:12 -1000 Message-Id: <1463098420-29113-12-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1463098420-29113-1-git-send-email-rth@twiddle.net> References: <1463098420-29113-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400d:c09::241 Subject: [Qemu-devel] [PULL 11/39] tcg/mips: Make direct jump patching 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: peter.maydell@linaro.org, Sergey Fedorov , Sergey Fedorov Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Sergey Fedorov Ensure direct jump patching in MIPS is atomic by using atomic_read()/atomic_set() for code patching. Signed-off-by: Sergey Fedorov Signed-off-by: Sergey Fedorov Message-Id: <1461341333-19646-11-git-send-email-sergey.fedorov@linaro.org> Signed-off-by: Richard Henderson [rth: Merged the deposit32 followup.] [rth: Merged the following followup.] Message-Id: <1462210518-26522-1-git-send-email-sergey.fedorov@linaro.org> --- tcg/mips/tcg-target.inc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tcg/mips/tcg-target.inc.c b/tcg/mips/tcg-target.inc.c index aaf881c..1e5a6b4 100644 --- a/tcg/mips/tcg-target.inc.c +++ b/tcg/mips/tcg-target.inc.c @@ -1885,7 +1885,6 @@ static void tcg_target_init(TCGContext *s) void tb_set_jmp_target1(uintptr_t jmp_addr, uintptr_t addr) { - uint32_t *ptr = (uint32_t *)jmp_addr; - *ptr = deposit32(*ptr, 0, 26, addr >> 2); + atomic_set((uint32_t *)jmp_addr, deposit32(OPC_J, 0, 26, addr >> 2)); flush_icache_range(jmp_addr, jmp_addr + 4); }