target-arm: sort TCG cpreg list by 64bit id version
PATCH 1/2 target-arm: sort TCG cpreg list by 64bit id version
Both KVM and TCG populate the cpreg_list with 64 bit registers IDs, but in the TCG side the cpreg_list is sorted using the 32 bit id version while in the kvm side the 64 bit id version is used. This patch makes the sorting of the cpreg_list consistent between KVM and TCG.
--- target-arm/helper.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
target-arm/helper.c +8 -4
@@ -225,10 +225,14 @@ static void count_cpreg(gpointer key, gpointer opaque)static gint cpreg_key_compare (gconstpointer a,gconstpointer b) { -uint32_t aidx = *(uint32_t *)a; -uint32_t bidx = *(uint32_t *)b; - -return aidx - bidx; +uint64_t aidx =cpreg_to_kvm_id (*(uint32_t *)a); +uint64_t bidx =cpreg_to_kvm_id (*(uint32_t *)b); + +if (aidx > bidx) +return 1 ; +if (aidx < bidx) +return -1 ; +return 0 ; }static void cpreg_make_keylist (gpointer key,gpointer value,gpointer udata)
Signature · 1 line
1.8.1.2
PATCH 2/2 target-arm: fix sorting iussue of KVM cpreg list
The compare_u64 function was not sorting the KVM cpreg_list in the right way due to the wrong returned value. Since we are comparing two 64bit values we can't simply return their difference if the returned type is int.
--- target-arm/kvm.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
target-arm/kvm.c +5 -1
@@ -67,7 +67,11 @@ static bool reg_syncs_via_tuple_list(uint64_t regidx)static int compare_u64 (const void *a,const void *b) { -return *(uint64_t *)a - *(uint64_t *)b; +if (*(uint64_t *)a > *(uint64_t *)b) +return 1 ; +if (*(uint64_t *)a < *(uint64_t *)b) +return -1 ; +return 0 ; }int kvm_arch_init_vcpu (CPUState *cs)
Signature · 1 line
1.8.1.2
Quoted 2 lines · Alvise Rigo
Both KVM and TCG populate the
cpreg_listwith 64 bit registers IDs, but in the TCG side thecpreg_listis sorted using the 32 bit id version while in the kvm side the 64 bit id version is used. This patch makes the sorting of thecpreg_listconsistent between KVM and TCG.
...this commit message doesn't say why this is a bad thing.
Quoted 14 lines
Signed-off-by Alvise Rigo <[email protected]>--- target-arm/helper.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)target-arm/helper.c +0
-1@@ -225,10 +225,14 @@ static void count_cpreg(gpointer key, gpointer opaque)static gint cpreg_key_compare (gconstpointer a,gconstpointer b) { -uint32_t aidx = *(uint32_t *)a;
target-arm/helper.c static void count_cpreg(gpointer key, gpointer opaque) · line 234
Quoted 10 lines
target-arm/helper.c +7
-3-uint32_t bidx = *(uint32_t *)b; - -return aidx - bidx; +uint64_t aidx =cpreg_to_kvm_id (*(uint32_t *)a); +uint64_t bidx =cpreg_to_kvm_id (*(uint32_t *)b); + +if (aidx > bidx) +return 1 ; +if (aidx < bidx) +return -1 ;
Coding standard requires braces.
Quoted 7 lines
target-arm/helper.c +1
-1+return 0 ; }static void cpreg_make_keylist (gpointer key,gpointer value,gpointer udata) --1.8.1.2
Sorry, I should have mentioned that an improper sorting of the cpreg_list could lead to a migration failure when cpu_post_load considers an incoming register as missing in the cpreg_indexes array.
However, as long as the two lists are exactly the same, the problem does not occur.
Quoted 47 lines · Peter Maydell
Quoted 1 line · Alvise Rigo
Both KVM and TCG populate the
cpreg_listwith 64 bit registers IDs, butin the TCG side the
cpreg_listis sorted using the 32 bit id version while in the kvm side the 64 bit id version is used.Quoted 1 line
This patch makes the sorting of the
cpreg_listconsistent between KVMand TCG.
...this commit message doesn't say why this is a bad thing.
target-arm/helper.c static void count_cpreg(gpointer key, gpointer
Quoted 10 lines
Signed-off-by Alvise Rigo <[email protected]>--- target-arm/helper.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)target-arm/helper.c +0
-0@@ -225,10 +225,14 @@ static void count_cpreg(gpointer key, gpointeropaque)
Quoted 4 lines
target-arm/helper.c +0
-1static gint cpreg_key_compare (gconstpointer a,gconstpointer b) { -uint32_t aidx = *(uint32_t *)a;target-arm/helper.c static void count_cpreg(gpointer key, gpointer opaque) · line 234
Quoted 10 lines
target-arm/helper.c +7
-3-uint32_t bidx = *(uint32_t *)b; - -return aidx - bidx; +uint64_t aidx =cpreg_to_kvm_id (*(uint32_t *)a); +uint64_t bidx =cpreg_to_kvm_id (*(uint32_t *)b); + +if (aidx > bidx) +return 1 ; +if (aidx < bidx) +return -1 ;Coding standard requires braces.
target-arm/helper.c static void count_cpreg(gpointer key, gpointer opaque)
Quoted 4 lines
target-arm/helper.c +1
-0+return 0 ; } static void cpreg_make_keylist(gpointer key, gpointer value, gpointerudata)
Quoted 3 lines
target-arm/helper.c +0
-1--1.8.1.2
Quoted 5 lines · alvise rigo
Sorry, I should have mentioned that an improper sorting of the
cpreg_listcould lead to a migration failure whencpu_post_loadconsiders an incoming register as missing in thecpreg_indexesarray.
However, as long as the two lists are exactly the same, the problem does not occur.
Yeah, makes sense. Note that this is an entirely theoretical problem at the moment: TCG<->KVM migration isn't supported and won't work because the set of coprocessor registers each supports is different. (At some point we should probably fix this by getting TCG to support the right set of regs, but it's not a very high priority for me.)
-- PMM
Quoted 4 lines · Alvise Rigo
Both KVM and TCG populate the
cpreg_listwith 64 bit registers IDs, but in the TCG side thecpreg_listis sorted using the 32 bit id version while in the kvm side the 64 bit id version is used. This patch makes the sorting of thecpreg_listconsistent between KVM and TCG.Signed-off-by Alvise Rigo <[email protected]>
Thanks, applied this and 2/2 to target-arm.next.
A couple of formatting notes for next time:
* please use checkpatch.pl to check you haven't got coding style violations (both these patches had bad indent and missing braces)
* please wrap your commit messages rather than having them be one very long line
* if you're submitting a patchset with more than one patch in it please include a cover letter email (this set doesn't seem to have one)
I've fixed these issues up in my queue this time round since I wanted to get the patches out in a pullreq this week, but usually I'd just bounce a patch back for that sort of error.
(If you haven't read http://qemu-project.org/Contribute/SubmitAPatch
I'd recommend it; it tries to list various minor formatting and process issues that can trip up first-time submitters.)
thanks
-- PMM