From patchwork Tue Jan 4 02:15:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 529860 Delivered-To: patch@linaro.org Received: by 2002:ac0:9f5c:0:0:0:0:0 with SMTP id l28csp1294222imf; Mon, 3 Jan 2022 18:19:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJw0p4HuemRKyBUjE4tLcXffDZefgJZ8ah7flGkWYbNx4pdquBhiP3mhLlNm1mzuU39suEzJ X-Received: by 2002:a25:5c6:: with SMTP id 189mr52653729ybf.595.1641262760274; Mon, 03 Jan 2022 18:19:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641262760; cv=none; d=google.com; s=arc-20160816; b=w3MnsWKYOP/VhBpENznwomK5RWMIq2KO+d5ll1kOsy0v0O6UQQ8SpF18jaPrn51ACR tu7qhHCTlNAnZjAXkYh92cmCvS/fVoRzIvJ5QkzL12gYW5ZBA9ik4tJrpY1fl71+IzOw TLE1BG8XM1Zpi1aHLttoVEtDqJMYIiVy2Yi2j23dGMm8tWu5576dwTHr/G8McPQqjrMb NnBMZww9nwOdOU4GEc4QBXn+AxZdTJxMbuOZX1jc8GcoFeAw29WNyTaLidBu1I0lWjNN 73Z5jeYKPXW17WE/cT46zOoBtCNMcqyT4rMZ4PgIX4UCAiH6do+7lLtz+N84u9iBTVlB G3EQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=xDlNcMPX+4x4RTjp0DsPf/CfOh4YFwKmpEmxN1K7ZOw=; b=bslYLBOdLBYmdDJA8FYSm85uz6+rSTJZOAcobRzLAjX6gSMnKwEf48KcjwzBCa77/X BtokTCd8YxvXdqTAoVM7Ofl+9s6zttIJ87nA5DUMFAkxXWpwOQSxyjkm8NBAYUMC4D/d uThLRyHFIdCWtZEiH+wa00UrUAHVfEm+l+a3jX+cY0SBiORR85QqsfA2OfVRBzmAocZg fgoqHnWiJ5Thl4Vl+bbEmGu6thVxnzimunTrVgLgBUZAwEkni3nVcIE40w17gRntPRG8 whYBbEbrFXpk8so8Mec2tD+9uuNpqhoxa6MiFS5yOSGtVgWA2XcSkO+SIsZygCxGBy1l Rb5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JoUYtQsg; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id k128si8673952ybc.249.2022.01.03.18.19.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 03 Jan 2022 18:19:20 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JoUYtQsg; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:52720 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n4ZPz-0007bP-QQ for patch@linaro.org; Mon, 03 Jan 2022 21:19:19 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51054) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n4ZMa-0002fy-RQ for qemu-devel@nongnu.org; Mon, 03 Jan 2022 21:15:48 -0500 Received: from [2607:f8b0:4864:20::1031] (port=38699 helo=mail-pj1-x1031.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n4ZMY-00089j-3f for qemu-devel@nongnu.org; Mon, 03 Jan 2022 21:15:48 -0500 Received: by mail-pj1-x1031.google.com with SMTP id l10-20020a17090a384a00b001b22190e075so34035244pjf.3 for ; Mon, 03 Jan 2022 18:15:45 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=xDlNcMPX+4x4RTjp0DsPf/CfOh4YFwKmpEmxN1K7ZOw=; b=JoUYtQsgRQ3JBiB5gOVxbQjw4g6JhUDux5nyVYKsyi5G1n4kIgNL+ADtwL2ABf9GIf 7wh5Pjlsj1849q1RqrW+0pUuSaztaHYWnDNHIQGlRz+ZAhwL4doYcefAYhIbe4LbFwjx 2lN5XhZ1g+cKt6V+f7bImSQOFoeQlR1/doP0UwRPJ5DnYTJ1C/WfbyrDHUt4kD/wO67k YP+H4gvkTvQnI7hj/5vbP8+0C4sh64l6Ub3j3Iz2AN9E7vKm/PEL521MI7cxweBnlriQ 36p71sQUMwyU+HquWiILzzFDqyuwaFFNefNGmQAQoLKpM9SFkYEGE6sAFWfJ3pvkTkiZ EH+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xDlNcMPX+4x4RTjp0DsPf/CfOh4YFwKmpEmxN1K7ZOw=; b=CMDkZLaTuSrxo40NnNs9xRNVNjxR3FfS7lK65oEJdksgoJgacRyp0ipHUsoLXQPPOG OuAdSX9e5DUYozTcr8gRu1/KyOcbplmZ9av8gMaHqP6+KY7qK8qdaCSy3BzaybwR1dbC tqgqFrIYNJL+rte/9H4AHtyjvcbbaYh8QUvTNJayKk4AAYddJEIqdgMMJbMgz+MSV8ri zo5x96Kcm1JOCPZv1TUx18mrvKHs5ACJUCPjscgf6fPLAyh3A059nly0WpjX71oDHJfB oLtMKo1AsSxIlsHrJGQbdd/qXZQgpwozW53bG1uVS0nW6bJk+U8eWMOJ1h6HdSY5ipSe 4dog== X-Gm-Message-State: AOAM530Azp1wwn67UXrWxUqfuylHu68wA8hacj4bwM4IAR9RasUQ8m+y BZtXzDUqqSQhTxfVsTcwCYl5l98syXEMWQ== X-Received: by 2002:a17:90a:bc92:: with SMTP id x18mr58761662pjr.130.1641262544815; Mon, 03 Jan 2022 18:15:44 -0800 (PST) Received: from localhost.localdomain (174-21-75-75.tukw.qwest.net. [174.21.75.75]) by smtp.gmail.com with ESMTPSA id b4sm37395501pjm.17.2022.01.03.18.15.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jan 2022 18:15:44 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v4 1/7] tcg/i386: Support raising sigbus for user-only Date: Mon, 3 Jan 2022 18:15:37 -0800 Message-Id: <20220104021543.396571-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220104021543.396571-1-richard.henderson@linaro.org> References: <20220104021543.396571-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::1031 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::1031; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1031.google.com X-Spam_score_int: 6 X-Spam_score: 0.6 X-Spam_bar: / X-Spam_report: (0.6 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: git@xen0n.name, peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- tcg/i386/tcg-target.h | 2 - tcg/i386/tcg-target.c.inc | 103 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 98 insertions(+), 7 deletions(-) diff --git a/tcg/i386/tcg-target.h b/tcg/i386/tcg-target.h index b00a6da293..3b2c9437a0 100644 --- a/tcg/i386/tcg-target.h +++ b/tcg/i386/tcg-target.h @@ -232,9 +232,7 @@ static inline void tb_target_set_jmp_target(uintptr_t tc_ptr, uintptr_t jmp_rx, #define TCG_TARGET_HAS_MEMORY_BSWAP have_movbe -#ifdef CONFIG_SOFTMMU #define TCG_TARGET_NEED_LDST_LABELS -#endif #define TCG_TARGET_NEED_POOL_LABELS #endif diff --git a/tcg/i386/tcg-target.c.inc b/tcg/i386/tcg-target.c.inc index 84b109bb84..e073868d8f 100644 --- a/tcg/i386/tcg-target.c.inc +++ b/tcg/i386/tcg-target.c.inc @@ -22,6 +22,7 @@ * THE SOFTWARE. */ +#include "../tcg-ldst.c.inc" #include "../tcg-pool.c.inc" #ifdef CONFIG_DEBUG_TCG @@ -421,8 +422,9 @@ static bool tcg_target_const_match(int64_t val, TCGType type, int ct) #define OPC_VZEROUPPER (0x77 | P_EXT) #define OPC_XCHG_ax_r32 (0x90) -#define OPC_GRP3_Ev (0xf7) -#define OPC_GRP5 (0xff) +#define OPC_GRP3_Eb (0xf6) +#define OPC_GRP3_Ev (0xf7) +#define OPC_GRP5 (0xff) #define OPC_GRP14 (0x73 | P_EXT | P_DATA16) /* Group 1 opcode extensions for 0x80-0x83. @@ -444,6 +446,7 @@ static bool tcg_target_const_match(int64_t val, TCGType type, int ct) #define SHIFT_SAR 7 /* Group 3 opcode extensions for 0xf6, 0xf7. To be used with OPC_GRP3. */ +#define EXT3_TESTi 0 #define EXT3_NOT 2 #define EXT3_NEG 3 #define EXT3_MUL 4 @@ -1606,8 +1609,6 @@ static void tcg_out_nopn(TCGContext *s, int n) } #if defined(CONFIG_SOFTMMU) -#include "../tcg-ldst.c.inc" - /* helper signature: helper_ret_ld_mmu(CPUState *env, target_ulong addr, * int mmu_idx, uintptr_t ra) */ @@ -1916,7 +1917,84 @@ static bool tcg_out_qemu_st_slow_path(TCGContext *s, TCGLabelQemuLdst *l) tcg_out_jmp(s, qemu_st_helpers[opc & (MO_BSWAP | MO_SIZE)]); return true; } -#elif TCG_TARGET_REG_BITS == 32 +#else + +static void tcg_out_test_alignment(TCGContext *s, bool is_ld, TCGReg addrlo, + TCGReg addrhi, unsigned a_bits) +{ + unsigned a_mask = (1 << a_bits) - 1; + TCGLabelQemuLdst *label; + + /* + * We are expecting a_bits to max out at 7, so we can usually use testb. + * For i686, we have to use testl for %esi/%edi. + */ + if (a_mask <= 0xff && (TCG_TARGET_REG_BITS == 64 || addrlo < 4)) { + tcg_out_modrm(s, OPC_GRP3_Eb | P_REXB_RM, EXT3_TESTi, addrlo); + tcg_out8(s, a_mask); + } else { + tcg_out_modrm(s, OPC_GRP3_Ev, EXT3_TESTi, addrlo); + tcg_out32(s, a_mask); + } + + /* jne slow_path */ + tcg_out_opc(s, OPC_JCC_long + JCC_JNE, 0, 0, 0); + + label = new_ldst_label(s); + label->is_ld = is_ld; + label->addrlo_reg = addrlo; + label->addrhi_reg = addrhi; + label->raddr = tcg_splitwx_to_rx(s->code_ptr + 4); + label->label_ptr[0] = s->code_ptr; + + s->code_ptr += 4; +} + +static bool tcg_out_fail_alignment(TCGContext *s, TCGLabelQemuLdst *l) +{ + /* resolve label address */ + tcg_patch32(l->label_ptr[0], s->code_ptr - l->label_ptr[0] - 4); + + if (TCG_TARGET_REG_BITS == 32) { + int ofs = 0; + + tcg_out_st(s, TCG_TYPE_PTR, TCG_AREG0, TCG_REG_ESP, ofs); + ofs += 4; + + tcg_out_st(s, TCG_TYPE_I32, l->addrlo_reg, TCG_REG_ESP, ofs); + ofs += 4; + if (TARGET_LONG_BITS == 64) { + tcg_out_st(s, TCG_TYPE_I32, l->addrhi_reg, TCG_REG_ESP, ofs); + ofs += 4; + } + + tcg_out_pushi(s, (uintptr_t)l->raddr); + } else { + tcg_out_mov(s, TCG_TYPE_TL, tcg_target_call_iarg_regs[1], + l->addrlo_reg); + tcg_out_mov(s, TCG_TYPE_PTR, tcg_target_call_iarg_regs[0], TCG_AREG0); + + tcg_out_movi(s, TCG_TYPE_PTR, TCG_REG_RAX, (uintptr_t)l->raddr); + tcg_out_push(s, TCG_REG_RAX); + } + + /* "Tail call" to the helper, with the return address back inline. */ + tcg_out_jmp(s, (const void *)(l->is_ld ? helper_unaligned_ld + : helper_unaligned_st)); + return true; +} + +static bool tcg_out_qemu_ld_slow_path(TCGContext *s, TCGLabelQemuLdst *l) +{ + return tcg_out_fail_alignment(s, l); +} + +static bool tcg_out_qemu_st_slow_path(TCGContext *s, TCGLabelQemuLdst *l) +{ + return tcg_out_fail_alignment(s, l); +} + +#if TCG_TARGET_REG_BITS == 32 # define x86_guest_base_seg 0 # define x86_guest_base_index -1 # define x86_guest_base_offset guest_base @@ -1950,6 +2028,7 @@ static inline int setup_guest_base_seg(void) return 0; } # endif +#endif #endif /* SOFTMMU */ static void tcg_out_qemu_ld_direct(TCGContext *s, TCGReg datalo, TCGReg datahi, @@ -2059,6 +2138,8 @@ static void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args, bool is64) #if defined(CONFIG_SOFTMMU) int mem_index; tcg_insn_unit *label_ptr[2]; +#else + unsigned a_bits; #endif datalo = *args++; @@ -2081,6 +2162,11 @@ static void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args, bool is64) add_qemu_ldst_label(s, true, is64, oi, datalo, datahi, addrlo, addrhi, s->code_ptr, label_ptr); #else + a_bits = get_alignment_bits(opc); + if (a_bits) { + tcg_out_test_alignment(s, true, addrlo, addrhi, a_bits); + } + tcg_out_qemu_ld_direct(s, datalo, datahi, addrlo, x86_guest_base_index, x86_guest_base_offset, x86_guest_base_seg, is64, opc); @@ -2148,6 +2234,8 @@ static void tcg_out_qemu_st(TCGContext *s, const TCGArg *args, bool is64) #if defined(CONFIG_SOFTMMU) int mem_index; tcg_insn_unit *label_ptr[2]; +#else + unsigned a_bits; #endif datalo = *args++; @@ -2170,6 +2258,11 @@ static void tcg_out_qemu_st(TCGContext *s, const TCGArg *args, bool is64) add_qemu_ldst_label(s, false, is64, oi, datalo, datahi, addrlo, addrhi, s->code_ptr, label_ptr); #else + a_bits = get_alignment_bits(opc); + if (a_bits) { + tcg_out_test_alignment(s, false, addrlo, addrhi, a_bits); + } + tcg_out_qemu_st_direct(s, datalo, datahi, addrlo, x86_guest_base_index, x86_guest_base_offset, x86_guest_base_seg, opc); #endif From patchwork Tue Jan 4 02:15:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 529858 Delivered-To: patch@linaro.org Received: by 2002:ac0:9f5c:0:0:0:0:0 with SMTP id l28csp1293407imf; Mon, 3 Jan 2022 18:17:21 -0800 (PST) X-Google-Smtp-Source: ABdhPJzPr9FSWgcPMsbtIlrgUxHckIoCc4P/JmR7/8OX+4O3SsmXnE6QwBCEB+bm+jhbWc2ADiCA X-Received: by 2002:a25:7444:: with SMTP id p65mr43752716ybc.254.1641262641576; Mon, 03 Jan 2022 18:17:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641262641; cv=none; d=google.com; s=arc-20160816; b=d7BtgWwITJvlXy9x3L5aF9y/HQdxKKKm2vpCt2bexKfgSqkcT0Cf/FwjrkrcGycFLm jClFEWW2jbxuiwqpMq9Wqz2ksJRSVfwuj+3g4whRtTjwj0ZSBILq4/2dGhjHFasViaIW sA6X+uNwkG+dlTv/X55RX2zlE/++7KNTlRihniZMHxveqw1SXYIjmoIa5GYSQYqZH61V zFDE6HDCn23zAsXzciyB7VeZu8lSMOgGqPeumSg1sNoCR68dU+EIPF6KzL1XmESC2tyw 0BkmgOmFfjV17W2q23IIn63TL+ZT/7z1d91G7WcUQ5Vcxko/zGC3fEgk4i1yBWA3idjN joEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=AEDrLdND+QdiSTD7gFvQs8s8wQuCqaZx5PiFrbiHmIQ=; b=gkd2pRTdrNpo5UeNVj05uGtA3pbagHN7tmpbqvZFs6fuH0lIdGH48RDdQiHsy9r0Zl JyLxjbD3zmpKgaaS+ndpR5ywySr4Sj4P5Hnsc3SXcR77QQdkVih4DqeGqZYWN+RFmDL7 GEH52Mi5GCq1a/1fRZjiIOi5PNMpzAmd/w6uTqDsKp+zcYUL6VTnulFlez3hOdr6Dniq HktML3spzhwbUeHTglXZHzZe+3wWEi5rgDlaY/TKsrneJT2QuEMv5CmBxB4bVDDx9K0E i1a/wCY6D6KUuCy1OvAW3BfJxqZSELAOyDVaQn/pJrtJ8Dojh93tlz8NYPNBt+v6mP/E kcog== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jkaXVIem; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id y192si10082197ybe.352.2022.01.03.18.17.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 03 Jan 2022 18:17:21 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jkaXVIem; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:45412 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n4ZO5-0002id-3g for patch@linaro.org; Mon, 03 Jan 2022 21:17:21 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51062) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n4ZMa-0002gU-W3 for qemu-devel@nongnu.org; Mon, 03 Jan 2022 21:15:49 -0500 Received: from [2607:f8b0:4864:20::102c] (port=42679 helo=mail-pj1-x102c.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n4ZMY-00089q-TI for qemu-devel@nongnu.org; Mon, 03 Jan 2022 21:15:48 -0500 Received: by mail-pj1-x102c.google.com with SMTP id lr15-20020a17090b4b8f00b001b19671cbebso1549383pjb.1 for ; Mon, 03 Jan 2022 18:15:46 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=AEDrLdND+QdiSTD7gFvQs8s8wQuCqaZx5PiFrbiHmIQ=; b=jkaXVIemgua2U4FcaQTU71wOy47KplMqSsG/mkLymQCH83gQGxnef2e4FIMRzMioQn 249gvniOGC2HoZYC5vRNW/UlzBcBMHDNEZxWHguEwn2tlel74sQ+80AY6Obyvk7SU9+r nhsuPPIdQ9IO/Fdh5xrBeSrfoUYL05kEE1uF7Y7y7nJCSZhNwxi7oXsKQ20I7ffFB8N4 vWkzNmoQ4CV3mOfjPet7+MNpue0BZN/4tzgOzuaa/C+ioZnSQc1xkQKGk4o0U1kqWEnj lJsOPMkAccwuXdRF1sr9DQP/oWqyoaI4DfJtyfKogRQuHefCe10lAckiz7FJc6Xrffhr OiCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AEDrLdND+QdiSTD7gFvQs8s8wQuCqaZx5PiFrbiHmIQ=; b=Grcc6CdRRzENNYPFK17kqKE01R4HVzjakhQUpP02Fk0yUhYuJPtI1s1hPiPeubhY4S Bv7k+1lscP+VLS8KGo55XKTHB+u+PNC590842mqCH9Ga3nIyhD0DIKWChb4pBjUbPMkC xpzDs1HQ8SIuxY05J7EG6Zhp4hAF+F7OnH96g6w3IL0OGb4yZ9nLFuNV/2kc5MW0UEKI RMBgmFd0B2NRqTkWXNYXfgQAzcdEhjNA2vtymhL1QTvYvpf+bv4onUTRE7Ya9UCptnZw Mb10SDZj9leWQzCYkiGYeG3cdPI1Nojb/I6oKbAwJ3EZ0A9F1He51YCQRfriAqksKYNb peBQ== X-Gm-Message-State: AOAM531XY98m4szwiuYzrg4EMdUJpnG56mDfWC5pJvvXnBn4AfkV6gwD L3uQSFCk46bVo/Nw1obugyT0TbTK30RQ7Q== X-Received: by 2002:a17:90b:350b:: with SMTP id ls11mr57395308pjb.134.1641262545520; Mon, 03 Jan 2022 18:15:45 -0800 (PST) Received: from localhost.localdomain (174-21-75-75.tukw.qwest.net. [174.21.75.75]) by smtp.gmail.com with ESMTPSA id b4sm37395501pjm.17.2022.01.03.18.15.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jan 2022 18:15:45 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v4 2/7] tcg/aarch64: Support raising sigbus for user-only Date: Mon, 3 Jan 2022 18:15:38 -0800 Message-Id: <20220104021543.396571-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220104021543.396571-1-richard.henderson@linaro.org> References: <20220104021543.396571-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::102c (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::102c; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102c.google.com X-Spam_score_int: 6 X-Spam_score: 0.6 X-Spam_bar: / X-Spam_report: (0.6 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: git@xen0n.name, peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- tcg/aarch64/tcg-target.h | 2 - tcg/aarch64/tcg-target.c.inc | 91 +++++++++++++++++++++++++++++------- 2 files changed, 74 insertions(+), 19 deletions(-) diff --git a/tcg/aarch64/tcg-target.h b/tcg/aarch64/tcg-target.h index 7a93ac8023..876af589ce 100644 --- a/tcg/aarch64/tcg-target.h +++ b/tcg/aarch64/tcg-target.h @@ -151,9 +151,7 @@ typedef enum { void tb_target_set_jmp_target(uintptr_t, uintptr_t, uintptr_t, uintptr_t); -#ifdef CONFIG_SOFTMMU #define TCG_TARGET_NEED_LDST_LABELS -#endif #define TCG_TARGET_NEED_POOL_LABELS #endif /* AARCH64_TCG_TARGET_H */ diff --git a/tcg/aarch64/tcg-target.c.inc b/tcg/aarch64/tcg-target.c.inc index 5edca8d44d..1f205f90b2 100644 --- a/tcg/aarch64/tcg-target.c.inc +++ b/tcg/aarch64/tcg-target.c.inc @@ -10,6 +10,7 @@ * See the COPYING file in the top-level directory for details. */ +#include "../tcg-ldst.c.inc" #include "../tcg-pool.c.inc" #include "qemu/bitops.h" @@ -443,6 +444,7 @@ typedef enum { I3404_ANDI = 0x12000000, I3404_ORRI = 0x32000000, I3404_EORI = 0x52000000, + I3404_ANDSI = 0x72000000, /* Move wide immediate instructions. */ I3405_MOVN = 0x12800000, @@ -1328,8 +1330,9 @@ static void tcg_out_goto_long(TCGContext *s, const tcg_insn_unit *target) if (offset == sextract64(offset, 0, 26)) { tcg_out_insn(s, 3206, B, offset); } else { - tcg_out_movi(s, TCG_TYPE_I64, TCG_REG_TMP, (intptr_t)target); - tcg_out_insn(s, 3207, BR, TCG_REG_TMP); + /* Choose X9 as a call-clobbered non-LR temporary. */ + tcg_out_movi(s, TCG_TYPE_I64, TCG_REG_X9, (intptr_t)target); + tcg_out_insn(s, 3207, BR, TCG_REG_X9); } } @@ -1541,9 +1544,14 @@ static void tcg_out_cltz(TCGContext *s, TCGType ext, TCGReg d, } } -#ifdef CONFIG_SOFTMMU -#include "../tcg-ldst.c.inc" +static void tcg_out_adr(TCGContext *s, TCGReg rd, const void *target) +{ + ptrdiff_t offset = tcg_pcrel_diff(s, target); + tcg_debug_assert(offset == sextract64(offset, 0, 21)); + tcg_out_insn(s, 3406, ADR, rd, offset); +} +#ifdef CONFIG_SOFTMMU /* helper signature: helper_ret_ld_mmu(CPUState *env, target_ulong addr, * MemOpIdx oi, uintptr_t ra) */ @@ -1577,13 +1585,6 @@ static void * const qemu_st_helpers[MO_SIZE + 1] = { #endif }; -static inline void tcg_out_adr(TCGContext *s, TCGReg rd, const void *target) -{ - ptrdiff_t offset = tcg_pcrel_diff(s, target); - tcg_debug_assert(offset == sextract64(offset, 0, 21)); - tcg_out_insn(s, 3406, ADR, rd, offset); -} - static bool tcg_out_qemu_ld_slow_path(TCGContext *s, TCGLabelQemuLdst *lb) { MemOpIdx oi = lb->oi; @@ -1714,15 +1715,58 @@ static void tcg_out_tlb_read(TCGContext *s, TCGReg addr_reg, MemOp opc, tcg_out_insn(s, 3202, B_C, TCG_COND_NE, 0); } +#else +static void tcg_out_test_alignment(TCGContext *s, bool is_ld, TCGReg addr_reg, + unsigned a_bits) +{ + unsigned a_mask = (1 << a_bits) - 1; + TCGLabelQemuLdst *label = new_ldst_label(s); + + label->is_ld = is_ld; + label->addrlo_reg = addr_reg; + + /* tst addr, #mask */ + tcg_out_logicali(s, I3404_ANDSI, 0, TCG_REG_XZR, addr_reg, a_mask); + + label->label_ptr[0] = s->code_ptr; + + /* b.ne slow_path */ + tcg_out_insn(s, 3202, B_C, TCG_COND_NE, 0); + + label->raddr = tcg_splitwx_to_rx(s->code_ptr); +} + +static bool tcg_out_fail_alignment(TCGContext *s, TCGLabelQemuLdst *l) +{ + if (!reloc_pc19(l->label_ptr[0], tcg_splitwx_to_rx(s->code_ptr))) { + return false; + } + + tcg_out_mov(s, TCG_TYPE_TL, TCG_REG_X1, l->addrlo_reg); + tcg_out_mov(s, TCG_TYPE_PTR, TCG_REG_X0, TCG_AREG0); + + /* "Tail call" to the helper, with the return address back inline. */ + tcg_out_adr(s, TCG_REG_LR, l->raddr); + tcg_out_goto_long(s, (const void *)(l->is_ld ? helper_unaligned_ld + : helper_unaligned_st)); + return true; +} + +static bool tcg_out_qemu_ld_slow_path(TCGContext *s, TCGLabelQemuLdst *l) +{ + return tcg_out_fail_alignment(s, l); +} + +static bool tcg_out_qemu_st_slow_path(TCGContext *s, TCGLabelQemuLdst *l) +{ + return tcg_out_fail_alignment(s, l); +} #endif /* CONFIG_SOFTMMU */ static void tcg_out_qemu_ld_direct(TCGContext *s, MemOp memop, TCGType ext, TCGReg data_r, TCGReg addr_r, TCGType otype, TCGReg off_r) { - /* Byte swapping is left to middle-end expansion. */ - tcg_debug_assert((memop & MO_BSWAP) == 0); - switch (memop & MO_SSIZE) { case MO_UB: tcg_out_ldst_r(s, I3312_LDRB, data_r, addr_r, otype, off_r); @@ -1756,9 +1800,6 @@ static void tcg_out_qemu_st_direct(TCGContext *s, MemOp memop, TCGReg data_r, TCGReg addr_r, TCGType otype, TCGReg off_r) { - /* Byte swapping is left to middle-end expansion. */ - tcg_debug_assert((memop & MO_BSWAP) == 0); - switch (memop & MO_SIZE) { case MO_8: tcg_out_ldst_r(s, I3312_STRB, data_r, addr_r, otype, off_r); @@ -1782,6 +1823,10 @@ static void tcg_out_qemu_ld(TCGContext *s, TCGReg data_reg, TCGReg addr_reg, { MemOp memop = get_memop(oi); const TCGType otype = TARGET_LONG_BITS == 64 ? TCG_TYPE_I64 : TCG_TYPE_I32; + + /* Byte swapping is left to middle-end expansion. */ + tcg_debug_assert((memop & MO_BSWAP) == 0); + #ifdef CONFIG_SOFTMMU unsigned mem_index = get_mmuidx(oi); tcg_insn_unit *label_ptr; @@ -1792,6 +1837,10 @@ static void tcg_out_qemu_ld(TCGContext *s, TCGReg data_reg, TCGReg addr_reg, add_qemu_ldst_label(s, true, oi, ext, data_reg, addr_reg, s->code_ptr, label_ptr); #else /* !CONFIG_SOFTMMU */ + unsigned a_bits = get_alignment_bits(memop); + if (a_bits) { + tcg_out_test_alignment(s, true, addr_reg, a_bits); + } if (USE_GUEST_BASE) { tcg_out_qemu_ld_direct(s, memop, ext, data_reg, TCG_REG_GUEST_BASE, otype, addr_reg); @@ -1807,6 +1856,10 @@ static void tcg_out_qemu_st(TCGContext *s, TCGReg data_reg, TCGReg addr_reg, { MemOp memop = get_memop(oi); const TCGType otype = TARGET_LONG_BITS == 64 ? TCG_TYPE_I64 : TCG_TYPE_I32; + + /* Byte swapping is left to middle-end expansion. */ + tcg_debug_assert((memop & MO_BSWAP) == 0); + #ifdef CONFIG_SOFTMMU unsigned mem_index = get_mmuidx(oi); tcg_insn_unit *label_ptr; @@ -1817,6 +1870,10 @@ static void tcg_out_qemu_st(TCGContext *s, TCGReg data_reg, TCGReg addr_reg, add_qemu_ldst_label(s, false, oi, (memop & MO_SIZE)== MO_64, data_reg, addr_reg, s->code_ptr, label_ptr); #else /* !CONFIG_SOFTMMU */ + unsigned a_bits = get_alignment_bits(memop); + if (a_bits) { + tcg_out_test_alignment(s, false, addr_reg, a_bits); + } if (USE_GUEST_BASE) { tcg_out_qemu_st_direct(s, memop, data_reg, TCG_REG_GUEST_BASE, otype, addr_reg); From patchwork Tue Jan 4 02:15:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 529859 Delivered-To: patch@linaro.org Received: by 2002:ac0:9f5c:0:0:0:0:0 with SMTP id l28csp1293942imf; Mon, 3 Jan 2022 18:18:46 -0800 (PST) X-Google-Smtp-Source: ABdhPJwTcmOiYEBuWwTvEPe/hZXYiyJKqtOwZPMyjrl8vKySBPODyCUlF8FY691hravD8KZQrefJ X-Received: by 2002:a25:2687:: with SMTP id m129mr38355881ybm.155.1641262726657; Mon, 03 Jan 2022 18:18:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641262726; cv=none; d=google.com; s=arc-20160816; b=ojG2SnBsD2j1WWImMTMccgA/+UwU1+luZPcMnceVJllyPsUCwY0VoWvsEqnDCl1l0r 9XbXNFOaGL6PEn1yMnCXCvnHauFjudHeb/k5K0Ds+WoBK93TJVyfA3ZATAWet+iaJEUi 17rnYldSSNa2vhq7YzORFCpThrTi5izwswF0e/0ICjzNyjdpTUGgiZxLtAjxdF96SSuW QATmNyJ2mK2udCLk8b+eXqWIgouHLAyI2KSelhoIwuSrY/B2dbJ7L34HkWWhkewYOeKZ XfbOI8GeoKB7lfdPMrgBU/vojU5heeQ0dIsfKtT1EeBXLQIZmo8oX81sBIld+leaykNU 6BiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=z9ajubKXxmD3iBvNRXK8ngdOfUUHM9YOJvnd1B/bzEU=; b=o43/+XaCMjpAc2ZRiyDwP76ugZq8WJe1JjFsjWrP8zjhsDwRhaTM5tPr8/tnVbErfG s8wObrkUSY3H2kvMcdbWdm4liURloY3C6MLpkWnhKsTgUZcfkA68OKR1YDXRJolfPahK 3JlT7Sk3j15wAZebzS4Iw6SBgn5mIH3ReW/h+zMg+YmSB/gZfxxBdcnSFvzhxdSS9Cum R0WotL/QIRWl14Y1b7ZzYtTJ+XMTvBAGKNPbw7u0VHzW98lnGXl7grufHUhG+OpvR2jd lEmXO5EDUUCDh+Ggb8zdhK/daAsShO7XJKsC/nC7c1c7TgRqKMjJ779GHM0dLqbRO6hZ bJVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=T3IbVifR; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id z15si13842064ybs.129.2022.01.03.18.18.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 03 Jan 2022 18:18:46 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=T3IbVifR; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:51158 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n4ZPS-0006Yf-5U for patch@linaro.org; Mon, 03 Jan 2022 21:18:46 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51070) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n4ZMb-0002hA-93 for qemu-devel@nongnu.org; Mon, 03 Jan 2022 21:15:49 -0500 Received: from [2607:f8b0:4864:20::535] (port=37733 helo=mail-pg1-x535.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n4ZMZ-00089u-FA for qemu-devel@nongnu.org; Mon, 03 Jan 2022 21:15:48 -0500 Received: by mail-pg1-x535.google.com with SMTP id x194so8224532pgx.4 for ; Mon, 03 Jan 2022 18:15:47 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=z9ajubKXxmD3iBvNRXK8ngdOfUUHM9YOJvnd1B/bzEU=; b=T3IbVifRixhABYpIPfroB06y6d95fuWbeX6kFejyyUxZUCrJ49DXyUunLaAyT/alr/ VBNgQM5vyZuSZYqwBF0xNBL2TcO/JOzBWROFwmjpIjH2+m3jkfvpS/WUlm61KOua0UxB Or6ILQVYlqi2JhrQ9jnLr69FH00rnVCXa/nsOHMJUbJK4jlmyUKL3wWNZe/h7M/UE6Lx tYiX/q47ZrHC3r7739J7dOQb1yHg1cfw+Us6z6B85xVtVkv6zWKfUD26c0nOvVSvynZ+ EA0YZ4fFyaSBgfajpO1AEwWLC+81NiPmjMcm2gxYKvLyn39GFIe2FSKp4Vnu1hzQTse7 moYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=z9ajubKXxmD3iBvNRXK8ngdOfUUHM9YOJvnd1B/bzEU=; b=qq9kx0ItAm8BApmoTqMo+ensK5eNqFLCgTrk5LY/XTxt2jnD2SxGnxBAz3vD8m7X3/ Fp7GjYeIgOsMGoGnoTeCOZG9QdnH7f9I44aZrK+rTXp172Lqu/KKQQ8hmsf3cCrjHin2 ir39JIAOEko5uiykLIxIIodZn7g2WD5d6qScRFT2e4SJZHybt6vmK43829+/3gS5XlqT LNOMnHF8qk2GBbMMsxp3Vs/jS+notzuqyJXjBp4bFIZ8Pl1KOABxdsvpTaUqdfDdyOPz eVTk3nGbT0KUfVQXLjDIRwkjNG7zypKzCuYCSC21c6GsHxY23P3/JA0tRJ57EgsyXJCs ga/w== X-Gm-Message-State: AOAM532Vvsj6k8aAJm4MezyQxVc/cF4I9WybWh0xcrR/kzFbKKD4qGze t+jLhsyRPEJ5c+P8w8GICCE5tTxg7eQ+xg== X-Received: by 2002:a63:751b:: with SMTP id q27mr42547961pgc.184.1641262546092; Mon, 03 Jan 2022 18:15:46 -0800 (PST) Received: from localhost.localdomain (174-21-75-75.tukw.qwest.net. [174.21.75.75]) by smtp.gmail.com with ESMTPSA id b4sm37395501pjm.17.2022.01.03.18.15.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jan 2022 18:15:45 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v4 3/7] tcg/ppc: Support raising sigbus for user-only Date: Mon, 3 Jan 2022 18:15:39 -0800 Message-Id: <20220104021543.396571-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220104021543.396571-1-richard.henderson@linaro.org> References: <20220104021543.396571-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::535 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::535; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x535.google.com X-Spam_score_int: 6 X-Spam_score: 0.6 X-Spam_bar: / X-Spam_report: (0.6 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: git@xen0n.name, peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- tcg/ppc/tcg-target.h | 2 - tcg/ppc/tcg-target.c.inc | 98 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 90 insertions(+), 10 deletions(-) diff --git a/tcg/ppc/tcg-target.h b/tcg/ppc/tcg-target.h index 0943192cde..c775c97b61 100644 --- a/tcg/ppc/tcg-target.h +++ b/tcg/ppc/tcg-target.h @@ -182,9 +182,7 @@ void tb_target_set_jmp_target(uintptr_t, uintptr_t, uintptr_t, uintptr_t); #define TCG_TARGET_DEFAULT_MO (0) #define TCG_TARGET_HAS_MEMORY_BSWAP 1 -#ifdef CONFIG_SOFTMMU #define TCG_TARGET_NEED_LDST_LABELS -#endif #define TCG_TARGET_NEED_POOL_LABELS #endif diff --git a/tcg/ppc/tcg-target.c.inc b/tcg/ppc/tcg-target.c.inc index 3e4ca2be88..8a117e0665 100644 --- a/tcg/ppc/tcg-target.c.inc +++ b/tcg/ppc/tcg-target.c.inc @@ -24,6 +24,7 @@ #include "elf.h" #include "../tcg-pool.c.inc" +#include "../tcg-ldst.c.inc" /* * Standardize on the _CALL_FOO symbols used by GCC: @@ -1881,7 +1882,8 @@ void tb_target_set_jmp_target(uintptr_t tc_ptr, uintptr_t jmp_rx, } } -static void tcg_out_call(TCGContext *s, const tcg_insn_unit *target) +static void tcg_out_call_int(TCGContext *s, int lk, + const tcg_insn_unit *target) { #ifdef _CALL_AIX /* Look through the descriptor. If the branch is in range, and we @@ -1892,7 +1894,7 @@ static void tcg_out_call(TCGContext *s, const tcg_insn_unit *target) if (in_range_b(diff) && toc == (uint32_t)toc) { tcg_out_movi(s, TCG_TYPE_PTR, TCG_REG_TMP1, toc); - tcg_out_b(s, LK, tgt); + tcg_out_b(s, lk, tgt); } else { /* Fold the low bits of the constant into the addresses below. */ intptr_t arg = (intptr_t)target; @@ -1907,7 +1909,7 @@ static void tcg_out_call(TCGContext *s, const tcg_insn_unit *target) tcg_out_ld(s, TCG_TYPE_PTR, TCG_REG_R0, TCG_REG_TMP1, ofs); tcg_out32(s, MTSPR | RA(TCG_REG_R0) | CTR); tcg_out_ld(s, TCG_TYPE_PTR, TCG_REG_R2, TCG_REG_TMP1, ofs + SZP); - tcg_out32(s, BCCTR | BO_ALWAYS | LK); + tcg_out32(s, BCCTR | BO_ALWAYS | lk); } #elif defined(_CALL_ELF) && _CALL_ELF == 2 intptr_t diff; @@ -1921,16 +1923,21 @@ static void tcg_out_call(TCGContext *s, const tcg_insn_unit *target) diff = tcg_pcrel_diff(s, target); if (in_range_b(diff)) { - tcg_out_b(s, LK, target); + tcg_out_b(s, lk, target); } else { tcg_out32(s, MTSPR | RS(TCG_REG_R12) | CTR); - tcg_out32(s, BCCTR | BO_ALWAYS | LK); + tcg_out32(s, BCCTR | BO_ALWAYS | lk); } #else - tcg_out_b(s, LK, target); + tcg_out_b(s, lk, target); #endif } +static void tcg_out_call(TCGContext *s, const tcg_insn_unit *target) +{ + tcg_out_call_int(s, LK, target); +} + static const uint32_t qemu_ldx_opc[(MO_SSIZE + MO_BSWAP) + 1] = { [MO_UB] = LBZX, [MO_UW] = LHZX, @@ -1960,8 +1967,6 @@ static const uint32_t qemu_exts_opc[4] = { }; #if defined (CONFIG_SOFTMMU) -#include "../tcg-ldst.c.inc" - /* helper signature: helper_ld_mmu(CPUState *env, target_ulong addr, * int mmu_idx, uintptr_t ra) */ @@ -2227,6 +2232,71 @@ static bool tcg_out_qemu_st_slow_path(TCGContext *s, TCGLabelQemuLdst *lb) tcg_out_b(s, 0, lb->raddr); return true; } +#else + +static void tcg_out_test_alignment(TCGContext *s, bool is_ld, TCGReg addrlo, + TCGReg addrhi, unsigned a_bits) +{ + unsigned a_mask = (1 << a_bits) - 1; + TCGLabelQemuLdst *label = new_ldst_label(s); + + label->is_ld = is_ld; + label->addrlo_reg = addrlo; + label->addrhi_reg = addrhi; + + /* We are expecting a_bits to max out at 7, much lower than ANDI. */ + tcg_debug_assert(a_bits < 16); + tcg_out32(s, ANDI | SAI(addrlo, TCG_REG_R0, a_mask)); + + label->label_ptr[0] = s->code_ptr; + tcg_out32(s, BC | BI(0, CR_EQ) | BO_COND_FALSE | LK); + + label->raddr = tcg_splitwx_to_rx(s->code_ptr); +} + +static bool tcg_out_fail_alignment(TCGContext *s, TCGLabelQemuLdst *l) +{ + if (!reloc_pc14(l->label_ptr[0], tcg_splitwx_to_rx(s->code_ptr))) { + return false; + } + + if (TCG_TARGET_REG_BITS < TARGET_LONG_BITS) { + TCGReg arg = TCG_REG_R4; +#ifdef TCG_TARGET_CALL_ALIGN_ARGS + arg |= 1; +#endif + if (l->addrlo_reg != arg) { + tcg_out_mov(s, TCG_TYPE_I32, arg, l->addrhi_reg); + tcg_out_mov(s, TCG_TYPE_I32, arg + 1, l->addrlo_reg); + } else if (l->addrhi_reg != arg + 1) { + tcg_out_mov(s, TCG_TYPE_I32, arg + 1, l->addrlo_reg); + tcg_out_mov(s, TCG_TYPE_I32, arg, l->addrhi_reg); + } else { + tcg_out_mov(s, TCG_TYPE_I32, TCG_REG_R0, arg); + tcg_out_mov(s, TCG_TYPE_I32, arg, arg + 1); + tcg_out_mov(s, TCG_TYPE_I32, arg + 1, TCG_REG_R0); + } + } else { + tcg_out_mov(s, TCG_TYPE_TL, TCG_REG_R4, l->addrlo_reg); + } + tcg_out_mov(s, TCG_TYPE_TL, TCG_REG_R3, TCG_AREG0); + + /* "Tail call" to the helper, with the return address back inline. */ + tcg_out_call_int(s, 0, (const void *)(l->is_ld ? helper_unaligned_ld + : helper_unaligned_st)); + return true; +} + +static bool tcg_out_qemu_ld_slow_path(TCGContext *s, TCGLabelQemuLdst *l) +{ + return tcg_out_fail_alignment(s, l); +} + +static bool tcg_out_qemu_st_slow_path(TCGContext *s, TCGLabelQemuLdst *l) +{ + return tcg_out_fail_alignment(s, l); +} + #endif /* SOFTMMU */ static void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args, bool is_64) @@ -2238,6 +2308,8 @@ static void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args, bool is_64) #ifdef CONFIG_SOFTMMU int mem_index; tcg_insn_unit *label_ptr; +#else + unsigned a_bits; #endif datalo = *args++; @@ -2258,6 +2330,10 @@ static void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args, bool is_64) rbase = TCG_REG_R3; #else /* !CONFIG_SOFTMMU */ + a_bits = get_alignment_bits(opc); + if (a_bits) { + tcg_out_test_alignment(s, true, addrlo, addrhi, a_bits); + } rbase = guest_base ? TCG_GUEST_BASE_REG : 0; if (TCG_TARGET_REG_BITS > TARGET_LONG_BITS) { tcg_out_ext32u(s, TCG_REG_TMP1, addrlo); @@ -2313,6 +2389,8 @@ static void tcg_out_qemu_st(TCGContext *s, const TCGArg *args, bool is_64) #ifdef CONFIG_SOFTMMU int mem_index; tcg_insn_unit *label_ptr; +#else + unsigned a_bits; #endif datalo = *args++; @@ -2333,6 +2411,10 @@ static void tcg_out_qemu_st(TCGContext *s, const TCGArg *args, bool is_64) rbase = TCG_REG_R3; #else /* !CONFIG_SOFTMMU */ + a_bits = get_alignment_bits(opc); + if (a_bits) { + tcg_out_test_alignment(s, false, addrlo, addrhi, a_bits); + } rbase = guest_base ? TCG_GUEST_BASE_REG : 0; if (TCG_TARGET_REG_BITS > TARGET_LONG_BITS) { tcg_out_ext32u(s, TCG_REG_TMP1, addrlo); From patchwork Tue Jan 4 02:15:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 529861 Delivered-To: patch@linaro.org Received: by 2002:ac0:9f5c:0:0:0:0:0 with SMTP id l28csp1294662imf; Mon, 3 Jan 2022 18:20:40 -0800 (PST) X-Google-Smtp-Source: ABdhPJxnvZc7xSTAeuqTnnAnPtiU6PUUer78ccr3TrzcckgmH7aCEsZKcQH//u8vYpXuV5VdIQJa X-Received: by 2002:a05:6902:1243:: with SMTP id t3mr20728302ybu.49.1641262840411; Mon, 03 Jan 2022 18:20:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641262840; cv=none; d=google.com; s=arc-20160816; b=Xfg5B7uKBOo04xOh3Q0gH4NES5fPrhlCJAW7ouIk21I/OTez/jZtZKpa1WjnKB884k 65bfWKftWyGaIwkRhwQbqnlw9aK5vGWp8gUfKNdS8Ak86TLyZlZP7bjkJDzjHy2t+yS3 ulSt66dAWrwV14oICMU6Rh/aT+dcjae5eWe9dxEFsS4RIzNtpfrdz0OGmJ0jjNcTnjvG z9vUnuIDZkNmBCYftFwsJRN6tMmbqGUFx0NPQ8fnDNxcPOyvthTZs/ig0ivaFp5c9uFb aNCVAhi5g5PM8jgilnkk1nlDMXisMGPuTBk9/worOzNl7gIixEVrcN5Zi15XCEhhFewY yASQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=DLEdjZy+09uGaMjE1uPY2LFNBR2LKIkdI9ZG+WGq/kQ=; b=r/jgI3WTqWlCdKRRKsfjKdn91QYHhAnkx37mjEYrkdIc1FpYmqsZDE8Lv49KiJY62t J5rLM5YYnSU2XL+ubSguuUwkV2gamwrDUACVoLjRz9JGJQNjcYKHxm8MtTIuqPKZ2856 JZn/2tDNceXxndzuW9+cOvnhvlCfzlQGS7kMXGLHiT4698Xcy2lIeY/i6HK9AIk4ThL+ 1Grp68oIcNswMDlxV+ayhZ6ELzk6Li5299Fu/2Zk2KMXVzoiIBzTq6cpXp9AJQDg+8Fg WvDPdDNyz1OzgUeluNL7o6uTjvW+e5tR+dr7ykdxsz0m3f2Llbjklq9+zlgM+0m5eMqY 2Hzg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fqNBS+D1; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id o4si9824014ybu.664.2022.01.03.18.20.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 03 Jan 2022 18:20:40 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fqNBS+D1; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:55970 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n4ZRH-0001Kz-QJ for patch@linaro.org; Mon, 03 Jan 2022 21:20:39 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51114) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n4ZMd-0002mC-C6 for qemu-devel@nongnu.org; Mon, 03 Jan 2022 21:15:51 -0500 Received: from [2607:f8b0:4864:20::636] (port=38420 helo=mail-pl1-x636.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n4ZMZ-0008A1-SG for qemu-devel@nongnu.org; Mon, 03 Jan 2022 21:15:51 -0500 Received: by mail-pl1-x636.google.com with SMTP id c3so12824298pls.5 for ; Mon, 03 Jan 2022 18:15:47 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=DLEdjZy+09uGaMjE1uPY2LFNBR2LKIkdI9ZG+WGq/kQ=; b=fqNBS+D1vSeU6Iv/jcLxuHg7WL3440Z1Qi/Y3aLPrOVSM92iFcKJzX7/8Qgf9shVVd S1WEsfKsSDW56GpcDJ9gd8nISOaEWZ2M1BFiIYADg+3G36b+BpTRpjDumhi+ljFEy98K zEPHj7P5qlzVK9CY0mL4/EniNnviJ8XgYROYQdRVaL0dSOOnEBeRGMhcboKB+lP8TDJu OULZvibdVsOWDIo9vcUFPtPmmIW4fu2qbXTeKHLzYc11slZSCF5repEUpkxEpd45a2Zw Kgc6GpBATrc/kx+kp7S8FgX52rbYNLJBuP5nMED7t5owZT/kXSJjO27mVEpjY9mualmh GEwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DLEdjZy+09uGaMjE1uPY2LFNBR2LKIkdI9ZG+WGq/kQ=; b=zS/tvAXmgPgo/RfMajVjnk03TIx0atAPVzdPbZ2mk3h0W5AawznvrZ2FimIBbZGnas RPWQqRbNw3NFqsXwd+fNIhpDZkkvivR50bznQAjycu7E4q4QYY0sKoH1O/T4xOg7HMr2 Srv7zsSrihzi4vfsVz/jsXfjIpF5QzCg3KNKT+pOA24bfIR7XVR7okKGvWz1E2qGMLF4 vcG/wJrRpCXbNhV5A784uE+FH87l3cxaTanMU3hdoLE4puHxiV7VcI/H27MD0G+UFPdG welFSLFLBtia6hUDMUDpjm5ciOE6ts5m3grsPI6M2rl2QPaqYs+4mCANrVJI7b8hK5Vu oU4g== X-Gm-Message-State: AOAM531yp7siKt2WSaMrRT8TZijf4IQ7KfT7yOJDAzOwluRcOTeDedJC 4eMCglPbReQWVApGGt0mgXGt04nhMYm2hQ== X-Received: by 2002:a17:902:b58d:b0:149:9c02:6345 with SMTP id a13-20020a170902b58d00b001499c026345mr24670291pls.21.1641262546693; Mon, 03 Jan 2022 18:15:46 -0800 (PST) Received: from localhost.localdomain (174-21-75-75.tukw.qwest.net. [174.21.75.75]) by smtp.gmail.com with ESMTPSA id b4sm37395501pjm.17.2022.01.03.18.15.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jan 2022 18:15:46 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v4 4/7] tcg/riscv: Support raising sigbus for user-only Date: Mon, 3 Jan 2022 18:15:40 -0800 Message-Id: <20220104021543.396571-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220104021543.396571-1-richard.henderson@linaro.org> References: <20220104021543.396571-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::636 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::636; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x636.google.com X-Spam_score_int: 6 X-Spam_score: 0.6 X-Spam_bar: / X-Spam_report: (0.6 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: git@xen0n.name, peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Richard Henderson --- tcg/riscv/tcg-target.h | 2 -- tcg/riscv/tcg-target.c.inc | 63 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 61 insertions(+), 4 deletions(-) diff --git a/tcg/riscv/tcg-target.h b/tcg/riscv/tcg-target.h index ef78b99e98..11c9b3e4f4 100644 --- a/tcg/riscv/tcg-target.h +++ b/tcg/riscv/tcg-target.h @@ -165,9 +165,7 @@ void tb_target_set_jmp_target(uintptr_t, uintptr_t, uintptr_t, uintptr_t); #define TCG_TARGET_DEFAULT_MO (0) -#ifdef CONFIG_SOFTMMU #define TCG_TARGET_NEED_LDST_LABELS -#endif #define TCG_TARGET_NEED_POOL_LABELS #define TCG_TARGET_HAS_MEMORY_BSWAP 0 diff --git a/tcg/riscv/tcg-target.c.inc b/tcg/riscv/tcg-target.c.inc index 9b13a46fb4..49e84cbe13 100644 --- a/tcg/riscv/tcg-target.c.inc +++ b/tcg/riscv/tcg-target.c.inc @@ -27,6 +27,7 @@ * THE SOFTWARE. */ +#include "../tcg-ldst.c.inc" #include "../tcg-pool.c.inc" #ifdef CONFIG_DEBUG_TCG @@ -847,8 +848,6 @@ static void tcg_out_mb(TCGContext *s, TCGArg a0) */ #if defined(CONFIG_SOFTMMU) -#include "../tcg-ldst.c.inc" - /* helper signature: helper_ret_ld_mmu(CPUState *env, target_ulong addr, * MemOpIdx oi, uintptr_t ra) */ @@ -1053,6 +1052,54 @@ static bool tcg_out_qemu_st_slow_path(TCGContext *s, TCGLabelQemuLdst *l) tcg_out_goto(s, l->raddr); return true; } +#else + +static void tcg_out_test_alignment(TCGContext *s, bool is_ld, TCGReg addr_reg, + unsigned a_bits) +{ + unsigned a_mask = (1 << a_bits) - 1; + TCGLabelQemuLdst *l = new_ldst_label(s); + + l->is_ld = is_ld; + l->addrlo_reg = addr_reg; + + /* We are expecting a_bits to max out at 7, so we can always use andi. */ + tcg_debug_assert(a_bits < 12); + tcg_out_opc_imm(s, OPC_ANDI, TCG_REG_TMP1, addr_reg, a_mask); + + l->label_ptr[0] = s->code_ptr; + tcg_out_opc_branch(s, OPC_BNE, TCG_REG_TMP1, TCG_REG_ZERO, 0); + + l->raddr = tcg_splitwx_to_rx(s->code_ptr); +} + +static bool tcg_out_fail_alignment(TCGContext *s, TCGLabelQemuLdst *l) +{ + /* resolve label address */ + if (!reloc_sbimm12(l->label_ptr[0], tcg_splitwx_to_rx(s->code_ptr))) { + return false; + } + + tcg_out_mov(s, TCG_TYPE_TL, TCG_REG_A1, l->addrlo_reg); + tcg_out_mov(s, TCG_TYPE_PTR, TCG_REG_A0, TCG_AREG0); + + /* tail call, with the return address back inline. */ + tcg_out_movi(s, TCG_TYPE_PTR, TCG_REG_RA, (uintptr_t)l->raddr); + tcg_out_call_int(s, (const void *)(l->is_ld ? helper_unaligned_ld + : helper_unaligned_st), true); + return true; +} + +static bool tcg_out_qemu_ld_slow_path(TCGContext *s, TCGLabelQemuLdst *l) +{ + return tcg_out_fail_alignment(s, l); +} + +static bool tcg_out_qemu_st_slow_path(TCGContext *s, TCGLabelQemuLdst *l) +{ + return tcg_out_fail_alignment(s, l); +} + #endif /* CONFIG_SOFTMMU */ static void tcg_out_qemu_ld_direct(TCGContext *s, TCGReg lo, TCGReg hi, @@ -1108,6 +1155,8 @@ static void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args, bool is_64) MemOp opc; #if defined(CONFIG_SOFTMMU) tcg_insn_unit *label_ptr[1]; +#else + unsigned a_bits; #endif TCGReg base = TCG_REG_TMP0; @@ -1130,6 +1179,10 @@ static void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args, bool is_64) tcg_out_ext32u(s, base, addr_regl); addr_regl = base; } + a_bits = get_alignment_bits(opc); + if (a_bits) { + tcg_out_test_alignment(s, true, addr_regl, a_bits); + } if (guest_base != 0) { tcg_out_opc_reg(s, OPC_ADD, base, TCG_GUEST_BASE_REG, addr_regl); } @@ -1174,6 +1227,8 @@ static void tcg_out_qemu_st(TCGContext *s, const TCGArg *args, bool is_64) MemOp opc; #if defined(CONFIG_SOFTMMU) tcg_insn_unit *label_ptr[1]; +#else + unsigned a_bits; #endif TCGReg base = TCG_REG_TMP0; @@ -1196,6 +1251,10 @@ static void tcg_out_qemu_st(TCGContext *s, const TCGArg *args, bool is_64) tcg_out_ext32u(s, base, addr_regl); addr_regl = base; } + a_bits = get_alignment_bits(opc); + if (a_bits) { + tcg_out_test_alignment(s, false, addr_regl, a_bits); + } if (guest_base != 0) { tcg_out_opc_reg(s, OPC_ADD, base, TCG_GUEST_BASE_REG, addr_regl); } From patchwork Tue Jan 4 02:15:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 529862 Delivered-To: patch@linaro.org Received: by 2002:ac0:9f5c:0:0:0:0:0 with SMTP id l28csp1294917imf; Mon, 3 Jan 2022 18:21:18 -0800 (PST) X-Google-Smtp-Source: ABdhPJzAV9pl8zun791bATZVq+Nc93cOPhs3gg1mYdS28geF+sDYGBe9pQ7VnHDx/3LVjpNTjPc6 X-Received: by 2002:a25:d889:: with SMTP id p131mr56885779ybg.475.1641262878034; Mon, 03 Jan 2022 18:21:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641262878; cv=none; d=google.com; s=arc-20160816; b=siuHX4Oid2BqD4Py9gZmNVr9OdfpXh9tWTaC03W9OOb3DnaiJAzzN8+I+fWpvKAj1g a9XpR/cy0B7Rojge94y+/sKtmYFVqiLNmZfHzevhPbSeXGEMXG9iFOgN+6l9jcTuRkrN 3qeDpVTETEM9ihamTufknpjmghH1+7qymYXX1TJAtczCraO2oH1AV16IQB/pysubBvV9 ybFsM5Hezig5000gKyZwKPKlC0ikj9VxROfSMcjiPlLyNnHRVcgftYc8YDBPyF9QZ/9J yR0D5ak01xVh00NkdHML0dQaWA6S4pQBySkZY+2ghO+ODlCZfXONcOersiGCnbcdJ8Yf Qumw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=drAXBZTymGcrnF+EgkjguW2KpUEgYFQR5BMyVS6Ccfg=; b=swMuBsh3QAzaYsiwtrf+7Y9IxiEdDfIKIL7Y5hhCWwZX2nGDsIremoU7UWS/q+wGnf un979vwkxbw3j/HYBPC8K2abMRqPWFZ5/ggrBR7GDyNNeXpvCF4Tu9Wa4+4lfvBoDf/x H3/xzc8kGnRicK+e+WM2+dpPebumHokUq4xlA2UsUg9vCCPgc4r+9NML7DXOwoj5ZZ0c ydRdaDNltiKN7P5tyVRaG0bbRqIFaCB4UpIAvxmnvytbfh0YOiWAx2YrixesGNyJx9np /Rza0Qp9u+t+jCgWrBAJLFfdcDSm2lByFhbY2JeTp0zBXsl5ziR9upIg0zJyxXgJmlZq ecpQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VkyyhpB6; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id s5si3756871ybg.495.2022.01.03.18.21.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 03 Jan 2022 18:21:18 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VkyyhpB6; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:57072 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n4ZRt-00023J-Hq for patch@linaro.org; Mon, 03 Jan 2022 21:21:17 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51098) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n4ZMc-0002jJ-8M for qemu-devel@nongnu.org; Mon, 03 Jan 2022 21:15:50 -0500 Received: from [2607:f8b0:4864:20::429] (port=34632 helo=mail-pf1-x429.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n4ZMa-0008AB-JD for qemu-devel@nongnu.org; Mon, 03 Jan 2022 21:15:49 -0500 Received: by mail-pf1-x429.google.com with SMTP id c2so30866887pfc.1 for ; Mon, 03 Jan 2022 18:15:48 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=drAXBZTymGcrnF+EgkjguW2KpUEgYFQR5BMyVS6Ccfg=; b=VkyyhpB6b6FX3yel49pBpR9J8Cp4MpE5AzMhYr0PYItcb1n3Bm4RWTDGnU77xhFNDO 3wunTRttgzjkRqTcSLPFPkFwCgSsUlnJBjtRjc+pSEi5z6REwzt3TheVts0E63UP2hGC Sr3VnuUEKn/QG+ZgBvIuEQ0g1FG4wTtczp+9CTGWvzFExpnzG/u3a3GKCGs0HbHZSuIu +d9d3WTSFNrZvPoZ3X7gdN81GSstVIiGHonfAV6Lr70N8+BjCm94Me/3kIvAHIxZcWVL +hzY1m4EBReTX+kbmkZOQNeAeVTApumbwT1d0KXRPFHlE1Q214gXOkcDSjPBbrwAdufH lx+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=drAXBZTymGcrnF+EgkjguW2KpUEgYFQR5BMyVS6Ccfg=; b=emDfvEVbxxLKL/BKccDyJ6zE9HTiWUA+jNyrCYbcNKapmpr34AVokCWs642r6QS0Yh d+9QDdgRXFnc404fg8o2c5yPGIEZtvl8LjeBeh9MCcTvLrjZ/qMrk14Js8l4qisEFqNg KfnRXU80BsELswKlB1jgGESpt9OMwKddt6vdUDL8favePksuw+XMhboKBud5DLix8xFx XFXmLAiwEsfRLNGrGyj2hIC4l6pQ22M38zITj9KkCy0A7yHPHZzV02nYqcgD3m3+vFOY zNmY/orak+BGE59f7TzxvYgr7YPZBQ5l+LRhozvWeviX0sSRGzl5YxUyGv8YgJTWijbO Ehbg== X-Gm-Message-State: AOAM533gm6YW6qMpgt3xblp7GhUCga2cbkzBLMDw4u57k/Poe9+Tj5yZ CwDc1yOD3mBThnk4G1Nwq+D5I/qdFwMlWg== X-Received: by 2002:a63:9819:: with SMTP id q25mr36395191pgd.605.1641262547309; Mon, 03 Jan 2022 18:15:47 -0800 (PST) Received: from localhost.localdomain (174-21-75-75.tukw.qwest.net. [174.21.75.75]) by smtp.gmail.com with ESMTPSA id b4sm37395501pjm.17.2022.01.03.18.15.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jan 2022 18:15:47 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v4 5/7] tcg/s390x: Support raising sigbus for user-only Date: Mon, 3 Jan 2022 18:15:41 -0800 Message-Id: <20220104021543.396571-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220104021543.396571-1-richard.henderson@linaro.org> References: <20220104021543.396571-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::429 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::429; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x429.google.com X-Spam_score_int: 6 X-Spam_score: 0.6 X-Spam_bar: / X-Spam_report: (0.6 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: git@xen0n.name, peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- tcg/s390x/tcg-target.h | 2 -- tcg/s390x/tcg-target.c.inc | 59 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 57 insertions(+), 4 deletions(-) diff --git a/tcg/s390x/tcg-target.h b/tcg/s390x/tcg-target.h index 527ada0f63..69217d995b 100644 --- a/tcg/s390x/tcg-target.h +++ b/tcg/s390x/tcg-target.h @@ -178,9 +178,7 @@ static inline void tb_target_set_jmp_target(uintptr_t tc_ptr, uintptr_t jmp_rx, /* no need to flush icache explicitly */ } -#ifdef CONFIG_SOFTMMU #define TCG_TARGET_NEED_LDST_LABELS -#endif #define TCG_TARGET_NEED_POOL_LABELS #endif diff --git a/tcg/s390x/tcg-target.c.inc b/tcg/s390x/tcg-target.c.inc index 57e803e339..d5ec770fb8 100644 --- a/tcg/s390x/tcg-target.c.inc +++ b/tcg/s390x/tcg-target.c.inc @@ -29,6 +29,7 @@ #error "unsupported code generation mode" #endif +#include "../tcg-ldst.c.inc" #include "../tcg-pool.c.inc" #include "elf.h" @@ -136,6 +137,7 @@ typedef enum S390Opcode { RI_OIHL = 0xa509, RI_OILH = 0xa50a, RI_OILL = 0xa50b, + RI_TMLL = 0xa701, RIE_CGIJ = 0xec7c, RIE_CGRJ = 0xec64, @@ -1804,8 +1806,6 @@ static void tcg_out_qemu_st_direct(TCGContext *s, MemOp opc, TCGReg data, } #if defined(CONFIG_SOFTMMU) -#include "../tcg-ldst.c.inc" - /* We're expecting to use a 20-bit negative offset on the tlb memory ops. */ QEMU_BUILD_BUG_ON(TLB_MASK_TABLE_OFS(0) > 0); QEMU_BUILD_BUG_ON(TLB_MASK_TABLE_OFS(0) < -(1 << 19)); @@ -1942,6 +1942,53 @@ static bool tcg_out_qemu_st_slow_path(TCGContext *s, TCGLabelQemuLdst *lb) return true; } #else +static void tcg_out_test_alignment(TCGContext *s, bool is_ld, + TCGReg addrlo, unsigned a_bits) +{ + unsigned a_mask = (1 << a_bits) - 1; + TCGLabelQemuLdst *l = new_ldst_label(s); + + l->is_ld = is_ld; + l->addrlo_reg = addrlo; + + /* We are expecting a_bits to max out at 7, much lower than TMLL. */ + tcg_debug_assert(a_bits < 16); + tcg_out_insn(s, RI, TMLL, addrlo, a_mask); + + tcg_out16(s, RI_BRC | (7 << 4)); /* CC in {1,2,3} */ + l->label_ptr[0] = s->code_ptr; + s->code_ptr += 1; + + l->raddr = tcg_splitwx_to_rx(s->code_ptr); +} + +static bool tcg_out_fail_alignment(TCGContext *s, TCGLabelQemuLdst *l) +{ + if (!patch_reloc(l->label_ptr[0], R_390_PC16DBL, + (intptr_t)tcg_splitwx_to_rx(s->code_ptr), 2)) { + return false; + } + + tcg_out_mov(s, TCG_TYPE_TL, TCG_REG_R3, l->addrlo_reg); + tcg_out_mov(s, TCG_TYPE_PTR, TCG_REG_R2, TCG_AREG0); + + /* "Tail call" to the helper, with the return address back inline. */ + tcg_out_movi(s, TCG_TYPE_PTR, TCG_REG_R14, (uintptr_t)l->raddr); + tgen_gotoi(s, S390_CC_ALWAYS, (const void *)(l->is_ld ? helper_unaligned_ld + : helper_unaligned_st)); + return true; +} + +static bool tcg_out_qemu_ld_slow_path(TCGContext *s, TCGLabelQemuLdst *l) +{ + return tcg_out_fail_alignment(s, l); +} + +static bool tcg_out_qemu_st_slow_path(TCGContext *s, TCGLabelQemuLdst *l) +{ + return tcg_out_fail_alignment(s, l); +} + static void tcg_prepare_user_ldst(TCGContext *s, TCGReg *addr_reg, TCGReg *index_reg, tcg_target_long *disp) { @@ -1980,7 +2027,11 @@ static void tcg_out_qemu_ld(TCGContext* s, TCGReg data_reg, TCGReg addr_reg, #else TCGReg index_reg; tcg_target_long disp; + unsigned a_bits = get_alignment_bits(opc); + if (a_bits) { + tcg_out_test_alignment(s, true, addr_reg, a_bits); + } tcg_prepare_user_ldst(s, &addr_reg, &index_reg, &disp); tcg_out_qemu_ld_direct(s, opc, data_reg, addr_reg, index_reg, disp); #endif @@ -2007,7 +2058,11 @@ static void tcg_out_qemu_st(TCGContext* s, TCGReg data_reg, TCGReg addr_reg, #else TCGReg index_reg; tcg_target_long disp; + unsigned a_bits = get_alignment_bits(opc); + if (a_bits) { + tcg_out_test_alignment(s, false, addr_reg, a_bits); + } tcg_prepare_user_ldst(s, &addr_reg, &index_reg, &disp); tcg_out_qemu_st_direct(s, opc, data_reg, addr_reg, index_reg, disp); #endif From patchwork Tue Jan 4 02:15:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 529864 Delivered-To: patch@linaro.org Received: by 2002:ac0:9f5c:0:0:0:0:0 with SMTP id l28csp1295662imf; Mon, 3 Jan 2022 18:23:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJzjnmUt2ozopYGYuZpcUoKGCm1cJ73Tree+JGSEHe8Y/czJHgJHx+4oWXl7dCGWGE1WhMnB X-Received: by 2002:a05:6902:571:: with SMTP id a17mr44763957ybt.36.1641263010436; Mon, 03 Jan 2022 18:23:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641263010; cv=none; d=google.com; s=arc-20160816; b=aegZ2rVSnDOujZxiuqQBLXNFUtzNNSatxO3WZoKckUlGbZ4fGEKBPf5eBblQT3/0OV Kp9In+Mz4imiRL3tXq1x8uzw90wad7lMb99G6l7JHQ9DRlBFO0BPf7vapu9+gWBwtD3H 8elV1Fu1x19feOIVZpCgFeQjFFk/DaENOYuZkDxOQ03IwtZz95VaFQ/akI3beG1DpR3X fK00rv8kCe0wYlvDhbeDTKYBjaMwswJmrZOGO76N1Wgjhw1SLyu7Kv/tOv7hlnyvhu5s 8pymTo56IKdQ8XDMnbioQoeMX/6khUWbldz0YpRej2KOCbYUoJF958x5kYW87l/vv0eP Jbag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=g06UIpFMVvSvANx+Qg+u743yK9fN9ISDaQhh0blxyhQ=; b=A3mxxdFw34Heyd0la3BW3WJLJ9eBogKYc46M8dhL6FbxWTOsfjbTXAiXb15Fc7JLsw AypcPDA/kOO7kr1HYwCyXumZhLiPJXHvqJ9hrnKGDpU0s+9Nv9v0R2I+08sN7QX5oUP7 hFIyyEAB/vJ8/3JXEyoQEpEuyfKJmQ73iGViJBMAwa2kwd+S96yMdRVpY26oUi6xTUTm mUx/sCDCd4VX++2INM8f73KMdlaQRLSThPyy9t8E2P8zhc6EryWOxtStei5Ndx2U7jqq 8PWS2uiN2FFeQ6p4/qT55sknO4/DdrSHmZUvmaZnc7+Lrqyt1vb5Mt2M3vjtDlW0t177 AMwg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RayTa0yc; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id j21si16348542ybj.475.2022.01.03.18.23.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 03 Jan 2022 18:23:30 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RayTa0yc; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33116 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n4ZU1-0004z1-Vk for patch@linaro.org; Mon, 03 Jan 2022 21:23:30 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51108) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n4ZMc-0002ke-NQ for qemu-devel@nongnu.org; Mon, 03 Jan 2022 21:15:50 -0500 Received: from [2607:f8b0:4864:20::102c] (port=55914 helo=mail-pj1-x102c.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n4ZMb-0008AI-6V for qemu-devel@nongnu.org; Mon, 03 Jan 2022 21:15:50 -0500 Received: by mail-pj1-x102c.google.com with SMTP id iy13so30130277pjb.5 for ; Mon, 03 Jan 2022 18:15:48 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=g06UIpFMVvSvANx+Qg+u743yK9fN9ISDaQhh0blxyhQ=; b=RayTa0ycU6LGpG5heatUGzR4CuZLKoUWs2ksQLp7YH7/q34wC7BooM048P624IGXS2 /yP5MuX3T6uJHmn+b6su923vWmYpBvo4KXlIP5+PtN2PB+2B8LS9EJ/9I/k3LhDeIuvg vEbGCUBIlzisQhs2D+YNB0yN4jBhFd4++QL/BOB248fWW7xCxYUKvuCpcRlTYukEbUfi oFxV4sShlG7bI8GpbChEJsPKxCb2uOLGFcCpa4Ds0UTuLxKia/59KOphyhffla4OMI1q bVcnSPxyMu5H2MX4k1HpOyFOBXnh2xrpqML4W4JtaRCCu0xSBaq8UvredsOcPSevliXm XeeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=g06UIpFMVvSvANx+Qg+u743yK9fN9ISDaQhh0blxyhQ=; b=uDWHhWDg5Rw0V/UcmHh0y02A11nSBAK0p/KXmtZ12VcySxmP5IocJHr39cBCZA5xpO U9JnH1uy4TgR9YVuiW+IEaBBwdEnll2sWc8pWgy8l8PKsZBEUbr6hXU15hcPMa4nL88K OmxCEUllLyrBhiIWYHQ5gn5uHPocwEM8r2YGBTe8df89nWldtDNGw+U+c6vzDxYbgYxW 468JhLO0/gH6X9IbFy/rsw2PQudL5K6R0rEkiaG+8znBhdmdnzzRigbcpDks8Puanbly 5ugC+8fZqi2uOnfCSkqbV4gOHxLBZ6R4U8XLFrwFVw+e0Y2ahTUMDeIXAhXx8s4A3iSh /BhA== X-Gm-Message-State: AOAM5302qRHsoQTWEdLLX/EqI54T53mmGufS8FnWHboGmR2LEoNVPp9o SORe0oRgdU2OxbRzUioYWc0+Tn/B0Lbrfw== X-Received: by 2002:a17:90a:cc1:: with SMTP id 1mr20280370pjt.124.1641262547919; Mon, 03 Jan 2022 18:15:47 -0800 (PST) Received: from localhost.localdomain (174-21-75-75.tukw.qwest.net. [174.21.75.75]) by smtp.gmail.com with ESMTPSA id b4sm37395501pjm.17.2022.01.03.18.15.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jan 2022 18:15:47 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v4 6/7] tcg/tci: Support raising sigbus for user-only Date: Mon, 3 Jan 2022 18:15:42 -0800 Message-Id: <20220104021543.396571-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220104021543.396571-1-richard.henderson@linaro.org> References: <20220104021543.396571-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::102c (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::102c; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102c.google.com X-Spam_score_int: 6 X-Spam_score: 0.6 X-Spam_bar: / X-Spam_report: (0.6 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: git@xen0n.name, peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé --- tcg/tci.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/tcg/tci.c b/tcg/tci.c index e76087ccac..92a7c81674 100644 --- a/tcg/tci.c +++ b/tcg/tci.c @@ -292,11 +292,11 @@ static bool tci_compare64(uint64_t u0, uint64_t u1, TCGCond condition) static uint64_t tci_qemu_ld(CPUArchState *env, target_ulong taddr, MemOpIdx oi, const void *tb_ptr) { - MemOp mop = get_memop(oi) & (MO_BSWAP | MO_SSIZE); + MemOp mop = get_memop(oi); uintptr_t ra = (uintptr_t)tb_ptr; #ifdef CONFIG_SOFTMMU - switch (mop) { + switch (mop & (MO_BSWAP | MO_SSIZE)) { case MO_UB: return helper_ret_ldub_mmu(env, taddr, oi, ra); case MO_SB: @@ -326,10 +326,14 @@ static uint64_t tci_qemu_ld(CPUArchState *env, target_ulong taddr, } #else void *haddr = g2h(env_cpu(env), taddr); + unsigned a_mask = (1u << get_alignment_bits(mop)) - 1; uint64_t ret; set_helper_retaddr(ra); - switch (mop) { + if (taddr & a_mask) { + helper_unaligned_ld(env, taddr); + } + switch (mop & (MO_BSWAP | MO_SSIZE)) { case MO_UB: ret = ldub_p(haddr); break; @@ -377,11 +381,11 @@ static uint64_t tci_qemu_ld(CPUArchState *env, target_ulong taddr, static void tci_qemu_st(CPUArchState *env, target_ulong taddr, uint64_t val, MemOpIdx oi, const void *tb_ptr) { - MemOp mop = get_memop(oi) & (MO_BSWAP | MO_SSIZE); + MemOp mop = get_memop(oi); uintptr_t ra = (uintptr_t)tb_ptr; #ifdef CONFIG_SOFTMMU - switch (mop) { + switch (mop & (MO_BSWAP | MO_SIZE)) { case MO_UB: helper_ret_stb_mmu(env, taddr, val, oi, ra); break; @@ -408,9 +412,13 @@ static void tci_qemu_st(CPUArchState *env, target_ulong taddr, uint64_t val, } #else void *haddr = g2h(env_cpu(env), taddr); + unsigned a_mask = (1u << get_alignment_bits(mop)) - 1; set_helper_retaddr(ra); - switch (mop) { + if (taddr & a_mask) { + helper_unaligned_st(env, taddr); + } + switch (mop & (MO_BSWAP | MO_SIZE)) { case MO_UB: stb_p(haddr, val); break; From patchwork Tue Jan 4 02:15:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 529863 Delivered-To: patch@linaro.org Received: by 2002:ac0:9f5c:0:0:0:0:0 with SMTP id l28csp1295530imf; Mon, 3 Jan 2022 18:23:04 -0800 (PST) X-Google-Smtp-Source: ABdhPJx3sdOl5b/yGZkY4Tu49V2CNoIqv9S3gNYqwI5cOMjcwxqipt8YEneyUSRwW3Lr7/zt4f/W X-Received: by 2002:a05:6902:4f1:: with SMTP id w17mr26585035ybs.647.1641262984732; Mon, 03 Jan 2022 18:23:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641262984; cv=none; d=google.com; s=arc-20160816; b=KvmKVmujS0PGGuKccE1+gzsKa0ykkuMIGDXiDWIIs5MtCfgQhJCArRQVu46p4ysJsm CtPGGQFR72Mv03PHkF3lX8qhtTEQnkOI8U0RSyJj6PZn9ba7KO2WAm2Q3HWdYUee2ZCz 72N4Q0JIOPndWTqHM7JGnot5hoDAd4NPGM2L5si0kI3PH946IBBj5jichPOBB/s/KGWe zKpoFINalOphgRcCufHyVaTjK9HgdabIyGNFgHyChfRPy3eqM57MaH4npukBSlQNZats j65Ahaw2WgPuEdWj4sd5Ii/sA6jsrH6uXoq/6xphcysJRkomfy2ZBV3BokhaovfVq7lo 4YsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=E7JCU1a/pkRMOjn44wnlj8F4Wtu8gz5MK8RJjxKzysE=; b=zQMZ2Y/kjnBcsWdjpF9uZDIjw5wKu00r3PUuVrHrQNoAtIw1HV+xkrXrKZYeVnr2SQ t8gTd8fE9za8cr/5oMUe1XPJGAxltuJZ4H/b6UipUtmX+dw5Xyqj63uRH6JTITCnExEo RVylPGYlh93e3qHC3aLnbc9izzm/HtOSsGs+dfLw/DH4urJNlpO59anlPIOtxj/DOP/2 sFFU1+bBdOkv9WUVg8bLW2/YvaucBWh3fGj3xclgAHnnBF/DtsrRPJVVpNTUruIAgWJi BjPFoAFhEOzOTP4qa6y5vDWPElZKaOOTAvK8qZrofk9oaNmWLt2UwxedIid/grhjJxlt 4X5g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LlnvOale; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id f189si24515182ybg.11.2022.01.03.18.23.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 03 Jan 2022 18:23:04 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LlnvOale; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:60368 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n4ZTc-0004Kh-7m for patch@linaro.org; Mon, 03 Jan 2022 21:23:04 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51116) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n4ZMd-0002mV-Em for qemu-devel@nongnu.org; Mon, 03 Jan 2022 21:15:51 -0500 Received: from [2607:f8b0:4864:20::533] (port=40477 helo=mail-pg1-x533.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n4ZMb-0008AY-P4 for qemu-devel@nongnu.org; Mon, 03 Jan 2022 21:15:51 -0500 Received: by mail-pg1-x533.google.com with SMTP id l10so31434259pgm.7 for ; Mon, 03 Jan 2022 18:15:49 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=E7JCU1a/pkRMOjn44wnlj8F4Wtu8gz5MK8RJjxKzysE=; b=LlnvOaleMsTHTr5F9hF2bNEryy2962/e1nWidwAX+7EafwpH8JbIQAYfKuGERIHI1u pMiGVZ+948Q7XoO+polkah2l6mRFRQAe7eSTlEGG4zqavB6FlNSYDH0FrbbT4fwCwXU8 8B/bTIKSCTIDlNKGnXri6eHq6MVpExzdur+ZGRe9uOWF5pHZWALx54Em2Fi/dn6cRaRG ZDKjTPSOMxnRJNkXgAfFgTJt37SQNcFNzuPJ+yIYjjEX7ZpafAfY+wlDpeQRzPyyhLNW BKaIRHhgqjC0JbU3Tw7V6fdTR16uRV2jphU7VWwfk1g8oX7VBigUK3X6rGSDjPIY0UTG 3oIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=E7JCU1a/pkRMOjn44wnlj8F4Wtu8gz5MK8RJjxKzysE=; b=Cgh5iWMOiaBoxUXR11kqDBTzYhdF4NClSUaieWr1e9QahNvO6UbRLy5b9qk4neNwlg KnHntfI2MH1LsXMPXTCLZ6MAIFAUlhiofxN4/p6ZSVSAfvA5Xz+7nPJv2ZYitZDWpeql cBrhDNrsFUYXWjBvN48If0kU+vbM2McV3hsXfz3SRB6FnWThU/+MReg5TDqbPKNGJDxd 59Kh7ievMGRITlCGXO6Gx+v2MQj9sNSWAxvv0Ronw9ga9NJNYE0iRxG+ruWFd2LtmmK0 Td/WUrJzbtMtBYyc+N67djNPwlZuObPMqhK7VxTQtTi9QylMk4nw/hLfniKMTmuRh37q 3XuQ== X-Gm-Message-State: AOAM532OgunogVHaJ0cq7FuGIjO/L433ryWMAAUb5pAbeYxmZMzwEQaP Ls7ccKwnEGJUf7MPEmqe7NqAdNqqJzeYHg== X-Received: by 2002:a63:9854:: with SMTP id l20mr42317871pgo.536.1641262548536; Mon, 03 Jan 2022 18:15:48 -0800 (PST) Received: from localhost.localdomain (174-21-75-75.tukw.qwest.net. [174.21.75.75]) by smtp.gmail.com with ESMTPSA id b4sm37395501pjm.17.2022.01.03.18.15.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jan 2022 18:15:48 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v4 7/7] tests/tcg/multiarch: Add sigbus.c Date: Mon, 3 Jan 2022 18:15:43 -0800 Message-Id: <20220104021543.396571-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220104021543.396571-1-richard.henderson@linaro.org> References: <20220104021543.396571-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::533 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::533; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x533.google.com X-Spam_score_int: 6 X-Spam_score: 0.6 X-Spam_bar: / X-Spam_report: (0.6 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: git@xen0n.name, peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" A mostly generic test for unaligned access raising SIGBUS. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Acked-by: Alex Bennée --- tests/tcg/multiarch/sigbus.c | 68 ++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 tests/tcg/multiarch/sigbus.c diff --git a/tests/tcg/multiarch/sigbus.c b/tests/tcg/multiarch/sigbus.c new file mode 100644 index 0000000000..8134c5fd56 --- /dev/null +++ b/tests/tcg/multiarch/sigbus.c @@ -0,0 +1,68 @@ +#define _GNU_SOURCE 1 + +#include +#include +#include +#include + + +unsigned long long x = 0x8877665544332211ull; +void * volatile p = (void *)&x + 1; + +void sigbus(int sig, siginfo_t *info, void *uc) +{ + assert(sig == SIGBUS); + assert(info->si_signo == SIGBUS); +#ifdef BUS_ADRALN + assert(info->si_code == BUS_ADRALN); +#endif + assert(info->si_addr == p); + exit(EXIT_SUCCESS); +} + +int main() +{ + struct sigaction sa = { + .sa_sigaction = sigbus, + .sa_flags = SA_SIGINFO + }; + int allow_fail = 0; + int tmp; + + tmp = sigaction(SIGBUS, &sa, NULL); + assert(tmp == 0); + + /* + * Select an operation that's likely to enforce alignment. + * On many guests that support unaligned accesses by default, + * this is often an atomic operation. + */ +#if defined(__aarch64__) + asm volatile("ldxr %w0,[%1]" : "=r"(tmp) : "r"(p) : "memory"); +#elif defined(__alpha__) + asm volatile("ldl_l %0,0(%1)" : "=r"(tmp) : "r"(p) : "memory"); +#elif defined(__arm__) + asm volatile("ldrex %0,[%1]" : "=r"(tmp) : "r"(p) : "memory"); +#elif defined(__powerpc__) + asm volatile("lwarx %0,0,%1" : "=r"(tmp) : "r"(p) : "memory"); +#elif defined(__riscv_atomic) + asm volatile("lr.w %0,(%1)" : "=r"(tmp) : "r"(p) : "memory"); +#else + /* No insn known to fault unaligned -- try for a straight load. */ + allow_fail = 1; + tmp = *(volatile int *)p; +#endif + + assert(allow_fail); + + /* + * We didn't see a signal. + * We might as well validate the unaligned load worked. + */ + if (BYTE_ORDER == LITTLE_ENDIAN) { + assert(tmp == 0x55443322); + } else { + assert(tmp == 0x77665544); + } + return EXIT_SUCCESS; +}