From patchwork Thu Aug 10 23:49:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 13482 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp774088vqi; Thu, 10 Aug 2023 17:39:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFvszZypetcfYPsIxTEftM8qbVPqYS+vkbLgf6qk5m60kyMdX4ZirI6RJtjyMNnr81lQSdj X-Received: by 2002:a2e:9584:0:b0:2b5:9778:7ce2 with SMTP id w4-20020a2e9584000000b002b597787ce2mr477179ljh.15.1691714343315; Thu, 10 Aug 2023 17:39:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691714343; cv=none; d=google.com; s=arc-20160816; b=nzQp0KkuJPPSxGalz2aqY28nvdjFcys40SyNUicejOYEtHIOIuufY0GiTnlrgYdass KzmwuSKfUqytv5a41uI/gblOv0HG7kfSunHw70KKuaIHOHRk+sH9PS9ma8YjV1tI4auU SKI9m2HkLMlP26wyIC5cZFDVd4cCa8Jnm5VzvL1A8YfC5eP6zzq8szifj4+GMLajLGMf 3DQpK335snMtr17ewEMpyWKtEBAxPcOUS2UJHWexZ1sEUHR3KSLSxZon/tYQ8D+xpCUk dP0aDIBOYzt2+Vpu1O7pSCzyQ/n07QBiCeSLKgh3q/EWfLYMmECn0QGkYUnzjKnT1J2w 9G8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:mime-version:date :reply-to:dkim-signature; bh=JCCbjs9yndiAMHKk4zASKNfGLKmo2+2FE4R0zJsZx6Q=; fh=V7CVPPTRbh2VufElafI2Ok/nHdujZmxHH7PJW4f8amU=; b=UJQAyjeRSHXzjlS5LLmd/1i63HTw4ca4tH7MGuqYwH5QXijtjGCb9ryrFLw8o3Lj5y HzyjlmlDvdmX6luhBHZv3lzN+5+cHrD7erBxyBvSrdICB7H/kQPpx2oUjitjCGPbmC7e p2XhGlDYtwXfGSyT7JFp/QK+nTqshOT5CZ+04XJWev4ZRm1+JsM+9Nty+CCk8YksB1zr ZObZTMtfDiAb/cQKyV6cHdtsCPdjnkRhJEx+De2m7BAp19/oYj/Jk0HVzhKwP18uGlpX sJHRokcQt5Evh447hELdijBJYxjmYgrsRkkMmM33Q4KNv1/0uavvu/Fbo6z60g7Npds/ 1VkA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=FAc2CxSH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h17-20020a170906719100b0099cc01fb28csi2486393ejk.780.2023.08.10.17.38.38; Thu, 10 Aug 2023 17:39:03 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=FAc2CxSH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233136AbjHJXt2 (ORCPT + 99 others); Thu, 10 Aug 2023 19:49:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47062 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229677AbjHJXtW (ORCPT ); Thu, 10 Aug 2023 19:49:22 -0400 Received: from mail-pf1-x449.google.com (mail-pf1-x449.google.com [IPv6:2607:f8b0:4864:20::449]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7B3902D47 for ; Thu, 10 Aug 2023 16:49:21 -0700 (PDT) Received: by mail-pf1-x449.google.com with SMTP id d2e1a72fcca58-686bc3f11feso1854863b3a.0 for ; Thu, 10 Aug 2023 16:49:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1691711361; x=1692316161; h=cc:to:from:subject:message-id:mime-version:date:reply-to:from:to:cc :subject:date:message-id:reply-to; bh=JCCbjs9yndiAMHKk4zASKNfGLKmo2+2FE4R0zJsZx6Q=; b=FAc2CxSHLC8ZxlV75t3HwLsw3iguLOIiobsunskpVdaaDLobGTrDJNCqxHOV5ZztvF nEi2bjCYtZcX2d6Xc9r34XQ5tf3WDS9tsxpSMrvq30i4m8eN10rkjwr4+TIafkaYvchN UlIyjlmZc0jE1fZGO6VD4N89rDsiqUAojHW7SpaEclte1hgZeZmzXTzfOsZCOiOoTB8a f5EEwkSyykDz+aYoKOO3tlgF6Ma8LqCYWIZPTUTd1VkS8lbB20MP7lkrCujOoaeBtA3I 0Ydn6LJ3aIPpJD+KUsTqsgiwv1R0J47J8VXt4pBAs8pMdsi1F0FdVonb/ymJamRErN+A fBzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691711361; x=1692316161; h=cc:to:from:subject:message-id:mime-version:date:reply-to :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=JCCbjs9yndiAMHKk4zASKNfGLKmo2+2FE4R0zJsZx6Q=; b=QIlvffTEwfX6K2qIVMZMljq7b8oL4hit9ZEWEs+GB0rAqRH+yokADRK3ZCfeec1fGa r3X84RoBAN/5GlLg4Wrr+vpkBuo0EWyvgYOT+vkikt8NqpDJBP3rXssr8vxg9HIZB10O gVKm1TPDlarBq0h0E0aev88aEwgt8cbweWBLsqEzpvMQajPLz1sIWZhMP02NjMuFqnB1 WEfXlLKteRUWJ6gm2j9y1LBt9ptkENtLLgbBjGcmvuIef2dlXWF8tWPpB6y6IkyMLtgd JxDNpW839eW6lcnpnqmSgpgsB2GrmM2PY7V3y81jgCI7EtQMLFIqhyyHKQ8yZoeoeF53 Ksyw== X-Gm-Message-State: AOJu0YypRycKdMLPux/4d5S4q0UAs48qlzfbYsqrUyj5mDzfi09Ujt/B buClz4t030VSTYHa21AsaqDSWPNBz9I= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a05:6a00:1d0d:b0:666:8f6c:c8ad with SMTP id a13-20020a056a001d0d00b006668f6cc8admr1036745pfx.2.1691711360993; Thu, 10 Aug 2023 16:49:20 -0700 (PDT) Reply-To: Sean Christopherson Date: Thu, 10 Aug 2023 16:49:16 -0700 Mime-Version: 1.0 X-Mailer: git-send-email 2.41.0.694.ge786442a9b-goog Message-ID: <20230810234919.145474-1-seanjc@google.com> Subject: [PATCH 0/2] KVM: SVM: Fix unexpected #UD on INT3 in SEV guests From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Wu Zongyo , Tom Lendacky X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773891059145388006 X-GMAIL-MSGID: 1773891059145388006 Fix a bug where KVM injects a bogus #UD for SEV guests when trying to skip an INT3 as part of re-injecting the associated #BP that got kinda sorta intercepted due to a #NPF occuring while vectoring/delivering the #BP. I haven't actually confirmed that patch 1 fixes the bug, as it's a different change than what I originally proposed. I'm 99% certain it will work, but I definitely need verification that it fixes the problem Patch 2 is a tangentially related cleanup to make NRIPS a requirement for enabling SEV, e.g. so that we don't ever get "bug" reports of SEV guests not working when NRIPS is disabled. Sean Christopherson (2): KVM: SVM: Don't inject #UD if KVM attempts emulation of SEV guest w/o insn KVM: SVM: Require nrips support for SEV guests (and beyond) arch/x86/kvm/svm/sev.c | 2 +- arch/x86/kvm/svm/svm.c | 37 ++++++++++++++++++++----------------- arch/x86/kvm/svm/svm.h | 1 + 3 files changed, 22 insertions(+), 18 deletions(-) base-commit: 240f736891887939571854bd6d734b6c9291f22e