From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C73A2E7AD7F for ; Tue, 3 Oct 2023 16:55:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240649AbjJCQzh (ORCPT ); Tue, 3 Oct 2023 12:55:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46304 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231388AbjJCQz2 (ORCPT ); Tue, 3 Oct 2023 12:55:28 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 13993A7 for ; Tue, 3 Oct 2023 09:54:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696352085; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AEA4UEa1g2oq3JcBQNLhy9atPLV06mxTKsyGqlcJSvY=; b=Z7JY62+OUBsMDwL80nNlemd/+Fv9DzbYl+uUfZk37FfyfKj0qskYUX7JcSYh8RmILOVOLF IXCnMHDtQz83IHJQ56+ZcXecoA1ftlmox9vkcAnwb8osK5yekO2a/q5ld0M1RUJmnYU/me XrjTwRvSeoInrY4FJa9ZD3v0BqwBlBU= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-380-Z5Q1kt85NI6zc3Fm5p343w-1; Tue, 03 Oct 2023 12:54:44 -0400 X-MC-Unique: Z5Q1kt85NI6zc3Fm5p343w-1 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-3247f646affso1189f8f.1 for ; Tue, 03 Oct 2023 09:54:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696352083; x=1696956883; h=content-transfer-encoding:mime-version:user-agent:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=AEA4UEa1g2oq3JcBQNLhy9atPLV06mxTKsyGqlcJSvY=; b=mZe1Yc9r1NAgCwZEZ16MaBD8BAW7YM9DaA+kzOrYeXOaDl4wtdqIwQ5ANEFZRjUDmp +7pFo7KslHKHE+kZT8hC8Pz/QdwbOp9LWV03JG3gSJY1ynX8ETynBx1kZMkNvvSWpuT4 A0ETqCwnX+EBEwjgUvWCdabrVE3rPIAEBAbZJazzoxTOt/fL3UJD8AcuSRXzCgDIHfEj MOgJL8RO8sutq7TARmq5WSeuSHngMf/K/XuHVWxuXqJVYULv4wAuoagUFCnXbMNgY9op DgqdZ5w+Jll4dUyOXmcO3OZMe8wl91CXnI41/ZnIW8NlzogXRoxBkYZO/k1RGtNDd/bW UEeA== X-Gm-Message-State: AOJu0YxOLWInLOdp3Ta3JreFKQQmu4XK4od1qNSI016DY0C6PtLO1Tnq P3T20gm7ABDRLOPe3udrvwLyj+APkpXcI281YGFalGnBM/RjF5z/zFcsHtIG3IBeFw0nyoUfUQW vKntLnRfrtJkS1uhKvgFLBoqR X-Received: by 2002:a5d:4d4f:0:b0:321:6339:f523 with SMTP id a15-20020a5d4d4f000000b003216339f523mr2507867wru.22.1696352082896; Tue, 03 Oct 2023 09:54:42 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFlDv2gBqmNjvi8JNhQ5M3NWUTvo78ciQKNKG4gkmI0moK0OwgDXlqnMKPVIA5lvJAWxNQcww== X-Received: by 2002:a5d:4d4f:0:b0:321:6339:f523 with SMTP id a15-20020a5d4d4f000000b003216339f523mr2507859wru.22.1696352082685; Tue, 03 Oct 2023 09:54:42 -0700 (PDT) Received: from starship ([89.237.100.246]) by smtp.gmail.com with ESMTPSA id p9-20020a5d4589000000b00326dd5486dcsm1968179wrq.107.2023.10.03.09.54.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 09:54:42 -0700 (PDT) Message-ID: <5e6665dc76663c9e7d1d47b3488184d5f23ce51f.camel@redhat.com> Subject: Re: [PATCH v9 4/6] KVM: Migrate kvm_vcpu_map to __kvm_follow_pfn From: Maxim Levitsky To: David Stevens , Sean Christopherson Cc: Yu Zhang , Isaku Yamahata , Zhi Wang , kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org, kvm@vger.kernel.org Date: Tue, 03 Oct 2023 19:54:40 +0300 In-Reply-To: <20230911021637.1941096-5-stevensd@google.com> References: <20230911021637.1941096-1-stevensd@google.com> <20230911021637.1941096-5-stevensd@google.com> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.36.5 (3.36.5-2.fc32) MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org У пн, 2023-09-11 у 11:16 +0900, David Stevens пише: > From: David Stevens > > Migrate kvm_vcpu_map to __kvm_follow_pfn. Track is_refcounted_page so > that kvm_vcpu_unmap know whether or not it needs to release the page. > > Signed-off-by: David Stevens > --- > include/linux/kvm_host.h | 2 +- > virt/kvm/kvm_main.c | 24 ++++++++++++++---------- > 2 files changed, 15 insertions(+), 11 deletions(-) > > diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h > index 2ed08ae1a9be..b95c79b7833b 100644 > --- a/include/linux/kvm_host.h > +++ b/include/linux/kvm_host.h > @@ -294,6 +294,7 @@ struct kvm_host_map { > void *hva; > kvm_pfn_t pfn; > kvm_pfn_t gfn; > + bool is_refcounted_page; > }; > > /* > @@ -1228,7 +1229,6 @@ void kvm_release_pfn_dirty(kvm_pfn_t pfn); > void kvm_set_pfn_dirty(kvm_pfn_t pfn); > void kvm_set_pfn_accessed(kvm_pfn_t pfn); > > -void kvm_release_pfn(kvm_pfn_t pfn, bool dirty); > int kvm_read_guest_page(struct kvm *kvm, gfn_t gfn, void *data, int offset, > int len); > int kvm_read_guest(struct kvm *kvm, gpa_t gpa, void *data, unsigned long len); > diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c > index 235c5cb3fdac..913de4e86d9d 100644 > --- a/virt/kvm/kvm_main.c > +++ b/virt/kvm/kvm_main.c > @@ -2886,24 +2886,22 @@ struct page *gfn_to_page(struct kvm *kvm, gfn_t gfn) > } > EXPORT_SYMBOL_GPL(gfn_to_page); > > -void kvm_release_pfn(kvm_pfn_t pfn, bool dirty) > -{ > - if (dirty) > - kvm_release_pfn_dirty(pfn); > - else > - kvm_release_pfn_clean(pfn); > -} > - > int kvm_vcpu_map(struct kvm_vcpu *vcpu, gfn_t gfn, struct kvm_host_map *map) > { > kvm_pfn_t pfn; > void *hva = NULL; > struct page *page = KVM_UNMAPPED_PAGE; > + struct kvm_follow_pfn foll = { > + .slot = gfn_to_memslot(vcpu->kvm, gfn), > + .gfn = gfn, > + .flags = FOLL_WRITE, > + .allow_non_refcounted_struct_page = true, > + }; > > if (!map) > return -EINVAL; > > - pfn = gfn_to_pfn(vcpu->kvm, gfn); > + pfn = __kvm_follow_pfn(&foll); > if (is_error_noslot_pfn(pfn)) > return -EINVAL; > > @@ -2923,6 +2921,7 @@ int kvm_vcpu_map(struct kvm_vcpu *vcpu, gfn_t gfn, struct kvm_host_map *map) > map->hva = hva; > map->pfn = pfn; > map->gfn = gfn; > + map->is_refcounted_page = foll.is_refcounted_page; > > return 0; > } > @@ -2946,7 +2945,12 @@ void kvm_vcpu_unmap(struct kvm_vcpu *vcpu, struct kvm_host_map *map, bool dirty) > if (dirty) > kvm_vcpu_mark_page_dirty(vcpu, map->gfn); > > - kvm_release_pfn(map->pfn, dirty); > + if (map->is_refcounted_page) { > + if (dirty) > + kvm_release_page_dirty(map->page); > + else > + kvm_release_page_clean(map->page); > + } > > map->hva = NULL; > map->page = NULL; Reviewed-by: Maxim Levitsky Best regards, Maxim Levitsky