Received: by 2002:a05:6358:7058:b0:131:369:b2a3 with SMTP id 24csp7657500rwp; Tue, 18 Jul 2023 20:32:53 -0700 (PDT) X-Google-Smtp-Source: APBJJlEaHTjfpPG1TODlWpOJCGSJWMok3Q1t0Y0wXhCb+PwMAPFrrt01R72SI8bYFJCEm2YLWjCy X-Received: by 2002:a17:907:7805:b0:994:5303:a1ec with SMTP id la5-20020a170907780500b009945303a1ecmr1324419ejc.43.1689737573192; Tue, 18 Jul 2023 20:32:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689737573; cv=none; d=google.com; s=arc-20160816; b=jHgJkAU741MDTMupPe5xgqWUjTzHR6n/llmbCEuMA9p7d6wdwxrW3pkWAwP8dWNRH/ DaX56zyLFMJkUE8SInoJVsqfgkcsG+ZMOXPMslv+sYpxAd1hnXZ8k0/17m4sIIjM32Ee 2DZmCMQFa8hjr9ENTzoH6kLnSKrl/lFTcAtaSaz5ZjhiGeiW2ChVAMmbvXlhUlPkHWHh y5VoIGGkZ61Zvmm75M+3R9mrSXFewsyaBKsjQM0FnDFs69hOr10PkcLCzVkZSEh/TUve AL4svj2lx96sJkSJQJCu3rUvvnxcwkzgQsMww2xg3DYsFG4wmZigb3Pb2rPH3ChsGnae 9QVA== 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=pnfFhtdhk2uUQ8ajt6DFtBUHqP/S5rSwOFJoRVWG9PmQyjXfgZBKeuxgzE0F3PPOv1 TN/B4S9uvZtS4ToUi1D/jfb4cUbfT/UOeugLhFE4mr5tmMJkW+hqgLy9689t8AlZIGGC Y+UiMw47amlpT6ijqTDH0KehJeAHuwG42sJepcQN8rNSR7hJU7H7z+EuljHnkKS7iBbZ 1QEvOPZxo2PNLtohUPhRzUMhKMG0KAjDClx24RG3E3yAqrXOqrnrPicPRj/nFKNlW1zE tKm+QkRhgrUv3aXzJN2hVRtms/NBZJq0hUH/eSpfQuqW8LM+Z6K2ya6ZrTW+TJ/0RYCh ds6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Hwggx9t1; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id jr1-20020a170906a98100b00992c7f7356dsi2340827ejb.8.2023.07.18.20.32.28; Tue, 18 Jul 2023 20:32:53 -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=Hwggx9t1; 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 S230465AbjGSD0L (ORCPT + 99 others); Tue, 18 Jul 2023 23:26:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48392 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230423AbjGSDZ4 (ORCPT ); Tue, 18 Jul 2023 23:25:56 -0400 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 74C361BF1; Tue, 18 Jul 2023 20:25:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1689737155; x=1721273155; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=LDXkVCSBwyltuNYKnmnknvsRCJGauTD4XIMPmA3/KsU=; b=Hwggx9t1chLv3NVybzPfnYTW0ez2/3lI54DPmbXUDIzWwTOzmnXOGx7L XtFoa5LSM4mMcjKB9dBYfGnRYcn3KZnCnctayAZ9j+1SvqwxTiiBUEIfq gcQvrTByxNcAezfaVf0OOVZXL95158g2AS4HW0UdNcdn84lpWs00KO8W7 v4YeN5Hz2OM9DSzYSh66sEShrKrXvsc9qZQ2r85DCzUXjizioI84n6GFV v6x1p5LxtXGSSFFRDrCvjgUIZOEpe5s98PLhgSp9rAMleFvyNG9y0EyOR qtHYM430Ncl0KPaUX7+EYBrqEg6G4wsl8ahe5pn4pRWydnblLEyJYGB1b A==; X-IronPort-AV: E=McAfee;i="6600,9927,10775"; a="346665837" X-IronPort-AV: E=Sophos;i="6.01,215,1684825200"; d="scan'208";a="346665837" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jul 2023 20:25:55 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10775"; a="813980273" X-IronPort-AV: E=Sophos;i="6.01,215,1684825200"; d="scan'208";a="813980273" Received: from arthur-vostro-3668.sh.intel.com ([10.238.200.123]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jul 2023 20:25:52 -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: Wed, 19 Jul 2023 10:45:54 +0800 Message-Id: <20230719024558.8539-5-guang.zeng@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230719024558.8539-1-guang.zeng@intel.com> References: <20230719024558.8539-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 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); -- 2.27.0