From patchwork Fri Feb 26 01:03:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 12105337 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-26.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2573CC433E0 for ; Fri, 26 Feb 2021 01:05:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D812464F29 for ; Fri, 26 Feb 2021 01:05:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232008AbhBZBFI (ORCPT ); Thu, 25 Feb 2021 20:05:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48886 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230010AbhBZBFC (ORCPT ); Thu, 25 Feb 2021 20:05:02 -0500 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 19178C06178A for ; Thu, 25 Feb 2021 17:03:39 -0800 (PST) Received: by mail-yb1-xb49.google.com with SMTP id g17so8409833ybh.4 for ; Thu, 25 Feb 2021 17:03:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:reply-to:date:in-reply-to:message-id:mime-version:references :subject:from:to:cc; bh=jjFmqKl5TUSlu20yk/qEiThTFlDZmJ7vLsHCxIjCxWQ=; b=thzagAC2ArbMJiyjkGonrAiEV5IKDadQD3GoC8IqgDet51VKEpm93EWDj/6VzmpRuj a/VY0bkTye3mYeoBN4b4QNxaAR9EuZbJjUULUXiARyXHcq750mYq5777gtWqvfp2AGGA k/sNnEhMFooq/WTLdg12HYSxlO06Wvq5pPpfCcQxVWNJAQZXziKuk3Kgv5HFXK8R/pxp Hm3Htl7yVjjQUhqALGZ27qBZpp7ck0SOzJ5ndxse6+LASF4xvLQLItlyj2/cSgPdCNyS cVEErZByxYfDcTl9bgYYVUeEZlB8VbbfMuVdiW8Ae2vE+z0Rpr6UU+wI2chH80TVAmAF 0P1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:reply-to:date:in-reply-to:message-id :mime-version:references:subject:from:to:cc; bh=jjFmqKl5TUSlu20yk/qEiThTFlDZmJ7vLsHCxIjCxWQ=; b=N7XQ4IztjPFfcjyh+ElCH3llYK373enjaGp4YeuLyN4hxMrW/g26kHjhq4jpHKKBXR gag+b0sLwvzoatQ7S4w8WBZXWkBr9BG4SgdGUGJnuGC07rY9lgEFQDia1mp+s/hGuaIn TfE6pDXooHJaECRW0gK/mP13qU5tiRxBUpobIz1L+ysn4WoeMggktNaB57shLb6evp0h HlhDomb/IFPRSCPV/a3kQ6cVGQ0KRY5mbA0+lombG52L94mRRfu1y1p+NIjstXUhzce3 oFCztlpQuRrm8EWc6uSsTgMVl8TFMoHKJo5BUq2TyR/oEMZN8to7iY10mEvXCfM+bkLf tN7A== X-Gm-Message-State: AOAM531/596ymdXgsTWuVYP1B7t+Jj4Zi2zTDXaJYpk+IEdfkUr7FYBt LfZIA3HOlX3hL7pyVNg72T/hbPoKB6k= X-Google-Smtp-Source: ABdhPJxS7wqy9jeWhEDjop15HOx+Q9pR1KowWkU+O8C8ijl/iTyZmsIqLlwpkLz1+C2/XCwoINxwcOewFn4= Sender: "seanjc via sendgmr" X-Received: from seanjc798194.pdx.corp.google.com ([2620:15c:f:10:34c4:7c1d:f9ba:4576]) (user=seanjc job=sendgmr) by 2002:a25:7312:: with SMTP id o18mr895039ybc.352.1614301418368; Thu, 25 Feb 2021 17:03:38 -0800 (PST) Reply-To: Sean Christopherson Date: Thu, 25 Feb 2021 17:03:26 -0800 In-Reply-To: <20210226010329.1766033-1-seanjc@google.com> Message-Id: <20210226010329.1766033-3-seanjc@google.com> Mime-Version: 1.0 References: <20210226010329.1766033-1-seanjc@google.com> X-Mailer: git-send-email 2.30.1.766.gb4fecdf3b7-goog Subject: [PATCH 2/5] KVM: x86/mmu: WARN if TDP MMU's set_tdp_spte() sees multiple GFNs From: Sean Christopherson To: Paolo Bonzini Cc: Sean Christopherson , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Ben Gardon Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org WARN if set_tdp_spte() is invoked with multipel GFNs. It is specifically a callback to handle a single host PTE being changed. Consuming the @end parameter also eliminates the confusing 'unused' parameter. Cc: Ben Gardon Signed-off-by: Sean Christopherson --- arch/x86/kvm/mmu/tdp_mmu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/mmu/tdp_mmu.c b/arch/x86/kvm/mmu/tdp_mmu.c index 3290e53fb850..020f2e573f44 100644 --- a/arch/x86/kvm/mmu/tdp_mmu.c +++ b/arch/x86/kvm/mmu/tdp_mmu.c @@ -1022,7 +1022,7 @@ int kvm_tdp_mmu_test_age_hva(struct kvm *kvm, unsigned long hva) * Returns non-zero if a flush is needed before releasing the MMU lock. */ static int set_tdp_spte(struct kvm *kvm, struct kvm_memory_slot *slot, - struct kvm_mmu_page *root, gfn_t gfn, gfn_t unused, + struct kvm_mmu_page *root, gfn_t gfn, gfn_t end, unsigned long data) { struct tdp_iter iter; @@ -1033,7 +1033,7 @@ static int set_tdp_spte(struct kvm *kvm, struct kvm_memory_slot *slot, rcu_read_lock(); - WARN_ON(pte_huge(*ptep)); + WARN_ON(pte_huge(*ptep) || (gfn + 1) != end); new_pfn = pte_pfn(*ptep);