From patchwork Thu Apr 7 15:53:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sergey.fedorov@linaro.org X-Patchwork-Id: 8774261 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 D86D69F3D1 for ; Thu, 7 Apr 2016 15:55:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 60EAC201CD for ; Thu, 7 Apr 2016 15:55:21 +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 B710220109 for ; Thu, 7 Apr 2016 15:55:20 +0000 (UTC) Received: from localhost ([::1]:50816 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aoCHA-0001IC-6h for patchwork-qemu-devel@patchwork.kernel.org; Thu, 07 Apr 2016 11:55:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56768) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aoCGw-0001Ce-HF for qemu-devel@nongnu.org; Thu, 07 Apr 2016 11:55:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aoCGv-0002pf-LW for qemu-devel@nongnu.org; Thu, 07 Apr 2016 11:55:06 -0400 Received: from mail-lf0-x22b.google.com ([2a00:1450:4010:c07::22b]:35623) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aoCGv-0002oq-EC for qemu-devel@nongnu.org; Thu, 07 Apr 2016 11:55:05 -0400 Received: by mail-lf0-x22b.google.com with SMTP id c126so60348377lfb.2 for ; Thu, 07 Apr 2016 08:55:05 -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=4ZHZFfYrl3QCvllAwzzlSz/IjPPPEXfup3l7B5b+tCU=; b=P+CoVVD8ks06cjnjda/iApWilOAtrVDrqLp4R6TpoGr8icSXSD497xVyLd5M9KAlCw +7FtkIDXa+YgjBGXYh0Z/0LfkbJVERzGHoSJ+ofpWMksPKNwKCtI9dORGNTckWpSAqM5 W45gePAVlr2N/as/Y955P/MklWO1fLrGo8ZDA= 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=4ZHZFfYrl3QCvllAwzzlSz/IjPPPEXfup3l7B5b+tCU=; b=A9gtRD2x5T8ap5Y7n9QutwfxWy5Ca1iV/aM42krLKdSSWSLRLMyfhGQdQ3MN4p2Jug 8cKWyZRV9DV6AOqrgCGVClXZWIuLB3j4UemDCLNuSmo9xZmshh4vxMC81fIIgIFvmgNT al6vaz+dAk6WX5GLKX361fqxkb6JQN99fJDUeruLRylgy4HnHaF+QIw6dZjWOJPEVS4A tkoWYTHGNGdTd16ecpxR+B9kvfZdjCvGEfyz2/u8FGZtwp3MVBGjyTMjF087lvKAkiQR peUYq9MGRAKq5tl2OQtIdUXcZYoe4sXPiorn8zOCFlg0o0nhcVq5G893cfRaCPA4s3Zv F2yA== X-Gm-Message-State: AD7BkJKydYsfg+eSyKFgw8ZPGc3yC7X97rDrmKEtyW/SxwEuhAqYhX2ChI3TL3JH7z6UKzw8 X-Received: by 10.25.211.75 with SMTP id k72mr1689133lfg.45.1460044504525; Thu, 07 Apr 2016 08:55:04 -0700 (PDT) Received: from localhost.localdomain ([195.91.132.170]) by smtp.gmail.com with ESMTPSA id p195sm1316255lfd.11.2016.04.07.08.55.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Apr 2016 08:55:03 -0700 (PDT) From: Sergey Fedorov To: qemu-devel@nongnu.org Date: Thu, 7 Apr 2016 18:53:48 +0300 Message-Id: <1460044433-19282-7-git-send-email-sergey.fedorov@linaro.org> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1460044433-19282-1-git-send-email-sergey.fedorov@linaro.org> References: <1460044433-19282-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::22b Cc: Sergey Fedorov , Peter Crosthwaite , Alexander Graf , Paolo Bonzini , Sergey Fedorov , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson Subject: [Qemu-devel] [PATCH 06/11] tcg/s390: Make direct jump patching thread-safe X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org 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 --- include/exec/exec-all.h | 2 +- tcg/s390/tcg-target.inc.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index 82399175fe80..e18cc24e50f0 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -320,7 +320,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 fbf97bb2e15d..84221dfb68c9 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; #ifndef NDEBUG @@ -1716,6 +1718,10 @@ static inline void tcg_out_op(TCGContext *s, TCGOpcode opc, case INDEX_op_goto_tb: if (s->tb_jmp_offset) { + /* align branch displacement for atomic pathing */ + if (((uintptr_t)s->code_ptr & 3) == 0) { + 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;