From patchwork Tue Aug 8 22:40:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 132973 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp2459075vqr; Tue, 8 Aug 2023 16:37:46 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFkG2nm52Hz1kQHemmI/K2XWORRxrf9vyJMkwm8f4BTj5N/dcHW8BS4j0MQwHJ3MtEeUXBO X-Received: by 2002:aa7:c542:0:b0:521:8d64:df1c with SMTP id s2-20020aa7c542000000b005218d64df1cmr1033682edr.0.1691537866320; Tue, 08 Aug 2023 16:37:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691537866; cv=none; d=google.com; s=arc-20160816; b=FDOxNLz8MK7Zn//CJi4WfKFl393/q0oVDiAUeECHruYpnGCa3D/fPvyGUJtdxgSyQy vwLKzdCfdVe4Qzpcc87k0EeyD/WlcLUzkPPV+Pd/kZMiEM7grmqMAHG2guIzsIvzo8JJ H68OjLUhOGoPbuDu88zRutrMqymplb4v+Omt2aTVp8FI14aQ8ohLwaKgsAzq3X/N+x+A /tQ34kRIHipZY8HSjRSc7vEr0a8GZFrD8AnlbpgIuav5cOb0RJ2ao8nB7S52/pdEXU8F TakPPMJHaR4+g/DqkkQPlvBCNJz2ChQX9VTC/ZmZV5F0iJbTBekCAz7X4omTmySYyhLB J6Jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:cc:to:from:subject :message-id:mime-version:date:reply-to:dkim-signature; bh=3rNBj6786+N1k32eHRRlayZnJaz3TtrdUsSjOGUYzq0=; fh=IYltlaa/cHY4Hy0cg0M1t7DPag1CgojBjoYmgb2Gp54=; b=XGOHzLz8HYVNnZAeHCOlcH6a/Y+WNr2fqqkGlK/sVdDMDo2WaageTpvmx7oEp/q7c4 7gSV8reUyxwbgXVEqRwTKIL0ezSMSBy181oMnLmYs3FeA/GhYTHnReIeap48So5f0XCi +XLVClA67UgfdZ4mbK9QtNTpsEGlWJwBKV0Chzc1ryqKFRIYHNMmydxZNPnE3bWOcoAw w4t2UkmJj4MS86kqNGEAnImUn3BANuOMPQ6LwFZgqFPn19G/eKIaCvupVoUbbC+KP80K 3x+nQSUYECWeR9gsIxZWwmAwmsm5mM9L6UAQV2jt2rOsahS7PcHKDB7g/fQVjutELNbb LwEQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=3ZqoyMsm; 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 w5-20020a056402128500b005231f4ead5dsi7002973edv.537.2023.08.08.16.37.07; Tue, 08 Aug 2023 16:37:46 -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=3ZqoyMsm; 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 S230345AbjHHWlE (ORCPT + 99 others); Tue, 8 Aug 2023 18:41:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46728 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230322AbjHHWlC (ORCPT ); Tue, 8 Aug 2023 18:41:02 -0400 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7095F10B for ; Tue, 8 Aug 2023 15:41:02 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-583f048985bso80870287b3.2 for ; Tue, 08 Aug 2023 15:41:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1691534461; x=1692139261; h=content-transfer-encoding:cc:to:from:subject:message-id :mime-version:date:reply-to:from:to:cc:subject:date:message-id :reply-to; bh=3rNBj6786+N1k32eHRRlayZnJaz3TtrdUsSjOGUYzq0=; b=3ZqoyMsmInjqXfLrhhQo3PmaKb4aK/U3mYdCHpVvru5JheoWVyAk7sYiYRcVwL9dpq V0pqPbbRLmNLOJrWYIfGS67Au7hiWO3Vz95IBlKApSJelhVNpJY2RIkyb8nhYheTKQ69 LL/RVxaE99OBa9+pGsngWbYgn9Pz/XEdLG1MGfiVI/hNhd+ZTBqotzZQeJZistGxnGvd d8yne52FcFYEhfwd6swj2mlxRB0f6w2iyI9expZ+Xc+q2DsH/3UvvD33pKWaRksyZJna F0Czv86+YHqEIkQR/h76PYg62M7N5afvK5DkAuXmdLIE9QTqgSlVxNABCeA48U3/Pri+ +Rbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691534461; x=1692139261; h=content-transfer-encoding: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=3rNBj6786+N1k32eHRRlayZnJaz3TtrdUsSjOGUYzq0=; b=LPxKOjLDbw5BlMkQg0J4EiuTUqlNf+Tf5hiYO2BA3GC+VxdzBWi+0qLSGj9lx4crZQ C5hVzv7+PLEqpoxkaK0j92y/JNOLUsSByReBKqwm7bD4jSRycVvAC0sW3/30Bg5aitA8 WYXzBWoZMb8chxOpPVQSRl1VYFGbzjEmR0L1YsycmqBjGYvsSCR+jy8CkT/r2gQvYyfq DUJOoLKYurHRJfCC9RrmUFfxmPEPkQx1r5PdQecQKe7pGxmXieSs5jUuMXKBe6RfaTUe TLgjfu9lzigPdlkdmljFZ9689kInOeMBl3ZtkLFp38LikAjm/1anZLw0rJ9x9QmIbsyz HtKQ== X-Gm-Message-State: AOJu0Yw9tWcMliQyUyZ4uwASl7gr16VaoXwgZJ3cNdGmElkqWWMzp2DY 1ubvpGCmUaKodifDNEDwtRAxjlJJcSE= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a25:7456:0:b0:d05:7ba4:67f9 with SMTP id p83-20020a257456000000b00d057ba467f9mr20788ybc.3.1691534461716; Tue, 08 Aug 2023 15:41:01 -0700 (PDT) Reply-To: Sean Christopherson Date: Tue, 8 Aug 2023 15:40:59 -0700 Mime-Version: 1.0 X-Mailer: git-send-email 2.41.0.640.ga95def55d0-goog Message-ID: <20230808224059.2492476-1-seanjc@google.com> Subject: [PATCH] KVM: x86/mmu: Include mmu.h in spte.h From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org 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=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: 1773706010117258710 X-GMAIL-MSGID: 1773706010117258710 Explicitly include mmu.h in spte.h instead of relying on the "parent" to include mmu.h. spte.h references a variety of macros and variables that are defined/declared in mmu.h, and so including spte.h before (or instead of) mmu.h will result in build errors, e.g. arch/x86/kvm/mmu/spte.h: In function ‘is_mmio_spte’: arch/x86/kvm/mmu/spte.h:242:23: error: ‘enable_mmio_caching’ undeclared 242 | likely(enable_mmio_caching); | ^~~~~~~~~~~~~~~~~~~ arch/x86/kvm/mmu/spte.h: In function ‘is_large_pte’: arch/x86/kvm/mmu/spte.h:302:22: error: ‘PT_PAGE_SIZE_MASK’ undeclared 302 | return pte & PT_PAGE_SIZE_MASK; | ^~~~~~~~~~~~~~~~~ arch/x86/kvm/mmu/spte.h: In function ‘is_dirty_spte’: arch/x86/kvm/mmu/spte.h:332:56: error: ‘PT_WRITABLE_MASK’ undeclared 332 | return dirty_mask ? spte & dirty_mask : spte & PT_WRITABLE_MASK; | ^~~~~~~~~~~~~~~~ Fixes: 5a9624affe7c ("KVM: mmu: extract spte.h and spte.c") Signed-off-by: Sean Christopherson --- arch/x86/kvm/mmu/spte.h | 1 + 1 file changed, 1 insertion(+) base-commit: 240f736891887939571854bd6d734b6c9291f22e diff --git a/arch/x86/kvm/mmu/spte.h b/arch/x86/kvm/mmu/spte.h index 83e6614f3720..6215f4c60ed5 100644 --- a/arch/x86/kvm/mmu/spte.h +++ b/arch/x86/kvm/mmu/spte.h @@ -3,6 +3,7 @@ #ifndef KVM_X86_MMU_SPTE_H #define KVM_X86_MMU_SPTE_H +#include "mmu.h" #include "mmu_internal.h" /*