From nobody Sat May 18 20:37:14 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1626881313; cv=none; d=zohomail.com; s=zohoarc; b=PxOWEOHn5r3aS+153Az2nRIc4fww8jeWqoftNtWNOtS4KsPxEfrghgPALQt/gQHdQ3WquqmQg56Z31gHZ53ZonVIZOv+b1cQIdqrbA5UCcIh3slcTH2cHhxULOcnbAdQ9PevkvhsFqk8ctoHcYL6LiobxNJWk3uE84UBkjNSVeo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626881313; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=jmcY+yD1tmUyd/kQyLuAdWH8+M5gVJSdYfJj4zAiRI0=; b=ahgef4PBgcX8NLFK8z8r9zTKzVDLFXxwHz5P+MsYE0+gGLDWkTQeKM7Hc0VJd7y6yaBBy0MqT9KhR8liCNvgbhzgJ/gVH45PZe5AaadKgfe5sbem4g8Mgms1aoPmAfrYoC69/oo+vEc1x8X3CMUBEBvngYKUfaf176ac4HVKDMk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1626881313361708.8720670687754; Wed, 21 Jul 2021 08:28:33 -0700 (PDT) Received: from localhost ([::1]:48540 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m6E99-0000uh-9b for importer@patchew.org; Wed, 21 Jul 2021 11:28:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59760) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m6E7p-0007Lx-4X for qemu-devel@nongnu.org; Wed, 21 Jul 2021 11:27:09 -0400 Received: from mail-ej1-x636.google.com ([2a00:1450:4864:20::636]:39905) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m6E7j-00041k-ML for qemu-devel@nongnu.org; Wed, 21 Jul 2021 11:27:07 -0400 Received: by mail-ej1-x636.google.com with SMTP id ga14so3843505ejc.6 for ; Wed, 21 Jul 2021 08:27:02 -0700 (PDT) Received: from localhost.localdomain ([151.68.51.173]) by smtp.gmail.com with ESMTPSA id r27sm10253217edb.66.2021.07.21.08.27.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Jul 2021 08:27:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=jmcY+yD1tmUyd/kQyLuAdWH8+M5gVJSdYfJj4zAiRI0=; b=DHWDUJLYicC+LWKK3dk/ja80BP9cMlUuYrVsM4946i1YMKijOjsrRPeWddVX4yvB3k 3fwHIgh4hf3qK0L2jPR0PF5huckDlkD13WLplIdFCa8S4BvEY1euR2mXg4UdaYHPCs4p XkPxaif/lemqh1TP8OsYeYp/NpNHt6bTxE2eWkKx4+1EgFQiqP4SDqLiNV1AaEvOXV8S cSMWUrFv8QZHiDwpT2QqQIomtIRQAQLJkqM5NdKD+5t08lK0WQ6AXrXOZs+8I541Yv9H dJ48pwva7inYqtFM4tAm/vODbgwVpDrOLFF8vB9Bly5JOsRDjAskUtgasR8Pk2n8ulI0 HPAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=jmcY+yD1tmUyd/kQyLuAdWH8+M5gVJSdYfJj4zAiRI0=; b=BTYM75IqVGzfXSqgp9sz6RkXfJs/t4kiu7zC3+B3XKcnQdnbs88jG3AhTYkLsSkGEe HZZIv23NecrsnZLxO9fNw7FQP4k89EAwfqFxoPGo8hjHqZzG83HjFENAlsYffaglg3mH ek2QaqgU2f/GAP3Pv0SxB3TXK1VSqcd0H8id/lDAw9oF7n4xVcs5Bvj88SghwCMtRHOq iIE2sqXxoDGDlNEnZnpKRKrVWu/XPiHI4ZQJzvfLFJoQpfyM+OmHpYZYcHIwE8SrdfeJ czEUZDi5T9gfkF4xaclP5P2Bwr74aTaH54Ngj94QcoPC+K3gNNKN728zZ+NaMgFpqgrv 3Abg== X-Gm-Message-State: AOAM530oCBRn6qYy5c/bolNsZbMUwzqBU2ku2pBePn2prxDP3faX86BB tCEAXnUIhVPL45r0SAu6xd2TxJR6VCB9YbLY X-Google-Smtp-Source: ABdhPJwtf+aPuiGd1VxiWoP+ny09QLLmiF5vH5Hu0jIj98r+UpmIP+nYDL2WP93d+SfBnLtFeSDqtQ== X-Received: by 2002:a17:906:e099:: with SMTP id gh25mr38816428ejb.346.1626881221082; Wed, 21 Jul 2021 08:27:01 -0700 (PDT) From: Lara Lazier To: qemu-devel@nongnu.org Subject: [PATCH] target/i386: Added V_INTR_PRIO check to virtual interrupts Date: Wed, 21 Jul 2021 17:26:49 +0200 Message-Id: <20210721152651.14683-1-laramglazier@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::636; envelope-from=laramglazier@gmail.com; helo=mail-ej1-x636.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, FREEMAIL_FROM=0.001, 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lara Lazier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1626881315399100001 Content-Type: text/plain; charset="utf-8" The APM2 states that The processor takes a virtual INTR interrupt if V_IRQ and V_INTR_PRIO indicate that there is a virtual interrupt pending whose priority is greater than the value in V_TPR. Signed-off-by: Lara Lazier --- target/i386/tcg/sysemu/svm_helper.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/target/i386/tcg/sysemu/svm_helper.c b/target/i386/tcg/sysemu/s= vm_helper.c index 2e66b05729..7ce85d1515 100644 --- a/target/i386/tcg/sysemu/svm_helper.c +++ b/target/i386/tcg/sysemu/svm_helper.c @@ -118,6 +118,16 @@ static inline void svm_vmrun_canonicalization(CPUX86St= ate *env) env->tr.base =3D (long) ((uint32_t) env->tr.base); } =20 +static inline bool ctl_has_irq(uint32_t int_ctl) +{ + uint32_t int_prio; + uint32_t tpr; + + int_prio =3D (int_ctl & V_INTR_PRIO_MASK) >> V_INTR_MASKING_SHIFT; + tpr =3D int_ctl & V_TPR_MASK; + return (int_ctl & V_IRQ_MASK) && (int_prio >=3D tpr); +} + static inline bool virtual_gif_enabled(CPUX86State *env, uint32_t int_ctl) { return (int_ctl & V_GIF_ENABLED_MASK) && (env->features[FEAT_SVM] & CP= UID_SVM_VGIF); @@ -363,7 +373,7 @@ void helper_vmrun(CPUX86State *env, int aflag, int next= _eip_addend) } else { env->hflags2 |=3D HF2_GIF_MASK; } - if (int_ctl & V_IRQ_MASK) { + if (ctl_has_irq(int_ctl)) { CPUState *cs =3D env_cpu(env); =20 cs->interrupt_request |=3D CPU_INTERRUPT_VIRQ; --=20 2.25.1