From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bob Liu Subject: [PATCH 11/11] tmem: cleanup: drop useless functions Date: Mon, 4 Nov 2013 20:40:54 +0800 Message-ID: <1383568854-30521-12-git-send-email-bob.liu@oracle.com> References: <1383568854-30521-1-git-send-email-bob.liu@oracle.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VdJXo-0003tX-6y for xen-devel@lists.xenproject.org; Mon, 04 Nov 2013 12:46:12 +0000 Received: by mail-pd0-f173.google.com with SMTP id r10so6626712pdi.32 for ; Mon, 04 Nov 2013 04:46:08 -0800 (PST) In-Reply-To: <1383568854-30521-1-git-send-email-bob.liu@oracle.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xenproject.org Cc: Bob Liu , keir@xen.org, ian.campbell@citrix.com, JBeulich@suse.com List-Id: xen-devel@lists.xenproject.org Function tmem_release_avail_pages_to_host() and tmem_scrub_page() only used once, no need to separate them out. Signed-off-by: Bob Liu --- xen/common/tmem.c | 19 +++++++++++++++++-- xen/common/tmem_xen.c | 24 ------------------------ xen/include/xen/tmem_xen.h | 3 --- 3 files changed, 17 insertions(+), 29 deletions(-) diff --git a/xen/common/tmem.c b/xen/common/tmem.c index 43d058c..4af04c5 100644 --- a/xen/common/tmem.c +++ b/xen/common/tmem.c @@ -1416,7 +1416,19 @@ static unsigned long tmem_relinquish_npages(unsigned long n) break; } if ( avail_pages ) - tmem_release_avail_pages_to_host(); + { + spin_lock(&tmem_page_list_lock); + while ( !page_list_empty(&tmem_page_list) ) + { + struct page_info *pg = page_list_remove_head(&tmem_page_list); + scrub_one_page(pg); + tmem_page_list_pages--; + free_domheap_page(pg); + } + ASSERT(tmem_page_list_pages == 0); + INIT_PAGE_LIST_HEAD(&tmem_page_list); + spin_unlock(&tmem_page_list_lock); + } return avail_pages; } @@ -2909,9 +2921,12 @@ EXPORT void *tmem_relinquish_pages(unsigned int order, unsigned int memflags) } if ( evicts_per_relinq > max_evicts_per_relinq ) max_evicts_per_relinq = evicts_per_relinq; - tmem_scrub_page(pfp, memflags); if ( pfp != NULL ) + { + if ( !(memflags & MEMF_tmem) ) + scrub_one_page(pfp); relinq_pgs++; + } if ( tmem_called_from_tmem(memflags) ) { diff --git a/xen/common/tmem_xen.c b/xen/common/tmem_xen.c index 0f5955d..d6e2e0d 100644 --- a/xen/common/tmem_xen.c +++ b/xen/common/tmem_xen.c @@ -289,30 +289,6 @@ EXPORT DEFINE_SPINLOCK(tmem_page_list_lock); EXPORT PAGE_LIST_HEAD(tmem_page_list); EXPORT unsigned long tmem_page_list_pages = 0; -/* free anything on tmem_page_list to Xen's scrub list */ -EXPORT void tmem_release_avail_pages_to_host(void) -{ - spin_lock(&tmem_page_list_lock); - while ( !page_list_empty(&tmem_page_list) ) - { - struct page_info *pg = page_list_remove_head(&tmem_page_list); - scrub_one_page(pg); - tmem_page_list_pages--; - free_domheap_page(pg); - } - ASSERT(tmem_page_list_pages == 0); - INIT_PAGE_LIST_HEAD(&tmem_page_list); - spin_unlock(&tmem_page_list_lock); -} - -EXPORT void tmem_scrub_page(struct page_info *pi, unsigned int memflags) -{ - if ( pi == NULL ) - return; - if ( !(memflags & MEMF_tmem) ) - scrub_one_page(pi); -} - static noinline void *tmem_mempool_page_get(unsigned long size) { struct page_info *pi; diff --git a/xen/include/xen/tmem_xen.h b/xen/include/xen/tmem_xen.h index acfc7ae..ce9c316 100644 --- a/xen/include/xen/tmem_xen.h +++ b/xen/include/xen/tmem_xen.h @@ -42,9 +42,6 @@ extern void tmem_copy_page(char *to, char*from); extern int tmem_init(void); #define tmem_hash hash_long -extern void tmem_release_avail_pages_to_host(void); -extern void tmem_scrub_page(struct page_info *pi, unsigned int memflags); - extern bool_t opt_tmem_compress; static inline bool_t tmem_compression_enabled(void) { -- 1.7.10.4