From patchwork Fri May 13 00:13:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9086951 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 6434C9F1D3 for ; Fri, 13 May 2016 00:15:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B196A20204 for ; Fri, 13 May 2016 00:15:01 +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 083A1200D0 for ; Fri, 13 May 2016 00:15:01 +0000 (UTC) Received: from localhost ([::1]:60301 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b10ku-0000SO-1W for patchwork-qemu-devel@patchwork.kernel.org; Thu, 12 May 2016 20:15:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38379) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b10kX-0000BI-JX for qemu-devel@nongnu.org; Thu, 12 May 2016 20:14:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b10kV-0002iM-3e for qemu-devel@nongnu.org; Thu, 12 May 2016 20:14:36 -0400 Received: from mail-qg0-x241.google.com ([2607:f8b0:400d:c04::241]:34236) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b10kU-0002iH-Nf for qemu-devel@nongnu.org; Thu, 12 May 2016 20:14:35 -0400 Received: by mail-qg0-x241.google.com with SMTP id e35so6832553qge.1 for ; Thu, 12 May 2016 17:14:34 -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=uDKUbKnhaXPWs2AVqkecIRDxAWt0DoZulklQt/o7u8c=; b=NNsE0PtN78JL6gxNFHbUETbcuqHRpCwRA3gwhsfeGlx9yrxqIo8sPq2Bep3udcRYfW xlZzWuwOToUzvSWw0Zv7Wc0itndyks2THF7hP00jQUkffmKwD6u+tEBmj17dvmijsCep mb0+Q8F1ypBp1Mo7fqsuaCDBdHKElxVP8EXwESSm8oUYSzo00rL63sDa5Z9uIIOAKHTr wthiAPPg2fsfdnLqKoJ8MDUiPhBhQbpzgy0jnfV+IMQzJH/61SoLe4OpZFBD5r+FII15 DKgpn12fiJ3bfYZM8yYzYxn7wmJL/NuFwSD24xYuL8wyWmvd8fFWJsfczewIYyg38fss BEUA== 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=uDKUbKnhaXPWs2AVqkecIRDxAWt0DoZulklQt/o7u8c=; b=l7WAnKptEWmACDk7N4CN33DpZJFLeVQ5jlcuRmBuuH/9M9NjXSNd346+chTVhv3gK9 cbCvb/od73Yg0lpuMluyILGSG2XTzYbzK6iyO/Bs27WPZEsxNppaqHPlAtbARLnSjwcL gaYfVQt3PiMqpEavxUfPQosInero1rFF/+yJ6oHYufjNl0+0SwrChyT8tbJ8E1pA+E9e cWjmLIqkp7TMGmLW4vF9C5vphscEitPKfqo40YeFUstfF0+4HbJvMl19wYfYFUi6RToD TqR2yVikKxyQ1YEhH9irZRCiBooSP5FEVL9fZxmVnYSQLP2SkCd+4iovn195IDEwjcLW K6RA== X-Gm-Message-State: AOPr4FXwqewPB8n6ouww4JO8yvzS81JFmh6sTo9Gs5aHvECMA6bfKp0y8yKomgprXmuxwg== X-Received: by 10.140.215.133 with SMTP id l127mr13503724qhb.26.1463098474466; Thu, 12 May 2016 17:14:34 -0700 (PDT) Received: from bigtime.com ([172.56.44.137]) by smtp.gmail.com with ESMTPSA id w16sm7171321qka.35.2016.05.12.17.14.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 May 2016 17:14:34 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 12 May 2016 14:13:08 -1000 Message-Id: <1463098420-29113-8-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:c04::241 Subject: [Qemu-devel] [PULL 07/39] tcg/s390: 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 s390 is atomic by: * naturally aligning a location of direct jump address; * using atomic_read()/atomic_set() for code patching. Signed-off-by: Sergey Fedorov Signed-off-by: Sergey Fedorov Message-Id: <1461341333-19646-7-git-send-email-sergey.fedorov@linaro.org> Signed-off-by: Richard Henderson --- include/exec/exec-all.h | 2 +- tcg/s390/tcg-target.inc.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index 0ab7803..6c095e8 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -321,7 +321,7 @@ static inline void tb_set_jmp_target1(uintptr_t jmp_addr, uintptr_t addr) { /* patch the branch destination */ intptr_t disp = addr - (jmp_addr - 2); - stl_be_p((void*)jmp_addr, disp / 2); + atomic_set((int32_t *)jmp_addr, disp / 2); /* no need to flush icache explicitly */ } #elif defined(__aarch64__) diff --git a/tcg/s390/tcg-target.inc.c b/tcg/s390/tcg-target.inc.c index 5805532..8e8064c 100644 --- a/tcg/s390/tcg-target.inc.c +++ b/tcg/s390/tcg-target.inc.c @@ -219,6 +219,8 @@ typedef enum S390Opcode { RX_ST = 0x50, RX_STC = 0x42, RX_STH = 0x40, + + NOP = 0x0707, } S390Opcode; #ifdef CONFIG_DEBUG_TCG @@ -1716,6 +1718,12 @@ static inline void tcg_out_op(TCGContext *s, TCGOpcode opc, case INDEX_op_goto_tb: if (s->tb_jmp_offset) { + /* branch displacement must be aligned for atomic patching; + * see if we need to add extra nop before branch + */ + if (!QEMU_PTR_IS_ALIGNED(s->code_ptr + 1, 4)) { + tcg_out16(s, NOP); + } tcg_out16(s, RIL_BRCL | (S390_CC_ALWAYS << 4)); s->tb_jmp_offset[args[0]] = tcg_current_code_size(s); s->code_ptr += 2;