xen: replace XENFEAT_auto_translated_physmap with xen_pv_domain()

Instead of testing the XENFEAT_auto_translated_physmap feature, just
use !xen_pv_domain() which is equivalent.

This has the advantage that a kernel not built with CONFIG_XEN_PV
will be smaller due to dead code elimination.

Reviewed-by: Jason Andryuk <jason.andryuk@amd.com>
Signed-off-by: Juergen Gross <jgross@suse.com>
Message-ID: <20250826145608.10352-3-jgross@suse.com>

diff --git a/arch/x86/include/asm/xen/page.h b/arch/x86/include/asm/xen/page.h
index 85e63d58c07463da177eaca4fe359cf264d0f3f6..59f642a94b9d9057b672e953bd45a2bf7cb64818 100644 (file)
--- a/arch/x86/include/asm/xen/page.h
+++ b/arch/x86/include/asm/xen/page.h
@@ -12,9 +12,9 @@
 #include <asm/extable.h>
 #include <asm/page.h>
 
+#include <xen/xen.h>
 #include <xen/interface/xen.h>
 #include <xen/interface/grant_table.h>
-#include <xen/features.h>
 
 /* Xen machine address */
 typedef struct xmaddr {
@@ -162,7 +162,7 @@ static inline unsigned long pfn_to_mfn(unsigned long pfn)
         * pfn_to_mfn. This will have to be removed when we figured
         * out which call.
         */
-       if (xen_feature(XENFEAT_auto_translated_physmap))
+       if (!xen_pv_domain())
                return pfn;
 
        mfn = __pfn_to_mfn(pfn);
@@ -175,7 +175,7 @@ static inline unsigned long pfn_to_mfn(unsigned long pfn)
 
 static inline int phys_to_machine_mapping_valid(unsigned long pfn)
 {
-       if (xen_feature(XENFEAT_auto_translated_physmap))
+       if (!xen_pv_domain())
                return 1;
 
        return __pfn_to_mfn(pfn) != INVALID_P2M_ENTRY;
@@ -210,7 +210,7 @@ static inline unsigned long mfn_to_pfn(unsigned long mfn)
         * gfn_to_pfn. This will have to be removed when we figure
         * out which call.
         */
-       if (xen_feature(XENFEAT_auto_translated_physmap))
+       if (!xen_pv_domain())
                return mfn;
 
        pfn = mfn_to_pfn_no_overrides(mfn);
@@ -242,7 +242,7 @@ static inline xpaddr_t machine_to_phys(xmaddr_t machine)
 /* Pseudo-physical <-> Guest conversion */
 static inline unsigned long pfn_to_gfn(unsigned long pfn)
 {
-       if (xen_feature(XENFEAT_auto_translated_physmap))
+       if (!xen_pv_domain())
                return pfn;
        else
                return pfn_to_mfn(pfn);
@@ -250,7 +250,7 @@ static inline unsigned long pfn_to_gfn(unsigned long pfn)
 
 static inline unsigned long gfn_to_pfn(unsigned long gfn)
 {
-       if (xen_feature(XENFEAT_auto_translated_physmap))
+       if (!xen_pv_domain())
                return gfn;
        else
                return mfn_to_pfn(gfn);
@@ -284,7 +284,7 @@ static inline unsigned long bfn_to_local_pfn(unsigned long mfn)
 {
        unsigned long pfn;
 
-       if (xen_feature(XENFEAT_auto_translated_physmap))
+       if (!xen_pv_domain())
                return mfn;
 
        pfn = mfn_to_pfn(mfn);

diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
index c4c479373249be15c263d6872f1a3ec8bdc8458a..3be45bf4bc79750c25a98f7fac2091fb269bd821 100644 (file)
--- a/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
@@ -41,7 +41,7 @@ EXPORT_SYMBOL_GPL(arbitrary_virt_to_machine);
 int xen_unmap_domain_gfn_range(struct vm_area_struct *vma,
                               int nr, struct page **pages)
 {
-       if (xen_feature(XENFEAT_auto_translated_physmap))
+       if (!xen_pv_domain())
                return xen_xlate_unmap_gfn_range(vma, nr, pages);
 
        if (!pages)

diff --git a/arch/x86/xen/p2m.c b/arch/x86/xen/p2m.c
index 56914e21e30305a17a9d27b60246f3acf7c7ec0c..2dd12b61a230ad2e363d5c8bf57d22c9d3a657f1 100644 (file)
--- a/arch/x86/xen/p2m.c
+++ b/arch/x86/xen/p2m.c
@@ -686,7 +686,7 @@ int set_foreign_p2m_mapping(struct gnttab_map_grant_ref *map_ops,
        int i, ret = 0;
        pte_t *pte;
 
-       if (xen_feature(XENFEAT_auto_translated_physmap))
+       if (!xen_pv_domain())
                return 0;
 
        if (kmap_ops) {
@@ -769,7 +769,7 @@ int clear_foreign_p2m_mapping(struct gnttab_unmap_grant_ref *unmap_ops,
 {
        int i, ret = 0;
 
-       if (xen_feature(XENFEAT_auto_translated_physmap))
+       if (!xen_pv_domain())
                return 0;
 
        for (i = 0; i < count; i++) {

diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c
index 2de37dcd75566fc1a03b75232cbe17fc0f53909d..49c3f992639435ce7f75f034c39764e388552e0a 100644 (file)
--- a/drivers/xen/balloon.c
+++ b/drivers/xen/balloon.c
@@ -302,7 +302,7 @@ static enum bp_state reserve_additional_memory(void)
          * are not restored since this region is now known not to
          * conflict with any devices.
          */ 
-       if (!xen_feature(XENFEAT_auto_translated_physmap)) {
+       if (xen_pv_domain()) {
                unsigned long pfn, i;
 
                pfn = PFN_DOWN(resource->start);
@@ -626,7 +626,7 @@ int xen_alloc_ballooned_pages(unsigned int nr_pages, struct page **pages)
                         */
                        BUILD_BUG_ON(XEN_PAGE_SIZE != PAGE_SIZE);
 
-                       if (!xen_feature(XENFEAT_auto_translated_physmap)) {
+                       if (xen_pv_domain()) {
                                ret = xen_alloc_p2m_entry(page_to_pfn(page));
                                if (ret < 0)
                                        goto out_undo;

diff --git a/drivers/xen/gntdev.c b/drivers/xen/gntdev.c
index 1f21607656182a321dce0b1114c8fa4b8905fb25..74491967f2ae216affc9087388442a6c3109ac68 100644 (file)
--- a/drivers/xen/gntdev.c
+++ b/drivers/xen/gntdev.c
@@ -1183,7 +1183,7 @@ static int __init gntdev_init(void)
        if (!xen_domain())
                return -ENODEV;
 
-       use_ptemod = !xen_feature(XENFEAT_auto_translated_physmap);
+       use_ptemod = xen_pv_domain();
 
        err = misc_register(&gntdev_miscdev);
        if (err != 0) {

diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c
index 04a6b470b15dfb714eaf15a1afc734abccd539c6..478d2ad725ac6bc522532ffd31af791793f1ff49 100644 (file)
--- a/drivers/xen/grant-table.c
+++ b/drivers/xen/grant-table.c
@@ -1449,7 +1449,7 @@ static int gnttab_map(unsigned int start_idx, unsigned int end_idx)
        unsigned int nr_gframes = end_idx + 1;
        int rc;
 
-       if (xen_feature(XENFEAT_auto_translated_physmap)) {
+       if (!xen_pv_domain()) {
                struct xen_add_to_physmap xatp;
                unsigned int i = end_idx;
                rc = 0;
@@ -1570,7 +1570,7 @@ static int gnttab_setup(void)
        if (max_nr_gframes < nr_grant_frames)
                return -ENOSYS;
 
-       if (xen_feature(XENFEAT_auto_translated_physmap) && gnttab_shared.addr == NULL) {
+       if (!xen_pv_domain() && gnttab_shared.addr == NULL) {
                gnttab_shared.addr = xen_auto_xlat_grant_frames.vaddr;
                if (gnttab_shared.addr == NULL) {
                        pr_warn("gnttab share frames is not mapped!\n");
@@ -1588,7 +1588,7 @@ int gnttab_resume(void)
 
 int gnttab_suspend(void)
 {
-       if (!xen_feature(XENFEAT_auto_translated_physmap))
+       if (xen_pv_domain())
                gnttab_interface->unmap_frames();
        return 0;
 }

diff --git a/drivers/xen/privcmd.c b/drivers/xen/privcmd.c
index 13a10f3294a80d8daa231ac556a998b2e494378a..f52a457b302d9cbf53eade7c07dba6ca72ab73dd 100644 (file)
--- a/drivers/xen/privcmd.c
+++ b/drivers/xen/privcmd.c
@@ -271,7 +271,7 @@ static long privcmd_ioctl_mmap(struct file *file, void __user *udata)
        struct mmap_gfn_state state;
 
        /* We only support privcmd_ioctl_mmap_batch for non-auto-translated. */
-       if (xen_feature(XENFEAT_auto_translated_physmap))
+       if (!xen_pv_domain())
                return -ENOSYS;
 
        if (copy_from_user(&mmapcmd, udata, sizeof(mmapcmd)))
@@ -353,7 +353,7 @@ static int mmap_batch_fn(void *data, int nr, void *state)
        struct page **cur_pages = NULL;
        int ret;
 
-       if (xen_feature(XENFEAT_auto_translated_physmap))
+       if (!xen_pv_domain())
                cur_pages = &pages[st->index];
 
        BUG_ON(nr < 0);
@@ -535,7 +535,7 @@ static long privcmd_ioctl_mmap_batch(
                        ret = -EINVAL;
                        goto out_unlock;
                }
-               if (xen_feature(XENFEAT_auto_translated_physmap)) {
+               if (!xen_pv_domain()) {
                        ret = alloc_empty_pages(vma, nr_pages);
                        if (ret < 0)
                                goto out_unlock;
@@ -779,8 +779,7 @@ static long privcmd_ioctl_mmap_resource(struct file *file,
                goto out;
        }
 
-       if (IS_ENABLED(CONFIG_XEN_AUTO_XLATE) &&
-           xen_feature(XENFEAT_auto_translated_physmap)) {
+       if (IS_ENABLED(CONFIG_XEN_AUTO_XLATE) && !xen_pv_domain()) {
                unsigned int nr = DIV_ROUND_UP(kdata.num, XEN_PFN_PER_PAGE);
                struct page **pages;
                unsigned int i;
@@ -811,8 +810,7 @@ static long privcmd_ioctl_mmap_resource(struct file *file,
        if (rc)
                goto out;
 
-       if (IS_ENABLED(CONFIG_XEN_AUTO_XLATE) &&
-           xen_feature(XENFEAT_auto_translated_physmap)) {
+       if (IS_ENABLED(CONFIG_XEN_AUTO_XLATE) && !xen_pv_domain()) {
                rc = xen_remap_vma_range(vma, kdata.addr, kdata.num << PAGE_SHIFT);
        } else {
                unsigned int domid =
@@ -1591,7 +1589,7 @@ static void privcmd_close(struct vm_area_struct *vma)
        int numgfns = (vma->vm_end - vma->vm_start) >> XEN_PAGE_SHIFT;
        int rc;
 
-       if (!xen_feature(XENFEAT_auto_translated_physmap) || !numpgs || !pages)
+       if (xen_pv_domain() || !numpgs || !pages)
                return;
 
        rc = xen_unmap_domain_gfn_range(vma, numgfns, pages);

diff --git a/drivers/xen/unpopulated-alloc.c b/drivers/xen/unpopulated-alloc.c
index a39f2d36dd9cfc7b4016afedb0c8c9c24f3aa8e4..d6fc2aefe2646b398a96e5c549a35e49719653c8 100644 (file)
--- a/drivers/xen/unpopulated-alloc.c
+++ b/drivers/xen/unpopulated-alloc.c
@@ -105,7 +105,7 @@ static int fill_list(unsigned int nr_pages)
          * are not restored since this region is now known not to
          * conflict with any devices.
          */
-       if (!xen_feature(XENFEAT_auto_translated_physmap)) {
+       if (xen_pv_domain()) {
                xen_pfn_t pfn = PFN_DOWN(res->start);
 
                for (i = 0; i < alloc_pages; i++) {
@@ -184,7 +184,7 @@ int xen_alloc_unpopulated_pages(unsigned int nr_pages, struct page **pages)
                pages[i] = pg;
 
 #ifdef CONFIG_XEN_HAVE_PVMMU
-               if (!xen_feature(XENFEAT_auto_translated_physmap)) {
+               if (xen_pv_domain()) {
                        ret = xen_alloc_p2m_entry(page_to_pfn(pg));
                        if (ret < 0) {
                                unsigned int j;

diff --git a/drivers/xen/xenbus/xenbus_client.c b/drivers/xen/xenbus/xenbus_client.c
index e73ec225d4a61d0da65baf4aef190da376eefb6a..2dc874fb550665048ff7dbec54f563bbffd1f7b7 100644 (file)
--- a/drivers/xen/xenbus/xenbus_client.c
+++ b/drivers/xen/xenbus/xenbus_client.c
@@ -955,7 +955,7 @@ static const struct xenbus_ring_ops ring_ops_hvm = {
 void __init xenbus_ring_ops_init(void)
 {
 #ifdef CONFIG_XEN_PV
-       if (!xen_feature(XENFEAT_auto_translated_physmap))
+       if (xen_pv_domain())
                ring_ops = &ring_ops_pv;
        else
 #endif

diff --git a/include/xen/grant_table.h b/include/xen/grant_table.h
index e279be353e3f11f7d620cfddf22a78f4a6df1831..69ac6d80a006b700106f5d4b969970a0a66951e1 100644 (file)
--- a/include/xen/grant_table.h
+++ b/include/xen/grant_table.h
@@ -164,7 +164,7 @@ gnttab_set_map_op(struct gnttab_map_grant_ref *map, phys_addr_t addr,
 {
        if (flags & GNTMAP_contains_pte)
                map->host_addr = addr;
-       else if (xen_feature(XENFEAT_auto_translated_physmap))
+       else if (!xen_pv_domain())
                map->host_addr = __pa(addr);
        else
                map->host_addr = addr;
@@ -181,7 +181,7 @@ gnttab_set_unmap_op(struct gnttab_unmap_grant_ref *unmap, phys_addr_t addr,
 {
        if (flags & GNTMAP_contains_pte)
                unmap->host_addr = addr;
-       else if (xen_feature(XENFEAT_auto_translated_physmap))
+       else if (!xen_pv_domain())
                unmap->host_addr = __pa(addr);
        else
                unmap->host_addr = addr;

diff --git a/include/xen/mem-reservation.h b/include/xen/mem-reservation.h
index a2ab516fcd2caf33167f3e64a76c2e77b726d6df..3cbe3df0dfd4e9445adf59c92423ff06899448e9 100644 (file)
--- a/include/xen/mem-reservation.h
+++ b/include/xen/mem-reservation.h
@@ -39,7 +39,7 @@ static inline void xenmem_reservation_va_mapping_update(unsigned long count,
                                                        xen_pfn_t *frames)
 {
 #ifdef CONFIG_XEN_HAVE_PVMMU
-       if (!xen_feature(XENFEAT_auto_translated_physmap))
+       if (xen_pv_domain())
                __xenmem_reservation_va_mapping_update(count, pages, frames);
 #endif
 }
@@ -48,7 +48,7 @@ static inline void xenmem_reservation_va_mapping_reset(unsigned long count,
                                                       struct page **pages)
 {
 #ifdef CONFIG_XEN_HAVE_PVMMU
-       if (!xen_feature(XENFEAT_auto_translated_physmap))
+       if (xen_pv_domain())
                __xenmem_reservation_va_mapping_reset(count, pages);
 #endif
 }

diff --git a/include/xen/xen-ops.h b/include/xen/xen-ops.h
index 9e2a769b0d961a558bcd094f45b3a5cd795e71aa..496e6013c689f9837c368bd4a798ea9c770cc431 100644 (file)
--- a/include/xen/xen-ops.h
+++ b/include/xen/xen-ops.h
@@ -6,6 +6,7 @@
 #include <linux/notifier.h>
 #include <linux/efi.h>
 #include <linux/virtio_anchor.h>
+#include <xen/xen.h>
 #include <xen/features.h>
 #include <asm/xen/interface.h>
 #include <xen/interface/vcpu.h>
@@ -116,7 +117,7 @@ static inline int xen_remap_domain_gfn_array(struct vm_area_struct *vma,
                                             unsigned int domid,
                                             struct page **pages)
 {
-       if (xen_feature(XENFEAT_auto_translated_physmap))
+       if (!xen_pv_domain())
                return xen_xlate_remap_gfn_array(vma, addr, gfn, nr, err_ptr,
                                                 prot, domid, pages);
 
@@ -150,7 +151,7 @@ static inline int xen_remap_domain_mfn_array(struct vm_area_struct *vma,
                                             int nr, int *err_ptr,
                                             pgprot_t prot, unsigned int domid)
 {
-       if (xen_feature(XENFEAT_auto_translated_physmap))
+       if (!xen_pv_domain())
                return -EOPNOTSUPP;
 
        return xen_remap_pfn(vma, addr, mfn, nr, err_ptr, prot, domid,
@@ -175,7 +176,7 @@ static inline int xen_remap_domain_gfn_range(struct vm_area_struct *vma,
                                             pgprot_t prot, unsigned int domid,
                                             struct page **pages)
 {
-       if (xen_feature(XENFEAT_auto_translated_physmap))
+       if (!xen_pv_domain())
                return -EOPNOTSUPP;
 
        return xen_remap_pfn(vma, addr, &gfn, nr, NULL, prot, domid, false);