From patchwork Tue May 16 19:40:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 682367 Delivered-To: patch@linaro.org Received: by 2002:a05:6504:558:b0:22d:db33:bb6d with SMTP id w24csp639278ltp; Tue, 16 May 2023 12:44:12 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7+f3AeNWq2G9QBsJnhZRD707DzSp/trnZJwP21aBs/EF3DhkqZ+wktFCUQqel4DiTJyIk3 X-Received: by 2002:ac8:7c4d:0:b0:3f2:384:9292 with SMTP id o13-20020ac87c4d000000b003f203849292mr59154722qtv.34.1684266251822; Tue, 16 May 2023 12:44:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684266251; cv=none; d=google.com; s=arc-20160816; b=LVTvzKGVtB2KaVYHjaLk0Z6TUrSzXL5YLDatbvURgMcBVEudGphHWnVcxqyMbE5+Ti 2966OQiKVvb7Do49yeDP89rREeCdNHsHCZ1aMfHghk7RrbVqHB31xV1vaU+RL214Ckkg SWJPf7WVlCgccPjK9TNEFRMzIaVaGXDwAkY22We/ky92SV7cjigeGcS4l7o9gBiTbduA vqqL9VSvIVZXfog2vW9FPoy+FYY93hv0YjIskArDl+CVIol6i48X/A+0C/O/lZ/5sw7p KVoVxmwCOD0VmD1oMgBf+RxMTfw3OWgvfRnJ7YriWtHaNs1arKOUwwpEXNJ7gdfHzgxA dINw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=PEsWAFpnCMYNqvb5yhVEEwYFWaIpTnBv29asu3C8fXA=; b=JAuGF+WnJ27nS5fqGjXR88/2NYofUoo9518ZCGJeNf+Chh8AVWUVlA6iQ+18ZXSfQ/ knjF+VVBYNXQTOoBfq0YMMOE4oe5bGSvs20L3KYn0p9JEAKl867/PjHTprhJJKt/VYzc 6P8mjQyEsGiGxl0YvRXyFad03AxswRaPxMAlW/55wcvkR8gxW2CrRqmA9xFzsDCCRzWK G9KGcs++9vWj5ckKMQUfBcEF4GEIiQWwj0ODWTqpj+CuSm/VLARU6CBU7VqU2DNldv4r HBQ785u7sPSqrcv50Mr7wEathw7iZPUzGAS/pRHlsWMAFZZ2LrkOMBZtc5GfKa2qNwss Fa/g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BDwoJPT3; 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 f22-20020a05622a105600b003b689c70396si11664179qte.86.2023.05.16.12.44.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 16 May 2023 12:44:11 -0700 (PDT) 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=BDwoJPT3; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pz0Yk-0006iU-ON; Tue, 16 May 2023 15:42:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pz0Yj-0006hp-GN for qemu-devel@nongnu.org; Tue, 16 May 2023 15:42:09 -0400 Received: from mail-pf1-x432.google.com ([2607:f8b0:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pz0Yg-0002jW-UI for qemu-devel@nongnu.org; Tue, 16 May 2023 15:42:09 -0400 Received: by mail-pf1-x432.google.com with SMTP id d2e1a72fcca58-643a6f993a7so9345404b3a.1 for ; Tue, 16 May 2023 12:42:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1684266126; x=1686858126; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PEsWAFpnCMYNqvb5yhVEEwYFWaIpTnBv29asu3C8fXA=; b=BDwoJPT3tJA8LuDQMGq7qGKQjQ5oLt3zrE1kSuzeEbI8De+ckLxl9kASJIzQSMVm7b wQ++4sOO5VpmuI4fez5wyQBXmdy0e7NOCfakw6hhMQNmzIAPmAWeFCTSi9+eKESFWsR/ CTjMrdaSgG8/iARFPSQVJo7TbDMSorliKJUwFX3x22uamqsHHmQBFfCq/6vt+XGkcIJF rXGp+w4iIhVXOrqUpANJvEt7VDZ0mgT+FdS0EzVo9F0KY328wLiorpAtuoZDiA4Fao7N 7oNQizi5/vAr7kmXG8GfEsMtSO7ESxiKZ8KVJ1XXpMlR8shZUZa2hTfvz2oCLgZsl+eZ nPew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684266126; x=1686858126; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PEsWAFpnCMYNqvb5yhVEEwYFWaIpTnBv29asu3C8fXA=; b=Et9Aa05dwT0ZK5xYiGAoXQAkdJQgi0fJSwNl3HO40/douB2FUh9IOu16zQHp+RU3lW Z7tmYBQXp5XC4IvsGYCJ7Lpiwxlak3HpLylYGb8cv/IwT+H/SGg2LMUaSf8SHdfNcqXV n2HmASe3C3b7pgJhDLP9g759FsdNfp0QXytHl2DRk0cIBHThsYqRcRRqRvsy5zGQgs+5 BfLJTWhEe1DQ6hHKEkbwfrInTjP0q15o0hM5YqSITU6exDyWWu2zGBrMQRYQfe/SyNpM t3+tnuzhJzRtnBPwe5+EgqyUxAKPReuSB6TIIrx35axRT8b+ANie8PIaVNlmJt/AWCA0 kGwQ== X-Gm-Message-State: AC+VfDy27Gr7kJ9AF4EAzzfiMy+33vLQCL5O/sNhtqrA70OIui0cBhxq 4wjp1wclvQHRa4qpmPhozHbE3TqQHrSq8zwuN2M= X-Received: by 2002:a05:6a00:194b:b0:647:f128:c4f5 with SMTP id s11-20020a056a00194b00b00647f128c4f5mr31552345pfk.22.1684266126154; Tue, 16 May 2023 12:42:06 -0700 (PDT) Received: from stoup.. ([2602:ae:1598:4c01:ec81:440e:33a4:40b9]) by smtp.gmail.com with ESMTPSA id z21-20020aa791d5000000b006260526cf0csm13771165pfa.116.2023.05.16.12.42.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 May 2023 12:42:05 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Peter Maydell Subject: [PULL 21/80] tcg/s390x: Use full load/store helpers in user-only mode Date: Tue, 16 May 2023 12:40:46 -0700 Message-Id: <20230516194145.1749305-22-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230516194145.1749305-1-richard.henderson@linaro.org> References: <20230516194145.1749305-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::432; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x432.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Instead of using helper_unaligned_{ld,st}, use the full load/store helpers. This will allow the fast path to increase alignment to implement atomicity while not immediately raising an alignment exception. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- tcg/s390x/tcg-target.c.inc | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/tcg/s390x/tcg-target.c.inc b/tcg/s390x/tcg-target.c.inc index 968977be98..de8aed5f77 100644 --- a/tcg/s390x/tcg-target.c.inc +++ b/tcg/s390x/tcg-target.c.inc @@ -1679,7 +1679,6 @@ static void tcg_out_qemu_st_direct(TCGContext *s, MemOp opc, TCGReg data, } } -#if defined(CONFIG_SOFTMMU) static const TCGLdstHelperParam ldst_helper_param = { .ntmp = 1, .tmp = { TCG_TMP0 } }; @@ -1716,34 +1715,6 @@ static bool tcg_out_qemu_st_slow_path(TCGContext *s, TCGLabelQemuLdst *lb) tgen_gotoi(s, S390_CC_ALWAYS, lb->raddr); return true; } -#else -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); -} -#endif /* CONFIG_SOFTMMU */ /* * For softmmu, perform the TLB load and compare.