From patchwork Tue Jul 18 13:18:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zeng Guang X-Patchwork-Id: 122074 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1791263vqt; Tue, 18 Jul 2023 07:33:48 -0700 (PDT) X-Google-Smtp-Source: APBJJlGtKdGJVN6/yADzd8DKBu/360iJ1Mei0FUFeb1jqkBmHdLzWq6x9MYQCVtt+NlaTWV4ElJF X-Received: by 2002:a05:6402:b06:b0:51e:166d:8e95 with SMTP id bm6-20020a0564020b0600b0051e166d8e95mr122042edb.4.1689690828538; Tue, 18 Jul 2023 07:33:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689690828; cv=none; d=google.com; s=arc-20160816; b=KZyIyK0tQ0JxyCt4p0ij0s/R4c5a2C48Hsv9jk53761GYy1Kj0q/41fGpteTXEUYt7 0C6xo9RkK5b7wuLcZ6dbZGgQD8couLcJvYi2MphzdS9bgSEjUG49M59HbLznEpakENgD AcWcuErbCB+Zb2E/8vfHkFB8vaYD+0TSGo/pFIefZ+zejlXbxgPKMxQd9WY/8n1+KHg5 8ot0q5SxTHXNbbu6DU3DEtWLfMrlHx+4Va0F0gKgob5laooAWQewCxyUl0ElH6LZlNCp FM/wg+EnWN9aSO5dpyUbTUdZhakxyl2/M5Wbfp3YI527c1NRD6oHBWaYryALKJBPXfAj XESg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:dkim-signature; bh=KXEOYKKJWLTsPPDpjBiG7ga7pUtYW5FORiCFzJN5924=; fh=Anq9OfXDpkFCOPFtgh8QgUfzP993MEtJnx/ssiwHMkk=; b=0+J3qSxiJ/pWoajERoMlZPquN25F7Oqvp5LF2Q0LOLIDhv3WhjrpFVlUTTXBB3Pxs6 UkasaBMcIZDPaO5A5XYX4mAw7n4CZhWQ9rgOD52G3mPeIVRpgYvxGnjEFYDusEID6I86 HX95WoUxoR0qmrIZg8RQZ1fUBaCZDrhZQZnGErQ/cpk366NxHQhUgVeWJUysdWszKwaE XViZ/ig8UHxSpN7zn8YfB4Jpa18KL1GtJCVfQa4psTogmsHyqGi6gLG5jBu0WoNN0HfV +04uZewvK0bdwdlvB3rJ71Q72fY74WVuy0+nYbc7zDsHPn+7SzLJ2cnO6+28uXzo4Ft9 HD6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=HCmzmvnB; 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=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e19-20020aa7d7d3000000b0051d882750d2si1306459eds.569.2023.07.18.07.33.25; Tue, 18 Jul 2023 07:33:48 -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=@intel.com header.s=Intel header.b=HCmzmvnB; 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=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232764AbjGROAp (ORCPT + 99 others); Tue, 18 Jul 2023 10:00:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58044 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233070AbjGROAh (ORCPT ); Tue, 18 Jul 2023 10:00:37 -0400 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B9C671BE4; Tue, 18 Jul 2023 07:00:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1689688810; x=1721224810; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=LDXkVCSBwyltuNYKnmnknvsRCJGauTD4XIMPmA3/KsU=; b=HCmzmvnBFUZemQgVqopA8Gy5wiSiRGGyHMpYZrwpaf+h7Old2Br055q3 VhWoZsSl+IPuHJnOr5m1PyZIC9P/KUSsloRI+kK3zJqPqqL1sEsqVLKtj gvr+V2EKts8SrL1DAt6WvDz0fPFy+vAhLg9b5lP7HMouNJ6lN52oL93fa uD5UwmjdJq6E5JdW7x0lxO/FY6qy7BtmGcbc4cREAsPprsQB4XtoGJTDx v/zyBq81z6EsQNJYoPgEvYD/ob8wc12JrauTxebdE3VcSdY6QRq5uNlIs HtjPWr2OvqMV5T1od2NBwl+HgN7LlQUEgx5A0CcvACLh65ULO+4W976Lv g==; X-IronPort-AV: E=McAfee;i="6600,9927,10775"; a="363676126" X-IronPort-AV: E=Sophos;i="6.01,214,1684825200"; d="scan'208";a="363676126" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jul 2023 06:58:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10775"; a="1054291147" X-IronPort-AV: E=Sophos;i="6.01,214,1684825200"; d="scan'208";a="1054291147" Received: from arthur-vostro-3668.sh.intel.com ([10.238.200.123]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jul 2023 06:58:49 -0700 From: Zeng Guang To: Paolo Bonzini , Sean Christopherson , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , H Peter Anvin , kvm@vger.kernel.org Cc: x86@kernel.org, linux-kernel@vger.kernel.org, Binbin Wu , Zeng Guang Subject: [PATCH v2 4/8] KVM: x86: Add X86EMUL_F_INVTLB and pass it in em_invlpg() Date: Tue, 18 Jul 2023 21:18:40 +0800 Message-Id: <20230718131844.5706-5-guang.zeng@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230718131844.5706-1-guang.zeng@intel.com> References: <20230718131844.5706-1-guang.zeng@intel.com> X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE, URIBL_BLOCKED autolearn=ham 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: 1771769250487016464 X-GMAIL-MSGID: 1771769250487016464 From: Binbin Wu Add an emulation flag X86EMUL_F_INVTLB, which is used to identify an instruction that does TLB invalidation without true memory access. Only invlpg & invlpga implemented in emulator belong to this kind. invlpga doesn't need additional information for emulation. Just pass the flag to em_invlpg(). Signed-off-by: Binbin Wu Signed-off-by: Zeng Guang --- arch/x86/kvm/emulate.c | 4 +++- arch/x86/kvm/kvm_emulate.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index 8e706d19ae45..9b4b3ce6d52a 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c @@ -3443,8 +3443,10 @@ static int em_invlpg(struct x86_emulate_ctxt *ctxt) { int rc; ulong linear; + unsigned max_size; - rc = linearize(ctxt, ctxt->src.addr.mem, 1, false, &linear); + rc = __linearize(ctxt, ctxt->src.addr.mem, &max_size, 1, ctxt->mode, + &linear, X86EMUL_F_INVTLB); if (rc == X86EMUL_CONTINUE) ctxt->ops->invlpg(ctxt, linear); /* Disable writeback. */ diff --git a/arch/x86/kvm/kvm_emulate.h b/arch/x86/kvm/kvm_emulate.h index c0e48f4fa7c4..c944055091e1 100644 --- a/arch/x86/kvm/kvm_emulate.h +++ b/arch/x86/kvm/kvm_emulate.h @@ -93,6 +93,7 @@ struct x86_instruction_info { #define X86EMUL_F_FETCH BIT(1) #define X86EMUL_F_BRANCH BIT(2) #define X86EMUL_F_IMPLICIT BIT(3) +#define X86EMUL_F_INVTLB BIT(4) struct x86_emulate_ops { void (*vm_bugged)(struct x86_emulate_ctxt *ctxt);