From patchwork Tue Oct 17 13:24:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paul Durrant X-Patchwork-Id: 10012027 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 618A260235 for ; Tue, 17 Oct 2017 13:27:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 568DB2884B for ; Tue, 17 Oct 2017 13:27:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4B686288B9; Tue, 17 Oct 2017 13:27:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B98092884B for ; Tue, 17 Oct 2017 13:27:23 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e4RrS-0000Aw-4l; Tue, 17 Oct 2017 13:24:46 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e4RrQ-0000AH-Sa for xen-devel@lists.xenproject.org; Tue, 17 Oct 2017 13:24:44 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id 55/9D-31302-C9406E95; Tue, 17 Oct 2017 13:24:44 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrBIsWRWlGSWpSXmKPExsXitHSDve5slme RBv+P6Vp83zKZyYHR4/CHKywBjFGsmXlJ+RUJrBmPWx6xFbTqVvRv7GRqYJyg3MXIySEh4C/x e0kTG4jNJqAjMfXpJdYuRg4OEQEVidt7DUDCzAJhEqsXXGQEsYUFfCSuTv3PDmKzCKhK3Pl+k hXE5hWwkbj2/SQbxEh5iV1tF8HinAK2Eq//HWAGsYWAajbNWw9VLyhxcuYTFoj5mhKt23+zQ9 jyEs1bZ0PVq0isnzqLbQIj3ywkLbOQtMxC0rKAkXkVo0ZxalFZapGukaFeUlFmekZJbmJmjq6 hgalebmpxcWJ6ak5iUrFecn7uJkZgqNUzMDDuYLw72e8QoyQHk5Ior7Phk0ghvqT8lMqMxOKM +KLSnNTiQ4wyHBxKErxnmZ9FCgkWpaanVqRl5gCDHiYtwcGjJMK7DCTNW1yQmFucmQ6ROsWoy 9Fx8+4fJiGWvPy8VClx3jKQIgGQoozSPLgRsAi8xCgrJczLyMDAIMRTkFqUm1mCKv+KUZyDUU mY1wBkCk9mXgncpldARzABHbHO6QnIESWJCCmpBkaNPwfvfTdVs4vYxvtq2h+3SdNXRyz/uu/ bglVGrrZ/BL4JbPtzbt9vf6kTj4ottRwqgy1VPLV3vFr5q67LpVWfy87R8ug9b0ODIknfVayf Kq7vKnDfJa1drnl21fff7yR+SBolZp6ur/oeH1EVeVn7WNfu/Za3Q/0O1dQlz5oSpKs0Y4t+y yIlluKMREMt5qLiRAAqvjVluwIAAA== X-Env-Sender: prvs=4567f63fb=Paul.Durrant@citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1508246679!71073821!2 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 678 invoked from network); 17 Oct 2017 13:24:43 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-12.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 17 Oct 2017 13:24:43 -0000 X-IronPort-AV: E=Sophos;i="5.43,391,1503360000"; d="scan'208";a="454570828" From: Paul Durrant To: Date: Tue, 17 Oct 2017 14:24:24 +0100 Message-ID: <20171017132432.24093-4-paul.durrant@citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171017132432.24093-1-paul.durrant@citrix.com> References: <20171017132432.24093-1-paul.durrant@citrix.com> MIME-Version: 1.0 Cc: Andrew Cooper , Paul Durrant Subject: [Xen-devel] [PATCH v12 03/11] x86/hvm/ioreq: use gfn_t in struct hvm_ioreq_page X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP This patch adjusts the ioreq server code to use type-safe gfn_t values where possible. No functional change. Signed-off-by: Paul Durrant Reviewed-by: Roger Pau Monné Reviewed-by: Wei Liu Acked-by: Jan Beulich --- Cc: Andrew Cooper --- xen/arch/x86/hvm/ioreq.c | 44 ++++++++++++++++++++-------------------- xen/include/asm-x86/hvm/domain.h | 2 +- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/xen/arch/x86/hvm/ioreq.c b/xen/arch/x86/hvm/ioreq.c index 6d81018369..64bb13cec9 100644 --- a/xen/arch/x86/hvm/ioreq.c +++ b/xen/arch/x86/hvm/ioreq.c @@ -210,7 +210,7 @@ bool handle_hvm_io_completion(struct vcpu *v) return true; } -static unsigned long hvm_alloc_ioreq_gfn(struct hvm_ioreq_server *s) +static gfn_t hvm_alloc_ioreq_gfn(struct hvm_ioreq_server *s) { struct domain *d = s->domain; unsigned int i; @@ -220,20 +220,19 @@ static unsigned long hvm_alloc_ioreq_gfn(struct hvm_ioreq_server *s) for ( i = 0; i < sizeof(d->arch.hvm_domain.ioreq_gfn.mask) * 8; i++ ) { if ( test_and_clear_bit(i, &d->arch.hvm_domain.ioreq_gfn.mask) ) - return d->arch.hvm_domain.ioreq_gfn.base + i; + return _gfn(d->arch.hvm_domain.ioreq_gfn.base + i); } - return gfn_x(INVALID_GFN); + return INVALID_GFN; } -static void hvm_free_ioreq_gfn(struct hvm_ioreq_server *s, - unsigned long gfn) +static void hvm_free_ioreq_gfn(struct hvm_ioreq_server *s, gfn_t gfn) { struct domain *d = s->domain; - unsigned int i = gfn - d->arch.hvm_domain.ioreq_gfn.base; + unsigned int i = gfn_x(gfn) - d->arch.hvm_domain.ioreq_gfn.base; ASSERT(!IS_DEFAULT(s)); - ASSERT(gfn != gfn_x(INVALID_GFN)); + ASSERT(!gfn_eq(gfn, INVALID_GFN)); set_bit(i, &d->arch.hvm_domain.ioreq_gfn.mask); } @@ -242,7 +241,7 @@ static void hvm_unmap_ioreq_gfn(struct hvm_ioreq_server *s, bool buf) { struct hvm_ioreq_page *iorp = buf ? &s->bufioreq : &s->ioreq; - if ( iorp->gfn == gfn_x(INVALID_GFN) ) + if ( gfn_eq(iorp->gfn, INVALID_GFN) ) return; destroy_ring_for_helper(&iorp->va, iorp->page); @@ -251,7 +250,7 @@ static void hvm_unmap_ioreq_gfn(struct hvm_ioreq_server *s, bool buf) if ( !IS_DEFAULT(s) ) hvm_free_ioreq_gfn(s, iorp->gfn); - iorp->gfn = gfn_x(INVALID_GFN); + iorp->gfn = INVALID_GFN; } static int hvm_map_ioreq_gfn(struct hvm_ioreq_server *s, bool buf) @@ -264,16 +263,17 @@ static int hvm_map_ioreq_gfn(struct hvm_ioreq_server *s, bool buf) return -EINVAL; if ( IS_DEFAULT(s) ) - iorp->gfn = buf ? - d->arch.hvm_domain.params[HVM_PARAM_BUFIOREQ_PFN] : - d->arch.hvm_domain.params[HVM_PARAM_IOREQ_PFN]; + iorp->gfn = _gfn(buf ? + d->arch.hvm_domain.params[HVM_PARAM_BUFIOREQ_PFN] : + d->arch.hvm_domain.params[HVM_PARAM_IOREQ_PFN]); else iorp->gfn = hvm_alloc_ioreq_gfn(s); - if ( iorp->gfn == gfn_x(INVALID_GFN) ) + if ( gfn_eq(iorp->gfn, INVALID_GFN) ) return -ENOMEM; - rc = prepare_ring_for_helper(d, iorp->gfn, &iorp->page, &iorp->va); + rc = prepare_ring_for_helper(d, gfn_x(iorp->gfn), &iorp->page, + &iorp->va); if ( rc ) hvm_unmap_ioreq_gfn(s, buf); @@ -309,10 +309,10 @@ static void hvm_remove_ioreq_gfn(struct hvm_ioreq_server *s, bool buf) struct domain *d = s->domain; struct hvm_ioreq_page *iorp = buf ? &s->bufioreq : &s->ioreq; - if ( IS_DEFAULT(s) || iorp->gfn == gfn_x(INVALID_GFN) ) + if ( IS_DEFAULT(s) || gfn_eq(iorp->gfn, INVALID_GFN) ) return; - if ( guest_physmap_remove_page(d, _gfn(iorp->gfn), + if ( guest_physmap_remove_page(d, iorp->gfn, _mfn(page_to_mfn(iorp->page)), 0) ) domain_crash(d); clear_page(iorp->va); @@ -324,12 +324,12 @@ static int hvm_add_ioreq_gfn(struct hvm_ioreq_server *s, bool buf) struct hvm_ioreq_page *iorp = buf ? &s->bufioreq : &s->ioreq; int rc; - if ( IS_DEFAULT(s) || iorp->gfn == gfn_x(INVALID_GFN) ) + if ( IS_DEFAULT(s) || gfn_eq(iorp->gfn, INVALID_GFN) ) return 0; clear_page(iorp->va); - rc = guest_physmap_add_page(d, _gfn(iorp->gfn), + rc = guest_physmap_add_page(d, iorp->gfn, _mfn(page_to_mfn(iorp->page)), 0); if ( rc == 0 ) paging_mark_dirty(d, _mfn(page_to_mfn(iorp->page))); @@ -590,8 +590,8 @@ static int hvm_ioreq_server_init(struct hvm_ioreq_server *s, INIT_LIST_HEAD(&s->ioreq_vcpu_list); spin_lock_init(&s->bufioreq_lock); - s->ioreq.gfn = gfn_x(INVALID_GFN); - s->bufioreq.gfn = gfn_x(INVALID_GFN); + s->ioreq.gfn = INVALID_GFN; + s->bufioreq.gfn = INVALID_GFN; rc = hvm_ioreq_server_alloc_rangesets(s, id); if ( rc ) @@ -757,11 +757,11 @@ int hvm_get_ioreq_server_info(struct domain *d, ioservid_t id, ASSERT(!IS_DEFAULT(s)); - *ioreq_gfn = s->ioreq.gfn; + *ioreq_gfn = gfn_x(s->ioreq.gfn); if ( s->bufioreq.va != NULL ) { - *bufioreq_gfn = s->bufioreq.gfn; + *bufioreq_gfn = gfn_x(s->bufioreq.gfn); *bufioreq_port = s->bufioreq_evtchn; } diff --git a/xen/include/asm-x86/hvm/domain.h b/xen/include/asm-x86/hvm/domain.h index e17bbe4004..3bd9c5d7c0 100644 --- a/xen/include/asm-x86/hvm/domain.h +++ b/xen/include/asm-x86/hvm/domain.h @@ -36,7 +36,7 @@ #include struct hvm_ioreq_page { - unsigned long gfn; + gfn_t gfn; struct page_info *page; void *va; };