[v4,7/7] mm: remove donate_page()
diff mbox series

Message ID 20200124153103.18321-8-pdurrant@amazon.com
State Superseded
Headers show
Series
  • purge free_shared_domheap_page()
Related show

Commit Message

Paul Durrant Jan. 24, 2020, 3:31 p.m. UTC
This function appears to have no callers.

Signed-off-by: Paul Durrant <pdurrant@amazon.com>
---
Cc: Stefano Stabellini <sstabellini@kernel.org>
Cc: Julien Grall <julien@xen.org>
Cc: Volodymyr Babchuk <Volodymyr_Babchuk@epam.com>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>
Cc: George Dunlap <George.Dunlap@eu.citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Jan Beulich <jbeulich@suse.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Wei Liu <wl@xen.org>
Cc: "Roger Pau Monné" <roger.pau@citrix.com>

v4:
 - New in v4
---
 xen/arch/arm/mm.c    |  6 ------
 xen/arch/x86/mm.c    | 41 -----------------------------------------
 xen/include/xen/mm.h |  2 --
 3 files changed, 49 deletions(-)

Comments

George Dunlap Jan. 24, 2020, 4:07 p.m. UTC | #1
On 1/24/20 3:31 PM, Paul Durrant wrote:
> This function appears to have no callers.
> 
> Signed-off-by: Paul Durrant <pdurrant@amazon.com>

Acked-by: George Dunlap <george.dunlap@citrix.com>
Julien Grall Jan. 24, 2020, 4:35 p.m. UTC | #2
Hi Paul,

On 24/01/2020 15:31, Paul Durrant wrote:
> This function appears to have no callers.
> 
> Signed-off-by: Paul Durrant <pdurrant@amazon.com>

Acked-by: Julien Grall <julien@xen.org>

Cheers,
Andrew Cooper Jan. 24, 2020, 5:56 p.m. UTC | #3
On 24/01/2020 15:31, Paul Durrant wrote:
> This function appears to have no callers.
>
> Signed-off-by: Paul Durrant <pdurrant@amazon.com>

Looks like tmem was the sole user.  donate_page() was introduced by
6009f4ddb2 and the last caller was dropped by c492e19fdd.

This patch is standalone, and I can tweak the commit message on commit,
if you're happy with that.

~Andrew
Durrant, Paul Jan. 24, 2020, 6:36 p.m. UTC | #4
Sent from Workspace ONE Boxer
On 24 Jan 2020 17:57, Andrew Cooper <andrew.cooper3@citrix.com> wrote:
>
> On 24/01/2020 15:31, Paul Durrant wrote:
> > This function appears to have no callers.
> >
> > Signed-off-by: Paul Durrant <pdurrant@amazon.com>
>
> Looks like tmem was the sole user.  donate_page() was introduced by
> 6009f4ddb2 and the last caller was dropped by c492e19fdd.
>
> This patch is standalone, and I can tweak the commit message on commit,
> if you're happy with that.
>

Fine with me.

  Paul
> ~Andrew

Patch
diff mbox series

diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c
index 4d6c971f37..727107eefa 100644
--- a/xen/arch/arm/mm.c
+++ b/xen/arch/arm/mm.c
@@ -1353,12 +1353,6 @@  void arch_dump_shared_mem_info(void)
 {
 }
 
-int donate_page(struct domain *d, struct page_info *page, unsigned int memflags)
-{
-    ASSERT_UNREACHABLE();
-    return -ENOSYS;
-}
-
 int steal_page(
     struct domain *d, struct page_info *page, unsigned int memflags)
 {
diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
index 2a6d2e8af9..67351798c7 100644
--- a/xen/arch/x86/mm.c
+++ b/xen/arch/x86/mm.c
@@ -4174,47 +4174,6 @@  long do_mmu_update(
 }
 #endif /* CONFIG_PV */
 
-int donate_page(
-    struct domain *d, struct page_info *page, unsigned int memflags)
-{
-    const struct domain *owner = dom_xen;
-
-    spin_lock(&d->page_alloc_lock);
-
-    if ( is_xen_heap_page(page) || ((owner = page_get_owner(page)) != NULL) )
-        goto fail;
-
-    if ( d->is_dying )
-        goto fail;
-
-    if ( page->count_info & ~(PGC_allocated | 1) )
-        goto fail;
-
-    if ( !(memflags & MEMF_no_refcount) )
-    {
-        if ( d->tot_pages >= d->max_pages )
-            goto fail;
-        if ( unlikely(domain_adjust_tot_pages(d, 1) == 1) )
-            get_knownalive_domain(d);
-    }
-
-    page->count_info = PGC_allocated | 1;
-    page_set_owner(page, d);
-    page_list_add_tail(page,&d->page_list);
-
-    spin_unlock(&d->page_alloc_lock);
-    return 0;
-
- fail:
-    spin_unlock(&d->page_alloc_lock);
-    gdprintk(XENLOG_WARNING, "Bad donate mfn %" PRI_mfn
-             " to d%d (owner d%d) caf=%08lx taf=%" PRtype_info "\n",
-             mfn_x(page_to_mfn(page)), d->domain_id,
-             owner ? owner->domain_id : DOMID_INVALID,
-             page->count_info, page->u.inuse.type_info);
-    return -EINVAL;
-}
-
 /*
  * Steal page will attempt to remove `page` from domain `d`.  Upon
  * return, `page` will be in a state similar to the state of a page
diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h
index 8d0ddfb60c..d0d095d9c7 100644
--- a/xen/include/xen/mm.h
+++ b/xen/include/xen/mm.h
@@ -599,8 +599,6 @@  int xenmem_add_to_physmap(struct domain *d, struct xen_add_to_physmap *xatp,
 int __must_check guest_remove_page(struct domain *d, unsigned long gmfn);
 int __must_check steal_page(struct domain *d, struct page_info *page,
                             unsigned int memflags);
-int __must_check donate_page(struct domain *d, struct page_info *page,
-                             unsigned int memflags);
 
 #define RAM_TYPE_CONVENTIONAL 0x00000001
 #define RAM_TYPE_RESERVED     0x00000002