| Message ID | 20230126235451.469087-3-gshan@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Improve dirty ring warning report | expand |
[ just coming back from holiday, sorry for the late reply ] On 2023/1/27 07:54, Gavin Shan wrote: > Currently, the unknown no-running-vcpu sites are reported when a > dirty page is tracked by mark_page_dirty_in_slot(). Until now, the > only known no-running-vcpu site is saving vgic/its tables through > KVM_DEV_ARM_{VGIC_GRP_CTRL, ITS_SAVE_TABLES} command on KVM device > "kvm-arm-vgic-its". Unfortunately, there are more unknown sites to > be handled and no-running-vcpu context will be allowed in these > sites: (1) KVM_DEV_ARM_{VGIC_GRP_CTRL, ITS_RESTORE_TABLES} command > on KVM device "kvm-arm-vgic-its" to restore vgic/its tables. The > vgic3 LPI pending status could be restored. (2) Save vgic3 pending We typically write it as "VGICv3". > table through KVM_DEV_ARM_{VGIC_GRP_CTRL, VGIC_SAVE_PENDING_TABLES} > command on KVM device "kvm-arm-vgic-v3". > > In order to handle those unknown cases, we need a unified helper > vgic_write_guest_lock(). struct vgic_dist::save_its_tables_in_progress > is also renamed to struct vgic_dist::save_tables_in_progress. How about renaming it to 'write_tables_in_progress' which would look a bit more generic? The rest looks good to me. Thanks, Zenghui
Hi Zenghui, On 1/28/23 2:57 AM, Zenghui Yu wrote: > [ just coming back from holiday, sorry for the late reply ] > Hope you have a nice refresh. Thanks for your review. > On 2023/1/27 07:54, Gavin Shan wrote: >> Currently, the unknown no-running-vcpu sites are reported when a >> dirty page is tracked by mark_page_dirty_in_slot(). Until now, the >> only known no-running-vcpu site is saving vgic/its tables through >> KVM_DEV_ARM_{VGIC_GRP_CTRL, ITS_SAVE_TABLES} command on KVM device >> "kvm-arm-vgic-its". Unfortunately, there are more unknown sites to >> be handled and no-running-vcpu context will be allowed in these >> sites: (1) KVM_DEV_ARM_{VGIC_GRP_CTRL, ITS_RESTORE_TABLES} command >> on KVM device "kvm-arm-vgic-its" to restore vgic/its tables. The >> vgic3 LPI pending status could be restored. (2) Save vgic3 pending > > We typically write it as "VGICv3". > Ok. I will fix by replacing 'vgic3' with 'VGICv3' in v4. However, the term 'vgic/its' will be kept. >> table through KVM_DEV_ARM_{VGIC_GRP_CTRL, VGIC_SAVE_PENDING_TABLES} >> command on KVM device "kvm-arm-vgic-v3". >> >> In order to handle those unknown cases, we need a unified helper >> vgic_write_guest_lock(). struct vgic_dist::save_its_tables_in_progress >> is also renamed to struct vgic_dist::save_tables_in_progress. > > How about renaming it to 'write_tables_in_progress' which would look a > bit more generic? The rest looks good to me. > 'write_tables_in_progress' works for me. I will have it in v4, which will be posted shortly. Thanks, Gavin
diff --git a/arch/arm64/kvm/vgic/vgic-its.c b/arch/arm64/kvm/vgic/vgic-its.c index ad4bb69ab83e..887dfa6cc79d 100644 --- a/arch/arm64/kvm/vgic/vgic-its.c +++ b/arch/arm64/kvm/vgic/vgic-its.c @@ -2186,7 +2186,7 @@ static int vgic_its_save_ite(struct vgic_its *its, struct its_device *dev, ((u64)ite->irq->intid << KVM_ITS_ITE_PINTID_SHIFT) | ite->collection->collection_id; val = cpu_to_le64(val); - return kvm_write_guest_lock(kvm, gpa, &val, ite_esz); + return vgic_write_guest_lock(kvm, gpa, &val, ite_esz); } /** @@ -2338,7 +2338,7 @@ static int vgic_its_save_dte(struct vgic_its *its, struct its_device *dev, (itt_addr_field << KVM_ITS_DTE_ITTADDR_SHIFT) | (dev->num_eventid_bits - 1)); val = cpu_to_le64(val); - return kvm_write_guest_lock(kvm, ptr, &val, dte_esz); + return vgic_write_guest_lock(kvm, ptr, &val, dte_esz); } /** @@ -2525,7 +2525,7 @@ static int vgic_its_save_cte(struct vgic_its *its, ((u64)collection->target_addr << KVM_ITS_CTE_RDBASE_SHIFT) | collection->collection_id); val = cpu_to_le64(val); - return kvm_write_guest_lock(its->dev->kvm, gpa, &val, esz); + return vgic_write_guest_lock(its->dev->kvm, gpa, &val, esz); } /* @@ -2606,7 +2606,7 @@ static int vgic_its_save_collection_table(struct vgic_its *its) */ val = 0; BUG_ON(cte_esz > sizeof(val)); - ret = kvm_write_guest_lock(its->dev->kvm, gpa, &val, cte_esz); + ret = vgic_write_guest_lock(its->dev->kvm, gpa, &val, cte_esz); return ret; } @@ -2742,7 +2742,6 @@ static int vgic_its_has_attr(struct kvm_device *dev, static int vgic_its_ctrl(struct kvm *kvm, struct vgic_its *its, u64 attr) { const struct vgic_its_abi *abi = vgic_its_get_abi(its); - struct vgic_dist *dist = &kvm->arch.vgic; int ret = 0; if (attr == KVM_DEV_ARM_VGIC_CTRL_INIT) /* Nothing to do */ @@ -2762,9 +2761,7 @@ static int vgic_its_ctrl(struct kvm *kvm, struct vgic_its *its, u64 attr) vgic_its_reset(kvm, its); break; case KVM_DEV_ARM_ITS_SAVE_TABLES: - dist->save_its_tables_in_progress = true; ret = abi->save_tables(its); - dist->save_its_tables_in_progress = false; break; case KVM_DEV_ARM_ITS_RESTORE_TABLES: ret = abi->restore_tables(its); @@ -2791,7 +2788,7 @@ bool kvm_arch_allow_write_without_running_vcpu(struct kvm *kvm) { struct vgic_dist *dist = &kvm->arch.vgic; - return dist->save_its_tables_in_progress; + return dist->save_tables_in_progress; } static int vgic_its_set_attr(struct kvm_device *dev, diff --git a/arch/arm64/kvm/vgic/vgic.h b/arch/arm64/kvm/vgic/vgic.h index 056425e3a490..3804b3e946fd 100644 --- a/arch/arm64/kvm/vgic/vgic.h +++ b/arch/arm64/kvm/vgic/vgic.h @@ -132,6 +132,19 @@ static inline bool vgic_irq_is_multi_sgi(struct vgic_irq *irq) return vgic_irq_get_lr_count(irq) > 1; } +static inline int vgic_write_guest_lock(struct kvm *kvm, gpa_t gpa, + const void *data, unsigned long len) +{ + struct vgic_dist *dist = &kvm->arch.vgic; + int ret; + + dist->save_tables_in_progress = true; + ret = kvm_write_guest_lock(kvm, gpa, data, len); + dist->save_tables_in_progress = false; + + return ret; +} + /* * This struct provides an intermediate representation of the fields contained * in the GICH_VMCR and ICH_VMCR registers, such that code exporting the GIC diff --git a/include/kvm/arm_vgic.h b/include/kvm/arm_vgic.h index 9270cd87da3f..a0be53bc5703 100644 --- a/include/kvm/arm_vgic.h +++ b/include/kvm/arm_vgic.h @@ -263,7 +263,7 @@ struct vgic_dist { struct vgic_io_device dist_iodev; bool has_its; - bool save_its_tables_in_progress; + bool save_tables_in_progress; /* * Contains the attributes and gpa of the LPI configuration table.
Currently, the unknown no-running-vcpu sites are reported when a dirty page is tracked by mark_page_dirty_in_slot(). Until now, the only known no-running-vcpu site is saving vgic/its tables through KVM_DEV_ARM_{VGIC_GRP_CTRL, ITS_SAVE_TABLES} command on KVM device "kvm-arm-vgic-its". Unfortunately, there are more unknown sites to be handled and no-running-vcpu context will be allowed in these sites: (1) KVM_DEV_ARM_{VGIC_GRP_CTRL, ITS_RESTORE_TABLES} command on KVM device "kvm-arm-vgic-its" to restore vgic/its tables. The vgic3 LPI pending status could be restored. (2) Save vgic3 pending table through KVM_DEV_ARM_{VGIC_GRP_CTRL, VGIC_SAVE_PENDING_TABLES} command on KVM device "kvm-arm-vgic-v3". In order to handle those unknown cases, we need a unified helper vgic_write_guest_lock(). struct vgic_dist::save_its_tables_in_progress is also renamed to struct vgic_dist::save_tables_in_progress. No functional change intended. Suggested-by: Oliver Upton <oliver.upton@linux.dev> Signed-off-by: Gavin Shan <gshan@redhat.com> Reviewed-by: Oliver Upton <oliver.upton@linux.dev> --- arch/arm64/kvm/vgic/vgic-its.c | 13 +++++-------- arch/arm64/kvm/vgic/vgic.h | 13 +++++++++++++ include/kvm/arm_vgic.h | 2 +- 3 files changed, 19 insertions(+), 9 deletions(-)