From patchwork Fri Dec 18 20:52:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: imp@freebsd.org X-Patchwork-Id: 11983711 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F0B7FC4361B for ; Sat, 19 Dec 2020 20:55:34 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 47F6A223DB for ; Sat, 19 Dec 2020 20:55:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 47F6A223DB Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=freebsd.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:44620 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kqjGD-00014u-91 for qemu-devel@archiver.kernel.org; Sat, 19 Dec 2020 15:55:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56032) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kqj5e-0007TN-0P for qemu-devel@nongnu.org; Sat, 19 Dec 2020 15:44:34 -0500 Received: from 50-253-99-174-static.hfc.comcastbusiness.net ([50.253.99.174]:16413 helo=dune.bsdimp.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kqj5c-000454-If for qemu-devel@nongnu.org; Sat, 19 Dec 2020 15:44:33 -0500 Received: from dune.bsdimp.com (localhost [127.0.0.1]) by dune.bsdimp.com (8.15.2/8.15.2) with ESMTPS id 0BIKqsrj086432 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Fri, 18 Dec 2020 13:52:54 -0700 (MST) (envelope-from imp@dune.bsdimp.com) Received: (from imp@localhost) by dune.bsdimp.com (8.15.2/8.15.2/Submit) id 0BIKqs44086431; Fri, 18 Dec 2020 13:52:54 -0700 (MST) (envelope-from imp) From: imp@freebsd.org To: qemu-devel@nongnu.org Subject: [PATCH 2/4] tcg: Additional Trap type for FreeBSD Date: Fri, 18 Dec 2020 13:52:48 -0700 Message-Id: <20201218205250.86382-3-imp@freebsd.org> X-Mailer: git-send-email 2.22.1 In-Reply-To: <20201218205250.86382-1-imp@freebsd.org> References: <20201218205250.86382-1-imp@freebsd.org> MIME-Version: 1.0 Received-SPF: none client-ip=50.253.99.174; envelope-from=imp@dune.bsdimp.com; helo=dune.bsdimp.com X-Spam_score_int: -13 X-Spam_score: -1.4 X-Spam_bar: - X-Spam_report: (-1.4 / 5.0 requ) BAYES_00=-1.9, HEADER_FROM_DIFFERENT_DOMAINS=0.249, KHOP_HELO_FCRDNS=0.267, NO_DNS_FOR_FROM=0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Juergen Lock , Sean Bruno , Warner Losh Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Sean Bruno FreeBSD can generate a trap 0xc as well as 0xe when writing to a read-only page. Signed-off-by: Juergen Lock [imp rewored commit message for clarity] Signed-off-by: Warner Losh --- accel/tcg/user-exec.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c index 4ebe25461a..1f5befa9f9 100644 --- a/accel/tcg/user-exec.c +++ b/accel/tcg/user-exec.c @@ -343,7 +343,13 @@ int cpu_signal_handler(int host_signum, void *pinfo, pc = PC_sig(uc); return handle_cpu_signal(pc, info, - TRAP_sig(uc) == 0xe ? (ERROR_sig(uc) >> 1) & 1 : 0, +#if defined(__FreeBSD__) || defined(__DragonFly__) + (TRAP_sig(uc) == 0xe || + TRAP_sig(uc) == 0xc) ? +#else + TRAP_sig(uc) == 0xe ? +#endif + (ERROR_sig(uc) >> 1) & 1 : 0, &MASK_sig(uc)); }