From patchwork Wed Mar 9 13:12:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 8546111 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B17A79F372 for ; Wed, 9 Mar 2016 13:16:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C8C142012D for ; Wed, 9 Mar 2016 13:16:18 +0000 (UTC) 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.kernel.org (Postfix) with ESMTPS id D35342008F for ; Wed, 9 Mar 2016 13:16:17 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xen.org with esmtp (Exim 4.84) (envelope-from ) id 1addvF-0005n2-Qm; Wed, 09 Mar 2016 13:13:05 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.84) (envelope-from ) id 1addvF-0005mv-2E for xen-devel@lists.xen.org; Wed, 09 Mar 2016 13:13:05 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 9B/86-24493-06120E65; Wed, 09 Mar 2016 13:13:04 +0000 X-Env-Sender: prvs=869909abb=Andrew.Cooper3@citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1457529182!27916796!1 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: 8.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 55849 invoked from network); 9 Mar 2016 13:13:03 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-9.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 9 Mar 2016 13:13:03 -0000 X-IronPort-AV: E=Sophos;i="5.24,311,1454976000"; d="scan'208";a="344327713" From: Andrew Cooper To: Xen-devel Date: Wed, 9 Mar 2016 13:12:59 +0000 Message-ID: <1457529180-25677-1-git-send-email-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 X-DLP: MIA2 Cc: George Dunlap , Andrew Cooper , Julien Grall , Stefano Stabellini , Jan Beulich Subject: [Xen-devel] [PATCH v4 1/2] xen/mm: Introduce arch_free_heap_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-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, 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 common/page_alloc.c references d->arch.relmem_list, which only exists on x86. This only compiles on ARM because page_list_del2() discards its second argument. Introduce a new common arch_free_heap_page() which only uses common lists in struct domain, and allow an architecture to override this with a custom alternative. x86 then provides a custom arch_free_heap_page() which takes care of managing d->arch.relmem_list. No functional change. Signed-off-by: Andrew Cooper --- CC: Jan Beulich CC: Stefano Stabellini CC: Julien Grall CC: George Dunlap --- xen/common/page_alloc.c | 4 ++-- xen/include/asm-x86/mm.h | 5 +++++ xen/include/xen/mm.h | 6 ++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 7179d67..22e8feb 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -1837,7 +1837,7 @@ void free_domheap_pages(struct page_info *pg, unsigned int order) spin_lock_recursive(&d->page_alloc_lock); for ( i = 0; i < (1 << order); i++ ) - page_list_del2(&pg[i], &d->xenpage_list, &d->arch.relmem_list); + arch_free_heap_page(d, &pg[i]); d->xenheap_pages -= 1 << order; drop_dom_ref = (d->xenheap_pages == 0); @@ -1856,7 +1856,7 @@ void free_domheap_pages(struct page_info *pg, unsigned int order) for ( i = 0; i < (1 << order); i++ ) { BUG_ON((pg[i].u.inuse.type_info & PGT_count_mask) != 0); - page_list_del2(&pg[i], &d->page_list, &d->arch.relmem_list); + arch_free_heap_page(d, &pg[i]); } drop_dom_ref = !domain_adjust_tot_pages(d, -(1 << order)); diff --git a/xen/include/asm-x86/mm.h b/xen/include/asm-x86/mm.h index 23a4092..195cbcb 100644 --- a/xen/include/asm-x86/mm.h +++ b/xen/include/asm-x86/mm.h @@ -590,4 +590,9 @@ typedef struct mm_rwlock { const char *locker_function; /* func that took it */ } mm_rwlock_t; +#define arch_free_heap_page(d, pg) \ + page_list_del2(pg, is_xen_heap_page(pg) ? \ + &(d)->xenpage_list : &(d)->page_list, \ + &(d)->arch.relmem_list) + #endif /* __ASM_X86_MM_H__ */ diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h index a795dd6..681e6c1 100644 --- a/xen/include/xen/mm.h +++ b/xen/include/xen/mm.h @@ -443,6 +443,12 @@ static inline unsigned int get_order_from_pages(unsigned long nr_pages) void scrub_one_page(struct page_info *); +#ifndef arch_free_heap_page +#define arch_free_heap_page(d, pg) \ + page_list_del(pg, is_xen_heap_page(pg) ? \ + &(d)->xenpage_list : &(d)->page_list) +#endif + int xenmem_add_to_physmap_one(struct domain *d, unsigned int space, domid_t foreign_domid, unsigned long idx, xen_pfn_t gpfn);