From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 94611C433DF for ; Wed, 8 Jul 2020 19:34:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 764142078D for ; Wed, 8 Jul 2020 19:34:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="d3tG82PY" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726809AbgGHTe2 (ORCPT ); Wed, 8 Jul 2020 15:34:28 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:50517 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726785AbgGHTeY (ORCPT ); Wed, 8 Jul 2020 15:34:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594236863; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hN7D86/UKZ9ErRoXs9fnrDlDCnq5Xvm3yeUIpEDme08=; b=d3tG82PYhJ0bDf+ex8D5kPfvYomp0TsTQM2gfbXNU9mDFHcH9VcLA0xucFLy65JVksOGkK 7jJi8hkzRdLhsPzD31Hyai/m/503HSIzqTQxVRHsfMdIzkXs7jpSOrbvkNYfSXOcruZtIw VnoR/IdvHoqhndRkS6bNDTiy7Neg0wo= Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-18-Vil8RRtMMx-iRTncMcbWUg-1; Wed, 08 Jul 2020 15:34:15 -0400 X-MC-Unique: Vil8RRtMMx-iRTncMcbWUg-1 Received: by mail-qt1-f197.google.com with SMTP id m25so29350159qtk.1 for ; Wed, 08 Jul 2020 12:34:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hN7D86/UKZ9ErRoXs9fnrDlDCnq5Xvm3yeUIpEDme08=; b=JEnZTVaWD4tODIVCcNB0Trzi3rqapIM4GKumOuxXKKjaiSymgbJQAQiAfti8VNl6T5 bE3Ih6HTn5CQf0MWI2Qr2aa9Z5KvB++38yPda40qtrsL/bWqMphSrCgLMmhM6I3ocJSB gVU887PHL6JxqErtdmNmZz/IhC9B7IiYFP2+iSzWLzE/USjUmxV313HxR4vvHk1of0vB e2SOEcx1xsvgCteXbNJxLD+RNNabUwcjWHeMqCpVJAhegaAL8AflDVsx0UtCvnvrmrVi u9HJnQFETX+delel5bg9gMsTq0NXt7V8rysSy1FQhW3rzV497z/rFFYwvRMbHwXWY2z7 I/lg== X-Gm-Message-State: AOAM5325bzHoGg4YkSdcqxhtb57rBRhYIX1hZJ5E1mDmuRoj8uVJemwU 94uj7N1h2GzlI+0Gj7KkB6wwv86JuQnsNV2sfbxzfefY28aC5bJ7xyfHmGH18J3ZBrBQOd8vFsO p3bRspHVA2bpeQqgOSclx2M54 X-Received: by 2002:a37:b701:: with SMTP id h1mr56064801qkf.335.1594236853828; Wed, 08 Jul 2020 12:34:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxd0GzOBMQ1NmDsTj1gJlUvriObJFrFgIgsPO2Y2kMXMZ0+3c7pEyiE7fyyqU0Z8irQDaMDNQ== X-Received: by 2002:a37:b701:: with SMTP id h1mr56064782qkf.335.1594236853604; Wed, 08 Jul 2020 12:34:13 -0700 (PDT) Received: from xz-x1.redhat.com ([2607:9880:19c8:6f::1f4f]) by smtp.gmail.com with ESMTPSA id f18sm664884qtc.28.2020.07.08.12.34.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jul 2020 12:34:12 -0700 (PDT) From: Peter Xu To: kvm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: peterx@redhat.com, Sean Christopherson , "Dr . David Alan Gilbert" , Andrew Jones , Paolo Bonzini Subject: [PATCH v11 01/13] KVM: Cache as_id in kvm_memory_slot Date: Wed, 8 Jul 2020 15:33:56 -0400 Message-Id: <20200708193408.242909-2-peterx@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200708193408.242909-1-peterx@redhat.com> References: <20200708193408.242909-1-peterx@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Cache the address space ID just like the slot ID. It will be used in order to fill in the dirty ring entries. Suggested-by: Paolo Bonzini Suggested-by: Sean Christopherson Signed-off-by: Peter Xu --- include/linux/kvm_host.h | 1 + virt/kvm/kvm_main.c | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 9edc6fc71a89..346ee5905359 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -346,6 +346,7 @@ struct kvm_memory_slot { unsigned long userspace_addr; u32 flags; short id; + u16 as_id; }; static inline unsigned long kvm_dirty_bitmap_bytes(struct kvm_memory_slot *memslot) diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index a852af5c3214..62b7d537e179 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -1191,6 +1191,11 @@ static int kvm_delete_memslot(struct kvm *kvm, memset(&new, 0, sizeof(new)); new.id = old->id; + /* + * This is only for debugging purpose; it should never be referenced + * for a removed memslot. + */ + new.as_id = as_id; r = kvm_set_memslot(kvm, mem, old, &new, as_id, KVM_MR_DELETE); if (r) @@ -1257,6 +1262,7 @@ int __kvm_set_memory_region(struct kvm *kvm, if (!mem->memory_size) return kvm_delete_memslot(kvm, mem, &old, as_id); + new.as_id = as_id; new.id = id; new.base_gfn = mem->guest_phys_addr >> PAGE_SHIFT; new.npages = mem->memory_size >> PAGE_SHIFT; -- 2.26.2