Received: by 2002:a05:7412:8d23:b0:f7:29d7:fb05 with SMTP id bj35csp20826rdb; Fri, 15 Dec 2023 21:08:25 -0800 (PST) X-Google-Smtp-Source: AGHT+IG1FqRS3AVSHm69h99H7j4ghznLruTJ71/+PRk48sPuiD/8kinY5gtDWZ+4PEy7ag+o+gn9 X-Received: by 2002:a05:620a:268b:b0:77f:61d0:94cf with SMTP id c11-20020a05620a268b00b0077f61d094cfmr15773190qkp.55.1702703305504; Fri, 15 Dec 2023 21:08:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702703305; cv=none; d=google.com; s=arc-20160816; b=vK9UfalSQuiFchD85I/fETj56jNegy+8LZ3/f6pAViwaosFLLUC6F7npmM7vf9H5Oh ur+10NNCHu8wA4qca8hnPRCaEZAF7iIxqEtDebGN3GaHI0uWr1S2ErYNKeKi1F0qrWeh NoVQunnfgcH3GUTsV7rraLQ4Nf5MzK7r6DdaShcRDxcvZTWgbDiA54FvxV50q4rj+yFR 5hsH7Q1fTNLsNHJmJYvwuTF8kq0zXA8qGNn2yqZ+zRiXS6vfmq2OKyWrIPBEPwNCbloF CfjdWJLiPaEV5Rm9pSrPwefIhQhUdg/Oalk6l4Puzl1EgCVSTlaciYH0CZwueDTs+lBw ItPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:date:message-id:dkim-signature; bh=LNbpWQOmt7apCl5n0HnfiCBr/R0dZ7dJOsEv+sS5huc=; fh=a86QlQ61vykCUCFk2PtCD4gici18IhWtbm/iqX0Dnig=; b=E4VpmCdoOtdHco22XrKJDr5KvFcdHcmU3DrY7V1WLG/b93yXW3x9seQBwt1tfM9vx4 0OCCLTMei+JdRf7q/QNQvpb287tJazWIrOPlZ33HwKJFBgFPTF1Z+qfq1vmDIkON3dlc q3hVM/Uowdqpwm8IZsVr94MNdMMEtPIS7YuiO7dVtaXYJIK4/iJS/Qm52T8OekX+vVxc vrCimLmUODiYQESDYse8LIq153Db/hMVem7uBP6BR3JzqC+6coUNNARUCAmcQWlw9pst C0v80uIX9U+1B3yECfpCfEBTYWWP6BnPM9E+wbpGNWkHoO11+8ZFHIkU6hv58l1pDv5o AvVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=y5GOZijB; spf=pass (google.com: domain of linux-kernel+bounces-2085-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-2085-linux.lists.archive=gmail.com@vger.kernel.org" Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id x21-20020a05620a449500b0077dcd9b09cesi19789564qkp.522.2023.12.15.21.08.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Dec 2023 21:08:25 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-2085-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=y5GOZijB; spf=pass (google.com: domain of linux-kernel+bounces-2085-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-2085-linux.lists.archive=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 2AE2F1C248F7 for ; Sat, 16 Dec 2023 05:08:25 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C548B1170A; Sat, 16 Dec 2023 05:08:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="y5GOZijB" X-Original-To: linux-kernel@vger.kernel.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A7DAC10A06; Sat, 16 Dec 2023 05:08:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: Content-Type:In-Reply-To:From:References:Cc:To:Subject:MIME-Version:Date: Message-ID:Sender:Reply-To:Content-ID:Content-Description; bh=LNbpWQOmt7apCl5n0HnfiCBr/R0dZ7dJOsEv+sS5huc=; b=y5GOZijB/vsGTnQ+5eB2ALoG0J QbRBUDvMMXk8egB3bzntff0aMPHjDgL1QBarq3yN7547EbeMlZYrraYv7y4oaxu77e0Bj8MdYaUUF 1UWCgYXMlfuQ2CqZ/gCBNgqkQXDbehSH8acWnkSip8lKqa9rZpXGpHzulX2LSFxjqrrishniuxvyg HVclsNKj/+S+bjT7s43UjOy1y2YL2zFXBv9sJ+1oZhf4c6cR/8ebJGgz6FEO/ryZ6tTYD2wvvBE5G DgRBtO131N3UhZRagRg7D/fbD+ce66yx+98zteFsLpZHAJGFVQmm99Uuzgx88JNiiQfODb/UkjX2N 8U5PuARw==; Received: from [50.53.46.231] (helo=[192.168.254.15]) by bombadil.infradead.org with esmtpsa (Exim 4.96 #2 (Red Hat Linux)) id 1rEMuE-005RHJ-2R; Sat, 16 Dec 2023 05:08:06 +0000 Message-ID: <15ba5868-42de-4563-9903-ccd0297e2075@infradead.org> Date: Fri, 15 Dec 2023 21:08:06 -0800 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] LoongArch: KVM: Fix build due to API changes Content-Language: en-US To: Huacai Chen , Paolo Bonzini , Huacai Chen , Tianrui Zhao , Bibo Mao Cc: kvm@vger.kernel.org, loongarch@lists.linux.dev, linux-kernel@vger.kernel.org, Xuerui Wang , Jiaxun Yang , Stephen Rothwell References: <20231115090735.2404866-1-chenhuacai@loongson.cn> From: Randy Dunlap In-Reply-To: <20231115090735.2404866-1-chenhuacai@loongson.cn> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Hi, Someone please merge this patch... Thanks. On 11/15/23 01:07, Huacai Chen wrote: > Commit 8569992d64b8f750e34b7858eac ("KVM: Use gfn instead of hva for > mmu_notifier_retry") replaces mmu_invalidate_retry_hva() usage with > mmu_invalidate_retry_gfn() for X86, LoongArch also need similar changes > to fix build. > > Signed-off-by: Huacai Chen > --- > arch/loongarch/kvm/mmu.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/loongarch/kvm/mmu.c b/arch/loongarch/kvm/mmu.c > index 80480df5f550..9463ebecd39b 100644 > --- a/arch/loongarch/kvm/mmu.c > +++ b/arch/loongarch/kvm/mmu.c > @@ -627,7 +627,7 @@ static bool fault_supports_huge_mapping(struct kvm_memory_slot *memslot, > * > * There are several ways to safely use this helper: > * > - * - Check mmu_invalidate_retry_hva() after grabbing the mapping level, before > + * - Check mmu_invalidate_retry_gfn() after grabbing the mapping level, before > * consuming it. In this case, mmu_lock doesn't need to be held during the > * lookup, but it does need to be held while checking the MMU notifier. > * > @@ -807,7 +807,7 @@ static int kvm_map_page(struct kvm_vcpu *vcpu, unsigned long gpa, bool write) > > /* Check if an invalidation has taken place since we got pfn */ > spin_lock(&kvm->mmu_lock); > - if (mmu_invalidate_retry_hva(kvm, mmu_seq, hva)) { > + if (mmu_invalidate_retry_gfn(kvm, mmu_seq, gfn)) { > /* > * This can happen when mappings are changed asynchronously, but > * also synchronously if a COW is triggered by -- #Randy https://people.kernel.org/tglx/notes-about-netiquette https://subspace.kernel.org/etiquette.html