From patchwork Fri Nov 14 11:12:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 5305081 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8C4DC9F440 for ; Fri, 14 Nov 2014 11:13:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BC0AB200FF for ; Fri, 14 Nov 2014 11:13:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D74E82015D for ; Fri, 14 Nov 2014 11:13:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965277AbaKNLMh (ORCPT ); Fri, 14 Nov 2014 06:12:37 -0500 Received: from mail-wi0-f182.google.com ([209.85.212.182]:52892 "EHLO mail-wi0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965249AbaKNLMg (ORCPT ); Fri, 14 Nov 2014 06:12:36 -0500 Received: by mail-wi0-f182.google.com with SMTP id h11so2309449wiw.9 for ; Fri, 14 Nov 2014 03:12:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=Yls/af/Wv1V5OfSBxBNk6q5uxr7fl1KMyZeRxbaN0AA=; b=rilLoKjQMIfrZI2j3gHOIK8aSTjbFzORIZjNwxzbjUKEj9Y3gpWHzBPHNWx8izIXXy aNotT2oSjYhbToMIL/ejpIlfClMA981RiGOyFFamH5UwRxIZRdSORfmfM8tsGU3Lbm5d lGjWLxBq5CYvjTaPWeY+Wxi6w9iNFE+4h3M3i9QVL6LUDKqESd2RvggqodhgEFbItCjq p/tMpru/mbwSX3VYOCnfsF2UKHLQFBd2KepF35VOjeHx1NtSDyJNtSXkUSSgrpp5tkK2 dYiD8S6zZRBYVQYE5nyalblrG5VdeGAZKy52+L9iidCEGJXS3lHarjemisPCFYXHvC/a kGWQ== X-Received: by 10.194.95.200 with SMTP id dm8mr4212058wjb.133.1415963554728; Fri, 14 Nov 2014 03:12:34 -0800 (PST) Received: from playground.station (net-37-117-142-149.cust.vodafonedsl.it. [37.117.142.149]) by mx.google.com with ESMTPSA id mu4sm3027288wib.2.2014.11.14.03.12.32 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Nov 2014 03:12:33 -0800 (PST) From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: yoshikawa_takuya_b1@lab.ntt.co.jp, imammedo@redhat.com Subject: [PATCH 1/3] kvm: memslots: track id_to_index changes during the insertion sort Date: Fri, 14 Nov 2014 12:12:00 +0100 Message-Id: <1415963522-5255-2-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1415963522-5255-1-git-send-email-pbonzini@redhat.com> References: <1415963522-5255-1-git-send-email-pbonzini@redhat.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This completes the optimization from the previous patch, by removing the KVM_MEM_SLOTS_NUM-iteration loop from insert_memslot. Signed-off-by: Paolo Bonzini Reviewed-by: Igor Mammedov --- virt/kvm/kvm_main.c | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index c0c2202e6c4f..c8ff99cc0ccb 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -677,31 +677,30 @@ static int kvm_create_dirty_bitmap(struct kvm_memory_slot *memslot) static void insert_memslot(struct kvm_memslots *slots, struct kvm_memory_slot *new) { - int i = slots->id_to_index[new->id]; - struct kvm_memory_slot *old = id_to_memslot(slots, new->id); + int id = new->id; + int i = slots->id_to_index[id]; struct kvm_memory_slot *mslots = slots->memslots; - if (new->npages == old->npages) { - *old = *new; - return; - } - - while (1) { - if (i < (KVM_MEM_SLOTS_NUM - 1) && - new->npages < mslots[i + 1].npages) { - mslots[i] = mslots[i + 1]; - i++; - } else if (i > 0 && new->npages > mslots[i - 1].npages) { - mslots[i] = mslots[i - 1]; - i--; - } else { - mslots[i] = *new; - break; + WARN_ON(mslots[i].id != id); + if (new->npages != mslots[i].npages) { + while (1) { + if (i < (KVM_MEM_SLOTS_NUM - 1) && + new->npages < mslots[i + 1].npages) { + mslots[i] = mslots[i + 1]; + slots->id_to_index[mslots[i].id] = i; + i++; + } else if (i > 0 && + new->npages > mslots[i - 1].npages) { + mslots[i] = mslots[i - 1]; + slots->id_to_index[mslots[i].id] = i; + i--; + } else + break; } } - for (i = 0; i < KVM_MEM_SLOTS_NUM; i++) - slots->id_to_index[slots->memslots[i].id] = i; + mslots[i] = *new; + slots->id_to_index[mslots[i].id] = i; } static void update_memslots(struct kvm_memslots *slots,