From patchwork Sat Mar 9 07:47:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1053799 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="XwR7R4bX"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44Gc2t4gkVz9s9N for ; Sat, 9 Mar 2019 18:49:40 +1100 (AEDT) Received: from localhost ([127.0.0.1]:55249 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2Wjh-0003qm-0p for incoming@patchwork.ozlabs.org; Sat, 09 Mar 2019 02:49:37 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47198) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2Wia-0003qU-9q for qemu-devel@nongnu.org; Sat, 09 Mar 2019 02:48:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h2WiX-0000NQ-4G for qemu-devel@nongnu.org; Sat, 09 Mar 2019 02:48:27 -0500 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:43382) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h2WiV-0000JY-SO for qemu-devel@nongnu.org; Sat, 09 Mar 2019 02:48:24 -0500 Received: by mail-wr1-x436.google.com with SMTP id d17so23651006wre.10 for ; Fri, 08 Mar 2019 23:48:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=yQ26pOTy7P4ofiTlf/SZaifTVQD5oVp7I02mOeiuF9I=; b=XwR7R4bX68c0pxNhZewLV9LTaknhf3/OF+/XaVTT6ucpcHen5ywwbbIt8wcCEkOJ3d o9V/57O4mkR1IfWzbgccRJ2bIX1ECYrk4a8aQQGg1JEHGwMRsPMDKU1MiBbZJLgob+LD wyG87c4eXbpkE9Zh2WRtUrEjSsQ1/H3/ixQLWclwSgxrijGV5s/tVhDCewW4hHQuYPNa MmYItg0k/VzxlTDVBHrcrOycg+lQqQYWYUzElhI7AfxEA6uBwtWDjPMrYkjIYQTyrzcC JcqHZ7EERZvSDAasZ6ucppyymkNcnt/gTyNQnpjEaqyn9XLGpH41q+t69WFNgqnNexV6 sfew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=yQ26pOTy7P4ofiTlf/SZaifTVQD5oVp7I02mOeiuF9I=; b=b8cuTZzex1NdLcgOC0NKro4HTtUubUb3Mkk+t8S9lGIAabnM2rOMdfZenhF5T8oscB JZ2sNegsnmecjA2ij/MKY6ECoGk/9ufOSz8FMeYP9wX8ha0wSP8xbeqOHSZt/iPHzSZq z+NaAiEw0jvID4PUpHa+os9qHuSi4X263keA3aH61tjgH4K4qR5RokJAoOkwsZVvE34D e48mvX7VZLc6EuE4IcJy7WNjWZr8VVDA3bZFlj6t1j/fMrrTOS9DYvTWHofwBCaIj49/ BUsFw2ZHv+VA4fDI4xztqdpfmT6K/BDh7srjmDO9JXB0ut4z9wHNihwMcnKeFmOh6lkg fp6Q== X-Gm-Message-State: APjAAAXEelD/wFhBiM+YwOHZZ9f6OqGBIY46ig/5Ae/c6wLArExGFjii 6inV0Zh19F2PoZnb+yDpVPBFR7tn X-Google-Smtp-Source: APXvYqzQNXmxU5QYafksCjAzs0JSQGBkFNtaup8rFPlu6Hiqt9VY12otuSAJ8obF60ve7sbl5V7zqQ== X-Received: by 2002:adf:e3cb:: with SMTP id k11mr13983141wrm.263.1552117700778; Fri, 08 Mar 2019 23:48:20 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id 11sm5252294wmg.27.2019.03.08.23.48.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Mar 2019 23:48:20 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 9 Mar 2019 08:47:54 +0100 Message-Id: <1552117698-12355-2-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1552117698-12355-1-git-send-email-pbonzini@redhat.com> References: <1552117698-12355-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::436 Subject: [Qemu-devel] [PULL 01/25] memory: Do not update coalesced IO range in the case of NOP X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jagannathan Raman Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Jagannathan Raman 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 Message-Id: <59572a7353830be4b7aa57d79ccb7ad6b72f0dda.1549406119.git.jag.raman@oracle.com> Signed-off-by: Paolo Bonzini --- 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;