Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7;
From:   Paul Durrant <xadimgnik@gmail.com>
Message-ID: <75b00614-a3a5-44de-5a14-3b7c7c7eceb0@xen.org>
Date:   Thu, 14 Sep 2023 15:07:18 +0200
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101
 Thunderbird/102.15.0
Reply-To: paul@xen.org
Subject: Re: [PATCH 2/8] KVM: pfncache: add a mark-dirty helper
Content-Language: en-US
To:     David Woodhouse <dwmw2@infradead.org>, kvm@vger.kernel.org,
        linux-kernel@vger.kernel.org
Cc:     Paul Durrant <pdurrant@amazon.com>,
        Sean Christopherson <seanjc@google.com>,
        Paolo Bonzini <pbonzini@redhat.com>,
        Thomas Gleixner <tglx@linutronix.de>,
        Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
        Dave Hansen <dave.hansen@linux.intel.com>,
        "H. Peter Anvin" <hpa@zytor.com>, x86@kernel.org
References: <20230914084946.200043-1-paul@xen.org>
 <20230914084946.200043-3-paul@xen.org>
 <87b3f6713a7c6aa57adc89b6c47be3e1511f66ca.camel@infradead.org>
 <69b2a8ae-fcae-75b8-4b2a-ca75bbd273f0@xen.org>
 <a689f4847d2272a75d89364723bab7a29508f646.camel@infradead.org>
Organization: Xen Project
In-Reply-To: <a689f4847d2272a75d89364723bab7a29508f646.camel@infradead.org>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
Precedence: bulk

On 14/09/2023 13:39, David Woodhouse wrote:
> On Thu, 2023-09-14 at 11:34 +0200, Paul Durrant wrote:
>> On 14/09/2023 10:21, David Woodhouse wrote:
>>> On Thu, 2023-09-14 at 08:49 +0000, Paul Durrant wrote:
>>>> --- a/arch/x86/kvm/xen.c
>>>> +++ b/arch/x86/kvm/xen.c
>>>> @@ -430,14 +430,13 @@ static void kvm_xen_update_runstate_guest(struct kvm_vcpu *v, bool atomic)
>>>>                   smp_wmb();
>>>>           }
>>>>    
>>>> -       if (user_len2)
>>>> +       if (user_len2) {
>>>> +               kvm_gpc_mark_dirty(gpc2);
>>>>                   read_unlock(&gpc2->lock);
>>>> +       }
>>>>    
>>>> +       kvm_gpc_mark_dirty(gpc1);
>>>>           read_unlock_irqrestore(&gpc1->lock, flags);
>>>> -
>>>> -       mark_page_dirty_in_slot(v->kvm, gpc1->memslot, gpc1->gpa >> PAGE_SHIFT);
>>>> -       if (user_len2)
>>>> -               mark_page_dirty_in_slot(v->kvm, gpc2->memslot, gpc2->gpa >> PAGE_SHIFT);
>>>>    }
>>>>    
>>>>    void kvm_xen_update_runstate(struct kvm_vcpu *v, int state)
>>>
>>> ISTR there was a reason why the mark_page_dirty_in_slot() was called
>>> *after* unlocking. Although now I say it, that seems wrong... is that
>>> because the spinlock is only protecting the uHVA→kHVA mapping, while
>>> the memslot/gpa are going to remain valid even after unlock, because
>>> those are protected by sRCU?
>>
>> Without the lock you could see an inconsistent GPA and memslot so I
>> think you could theoretically calculate a bogus rel_gfn and walk off the
>> end of the dirty bitmap. Hence moving the call inside the lock while I
>> was in the neighbourhood seemed like a good idea. I could call it out in
>> the commit comment if you'd like.
> 
> Yeah, I can't see a reason why it needs to be outside the lock, and as
> you note, there really is a reason why it should be *inside*. Whatever
> reason there was, it either disappeared in the revisions of the gpc
> patch set or it was stupidity on my part in the first place.
> 
> So yeah, let it move inside the lock, call that out in the commit
> message (I did note some of the other commits could have used a 'No
> functional change intended' too, FWIW), and

Ack. Will do.

> 
> Reviewed-by: David Woodhouse <dwmw@amazon.co.uk>
> 

Thanks.

   Paul