From patchwork Tue Nov 2 18:25:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 516701 Delivered-To: patch@linaro.org Received: by 2002:ad5:5208:0:0:0:0:0 with SMTP id p8csp4876926iml; Tue, 2 Nov 2021 11:41:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwduIu0kPL7/IbPXXK5Pr03OlyQlMXXefk057e7en8I67abNwomTB3sdv3cdRKf1HVKfVJL X-Received: by 2002:a4a:958b:: with SMTP id o11mr25933568ooi.35.1635878501470; Tue, 02 Nov 2021 11:41:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635878501; cv=none; d=google.com; s=arc-20160816; b=g7X2BTUdDEyJFhat/BSsrkleYAKOhKdeL825JkoOZpDBOxP8/lSA1nlWRhF3EynQHa /gBpXCrORtK3L8kXWrU4xiZUmIz9FImIv8Rg+jmSNLqFGyvrYBhNgaFd98dzq6Jge3w4 RrFFKC2+tHkLvXMitoHPr0PRWPFvi+mN0vElrg+s5RE3Q6k7PT7uO5Wjssh2Sutcc2Dt SH8Ob3aA8I0Twi4ypAYnp5TimHEbumoex2ynhVZqGTLn/VxDarhMmtskbW5cN4kKL/cp NSfsPI6L6c5OUhCEyI5TZS7ia3WezQsSeAnsV26kvbkSkCZgWLb0UrFel5TSALIRGd+8 aB5w== 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=7Kz+tFXT6K2UnZ30LjvUt2SSF2VfSMoswo/CAJ5bGD8=; b=AVLfk5Ewk1+8a8vnP5Qus6NhnpwoozgVCCi24tGEx6UBbrmxm1hn1a8LRGD1o9Di0R PY8NFo6nM4K7OHGLkmH+KHEux12g8OML4mIyPwjwMK5RpP+aIqAragc8XaC/F1GrI5nl 0WyeEMM/CPpyvktr2kLQWv5p6JPDbG+dL8sXlR5qnMiFxdDMAP4Eom+FuC/me4OCdHmZ ZpUOYG7A/374hdd1c3Zlm2jDExyQTFyDIJZdKrdEFuCE1MtIdkuaxIdHPedfsztJ+b1F zQKLmgJ6EWoxzVh8t/gKGORZOP6/0f7MHt2TsdPcksNf6w7/FF6f2NSm23Jekd6zi3bg /q4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=RoBJMFvy; 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: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id j7si12100284otu.339.2021.11.02.11.41.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 02 Nov 2021 11:41:41 -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=RoBJMFvy; 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]:42756 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mhyj6-0004xA-W1 for patch@linaro.org; Tue, 02 Nov 2021 14:41:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38784) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mhyTU-0005rU-Ei for qemu-devel@nongnu.org; Tue, 02 Nov 2021 14:25:32 -0400 Received: from mail-qk1-x72b.google.com ([2607:f8b0:4864:20::72b]:40490) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mhyTS-0004Er-DW for qemu-devel@nongnu.org; Tue, 02 Nov 2021 14:25:32 -0400 Received: by mail-qk1-x72b.google.com with SMTP id ay20so5219934qkb.7 for ; Tue, 02 Nov 2021 11:25:29 -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=7Kz+tFXT6K2UnZ30LjvUt2SSF2VfSMoswo/CAJ5bGD8=; b=RoBJMFvyHtgjdSELtMp7ShBpBzmLUd5vs5yshJw8ZlxLKLZebCMehwaYw+qDyoB/m+ csV/RETGHql3CUxH283f5BlH8FJuJrwzOrHxu1h8n/OGSaePX6YDrRzC52dc1oE/dfc4 UH/YOMwMmaWqSms/hSTs7Isrb0AcaSWOMIjqFdHPzMagAWrHU8ouLTC+Zd3ndIPZiOzI ecc+L0iGjBMQeryUsmsnm5wI8Clg3ztYHpDd6SnML4mPRK3F96lZREmntpopOMg7ZcpF EEKFDvUas7wQaPmy9td2Sr25sJ0A1O+7BjqVZV90qKrsWg0NJ4mZnTm4JrX4q0nwqNSN 1/eA== 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=7Kz+tFXT6K2UnZ30LjvUt2SSF2VfSMoswo/CAJ5bGD8=; b=Yt65eUllePMDcxyQJiVvrPjEk+qjIipgXlHQuoI5ha0cPtiRvcIXF9Fhzn8sGhIKZS vq50LfQNU0VcJDOiTgZ4gWfCMBpNgi+4G9tONyVVBgcl047beUOkWShvXSNuhv9tbUo7 T9j2djf4aA7DB5Qkj07+DrX9P3pjhn88QR59UjQjMitZrtapaOmIPHK2kfuH9LnBoRlk Z0TCvkVHri/LpFgPss7audwSo4e0cuBfMKWiBerbr7OyCayKYrnbH5QFml8cKFiMD6nq N7ZfLPWuNU7iIi8nQzO1I6yG5D3BWl6QdzP6wsJIp8TgJswgkEsOXp/LoiyP9E6tOjYF XgnQ== X-Gm-Message-State: AOAM530Jjw+vHE1jvQ5I1zIQRthUym0Y3kVMgQxeVQkVeX2MWGea8WLP Ph9FrSQ7SHr2jlasBbMJ7ZZTcsCo7Mvf5w== X-Received: by 2002:a05:620a:2a10:: with SMTP id o16mr9043917qkp.88.1635877528333; Tue, 02 Nov 2021 11:25:28 -0700 (PDT) Received: from localhost.localdomain (rrcs-172-254-253-57.nyc.biz.rr.com. [172.254.253.57]) by smtp.gmail.com with ESMTPSA id y9sm13701081qko.74.2021.11.02.11.25.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Nov 2021 11:25:28 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL v2 12/12] hvf: arm: Ignore cache operations on MMIO Date: Tue, 2 Nov 2021 14:25:19 -0400 Message-Id: <20211102182519.320319-13-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211102182519.320319-1-richard.henderson@linaro.org> References: <20211102182519.320319-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::72b; envelope-from=richard.henderson@linaro.org; helo=mail-qk1-x72b.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 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: , Cc: Mark Kettenis , Alexander Graf , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , AJ Barris Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Alexander Graf Apple's Hypervisor.Framework forwards cache operations as MMIO traps into user space. For MMIO however, these have no meaning: There is no cache attached to them. So let's just treat cache data exits as nops. This fixes OpenBSD booting as guest. Reported-by: AJ Barris Signed-off-by: Alexander Graf Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Reviewed-by: Mark Kettenis Reference: https://github.com/utmapp/UTM/issues/3197 Message-Id: <20211026071241.74889-1-agraf@csgraf.de> Signed-off-by: Richard Henderson --- target/arm/hvf/hvf.c | 7 +++++++ 1 file changed, 7 insertions(+) -- 2.25.1 diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index bff3e0cde7..0dc96560d3 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -1150,12 +1150,19 @@ int hvf_vcpu_exec(CPUState *cpu) uint32_t sas = (syndrome >> 22) & 3; uint32_t len = 1 << sas; uint32_t srt = (syndrome >> 16) & 0x1f; + uint32_t cm = (syndrome >> 8) & 0x1; uint64_t val = 0; trace_hvf_data_abort(env->pc, hvf_exit->exception.virtual_address, hvf_exit->exception.physical_address, isv, iswrite, s1ptw, len, srt); + if (cm) { + /* We don't cache MMIO regions */ + advance_pc = true; + break; + } + assert(isv); if (iswrite) {