From patchwork Tue Apr 11 04:00:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 81707 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2318088vqo; Mon, 10 Apr 2023 21:10:41 -0700 (PDT) X-Google-Smtp-Source: AKy350aUH6HbRKKS+3VZlEhwv0S6RXXIyKZQmblxXG9T+r12EB688N7v6odxQNaxSEAeZt1GABR9 X-Received: by 2002:a05:6a20:b2a6:b0:db:391a:5eff with SMTP id ei38-20020a056a20b2a600b000db391a5effmr1352643pzb.22.1681186240802; Mon, 10 Apr 2023 21:10:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681186240; cv=none; d=google.com; s=arc-20160816; b=Ad71cuyP3lejDw6b2EKevNCt68wLN1DLQOFr1AR21OgzNN6F08IRua3HZjGR954ILZ 0eQFhc+9uNkZM0ZaXltSutI1LpCPwOl9hXqYIwfnXPGpGKyIbkvqmIA1gg/b6X2eKpsO Gv83kYgmDwPnN9xdcejWa/q68YF5WVoixkG7Ct/cKJRoIyYCVtZ8xNCwiUVsO/p5rAUa id/Ow7Z97GhaQLHlYT+41oGtSCnBm3HAIvCqWmlag8QH6c3CGF9ExWXvZhrjX+SnctJO FZ4HfbkYO5qCxu9oUq0ArHH2nqAw4+pfHBfGM4AcajKG+VI2EGp1sup/XmAkov9CVUze HA2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=A4xtdtTFZHDa5jhDkwr5zZ0PTsE0F+cWAuO7NEPKLLc=; b=CczcoF7MN6Re4iN1Ke+1F98t2duazniewEqZtBhelV7G+wiWtTJTFuVSHhndUgFaDc pL/l+w7TGOS5xi0A0Itm5dh0iTd5F72n102jUsXzfHvBNRj8FvQVPGAQT659BeN3jDrH HWk11ycLFlAnamaDgqCp1De70XQY4mg1ekg1Gf1Q2NcKImh2i4YYl4Owx42hQkShkm3P BKc6Wq+nUNjxejQxUVfVaylqzG+JyJgfRbKq+fzIZxJquq3J/egAYCAFw9sy1eTkpsb8 X2Ozhm+pBMFXGK3pwVGNrwoggqSjcidz+5Ag55zMmZ5wT36x4yUewZ+ns1QW1n+Gc9V0 2vzA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=WQVv+GC8; 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=canb.auug.org.au Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p22-20020a635b16000000b005139e0d2b5csi12674390pgb.487.2023.04.10.21.10.27; Mon, 10 Apr 2023 21:10:40 -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=@canb.auug.org.au header.s=201702 header.b=WQVv+GC8; 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=canb.auug.org.au Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229872AbjDKEBC (ORCPT + 99 others); Tue, 11 Apr 2023 00:01:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56678 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229720AbjDKEBA (ORCPT ); Tue, 11 Apr 2023 00:01:00 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1E9F01BF7; Mon, 10 Apr 2023 21:00:59 -0700 (PDT) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4PwXFP1f1mz4xDh; Tue, 11 Apr 2023 14:00:57 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1681185657; bh=A4xtdtTFZHDa5jhDkwr5zZ0PTsE0F+cWAuO7NEPKLLc=; h=Date:From:To:Cc:Subject:From; b=WQVv+GC8XX3wIlgW6dPN0KX4qzcdyIffSXdT5HBA2Eq/apOqRBnO6vGeZfOz39uq/ tnWXFu1VfOm8zLVNihHV3bhEIqiqO8JOf6mN26VlKx8cV4YSD5spsN57ezvA/HNm6c XbKEJoabwn4lzQzrtWmOl6IEMfvDoz5TTY3B5/9OGQSvfrOTq4k0nYtQ1it7B0GQis MSUvshrS0YHs/t91yQMyKt8jTJObBsuTfJXMEJXn6tV4UpJxR2FOwpyN+mJHWTfzLS VWoD7TklslDazmzbl2vYjWhPC0ym8CO2aAGrGeCTto37vr8bv25IuOu2s7aV5qGu24 HiucDb09Z+rbg== Date: Tue, 11 Apr 2023 14:00:55 +1000 From: Stephen Rothwell To: Sean Christopherson Cc: Jeremi Piotrowski , Paolo Bonzini , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: build failure after merge of the kvm-x86 tree Message-ID: <20230411140055.648cda0e@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-2.4 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS autolearn=unavailable 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?1762851543558213113?= X-GMAIL-MSGID: =?utf-8?q?1762851543558213113?= Hi all, After merging the kvm-x86 tree, today's linux-next build (x86_64 allmodconfig) failed like this: arch/x86/kvm/svm/svm.c: In function 'svm_flush_tlb_all': arch/x86/kvm/svm/svm.c:3852:17: error: implicit declaration of function 'hv_remote_flush_tlb' [-Werror=implicit-function-declaration] 3852 | hv_remote_flush_tlb(vcpu->kvm); | ^~~~~~~~~~~~~~~~~~~ Caused by commit 8a1300ff9518 ("KVM: x86: Rename Hyper-V remote TLB hooks to match established scheme") interacting with commit e5c972c1fada ("KVM: SVM: Flush Hyper-V TLB when required") from Linus' tree. I have applied the following merge fix patch. From: Stephen Rothwell Date: Tue, 11 Apr 2023 13:21:46 +1000 Subject: [PATCH] fixup for "KVM: x86: Rename Hyper-V remote TLB hooks to match established scheme" interacting with "KVM: SVM: Flush Hyper-V TLB when required" Signed-off-by: Stephen Rothwell --- arch/x86/kvm/kvm_onhyperv.h | 2 +- arch/x86/kvm/svm/svm.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/kvm/kvm_onhyperv.h b/arch/x86/kvm/kvm_onhyperv.h index 2d5f669c1ea1..f9ca3e7432b2 100644 --- a/arch/x86/kvm/kvm_onhyperv.h +++ b/arch/x86/kvm/kvm_onhyperv.h @@ -11,7 +11,7 @@ int hv_flush_remote_tlbs_range(struct kvm *kvm, gfn_t gfn, gfn_t nr_pages); int hv_flush_remote_tlbs(struct kvm *kvm); void hv_track_root_tdp(struct kvm_vcpu *vcpu, hpa_t root_tdp); #else /* !CONFIG_HYPERV */ -static inline int hv_remote_flush_tlb(struct kvm *kvm) +static inline int hv_flush_remote_tlbs(struct kvm *kvm) { return -EOPNOTSUPP; } diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index a9c940a31f3a..ca32389f3c36 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -3843,13 +3843,13 @@ static void svm_flush_tlb_all(struct kvm_vcpu *vcpu) { /* * When running on Hyper-V with EnlightenedNptTlb enabled, remote TLB - * flushes should be routed to hv_remote_flush_tlb() without requesting + * flushes should be routed to hv_flush_remote_tlbs() without requesting * a "regular" remote flush. Reaching this point means either there's - * a KVM bug or a prior hv_remote_flush_tlb() call failed, both of + * a KVM bug or a prior hv_flush_remote_tlbs() call failed, both of * which might be fatal to the guest. Yell, but try to recover. */ if (WARN_ON_ONCE(svm_hv_is_enlightened_tlb_enabled(vcpu))) - hv_remote_flush_tlb(vcpu->kvm); + hv_flush_remote_tlbs(vcpu->kvm); svm_flush_tlb_asid(vcpu); }