Do not add/del coalesced IO ranges in the case where the
same FlatRanges are present in both old and new FlatViews

Fixes: 3ac7d43a6fbb ("memory: update coalesced_range on transaction_commit")
Signed-off-by: Jagannathan Raman <jag.raman@oracle.com>
---
 memory.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/memory.c b/memory.c
index 61d66e4..e49369d 100644
--- a/memory.c
+++ b/memory.c
@@ -932,9 +932,7 @@ static void address_space_update_topology_pass(AddressSpace *as,
         } else if (frold && frnew && flatrange_equal(frold, frnew)) {
             /* In both and unchanged (except logging may have changed) */
 
-            if (!adding) {
-                flat_range_coalesced_io_del(frold, as);
-            } else {
+            if (adding) {
                 MEMORY_LISTENER_UPDATE_REGION(frnew, as, Forward, region_nop);
                 if (frnew->dirty_log_mask & ~frold->dirty_log_mask) {
                     MEMORY_LISTENER_UPDATE_REGION(frnew, as, Forward, log_start,
@@ -946,7 +944,6 @@ static void address_space_update_topology_pass(AddressSpace *as,
                                                   frold->dirty_log_mask,
                                                   frnew->dirty_log_mask);
                 }
-                flat_range_coalesced_io_add(frnew, as);
             }
 
             ++iold;
-- 
1.8.3.1

ping

> On Feb 5, 2019, at 5:50 PM, Jagannathan Raman <jag.raman@oracle.com> wrote:
> 
> Do not add/del coalesced IO ranges in the case where the
> same FlatRanges are present in both old and new FlatViews
> 
> Fixes: 3ac7d43a6fbb ("memory: update coalesced_range on transaction_commit")
> Signed-off-by: Jagannathan Raman <jag.raman@oracle.com>
> ---
> memory.c | 5 +----
> 1 file changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/memory.c b/memory.c
> index 61d66e4..e49369d 100644
> --- a/memory.c
> +++ b/memory.c
> @@ -932,9 +932,7 @@ static void address_space_update_topology_pass(AddressSpace *as,
>         } else if (frold && frnew && flatrange_equal(frold, frnew)) {
>             /* In both and unchanged (except logging may have changed) */
> 
> -            if (!adding) {
> -                flat_range_coalesced_io_del(frold, as);
> -            } else {
> +            if (adding) {
>                 MEMORY_LISTENER_UPDATE_REGION(frnew, as, Forward, region_nop);
>                 if (frnew->dirty_log_mask & ~frold->dirty_log_mask) {
>                     MEMORY_LISTENER_UPDATE_REGION(frnew, as, Forward, log_start,
> @@ -946,7 +944,6 @@ static void address_space_update_topology_pass(AddressSpace *as,
>                                                   frold->dirty_log_mask,
>                                                   frnew->dirty_log_mask);
>                 }
> -                flat_range_coalesced_io_add(frnew, as);
>             }
> 
>             ++iold;
> -- 
> 1.8.3.1
> 
> 

On 05/02/19 23:50, Jagannathan Raman wrote:
> Do not add/del coalesced IO ranges in the case where the
> same FlatRanges are present in both old and new FlatViews
> 
> Fixes: 3ac7d43a6fbb ("memory: update coalesced_range on transaction_commit")
> Signed-off-by: Jagannathan Raman <jag.raman@oracle.com>
> ---
>  memory.c | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/memory.c b/memory.c
> index 61d66e4..e49369d 100644
> --- a/memory.c
> +++ b/memory.c
> @@ -932,9 +932,7 @@ static void address_space_update_topology_pass(AddressSpace *as,
>          } else if (frold && frnew && flatrange_equal(frold, frnew)) {
>              /* In both and unchanged (except logging may have changed) */
>  
> -            if (!adding) {
> -                flat_range_coalesced_io_del(frold, as);
> -            } else {
> +            if (adding) {
>                  MEMORY_LISTENER_UPDATE_REGION(frnew, as, Forward, region_nop);
>                  if (frnew->dirty_log_mask & ~frold->dirty_log_mask) {
>                      MEMORY_LISTENER_UPDATE_REGION(frnew, as, Forward, log_start,
> @@ -946,7 +944,6 @@ static void address_space_update_topology_pass(AddressSpace *as,
>                                                    frold->dirty_log_mask,
>                                                    frnew->dirty_log_mask);
>                  }
> -                flat_range_coalesced_io_add(frnew, as);
>              }
>  
>              ++iold;
> 

Queued, thanks.

Paolo