Message ID | 20211030171635.1689530-58-richard.henderson@linaro.org |
---|---|
State | Superseded |
Headers | show
Delivered-To: patch@linaro.org Received: by 2002:ad5:5208:0:0:0:0:0 with SMTP id p8csp1459560iml; Sat, 30 Oct 2021 11:29:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzWXzNwuf4V167XkkAXqzt3nBixwBN69x/u0KsJA1bTmBbvRHXdxBp2lbBQvcKgyyGP5cf7 X-Received: by 2002:a9d:8ab:: with SMTP id 40mr14720636otf.109.1635618597863; Sat, 30 Oct 2021 11:29:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635618597; cv=none; d=google.com; s=arc-20160816; b=Xlz/Z8R/JnJWs38xwWiqqUHeYKvIGsIGIE4baPFE7gxaq6dOvZyK5CHVM9pVWkPikp TqXNkrAhb30iqRHuDTfDLvMwiLdsvUH9FwU6WB2sl1hQtFBFuntB2j7h2Eqrtn8i/NH4 LK5bZfS5MxJOeCxwPHlcc/6vkRNPR8j0Fjr7Mi3HZgK/5xoXLtZBJ9dP8VEkHEbW5AyJ 52b9ngOgb8EGGwb0JO3qQR5klAbA7Ofx0WjQcrGxjBbQTl1GfzfGJaXHiIr8yLmSzdc/ L/1ZJqNahpuMocoizaJ+R9oeRkdaz7gw+zBzrnfGs8b7OdCh4bPpi+ZKHRZ2pE91mIL4 TjzA== 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=G7SBr/WksrEb3wfGw9+4/7HGKeZrYxUMshTizcIBHp0=; b=qXzWl8dAlqA+ONIdyGDKQqJBnm0k+8HyUaLrI0nSzM1QAtBoUv9ryX4wTsJ/wdZZ14 mgnIKGbNOTZixlvfKvMSBvCMgNWgfBz+ccDoGRp1kKhKGAkQE/rM3BodJv/8uhxZurAR aRA0l2qxeuAcNQx72WGsT9M57CkEeE2cbByRZP37faffX01zHA/SD5/OK2TzbkrnWPYk geSg3ruKJki6GVoAd+bSPr3OsS+Mb5Rs87ivHmKHhUAfYNtGc6BSpA3aYEccFU+fh1aA BjveSsT4nlPuKxf/GHrssjjpKT1P9vZYfTGmYUSfyB3ghR+4AUHjWfGJJV/5wkyvMoRz aVEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ha+vwqS4; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: <qemu-devel-bounces+patch=linaro.org@nongnu.org> Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id m7si1783466otn.281.2021.10.30.11.29.57 for <patch@linaro.org> (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 30 Oct 2021 11:29:57 -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=fail header.i=@linaro.org header.s=google header.b=ha+vwqS4; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:46010 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <qemu-devel-bounces+patch=linaro.org@nongnu.org>) id 1mgt77-0003L3-81 for patch@linaro.org; Sat, 30 Oct 2021 14:29:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58838) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <richard.henderson@linaro.org>) id 1mgs1x-0001a6-KH for qemu-devel@nongnu.org; Sat, 30 Oct 2021 13:20:33 -0400 Received: from mail-pg1-x52c.google.com ([2607:f8b0:4864:20::52c]:45804) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <richard.henderson@linaro.org>) id 1mgs1v-0002Fr-At for qemu-devel@nongnu.org; Sat, 30 Oct 2021 13:20:33 -0400 Received: by mail-pg1-x52c.google.com with SMTP id f5so12980217pgc.12 for <qemu-devel@nongnu.org>; Sat, 30 Oct 2021 10:20:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=G7SBr/WksrEb3wfGw9+4/7HGKeZrYxUMshTizcIBHp0=; b=ha+vwqS490HsDFEQ0F/1pikVnMkJcrluXAED+0j3rqMv+we36g6BjtrpJwLnoSPAIT FkZCAY68jMp+tTFn0alRgo8/Lgi6V9bycGgXNpuGqGceN8EgnBwTagIHCrPQbSVBvKbO 41fzzzIqKm6BjtjIkop8sGuOUm0KeJNm+yBG1JTvDzGEM/g/eEwZY+zytbT+Vx/zmkFa NcRKT4Qk85APgf/lviVO5DvxDdYb9xaDzQ1hK0gjYlc2NLbd3mknXaT4okU5Bx/iVGN7 0cpQ8nac800QTPaZB4b7rml8FB0jBxdPA4Rv498EYNolXxcXXOErEn05u8IRuiPzmeGx x6Rw== 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=G7SBr/WksrEb3wfGw9+4/7HGKeZrYxUMshTizcIBHp0=; b=fURRZ5kNYkBTfX5vwK4cpiyc/HMwaoxUE99SPDNlVBMbg9HploYmIgPxa8CJ7+hiHh xpNnhPGWJ2Fr/pxgFY5oR7uNi/xdToP6JNHx7fWf3pHaFpAbt6NDsJChpRR8eERXfZq5 RT7qqqK5kUs790p9+WB/UVRCHcAP9hDQhZszxZOkcfwKkcY3Rx677N7vbP7dOvBbR2ru cbiDibNdeDdnfbzf/6KXhym8N4w0tj1TJm5m8vmVae/SIvOAjwPWGwUW+QxcnPsb7kbp fpguengEgglS+0wH7zGSYYY0LxOQ4yUb9kQdvVqqwRdDrV53mxliyOzlEpiUuU+eaQ9j Ntpw== X-Gm-Message-State: AOAM533Zi7obj6lRc39KJ4O/3WuItBPwIQtEWGu+NB7F3d+os7M0V3Pb qoASI+dHQZRhA584vtSM2UxlbrkmRB3ejQ== X-Received: by 2002:a63:b241:: with SMTP id t1mr13676132pgo.154.1635614429261; Sat, 30 Oct 2021 10:20:29 -0700 (PDT) Received: from localhost.localdomain (174-21-75-75.tukw.qwest.net. [174.21.75.75]) by smtp.gmail.com with ESMTPSA id k14sm9584798pji.45.2021.10.30.10.20.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 Oct 2021 10:20:28 -0700 (PDT) From: Richard Henderson <richard.henderson@linaro.org> To: qemu-devel@nongnu.org Subject: [PATCH v6 57/66] accel/tcg: Report unaligned atomics for user-only Date: Sat, 30 Oct 2021 10:16:26 -0700 Message-Id: <20211030171635.1689530-58-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211030171635.1689530-1-richard.henderson@linaro.org> References: <20211030171635.1689530-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::52c; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52c.google.com X-Spam_score_int: -1 X-Spam_score: -0.2 X-Spam_bar: / X-Spam_report: (-0.2 / 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: alex.bennee@linaro.org, laurent@vivier.eu, imp@bsdimp.com, f4bug@amsat.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org> |
Series |
user-only: Cleanup SIGSEGV and SIGBUS handling
|
expand
|
diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c index c4f69908e9..1ee64f01fc 100644 --- a/accel/tcg/user-exec.c +++ b/accel/tcg/user-exec.c @@ -474,11 +474,22 @@ static void *atomic_mmu_lookup(CPUArchState *env, target_ulong addr, MemOpIdx oi, int size, int prot, uintptr_t retaddr) { + MemOp mop = get_memop(oi); + int a_bits = get_alignment_bits(mop); + void *ret; + + /* Enforce guest required alignment. */ + if (unlikely(addr & ((1 << a_bits) - 1))) { + MMUAccessType t = prot == PAGE_READ ? MMU_DATA_LOAD : MMU_DATA_STORE; + cpu_loop_exit_sigbus(env_cpu(env), addr, t, retaddr); + } + /* Enforce qemu required alignment. */ if (unlikely(addr & (size - 1))) { cpu_loop_exit_atomic(env_cpu(env), retaddr); } - void *ret = g2h(env_cpu(env), addr); + + ret = g2h(env_cpu(env), addr); set_helper_retaddr(retaddr); return ret; }