From patchwork Thu Feb 2 18:28: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: 52117 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp400795wrn; Thu, 2 Feb 2023 10:30:09 -0800 (PST) X-Google-Smtp-Source: AK7set+p8nANhA40hfXJv19S/vqnEaX3K3gYIDLm94P50K3MIO/fBwpinKSGhF+nkF00uUhaIAk4 X-Received: by 2002:a17:90b:1d82:b0:22c:169b:ec44 with SMTP id pf2-20020a17090b1d8200b0022c169bec44mr7671548pjb.31.1675362608793; Thu, 02 Feb 2023 10:30:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675362608; cv=none; d=google.com; s=arc-20160816; b=zEMDFEUQrnQdIktD3bBwT5hmP2W18wnEp5KLOOK5ff/QzGDYirX0gJvHDIQqHj0YYV 09+C5QHc16ajK2bYh0IO7sJrGZWv89favJiXjCEer/QyQx8Tv6eb2NM8E4MTNpCb5s3f bIVrQjrP9/zYUKsZ+RTrh1W9RrHmEu1hwH3PkKmFVVwNX+3R3Q4wzHAYXxUVzr1Rzsst qPcRiFWyoYGjZMxmMrzFTrV/lXcQHTvsOyrHClRNyy/6gG0JmylwY8nF/tOGwAkIp8B5 NTJbygvafPr99bCyEgiUdLAocmbRsqokpjJLxws2vkzanoESkAWZGgNhehVYoYgK84k9 MxCw== 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:references :mime-version:in-reply-to:date:reply-to:dkim-signature; bh=23k7ngnnq1dagvKcwTov6zadXURGVa/hBCuLb+iV0g0=; b=jNCodkGzIHP3NPibNSRHkUvof15XGd20BkpSrOnYX+QFU07MPKyRlKWm90L5gqcVfk EkACuNAZEz/X37Zt9oFdA3YG/Fw/hbOovYJxsoU7bgwN2J1ov9gTTQKX1YX81nLbfQPJ kiUr7KdYXuvX0pALn06gPnb0ZjdTOEN5b1DdBx+4Ufw9AlLAX2vIDCqntc1ODpkpCN9q NjHy5b3E0+/YMNudLEGO9R5QZo+u/XX16GezPvMCjmjjY1YzrkwoDwTccmmZPh0+ceIm IJRsAmftO4S2E1Lsqih1c7K1CM6EtQwoEOTpoby9I8nG2SanbWS82wwZuebAphnUs5zS hRmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b="qlL/NRrp"; 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 on16-20020a17090b1d1000b002291890533esi493412pjb.114.2023.02.02.10.29.56; Thu, 02 Feb 2023 10:30:08 -0800 (PST) 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=20210112 header.b="qlL/NRrp"; 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 S232697AbjBBS3G (ORCPT + 99 others); Thu, 2 Feb 2023 13:29:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60754 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232568AbjBBS2l (ORCPT ); Thu, 2 Feb 2023 13:28:41 -0500 Received: from mail-pf1-x44a.google.com (mail-pf1-x44a.google.com [IPv6:2607:f8b0:4864:20::44a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 74EC754542 for ; Thu, 2 Feb 2023 10:28:24 -0800 (PST) Received: by mail-pf1-x44a.google.com with SMTP id v23-20020aa78097000000b005748c087db1so1356000pff.2 for ; Thu, 02 Feb 2023 10:28:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=23k7ngnnq1dagvKcwTov6zadXURGVa/hBCuLb+iV0g0=; b=qlL/NRrpG/+vpCbk4ZkF9xxNrvsWRSi6Ew/JHzWHJRFEE18vAOAO0CiLpVr7HiCAIS Xe+67hFPUl+94O9IvYmpLCQy2+x2p+BQrVc5ZrQIT6CqMJ4N9kHM1xwcuvqQSdloVLTl 4h9uMBNRWSRlWSp3i/vCULSGzs4w2spCcj5cGI0XJ7GVEtCFgRZS+QcocrikNW3ysSjD 0/27DxwuU9cVtWo6s0S9Vmak9nzECvFXw97c22bO2QBK2MLxHv3N+Z1FpfaQ5iGdvYz1 VjUJ6CgH/iBzlsETUhDGS6soZPFVpZQHzdogttMDnsowbI5LcqQ/mCsxEGfDGAwDjG0S n4mQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=23k7ngnnq1dagvKcwTov6zadXURGVa/hBCuLb+iV0g0=; b=Ww0FZsoqWstDI3QG7hsJdUGvMdJsbxIxoHt/mEeWP4QGI5gV9T9kphvmhFMc+prQxy 87kVNaxW8YMi5UE08KaccdSYwzGZZOOXCbBOE04BBtJGygZwXo0mA1XieHqUsxheAymg 4V772L3FpdPnES5FGzWtSY2Lit4NPzln2LSMDBFNwpJ7YxOFoAf/l6F98nVo3LF0SVj7 c7VN0nAC9y0TdBz/fYREpQoxW/fkmXJOYdNCSSJBIZx+vIAFLaxuhnqgCDaLGvTPoDPJ E8Qg+qokEm82xc+ZCtReaT82DcnvpnhVJhVNDbj88oFdXZyehstlODP4TQdFooOs04Tt cJ+w== X-Gm-Message-State: AO0yUKUXi1eXSOo7jdCYoRwAg/lxgyGGXKiDO31WkKyOcdCUzzQGiSo6 +r70IKzFyB9NthqHudJJJZyAR0sY2Q4= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a63:5715:0:b0:477:c1a3:9a10 with SMTP id l21-20020a635715000000b00477c1a39a10mr1205868pgb.33.1675362503600; Thu, 02 Feb 2023 10:28:23 -0800 (PST) Reply-To: Sean Christopherson Date: Thu, 2 Feb 2023 18:28:16 +0000 In-Reply-To: <20230202182817.407394-1-seanjc@google.com> Mime-Version: 1.0 References: <20230202182817.407394-1-seanjc@google.com> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog Message-ID: <20230202182817.407394-3-seanjc@google.com> Subject: [PATCH v2 2/3] KVM: x86/mmu: Detect write #PF to shadow pages during FNAME(fetch) walk From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Huang Hang , Lai Jiangshan 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_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756745022749476600?= X-GMAIL-MSGID: =?utf-8?q?1756745022749476600?= From: Lai Jiangshan Move the detection of write #PF to shadow pages, i.e. a fault on a write to a page table that is being shadowed by KVM that is used to translate the write itself, from FNAME(is_self_change_mapping) to FNAME(fetch). There is no need to detect the self-referential write before kvm_faultin_pfn() as KVM does not consume EMULTYPE_WRITE_PF_TO_SP for accesses that resolve to "error or no-slot" pfns, i.e. KVM doesn't allow retrying MMIO accesses or writes to read-only memslots. Detecting the EMULTYPE_WRITE_PF_TO_SP scenario in FNAME(fetch) will allow dropping FNAME(is_self_change_mapping) entirely, as the hugepage interaction can be deferred to kvm_mmu_hugepage_adjust(). Cc: Huang Hang Signed-off-by: Lai Jiangshan Link: https://lore.kernel.org/r/20221213125538.81209-1-jiangshanlai@gmail.com [sean: split to separate patch, write changelog] Signed-off-by: Sean Christopherson --- arch/x86/kvm/mmu/paging_tmpl.h | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/arch/x86/kvm/mmu/paging_tmpl.h b/arch/x86/kvm/mmu/paging_tmpl.h index 5d2958299b4f..f57d9074fb9b 100644 --- a/arch/x86/kvm/mmu/paging_tmpl.h +++ b/arch/x86/kvm/mmu/paging_tmpl.h @@ -685,6 +685,9 @@ static int FNAME(fetch)(struct kvm_vcpu *vcpu, struct kvm_page_fault *fault, if (sp != ERR_PTR(-EEXIST)) link_shadow_page(vcpu, it.sptep, sp); + + if (fault->write && table_gfn == fault->gfn) + fault->write_fault_to_shadow_pgtable = true; } kvm_mmu_hugepage_adjust(vcpu, fault); @@ -741,17 +744,13 @@ static int FNAME(fetch)(struct kvm_vcpu *vcpu, struct kvm_page_fault *fault, * created when kvm establishes shadow page table that stop kvm using large * page size. Do it early can avoid unnecessary #PF and emulation. * - * @write_fault_to_shadow_pgtable will return true if the fault gfn is - * currently used as its page table. - * * Note: the PDPT page table is not checked for PAE-32 bit guest. It is ok * since the PDPT is always shadowed, that means, we can not use large page * size to map the gfn which is used as PDPT. */ static bool FNAME(is_self_change_mapping)(struct kvm_vcpu *vcpu, - struct guest_walker *walker, bool user_fault, - bool *write_fault_to_shadow_pgtable) + struct guest_walker *walker, bool user_fault) { int level; gfn_t mask = ~(KVM_PAGES_PER_HPAGE(walker->level) - 1); @@ -765,7 +764,6 @@ FNAME(is_self_change_mapping)(struct kvm_vcpu *vcpu, gfn_t gfn = walker->gfn ^ walker->table_gfn[level - 1]; self_changed |= !(gfn & mask); - *write_fault_to_shadow_pgtable |= !gfn; } return self_changed; @@ -826,7 +824,7 @@ static int FNAME(page_fault)(struct kvm_vcpu *vcpu, struct kvm_page_fault *fault return r; is_self_change_mapping = FNAME(is_self_change_mapping)(vcpu, - &walker, fault->user, &fault->write_fault_to_shadow_pgtable); + &walker, fault->user); if (is_self_change_mapping) fault->max_level = PG_LEVEL_4K;