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