From nobody Sat Sep 21 04:40:43 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=1705590471; cv=none; d=zohomail.com; s=zohoarc; b=Izn0zakyv6DX2+EdYQHsXN1R95vUEaaH7zAEmtK5krxh/ICVNeOxRZTAyzPLibUiqoQaXYRIo7q8hs8jFjRAhJnXYMBv5Eq1iV2upWJpKpLa2sf/B2cMtI+jQnO2nF8eOOvKvi8Dx/OGTcr5zA/9HGk06GxDBBmmqvnSQnwTfes= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1705590471; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=+Qm/qBc7xw4k/QzMtPvB782F7uhFe9bOJTuo4589f0o=; b=ahV+DdAQ3z0gp15p0wIi+1xen69NkXYO7+fGiY5oJmRqi3Kuq3EsbgzdB/X23yBjqCoDb2uDwvRdTrJNN35h6N6R5c9f9LZ7BQYxx7nmbf5ZrGaZ0yec8e4HRkRrd00dQ5ZOkllbVSN2LGPwryLGXqaWcWeLVLOxEq1vwEZ1UGE= 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 1705590471537102.33880625263282; Thu, 18 Jan 2024 07:07:51 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQTz5-0007FC-FU; Thu, 18 Jan 2024 10:07:11 -0500 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 1rQTz3-0007AS-NJ; Thu, 18 Jan 2024 10:07:09 -0500 Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rQTz2-0007qj-7C; Thu, 18 Jan 2024 10:07:09 -0500 Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-1d70a98c189so4346445ad.1; Thu, 18 Jan 2024 07:07:07 -0800 (PST) Received: from wheely.local0.net (124-171-76-150.tpgi.com.au. [124.171.76.150]) by smtp.gmail.com with ESMTPSA id e17-20020a170902cf5100b001d052d1aaf2sm1509401plg.101.2024.01.18.07.07.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Jan 2024 07:07:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705590426; x=1706195226; darn=nongnu.org; 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=+Qm/qBc7xw4k/QzMtPvB782F7uhFe9bOJTuo4589f0o=; b=DzVKUyTetNXWaXd5ePu/tQiLYirz2cV0ZO0QMSBGpJuUJa/RY9xr//UuM+k04qSYUw ypdxZ6X8r6sEPkTk2WlY68NPv2lO0UGB4cr9ZeJ40oqg0ZphA3lOviNH2wlX7O4kUG1G UvYvx9k5e2xghHKgvoHjHLz9jSGBJdi7J5trD+2mg5+iqQYPiz6ReRBjYHFhJWjnqwS7 tZG6w6D7TVqgDqovN5L5pJQR29ael2Fku1ZmcXDnrNqDoA9PKlz6/tO6QHG99VvSP1Qy wbCP6iUFXfhvNR0DI/YJEnPtwx5ftfVorwIQHUkufO6YS4oe8OTt5t3+DKZc6b6kWd/p 2vug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705590426; x=1706195226; 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=+Qm/qBc7xw4k/QzMtPvB782F7uhFe9bOJTuo4589f0o=; b=XiIqBRU0pJPN59OwzShLUOOCHluS4M8Xt1BrZYFYxd+V8bGFXaakCo+eT5MXCxPg/v EKwYXWjF/3UHvNQw0DyNJFKg8fUbDPUZBoeEYu6I0q3qUK1HXwTZzk/cgGmAO2fIWvzy A5/kCjZbOLfqNvxl4HrbsycKd57+z2Z9Qs21na6Ma71IRf/ezOk03859PcYES7naakV6 zdH4ZDOjA+P0Dy7xHOuG48yfBZL07RARYdO7R3rCzWFNXXi4Bgo/WycvZkdCuqIU7mlW oWcH4QJJqdHNtLMKapci8EdYNRfLKxCRfqriKYtw2qJH3GV/DzuDL9e0fRYTjMdMpTgU xItw== X-Gm-Message-State: AOJu0YxsBupTAc0/kqetJ5c0vYtiMtyt3jRjou2u6NumftjyRsdw3rDa 4aqgoQWgTeCvd7rvNZPvmgGh7ITNSwPkZd18SISWM3EMNhQvo9yrObLiMb6h X-Google-Smtp-Source: AGHT+IE+fBevvTAxUk2knvF39GtNnFd5Uhj88odsSylExCjwiZYZ5XNzMZPrNvBA9i9U+xPdL2tp+w== X-Received: by 2002:a17:903:244d:b0:1d6:f139:cc20 with SMTP id l13-20020a170903244d00b001d6f139cc20mr1152506pls.32.1705590426277; Thu, 18 Jan 2024 07:07:06 -0800 (PST) From: Nicholas Piggin To: qemu-ppc@nongnu.org Cc: Nicholas Piggin , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Barrat?= , Daniel Henrique Barboza , David Gibson , Harsh Prateek Bora , qemu-devel@nongnu.org Subject: [PATCH 02/26] target/ppc: Prevent supervisor from modifying MSR[ME] Date: Fri, 19 Jan 2024 01:06:20 +1000 Message-ID: <20240118150644.177371-3-npiggin@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240118150644.177371-1-npiggin@gmail.com> References: <20240118150644.177371-1-npiggin@gmail.com> 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=2607:f8b0:4864:20::632; envelope-from=npiggin@gmail.com; helo=mail-pl1-x632.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, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1705590472179100009 Content-Type: text/plain; charset="utf-8" Prevent guest state modifying the MSR[ME] bit. Per ISA: An attempt to modify MSRME in privileged but non-hypervisor state is ignored (i.e., the bit is not changed). Signed-off-by: Nicholas Piggin --- target/ppc/helper_regs.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/target/ppc/helper_regs.c b/target/ppc/helper_regs.c index e0b2dcd02e..bd17c14136 100644 --- a/target/ppc/helper_regs.c +++ b/target/ppc/helper_regs.c @@ -264,6 +264,11 @@ int hreg_store_msr(CPUPPCState *env, target_ulong valu= e, int alter_hv) value &=3D ~MSR_HVB; value |=3D env->msr & MSR_HVB; } + /* Attempt to modify MSR[ME] in guest state is ignored */ + if (is_book3s_arch2x(env) && !(env->msr & MSR_HVB)) { + value &=3D ~(1 << MSR_ME); + value |=3D env->msr & (1 << MSR_ME); + } if ((value ^ env->msr) & (R_MSR_IR_MASK | R_MSR_DR_MASK)) { cpu_interrupt_exittb(cs); } --=20 2.42.0