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 1B424C43603 for ; Fri, 20 Dec 2019 21:03:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DF63E2146E for ; Fri, 20 Dec 2019 21:03:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="JHYlASTk" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727754AbfLTVDk (ORCPT ); Fri, 20 Dec 2019 16:03:40 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:21344 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727764AbfLTVDj (ORCPT ); Fri, 20 Dec 2019 16:03:39 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576875818; 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=5JYh7n3fhb27PXs/bYUs6lzlcg1ya8dgcofIlxRo1Jg=; b=JHYlASTk2n2IpYAqnVsa8zL6HxT+rixFPxOVx7W3N0A6vXsWPXj/gMdLPl/D+dYjgyMLlD Mxjda9Yq29kC8UYJgwNDL1zRiYr354/Jk8G9UWK+S8jtSjqnMDg6JqUVnZFKuQtOton2BB zeD2V9Lafngk+3gzP1QXWCO6bM+FEwA= 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-235-lte1sWzTPa-FCkZeul_B_w-1; Fri, 20 Dec 2019 16:03:37 -0500 X-MC-Unique: lte1sWzTPa-FCkZeul_B_w-1 Received: by mail-qt1-f197.google.com with SMTP id b14so6845355qtt.1 for ; Fri, 20 Dec 2019 13:03:36 -0800 (PST) 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=5JYh7n3fhb27PXs/bYUs6lzlcg1ya8dgcofIlxRo1Jg=; b=iHn0/+BLKhWj3YmQTqytGOcRFHJezaKzPbXCx7aYxHHPmbhVc2Pngj3nNDv+NdaXUF wwCumfLnKeRW+Ij2MiQXDZNtVY3lFa2FXWUqV5vRDtrF8E9pE5yDB5dnddCiSipf0JA6 v/FNv1l46hM4BaX4xai3bDiOXNST/9LWXswPxx4fHj/79eQPsm55XNCN/jta1PlH3cBC 0HW16xbus/+QeZ+pb0I2fqdvx5oUXZzFRklGpuOnXFhNAelsN2xukeTY10h5Q7dKBrvi qKHdOnt5V9GbdGTZ/LCzo60n9gwEswNM7mbPMjU74jmA3zwiIBrf5u+rldHO80v6B7JD hSSg== X-Gm-Message-State: APjAAAW4GAJCfz4WgEx5AF6/SwUWWKVIvSe2vpQx0PHvOiJ/2ille0sq 8JYYPR3ASd6tEJeHjreDGCog2hXvJk0UmLEOjGt5SnMHaW1sIHafnCD2kzxldrRDSKdgmVSeJwM LgzvEM/sxGxyx X-Received: by 2002:a0c:f8ce:: with SMTP id h14mr14081864qvo.91.1576875816077; Fri, 20 Dec 2019 13:03:36 -0800 (PST) X-Google-Smtp-Source: APXvYqyNSD9sJzoZa53Bscgtcp3kOJukY7A7DFBD+/ym7p7wDcbwYwsje85hFcdBLyzFwr+wgJtPTg== X-Received: by 2002:a0c:f8ce:: with SMTP id h14mr14081841qvo.91.1576875815891; Fri, 20 Dec 2019 13:03:35 -0800 (PST) Received: from xz-x1.redhat.com ([104.156.64.74]) by smtp.gmail.com with ESMTPSA id a9sm3061018qtb.36.2019.12.20.13.03.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Dec 2019 13:03:34 -0800 (PST) From: Peter Xu To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: peterx@redhat.com, Sean Christopherson , "Michael S . Tsirkin" , Vitaly Kuznetsov , Paolo Bonzini , Christophe de Dinechin , "Dr . David Alan Gilbert" , Jason Wang Subject: [PATCH v2 04/17] KVM: Cache as_id in kvm_memory_slot Date: Fri, 20 Dec 2019 16:03:13 -0500 Message-Id: <20191220210326.49949-5-peterx@redhat.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191220210326.49949-1-peterx@redhat.com> References: <20191220210326.49949-1-peterx@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Let's cache the address space ID just like the slot ID. Suggested-by: Paolo Bonzini Suggested-by: Sean Christopherson Signed-off-by: Peter Xu --- include/linux/kvm_host.h | 1 + virt/kvm/kvm_main.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 4e34cf97ca90..24854c9e3717 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -348,6 +348,7 @@ struct kvm_memory_slot { unsigned long userspace_addr; u32 flags; short id; + u8 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 b1047173d78e..cea4b8dd4ac9 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -1027,6 +1027,8 @@ int __kvm_set_memory_region(struct kvm *kvm, new = old = *slot; + BUILD_BUG_ON(U8_MAX < KVM_ADDRESS_SPACE_NUM); + new.as_id = as_id; new.id = id; new.base_gfn = base_gfn; new.npages = npages; -- 2.24.1