[alsa-devel] [Xen-devel][PATCH v2 1/3] xen: Introduce shared buffer helpers for page directory...
From: Oleksandr Andrushchenko oleksandr_andrushchenko@epam.com
based frontends. Currently the frontends which implement similar code for sharing big buffers between frontend and backend are para-virtualized DRM and sound drivers. Both define the same way to share grant references of a data buffer with the corresponding backend with little differences.
Move shared code into a helper module, so there is a single implementation of the same functionality for all.
This patch introduces code which is used by sound and display frontend drivers without functional changes with the intention to remove shared code from the corresponding drivers.
Signed-off-by: Oleksandr Andrushchenko oleksandr_andrushchenko@epam.com --- drivers/xen/Kconfig | 3 + drivers/xen/Makefile | 1 + drivers/xen/xen-front-pgdir-shbuf.c | 553 ++++++++++++++++++++++++++++ include/xen/xen-front-pgdir-shbuf.h | 89 +++++ 4 files changed, 646 insertions(+) create mode 100644 drivers/xen/xen-front-pgdir-shbuf.c create mode 100644 include/xen/xen-front-pgdir-shbuf.h
diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig index 815b9e9bb975..838b66a9a0e7 100644 --- a/drivers/xen/Kconfig +++ b/drivers/xen/Kconfig @@ -340,4 +340,7 @@ config XEN_SYMS config XEN_HAVE_VPMU bool
+config XEN_FRONT_PGDIR_SHBUF + tristate + endmenu diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile index 3e542f60f29f..c48927a58e10 100644 --- a/drivers/xen/Makefile +++ b/drivers/xen/Makefile @@ -44,3 +44,4 @@ xen-gntdev-y := gntdev.o xen-gntdev-$(CONFIG_XEN_GNTDEV_DMABUF) += gntdev-dmabuf.o xen-gntalloc-y := gntalloc.o xen-privcmd-y := privcmd.o privcmd-buf.o +obj-$(CONFIG_XEN_FRONT_PGDIR_SHBUF) += xen-front-pgdir-shbuf.o diff --git a/drivers/xen/xen-front-pgdir-shbuf.c b/drivers/xen/xen-front-pgdir-shbuf.c new file mode 100644 index 000000000000..48a658dc7ccf --- /dev/null +++ b/drivers/xen/xen-front-pgdir-shbuf.c @@ -0,0 +1,553 @@ +// SPDX-License-Identifier: GPL-2.0 OR MIT + +/* + * Xen frontend/backend page directory based shared buffer + * helper module. + * + * Copyright (C) 2018 EPAM Systems Inc. + * + * Author: Oleksandr Andrushchenko oleksandr_andrushchenko@epam.com + */ + +#include <linux/module.h> +#include <linux/errno.h> +#include <linux/mm.h> + +#include <asm/xen/hypervisor.h> +#include <xen/balloon.h> +#include <xen/xen.h> +#include <xen/xenbus.h> +#include <xen/interface/io/ring.h> + +#include <xen/xen-front-pgdir-shbuf.h> + +#ifndef GRANT_INVALID_REF +/* + * FIXME: usage of grant reference 0 as invalid grant reference: + * grant reference 0 is valid, but never exposed to a PV driver, + * because of the fact it is already in use/reserved by the PV console. + */ +#define GRANT_INVALID_REF 0 +#endif + +/** + * This structure represents the structure of a shared page + * that contains grant references to the pages of the shared + * buffer. This structure is common to many Xen para-virtualized + * protocols at include/xen/interface/io/ + */ +struct xen_page_directory { + grant_ref_t gref_dir_next_page; + grant_ref_t gref[1]; /* Variable length */ +}; + +/** + * Shared buffer ops which are differently implemented + * depending on the allocation mode, e.g. if the buffer + * is allocated by the corresponding backend or frontend. + * Some of the operations. + */ +struct xen_front_pgdir_shbuf_ops { + /* + * Calculate number of grefs required to handle this buffer, + * e.g. if grefs are required for page directory only or the buffer + * pages as well. + */ + void (*calc_num_grefs)(struct xen_front_pgdir_shbuf *buf); + + /* Fill page directory according to para-virtual display protocol. */ + void (*fill_page_dir)(struct xen_front_pgdir_shbuf *buf); + + /* Claim grant references for the pages of the buffer. */ + int (*grant_refs_for_buffer)(struct xen_front_pgdir_shbuf *buf, + grant_ref_t *priv_gref_head, int gref_idx); + + /* Map grant references of the buffer. */ + int (*map)(struct xen_front_pgdir_shbuf *buf); + + /* Unmap grant references of the buffer. */ + int (*unmap)(struct xen_front_pgdir_shbuf *buf); +}; + +/** + * Get granted reference to the very first page of the + * page directory. Usually this is passed to the backend, + * so it can find/fill the grant references to the buffer's + * pages. + * + * \param buf shared buffer which page directory is of interest. + * \return granted reference to the very first page of the + * page directory. + */ +grant_ref_t +xen_front_pgdir_shbuf_get_dir_start(struct xen_front_pgdir_shbuf *buf) +{ + if (!buf->grefs) + return GRANT_INVALID_REF; + + return buf->grefs[0]; +} +EXPORT_SYMBOL_GPL(xen_front_pgdir_shbuf_get_dir_start); + +/** + * Map granted references of the shared buffer. + * + * Depending on the shared buffer mode of allocation + * (be_alloc flag) this can either do nothing (for buffers + * shared by the frontend itself) or map the provided granted + * references onto the backing storage (buf->pages). + * + * \param buf shared buffer which grants to be maped. + * \return zero on success or a negative number on failure. + */ +int xen_front_pgdir_shbuf_map(struct xen_front_pgdir_shbuf *buf) +{ + if (buf->ops && buf->ops->map) + return buf->ops->map(buf); + + /* No need to map own grant references. */ + return 0; +} +EXPORT_SYMBOL_GPL(xen_front_pgdir_shbuf_map); + +/** + * Unmap granted references of the shared buffer. + * + * Depending on the shared buffer mode of allocation + * (be_alloc flag) this can either do nothing (for buffers + * shared by the frontend itself) or unmap the provided granted + * references. + * + * \param buf shared buffer which grants to be unmaped. + * \return zero on success or a negative number on failure. + */ +int xen_front_pgdir_shbuf_unmap(struct xen_front_pgdir_shbuf *buf) +{ + if (buf->ops && buf->ops->unmap) + return buf->ops->unmap(buf); + + /* No need to unmap own grant references. */ + return 0; +} +EXPORT_SYMBOL_GPL(xen_front_pgdir_shbuf_unmap); + +/** + * Free all the resources of the shared buffer. + * + * \param buf shared buffer which resources to be freed. + */ +void xen_front_pgdir_shbuf_free(struct xen_front_pgdir_shbuf *buf) +{ + if (buf->grefs) { + int i; + + for (i = 0; i < buf->num_grefs; i++) + if (buf->grefs[i] != GRANT_INVALID_REF) + gnttab_end_foreign_access(buf->grefs[i], + 0, 0UL); + } + kfree(buf->grefs); + kfree(buf->directory); +} +EXPORT_SYMBOL_GPL(xen_front_pgdir_shbuf_free); + +/* + * Number of grefs a page can hold with respect to the + * struct xen_page_directory header. + */ +#define XEN_NUM_GREFS_PER_PAGE ((PAGE_SIZE - \ + offsetof(struct xen_page_directory, \ + gref)) / sizeof(grant_ref_t)) + +/** + * Get the number of pages the page directory consumes itself. + * + * \param buf shared buffer. + */ +static int get_num_pages_dir(struct xen_front_pgdir_shbuf *buf) +{ + return DIV_ROUND_UP(buf->num_pages, XEN_NUM_GREFS_PER_PAGE); +} + +/** + * Calculate the number of grant references needed to share the buffer + * and its pages when backend allocates the buffer. + * + * \param buf shared buffer. + */ +static void backend_calc_num_grefs(struct xen_front_pgdir_shbuf *buf) +{ + /* Only for pages the page directory consumes itself. */ + buf->num_grefs = get_num_pages_dir(buf); +} + +/** + * Calculate the number of grant references needed to share the buffer + * and its pages when frontend allocates the buffer. + * + * \param buf shared buffer. + */ +static void guest_calc_num_grefs(struct xen_front_pgdir_shbuf *buf) +{ + /* + * Number of pages the page directory consumes itself + * plus grefs for the buffer pages. + */ + buf->num_grefs = get_num_pages_dir(buf) + buf->num_pages; +} + +#define xen_page_to_vaddr(page) \ + ((uintptr_t)pfn_to_kaddr(page_to_xen_pfn(page))) + +/** + * Unmap the buffer previously mapped with grant references + * provided by the backend. + * + * \param buf shared buffer. + * \return zero on success or a negative number on failure. + */ +static int backend_unmap(struct xen_front_pgdir_shbuf *buf) +{ + struct gnttab_unmap_grant_ref *unmap_ops; + int i, ret; + + if (!buf->pages || !buf->backend_map_handles || !buf->grefs) + return 0; + + unmap_ops = kcalloc(buf->num_pages, sizeof(*unmap_ops), + GFP_KERNEL); + if (!unmap_ops) + return -ENOMEM; + + for (i = 0; i < buf->num_pages; i++) { + phys_addr_t addr; + + addr = xen_page_to_vaddr(buf->pages[i]); + gnttab_set_unmap_op(&unmap_ops[i], addr, GNTMAP_host_map, + buf->backend_map_handles[i]); + } + + ret = gnttab_unmap_refs(unmap_ops, NULL, buf->pages, + buf->num_pages); + + for (i = 0; i < buf->num_pages; i++) { + if (unlikely(unmap_ops[i].status != GNTST_okay)) + dev_err(&buf->xb_dev->dev, + "Failed to unmap page %d: %d\n", + i, unmap_ops[i].status); + } + + if (ret) + dev_err(&buf->xb_dev->dev, + "Failed to unmap grant references, ret %d", ret); + + kfree(unmap_ops); + kfree(buf->backend_map_handles); + buf->backend_map_handles = NULL; + return ret; +} + +/** + * Map the buffer with grant references provided by the backend. + * + * \param buf shared buffer. + * \return zero on success or a negative number on failure. + */ +static int backend_map(struct xen_front_pgdir_shbuf *buf) +{ + struct gnttab_map_grant_ref *map_ops = NULL; + unsigned char *ptr; + int ret, cur_gref, cur_dir_page, cur_page, grefs_left; + + map_ops = kcalloc(buf->num_pages, sizeof(*map_ops), GFP_KERNEL); + if (!map_ops) + return -ENOMEM; + + buf->backend_map_handles = kcalloc(buf->num_pages, + sizeof(*buf->backend_map_handles), + GFP_KERNEL); + if (!buf->backend_map_handles) { + kfree(map_ops); + return -ENOMEM; + } + + /* + * Read page directory to get grefs from the backend: for external + * buffer we only allocate buf->grefs for the page directory, + * so buf->num_grefs has number of pages in the page directory itself. + */ + ptr = buf->directory; + grefs_left = buf->num_pages; + cur_page = 0; + for (cur_dir_page = 0; cur_dir_page < buf->num_grefs; cur_dir_page++) { + struct xen_page_directory *page_dir = + (struct xen_page_directory *)ptr; + int to_copy = XEN_NUM_GREFS_PER_PAGE; + + if (to_copy > grefs_left) + to_copy = grefs_left; + + for (cur_gref = 0; cur_gref < to_copy; cur_gref++) { + phys_addr_t addr; + + addr = xen_page_to_vaddr(buf->pages[cur_page]); + gnttab_set_map_op(&map_ops[cur_page], addr, + GNTMAP_host_map, + page_dir->gref[cur_gref], + buf->xb_dev->otherend_id); + cur_page++; + } + + grefs_left -= to_copy; + ptr += PAGE_SIZE; + } + ret = gnttab_map_refs(map_ops, NULL, buf->pages, buf->num_pages); + + /* Save handles even if error, so we can unmap. */ + for (cur_page = 0; cur_page < buf->num_pages; cur_page++) { + buf->backend_map_handles[cur_page] = map_ops[cur_page].handle; + if (unlikely(map_ops[cur_page].status != GNTST_okay)) + dev_err(&buf->xb_dev->dev, + "Failed to map page %d: %d\n", + cur_page, map_ops[cur_page].status); + } + + if (ret) { + dev_err(&buf->xb_dev->dev, + "Failed to map grant references, ret %d", ret); + backend_unmap(buf); + } + + kfree(map_ops); + return ret; +} + +/** + * Fill page directory with grant references to the pages of the + * page directory itself. + * + * The grant references to the buffer pages are provided by the + * backend in this case. + * + * \param buf shared buffer. + */ +static void backend_fill_page_dir(struct xen_front_pgdir_shbuf *buf) +{ + struct xen_page_directory *page_dir; + unsigned char *ptr; + int i, num_pages_dir; + + ptr = buf->directory; + num_pages_dir = get_num_pages_dir(buf); + + /* Fill only grefs for the page directory itself. */ + for (i = 0; i < num_pages_dir - 1; i++) { + page_dir = (struct xen_page_directory *)ptr; + + page_dir->gref_dir_next_page = buf->grefs[i + 1]; + ptr += PAGE_SIZE; + } + /* Last page must say there is no more pages. */ + page_dir = (struct xen_page_directory *)ptr; + page_dir->gref_dir_next_page = GRANT_INVALID_REF; +} + +/** + * Fill page directory with grant references to the pages of the + * page directory and the buffer we share with the backend. + * + * \param buf shared buffer. + */ +static void guest_fill_page_dir(struct xen_front_pgdir_shbuf *buf) +{ + unsigned char *ptr; + int cur_gref, grefs_left, to_copy, i, num_pages_dir; + + ptr = buf->directory; + num_pages_dir = get_num_pages_dir(buf); + + /* + * While copying, skip grefs at start, they are for pages + * granted for the page directory itself. + */ + cur_gref = num_pages_dir; + grefs_left = buf->num_pages; + for (i = 0; i < num_pages_dir; i++) { + struct xen_page_directory *page_dir = + (struct xen_page_directory *)ptr; + + if (grefs_left <= XEN_NUM_GREFS_PER_PAGE) { + to_copy = grefs_left; + page_dir->gref_dir_next_page = GRANT_INVALID_REF; + } else { + to_copy = XEN_NUM_GREFS_PER_PAGE; + page_dir->gref_dir_next_page = buf->grefs[i + 1]; + } + memcpy(&page_dir->gref, &buf->grefs[cur_gref], + to_copy * sizeof(grant_ref_t)); + ptr += PAGE_SIZE; + grefs_left -= to_copy; + cur_gref += to_copy; + } +} + +/** + * Grant references to the frontend's buffer pages. + * + * These will be shared with the backend, so it can + * access the buffer's data. + * + * \param buf shared buffer. + * \return zero on success or a negative number on failure. + */ +static int guest_grant_refs_for_buffer(struct xen_front_pgdir_shbuf *buf, + grant_ref_t *priv_gref_head, + int gref_idx) +{ + int i, cur_ref, otherend_id; + + otherend_id = buf->xb_dev->otherend_id; + for (i = 0; i < buf->num_pages; i++) { + cur_ref = gnttab_claim_grant_reference(priv_gref_head); + if (cur_ref < 0) + return cur_ref; + + gnttab_grant_foreign_access_ref(cur_ref, otherend_id, + xen_page_to_gfn(buf->pages[i]), + 0); + buf->grefs[gref_idx++] = cur_ref; + } + return 0; +} + +/** + * Grant all the references needed to share the buffer. + * + * Grant references to the page directory pages and, if + * needed, also to the pages of the shared buffer data. + * + * \param buf shared buffer. + * \return zero on success or a negative number on failure. + */ +static int grant_references(struct xen_front_pgdir_shbuf *buf) +{ + grant_ref_t priv_gref_head; + int ret, i, j, cur_ref; + int otherend_id, num_pages_dir; + + ret = gnttab_alloc_grant_references(buf->num_grefs, &priv_gref_head); + if (ret < 0) { + dev_err(&buf->xb_dev->dev, + "Cannot allocate grant references\n"); + return ret; + } + + otherend_id = buf->xb_dev->otherend_id; + j = 0; + num_pages_dir = get_num_pages_dir(buf); + for (i = 0; i < num_pages_dir; i++) { + unsigned long frame; + + cur_ref = gnttab_claim_grant_reference(&priv_gref_head); + if (cur_ref < 0) + return cur_ref; + + frame = xen_page_to_gfn(virt_to_page(buf->directory + + PAGE_SIZE * i)); + gnttab_grant_foreign_access_ref(cur_ref, otherend_id, frame, 0); + buf->grefs[j++] = cur_ref; + } + + if (buf->ops->grant_refs_for_buffer) { + ret = buf->ops->grant_refs_for_buffer(buf, &priv_gref_head, j); + if (ret) + return ret; + } + + gnttab_free_grant_references(priv_gref_head); + return 0; +} + +/** + * Allocate all required structures to mange shared buffer. + * + * \param buf shared buffer. + * \return zero on success or a negative number on failure. + */ +static int alloc_storage(struct xen_front_pgdir_shbuf *buf) +{ + buf->grefs = kcalloc(buf->num_grefs, sizeof(*buf->grefs), GFP_KERNEL); + if (!buf->grefs) + return -ENOMEM; + + buf->directory = kcalloc(get_num_pages_dir(buf), PAGE_SIZE, GFP_KERNEL); + if (!buf->directory) + return -ENOMEM; + + return 0; +} + +/* + * For backend allocated buffers we don't need grant_refs_for_buffer + * as those grant references are allocated at backend side. + */ +static const struct xen_front_pgdir_shbuf_ops backend_ops = { + .calc_num_grefs = backend_calc_num_grefs, + .fill_page_dir = backend_fill_page_dir, + .map = backend_map, + .unmap = backend_unmap +}; + +/* + * For locally granted references we do not need to map/unmap + * the references. + */ +static const struct xen_front_pgdir_shbuf_ops local_ops = { + .calc_num_grefs = guest_calc_num_grefs, + .fill_page_dir = guest_fill_page_dir, + .grant_refs_for_buffer = guest_grant_refs_for_buffer, +}; + +/** + * Allocate a new instance of a shared buffer. + * + * \param cfg configuration to be used while allocating a new shared buffer. + * \return zero on success or a negative number on failure. + */ +int xen_front_pgdir_shbuf_alloc(struct xen_front_pgdir_shbuf_cfg *cfg) +{ + struct xen_front_pgdir_shbuf *buf = cfg->pgdir; + int ret; + + if (cfg->be_alloc) + buf->ops = &backend_ops; + else + buf->ops = &local_ops; + buf->xb_dev = cfg->xb_dev; + buf->num_pages = cfg->num_pages; + buf->pages = cfg->pages; + + buf->ops->calc_num_grefs(buf); + + ret = alloc_storage(buf); + if (ret) + goto fail; + + ret = grant_references(buf); + if (ret) + goto fail; + + buf->ops->fill_page_dir(buf); + + return 0; + +fail: + xen_front_pgdir_shbuf_free(buf); + return ret; +} +EXPORT_SYMBOL_GPL(xen_front_pgdir_shbuf_alloc); + +MODULE_DESCRIPTION("Xen frontend/backend page directory based " + "shared buffer handling"); +MODULE_AUTHOR("Oleksandr Andrushchenko"); +MODULE_LICENSE("GPL"); diff --git a/include/xen/xen-front-pgdir-shbuf.h b/include/xen/xen-front-pgdir-shbuf.h new file mode 100644 index 000000000000..150ef7ec51ec --- /dev/null +++ b/include/xen/xen-front-pgdir-shbuf.h @@ -0,0 +1,89 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ + +/* + * Xen frontend/backend page directory based shared buffer + * helper module. + * + * Copyright (C) 2018 EPAM Systems Inc. + * + * Author: Oleksandr Andrushchenko oleksandr_andrushchenko@epam.com + */ + +#ifndef __XEN_FRONT_PGDIR_SHBUF_H_ +#define __XEN_FRONT_PGDIR_SHBUF_H_ + +#include <linux/kernel.h> + +#include <xen/grant_table.h> + +struct xen_front_pgdir_shbuf_ops; + +struct xen_front_pgdir_shbuf { + /* + * Number of references granted for the backend use: + * + * - for frontend allocated/imported buffers this holds the number + * of grant references for the page directory and the pages + * of the buffer + * + * - for the buffer provided by the backend this only holds the number + * of grant references for the page directory itself as grant + * references for the buffer will be provided by the backend. + */ + int num_grefs; + grant_ref_t *grefs; + /* Page directory backing storage. */ + u8 *directory; + + /* + * Number of pages for the shared buffer itself (excluding the page + * directory). + */ + int num_pages; + /* + * Backing storage of the shared buffer: these are the pages being + * shared. + */ + struct page **pages; + + struct xenbus_device *xb_dev; + + /* These are the ops used internally depending on be_alloc mode. */ + const struct xen_front_pgdir_shbuf_ops *ops; + + /* Xen map handles for the buffer allocated by the backend. */ + grant_handle_t *backend_map_handles; +}; + +struct xen_front_pgdir_shbuf_cfg { + struct xenbus_device *xb_dev; + + /* Number of pages of the buffer backing storage. */ + int num_pages; + /* Pages of the buffer to be shared. */ + struct page **pages; + + /* + * This is allocated outside because there are use-cases when + * the buffer structure is allocated as a part of a bigger one. + */ + struct xen_front_pgdir_shbuf *pgdir; + /* + * Mode of grant reference sharing: if set then backend will share + * grant references to the buffer with the frontend. + */ + int be_alloc; +}; + +int xen_front_pgdir_shbuf_alloc(struct xen_front_pgdir_shbuf_cfg *cfg); + +grant_ref_t +xen_front_pgdir_shbuf_get_dir_start(struct xen_front_pgdir_shbuf *buf); + +int xen_front_pgdir_shbuf_map(struct xen_front_pgdir_shbuf *buf); + +int xen_front_pgdir_shbuf_unmap(struct xen_front_pgdir_shbuf *buf); + +void xen_front_pgdir_shbuf_free(struct xen_front_pgdir_shbuf *buf); + +#endif /* __XEN_FRONT_PGDIR_SHBUF_H_ */
From: Oleksandr Andrushchenko oleksandr_andrushchenko@epam.com
Use page directory based shared buffer implementation now available as common code for Xen frontend drivers.
Remove flushing of shared buffer on page flip as this workaround needs a proper fix.
Signed-off-by: Oleksandr Andrushchenko oleksandr_andrushchenko@epam.com --- drivers/gpu/drm/xen/Kconfig | 1 + drivers/gpu/drm/xen/Makefile | 1 - drivers/gpu/drm/xen/xen_drm_front.c | 65 ++-- drivers/gpu/drm/xen/xen_drm_front_gem.c | 1 - drivers/gpu/drm/xen/xen_drm_front_shbuf.c | 414 ---------------------- drivers/gpu/drm/xen/xen_drm_front_shbuf.h | 64 ---- 6 files changed, 26 insertions(+), 520 deletions(-) delete mode 100644 drivers/gpu/drm/xen/xen_drm_front_shbuf.c delete mode 100644 drivers/gpu/drm/xen/xen_drm_front_shbuf.h
diff --git a/drivers/gpu/drm/xen/Kconfig b/drivers/gpu/drm/xen/Kconfig index 4cca160782ab..f969d486855d 100644 --- a/drivers/gpu/drm/xen/Kconfig +++ b/drivers/gpu/drm/xen/Kconfig @@ -12,6 +12,7 @@ config DRM_XEN_FRONTEND select DRM_KMS_HELPER select VIDEOMODE_HELPERS select XEN_XENBUS_FRONTEND + select XEN_FRONT_PGDIR_SHBUF help Choose this option if you want to enable a para-virtualized frontend DRM/KMS driver for Xen guest OSes. diff --git a/drivers/gpu/drm/xen/Makefile b/drivers/gpu/drm/xen/Makefile index 712afff5ffc3..825905f67faa 100644 --- a/drivers/gpu/drm/xen/Makefile +++ b/drivers/gpu/drm/xen/Makefile @@ -4,7 +4,6 @@ drm_xen_front-objs := xen_drm_front.o \ xen_drm_front_kms.o \ xen_drm_front_conn.o \ xen_drm_front_evtchnl.o \ - xen_drm_front_shbuf.o \ xen_drm_front_cfg.o \ xen_drm_front_gem.o
diff --git a/drivers/gpu/drm/xen/xen_drm_front.c b/drivers/gpu/drm/xen/xen_drm_front.c index 6b6d5ab82ec3..4d3d36fc3a5d 100644 --- a/drivers/gpu/drm/xen/xen_drm_front.c +++ b/drivers/gpu/drm/xen/xen_drm_front.c @@ -19,6 +19,7 @@ #include <xen/xen.h> #include <xen/xenbus.h>
+#include <xen/xen-front-pgdir-shbuf.h> #include <xen/interface/io/displif.h>
#include "xen_drm_front.h" @@ -26,28 +27,20 @@ #include "xen_drm_front_evtchnl.h" #include "xen_drm_front_gem.h" #include "xen_drm_front_kms.h" -#include "xen_drm_front_shbuf.h"
struct xen_drm_front_dbuf { struct list_head list; u64 dbuf_cookie; u64 fb_cookie; - struct xen_drm_front_shbuf *shbuf; + + struct xen_front_pgdir_shbuf shbuf; };
-static int dbuf_add_to_list(struct xen_drm_front_info *front_info, - struct xen_drm_front_shbuf *shbuf, u64 dbuf_cookie) +static void dbuf_add_to_list(struct xen_drm_front_info *front_info, + struct xen_drm_front_dbuf *dbuf, u64 dbuf_cookie) { - struct xen_drm_front_dbuf *dbuf; - - dbuf = kzalloc(sizeof(*dbuf), GFP_KERNEL); - if (!dbuf) - return -ENOMEM; - dbuf->dbuf_cookie = dbuf_cookie; - dbuf->shbuf = shbuf; list_add(&dbuf->list, &front_info->dbuf_list); - return 0; }
static struct xen_drm_front_dbuf *dbuf_get(struct list_head *dbuf_list, @@ -62,15 +55,6 @@ static struct xen_drm_front_dbuf *dbuf_get(struct list_head *dbuf_list, return NULL; }
-static void dbuf_flush_fb(struct list_head *dbuf_list, u64 fb_cookie) -{ - struct xen_drm_front_dbuf *buf, *q; - - list_for_each_entry_safe(buf, q, dbuf_list, list) - if (buf->fb_cookie == fb_cookie) - xen_drm_front_shbuf_flush(buf->shbuf); -} - static void dbuf_free(struct list_head *dbuf_list, u64 dbuf_cookie) { struct xen_drm_front_dbuf *buf, *q; @@ -78,8 +62,8 @@ static void dbuf_free(struct list_head *dbuf_list, u64 dbuf_cookie) list_for_each_entry_safe(buf, q, dbuf_list, list) if (buf->dbuf_cookie == dbuf_cookie) { list_del(&buf->list); - xen_drm_front_shbuf_unmap(buf->shbuf); - xen_drm_front_shbuf_free(buf->shbuf); + xen_front_pgdir_shbuf_unmap(&buf->shbuf); + xen_front_pgdir_shbuf_free(&buf->shbuf); kfree(buf); break; } @@ -91,8 +75,8 @@ static void dbuf_free_all(struct list_head *dbuf_list)
list_for_each_entry_safe(buf, q, dbuf_list, list) { list_del(&buf->list); - xen_drm_front_shbuf_unmap(buf->shbuf); - xen_drm_front_shbuf_free(buf->shbuf); + xen_front_pgdir_shbuf_unmap(&buf->shbuf); + xen_front_pgdir_shbuf_free(&buf->shbuf); kfree(buf); } } @@ -171,9 +155,9 @@ int xen_drm_front_dbuf_create(struct xen_drm_front_info *front_info, u32 bpp, u64 size, struct page **pages) { struct xen_drm_front_evtchnl *evtchnl; - struct xen_drm_front_shbuf *shbuf; + struct xen_drm_front_dbuf *dbuf; struct xendispl_req *req; - struct xen_drm_front_shbuf_cfg buf_cfg; + struct xen_front_pgdir_shbuf_cfg buf_cfg; unsigned long flags; int ret;
@@ -181,28 +165,29 @@ int xen_drm_front_dbuf_create(struct xen_drm_front_info *front_info, if (unlikely(!evtchnl)) return -EIO;
+ dbuf = kzalloc(sizeof(*dbuf), GFP_KERNEL); + if (!dbuf) + return -ENOMEM; + + dbuf_add_to_list(front_info, dbuf, dbuf_cookie); + memset(&buf_cfg, 0, sizeof(buf_cfg)); buf_cfg.xb_dev = front_info->xb_dev; + buf_cfg.num_pages = DIV_ROUND_UP(size, PAGE_SIZE); buf_cfg.pages = pages; - buf_cfg.size = size; + buf_cfg.pgdir = &dbuf->shbuf; buf_cfg.be_alloc = front_info->cfg.be_alloc;
- shbuf = xen_drm_front_shbuf_alloc(&buf_cfg); - if (IS_ERR(shbuf)) - return PTR_ERR(shbuf); - - ret = dbuf_add_to_list(front_info, shbuf, dbuf_cookie); - if (ret < 0) { - xen_drm_front_shbuf_free(shbuf); - return ret; - } + ret = xen_front_pgdir_shbuf_alloc(&buf_cfg); + if (ret < 0) + goto fail_shbuf_alloc;
mutex_lock(&evtchnl->u.req.req_io_lock);
spin_lock_irqsave(&front_info->io_lock, flags); req = be_prepare_req(evtchnl, XENDISPL_OP_DBUF_CREATE); req->op.dbuf_create.gref_directory = - xen_drm_front_shbuf_get_dir_start(shbuf); + xen_front_pgdir_shbuf_get_dir_start(&dbuf->shbuf); req->op.dbuf_create.buffer_sz = size; req->op.dbuf_create.dbuf_cookie = dbuf_cookie; req->op.dbuf_create.width = width; @@ -221,7 +206,7 @@ int xen_drm_front_dbuf_create(struct xen_drm_front_info *front_info, if (ret < 0) goto fail;
- ret = xen_drm_front_shbuf_map(shbuf); + ret = xen_front_pgdir_shbuf_map(&dbuf->shbuf); if (ret < 0) goto fail;
@@ -230,6 +215,7 @@ int xen_drm_front_dbuf_create(struct xen_drm_front_info *front_info,
fail: mutex_unlock(&evtchnl->u.req.req_io_lock); +fail_shbuf_alloc: dbuf_free(&front_info->dbuf_list, dbuf_cookie); return ret; } @@ -358,7 +344,6 @@ int xen_drm_front_page_flip(struct xen_drm_front_info *front_info, if (unlikely(conn_idx >= front_info->num_evt_pairs)) return -EINVAL;
- dbuf_flush_fb(&front_info->dbuf_list, fb_cookie); evtchnl = &front_info->evt_pairs[conn_idx].req;
mutex_lock(&evtchnl->u.req.req_io_lock); diff --git a/drivers/gpu/drm/xen/xen_drm_front_gem.c b/drivers/gpu/drm/xen/xen_drm_front_gem.c index c85bfe7571cb..53be4c7dc0a4 100644 --- a/drivers/gpu/drm/xen/xen_drm_front_gem.c +++ b/drivers/gpu/drm/xen/xen_drm_front_gem.c @@ -22,7 +22,6 @@ #include <xen/balloon.h>
#include "xen_drm_front.h" -#include "xen_drm_front_shbuf.h"
struct xen_gem_object { struct drm_gem_object base; diff --git a/drivers/gpu/drm/xen/xen_drm_front_shbuf.c b/drivers/gpu/drm/xen/xen_drm_front_shbuf.c deleted file mode 100644 index d333b67cc1a0..000000000000 --- a/drivers/gpu/drm/xen/xen_drm_front_shbuf.c +++ /dev/null @@ -1,414 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 OR MIT - -/* - * Xen para-virtual DRM device - * - * Copyright (C) 2016-2018 EPAM Systems Inc. - * - * Author: Oleksandr Andrushchenko oleksandr_andrushchenko@epam.com - */ - -#include <drm/drmP.h> - -#if defined(CONFIG_X86) -#include <drm/drm_cache.h> -#endif -#include <linux/errno.h> -#include <linux/mm.h> - -#include <asm/xen/hypervisor.h> -#include <xen/balloon.h> -#include <xen/xen.h> -#include <xen/xenbus.h> -#include <xen/interface/io/ring.h> -#include <xen/interface/io/displif.h> - -#include "xen_drm_front.h" -#include "xen_drm_front_shbuf.h" - -struct xen_drm_front_shbuf_ops { - /* - * Calculate number of grefs required to handle this buffer, - * e.g. if grefs are required for page directory only or the buffer - * pages as well. - */ - void (*calc_num_grefs)(struct xen_drm_front_shbuf *buf); - /* Fill page directory according to para-virtual display protocol. */ - void (*fill_page_dir)(struct xen_drm_front_shbuf *buf); - /* Claim grant references for the pages of the buffer. */ - int (*grant_refs_for_buffer)(struct xen_drm_front_shbuf *buf, - grant_ref_t *priv_gref_head, int gref_idx); - /* Map grant references of the buffer. */ - int (*map)(struct xen_drm_front_shbuf *buf); - /* Unmap grant references of the buffer. */ - int (*unmap)(struct xen_drm_front_shbuf *buf); -}; - -grant_ref_t xen_drm_front_shbuf_get_dir_start(struct xen_drm_front_shbuf *buf) -{ - if (!buf->grefs) - return GRANT_INVALID_REF; - - return buf->grefs[0]; -} - -int xen_drm_front_shbuf_map(struct xen_drm_front_shbuf *buf) -{ - if (buf->ops->map) - return buf->ops->map(buf); - - /* no need to map own grant references */ - return 0; -} - -int xen_drm_front_shbuf_unmap(struct xen_drm_front_shbuf *buf) -{ - if (buf->ops->unmap) - return buf->ops->unmap(buf); - - /* no need to unmap own grant references */ - return 0; -} - -void xen_drm_front_shbuf_flush(struct xen_drm_front_shbuf *buf) -{ -#if defined(CONFIG_X86) - drm_clflush_pages(buf->pages, buf->num_pages); -#endif -} - -void xen_drm_front_shbuf_free(struct xen_drm_front_shbuf *buf) -{ - if (buf->grefs) { - int i; - - for (i = 0; i < buf->num_grefs; i++) - if (buf->grefs[i] != GRANT_INVALID_REF) - gnttab_end_foreign_access(buf->grefs[i], - 0, 0UL); - } - kfree(buf->grefs); - kfree(buf->directory); - kfree(buf); -} - -/* - * number of grefs a page can hold with respect to the - * struct xendispl_page_directory header - */ -#define XEN_DRM_NUM_GREFS_PER_PAGE ((PAGE_SIZE - \ - offsetof(struct xendispl_page_directory, gref)) / \ - sizeof(grant_ref_t)) - -static int get_num_pages_dir(struct xen_drm_front_shbuf *buf) -{ - /* number of pages the page directory consumes itself */ - return DIV_ROUND_UP(buf->num_pages, XEN_DRM_NUM_GREFS_PER_PAGE); -} - -static void backend_calc_num_grefs(struct xen_drm_front_shbuf *buf) -{ - /* only for pages the page directory consumes itself */ - buf->num_grefs = get_num_pages_dir(buf); -} - -static void guest_calc_num_grefs(struct xen_drm_front_shbuf *buf) -{ - /* - * number of pages the page directory consumes itself - * plus grefs for the buffer pages - */ - buf->num_grefs = get_num_pages_dir(buf) + buf->num_pages; -} - -#define xen_page_to_vaddr(page) \ - ((uintptr_t)pfn_to_kaddr(page_to_xen_pfn(page))) - -static int backend_unmap(struct xen_drm_front_shbuf *buf) -{ - struct gnttab_unmap_grant_ref *unmap_ops; - int i, ret; - - if (!buf->pages || !buf->backend_map_handles || !buf->grefs) - return 0; - - unmap_ops = kcalloc(buf->num_pages, sizeof(*unmap_ops), - GFP_KERNEL); - if (!unmap_ops) { - DRM_ERROR("Failed to get memory while unmapping\n"); - return -ENOMEM; - } - - for (i = 0; i < buf->num_pages; i++) { - phys_addr_t addr; - - addr = xen_page_to_vaddr(buf->pages[i]); - gnttab_set_unmap_op(&unmap_ops[i], addr, GNTMAP_host_map, - buf->backend_map_handles[i]); - } - - ret = gnttab_unmap_refs(unmap_ops, NULL, buf->pages, - buf->num_pages); - - for (i = 0; i < buf->num_pages; i++) { - if (unlikely(unmap_ops[i].status != GNTST_okay)) - DRM_ERROR("Failed to unmap page %d: %d\n", - i, unmap_ops[i].status); - } - - if (ret) - DRM_ERROR("Failed to unmap grant references, ret %d", ret); - - kfree(unmap_ops); - kfree(buf->backend_map_handles); - buf->backend_map_handles = NULL; - return ret; -} - -static int backend_map(struct xen_drm_front_shbuf *buf) -{ - struct gnttab_map_grant_ref *map_ops = NULL; - unsigned char *ptr; - int ret, cur_gref, cur_dir_page, cur_page, grefs_left; - - map_ops = kcalloc(buf->num_pages, sizeof(*map_ops), GFP_KERNEL); - if (!map_ops) - return -ENOMEM; - - buf->backend_map_handles = kcalloc(buf->num_pages, - sizeof(*buf->backend_map_handles), - GFP_KERNEL); - if (!buf->backend_map_handles) { - kfree(map_ops); - return -ENOMEM; - } - - /* - * read page directory to get grefs from the backend: for external - * buffer we only allocate buf->grefs for the page directory, - * so buf->num_grefs has number of pages in the page directory itself - */ - ptr = buf->directory; - grefs_left = buf->num_pages; - cur_page = 0; - for (cur_dir_page = 0; cur_dir_page < buf->num_grefs; cur_dir_page++) { - struct xendispl_page_directory *page_dir = - (struct xendispl_page_directory *)ptr; - int to_copy = XEN_DRM_NUM_GREFS_PER_PAGE; - - if (to_copy > grefs_left) - to_copy = grefs_left; - - for (cur_gref = 0; cur_gref < to_copy; cur_gref++) { - phys_addr_t addr; - - addr = xen_page_to_vaddr(buf->pages[cur_page]); - gnttab_set_map_op(&map_ops[cur_page], addr, - GNTMAP_host_map, - page_dir->gref[cur_gref], - buf->xb_dev->otherend_id); - cur_page++; - } - - grefs_left -= to_copy; - ptr += PAGE_SIZE; - } - ret = gnttab_map_refs(map_ops, NULL, buf->pages, buf->num_pages); - - /* save handles even if error, so we can unmap */ - for (cur_page = 0; cur_page < buf->num_pages; cur_page++) { - buf->backend_map_handles[cur_page] = map_ops[cur_page].handle; - if (unlikely(map_ops[cur_page].status != GNTST_okay)) - DRM_ERROR("Failed to map page %d: %d\n", - cur_page, map_ops[cur_page].status); - } - - if (ret) { - DRM_ERROR("Failed to map grant references, ret %d", ret); - backend_unmap(buf); - } - - kfree(map_ops); - return ret; -} - -static void backend_fill_page_dir(struct xen_drm_front_shbuf *buf) -{ - struct xendispl_page_directory *page_dir; - unsigned char *ptr; - int i, num_pages_dir; - - ptr = buf->directory; - num_pages_dir = get_num_pages_dir(buf); - - /* fill only grefs for the page directory itself */ - for (i = 0; i < num_pages_dir - 1; i++) { - page_dir = (struct xendispl_page_directory *)ptr; - - page_dir->gref_dir_next_page = buf->grefs[i + 1]; - ptr += PAGE_SIZE; - } - /* last page must say there is no more pages */ - page_dir = (struct xendispl_page_directory *)ptr; - page_dir->gref_dir_next_page = GRANT_INVALID_REF; -} - -static void guest_fill_page_dir(struct xen_drm_front_shbuf *buf) -{ - unsigned char *ptr; - int cur_gref, grefs_left, to_copy, i, num_pages_dir; - - ptr = buf->directory; - num_pages_dir = get_num_pages_dir(buf); - - /* - * while copying, skip grefs at start, they are for pages - * granted for the page directory itself - */ - cur_gref = num_pages_dir; - grefs_left = buf->num_pages; - for (i = 0; i < num_pages_dir; i++) { - struct xendispl_page_directory *page_dir = - (struct xendispl_page_directory *)ptr; - - if (grefs_left <= XEN_DRM_NUM_GREFS_PER_PAGE) { - to_copy = grefs_left; - page_dir->gref_dir_next_page = GRANT_INVALID_REF; - } else { - to_copy = XEN_DRM_NUM_GREFS_PER_PAGE; - page_dir->gref_dir_next_page = buf->grefs[i + 1]; - } - memcpy(&page_dir->gref, &buf->grefs[cur_gref], - to_copy * sizeof(grant_ref_t)); - ptr += PAGE_SIZE; - grefs_left -= to_copy; - cur_gref += to_copy; - } -} - -static int guest_grant_refs_for_buffer(struct xen_drm_front_shbuf *buf, - grant_ref_t *priv_gref_head, - int gref_idx) -{ - int i, cur_ref, otherend_id; - - otherend_id = buf->xb_dev->otherend_id; - for (i = 0; i < buf->num_pages; i++) { - cur_ref = gnttab_claim_grant_reference(priv_gref_head); - if (cur_ref < 0) - return cur_ref; - - gnttab_grant_foreign_access_ref(cur_ref, otherend_id, - xen_page_to_gfn(buf->pages[i]), - 0); - buf->grefs[gref_idx++] = cur_ref; - } - return 0; -} - -static int grant_references(struct xen_drm_front_shbuf *buf) -{ - grant_ref_t priv_gref_head; - int ret, i, j, cur_ref; - int otherend_id, num_pages_dir; - - ret = gnttab_alloc_grant_references(buf->num_grefs, &priv_gref_head); - if (ret < 0) { - DRM_ERROR("Cannot allocate grant references\n"); - return ret; - } - - otherend_id = buf->xb_dev->otherend_id; - j = 0; - num_pages_dir = get_num_pages_dir(buf); - for (i = 0; i < num_pages_dir; i++) { - unsigned long frame; - - cur_ref = gnttab_claim_grant_reference(&priv_gref_head); - if (cur_ref < 0) - return cur_ref; - - frame = xen_page_to_gfn(virt_to_page(buf->directory + - PAGE_SIZE * i)); - gnttab_grant_foreign_access_ref(cur_ref, otherend_id, frame, 0); - buf->grefs[j++] = cur_ref; - } - - if (buf->ops->grant_refs_for_buffer) { - ret = buf->ops->grant_refs_for_buffer(buf, &priv_gref_head, j); - if (ret) - return ret; - } - - gnttab_free_grant_references(priv_gref_head); - return 0; -} - -static int alloc_storage(struct xen_drm_front_shbuf *buf) -{ - buf->grefs = kcalloc(buf->num_grefs, sizeof(*buf->grefs), GFP_KERNEL); - if (!buf->grefs) - return -ENOMEM; - - buf->directory = kcalloc(get_num_pages_dir(buf), PAGE_SIZE, GFP_KERNEL); - if (!buf->directory) - return -ENOMEM; - - return 0; -} - -/* - * For be allocated buffers we don't need grant_refs_for_buffer as those - * grant references are allocated at backend side - */ -static const struct xen_drm_front_shbuf_ops backend_ops = { - .calc_num_grefs = backend_calc_num_grefs, - .fill_page_dir = backend_fill_page_dir, - .map = backend_map, - .unmap = backend_unmap -}; - -/* For locally granted references we do not need to map/unmap the references */ -static const struct xen_drm_front_shbuf_ops local_ops = { - .calc_num_grefs = guest_calc_num_grefs, - .fill_page_dir = guest_fill_page_dir, - .grant_refs_for_buffer = guest_grant_refs_for_buffer, -}; - -struct xen_drm_front_shbuf * -xen_drm_front_shbuf_alloc(struct xen_drm_front_shbuf_cfg *cfg) -{ - struct xen_drm_front_shbuf *buf; - int ret; - - buf = kzalloc(sizeof(*buf), GFP_KERNEL); - if (!buf) - return ERR_PTR(-ENOMEM); - - if (cfg->be_alloc) - buf->ops = &backend_ops; - else - buf->ops = &local_ops; - - buf->xb_dev = cfg->xb_dev; - buf->num_pages = DIV_ROUND_UP(cfg->size, PAGE_SIZE); - buf->pages = cfg->pages; - - buf->ops->calc_num_grefs(buf); - - ret = alloc_storage(buf); - if (ret) - goto fail; - - ret = grant_references(buf); - if (ret) - goto fail; - - buf->ops->fill_page_dir(buf); - - return buf; - -fail: - xen_drm_front_shbuf_free(buf); - return ERR_PTR(ret); -} diff --git a/drivers/gpu/drm/xen/xen_drm_front_shbuf.h b/drivers/gpu/drm/xen/xen_drm_front_shbuf.h deleted file mode 100644 index 7545c692539e..000000000000 --- a/drivers/gpu/drm/xen/xen_drm_front_shbuf.h +++ /dev/null @@ -1,64 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 OR MIT */ - -/* - * Xen para-virtual DRM device - * - * Copyright (C) 2016-2018 EPAM Systems Inc. - * - * Author: Oleksandr Andrushchenko oleksandr_andrushchenko@epam.com - */ - -#ifndef __XEN_DRM_FRONT_SHBUF_H_ -#define __XEN_DRM_FRONT_SHBUF_H_ - -#include <linux/kernel.h> -#include <linux/scatterlist.h> - -#include <xen/grant_table.h> - -struct xen_drm_front_shbuf { - /* - * number of references granted for the backend use: - * - for allocated/imported dma-buf's this holds number of grant - * references for the page directory and pages of the buffer - * - for the buffer provided by the backend this holds number of - * grant references for the page directory as grant references for - * the buffer will be provided by the backend - */ - int num_grefs; - grant_ref_t *grefs; - unsigned char *directory; - - int num_pages; - struct page **pages; - - struct xenbus_device *xb_dev; - - /* these are the ops used internally depending on be_alloc mode */ - const struct xen_drm_front_shbuf_ops *ops; - - /* Xen map handles for the buffer allocated by the backend */ - grant_handle_t *backend_map_handles; -}; - -struct xen_drm_front_shbuf_cfg { - struct xenbus_device *xb_dev; - size_t size; - struct page **pages; - bool be_alloc; -}; - -struct xen_drm_front_shbuf * -xen_drm_front_shbuf_alloc(struct xen_drm_front_shbuf_cfg *cfg); - -grant_ref_t xen_drm_front_shbuf_get_dir_start(struct xen_drm_front_shbuf *buf); - -int xen_drm_front_shbuf_map(struct xen_drm_front_shbuf *buf); - -int xen_drm_front_shbuf_unmap(struct xen_drm_front_shbuf *buf); - -void xen_drm_front_shbuf_flush(struct xen_drm_front_shbuf *buf); - -void xen_drm_front_shbuf_free(struct xen_drm_front_shbuf *buf); - -#endif /* __XEN_DRM_FRONT_SHBUF_H_ */
Hello, Daniel!
Could you please ack/nack the patch, so either we can merge the
series or I can address your comments if any
Thank you,
Oleksandr
On 11/30/18 9:42 AM, Oleksandr Andrushchenko wrote:
From: Oleksandr Andrushchenko oleksandr_andrushchenko@epam.com
Use page directory based shared buffer implementation now available as common code for Xen frontend drivers.
Remove flushing of shared buffer on page flip as this workaround needs a proper fix.
Signed-off-by: Oleksandr Andrushchenko oleksandr_andrushchenko@epam.com
drivers/gpu/drm/xen/Kconfig | 1 + drivers/gpu/drm/xen/Makefile | 1 - drivers/gpu/drm/xen/xen_drm_front.c | 65 ++-- drivers/gpu/drm/xen/xen_drm_front_gem.c | 1 - drivers/gpu/drm/xen/xen_drm_front_shbuf.c | 414 ---------------------- drivers/gpu/drm/xen/xen_drm_front_shbuf.h | 64 ---- 6 files changed, 26 insertions(+), 520 deletions(-) delete mode 100644 drivers/gpu/drm/xen/xen_drm_front_shbuf.c delete mode 100644 drivers/gpu/drm/xen/xen_drm_front_shbuf.h
diff --git a/drivers/gpu/drm/xen/Kconfig b/drivers/gpu/drm/xen/Kconfig index 4cca160782ab..f969d486855d 100644 --- a/drivers/gpu/drm/xen/Kconfig +++ b/drivers/gpu/drm/xen/Kconfig @@ -12,6 +12,7 @@ config DRM_XEN_FRONTEND select DRM_KMS_HELPER select VIDEOMODE_HELPERS select XEN_XENBUS_FRONTEND
- select XEN_FRONT_PGDIR_SHBUF help Choose this option if you want to enable a para-virtualized frontend DRM/KMS driver for Xen guest OSes.
diff --git a/drivers/gpu/drm/xen/Makefile b/drivers/gpu/drm/xen/Makefile index 712afff5ffc3..825905f67faa 100644 --- a/drivers/gpu/drm/xen/Makefile +++ b/drivers/gpu/drm/xen/Makefile @@ -4,7 +4,6 @@ drm_xen_front-objs := xen_drm_front.o \ xen_drm_front_kms.o \ xen_drm_front_conn.o \ xen_drm_front_evtchnl.o \
xen_drm_front_shbuf.o \ xen_drm_front_cfg.o \ xen_drm_front_gem.odiff --git a/drivers/gpu/drm/xen/xen_drm_front.c b/drivers/gpu/drm/xen/xen_drm_front.c index 6b6d5ab82ec3..4d3d36fc3a5d 100644 --- a/drivers/gpu/drm/xen/xen_drm_front.c +++ b/drivers/gpu/drm/xen/xen_drm_front.c @@ -19,6 +19,7 @@ #include <xen/xen.h> #include <xen/xenbus.h>
+#include <xen/xen-front-pgdir-shbuf.h> #include <xen/interface/io/displif.h>
#include "xen_drm_front.h" @@ -26,28 +27,20 @@ #include "xen_drm_front_evtchnl.h" #include "xen_drm_front_gem.h" #include "xen_drm_front_kms.h" -#include "xen_drm_front_shbuf.h"
struct xen_drm_front_dbuf { struct list_head list; u64 dbuf_cookie; u64 fb_cookie;
- struct xen_drm_front_shbuf *shbuf;
- struct xen_front_pgdir_shbuf shbuf; };
-static int dbuf_add_to_list(struct xen_drm_front_info *front_info,
struct xen_drm_front_shbuf *shbuf, u64 dbuf_cookie)+static void dbuf_add_to_list(struct xen_drm_front_info *front_info,
struct xen_drm_front_dbuf *dbuf, u64 dbuf_cookie)
struct xen_drm_front_dbuf *dbuf;
dbuf = kzalloc(sizeof(*dbuf), GFP_KERNEL);
if (!dbuf)
return -ENOMEM;dbuf->dbuf_cookie = dbuf_cookie;
dbuf->shbuf = shbuf; list_add(&dbuf->list, &front_info->dbuf_list);
return 0; }
static struct xen_drm_front_dbuf *dbuf_get(struct list_head *dbuf_list,
@@ -62,15 +55,6 @@ static struct xen_drm_front_dbuf *dbuf_get(struct list_head *dbuf_list, return NULL; }
-static void dbuf_flush_fb(struct list_head *dbuf_list, u64 fb_cookie) -{
- struct xen_drm_front_dbuf *buf, *q;
- list_for_each_entry_safe(buf, q, dbuf_list, list)
if (buf->fb_cookie == fb_cookie)xen_drm_front_shbuf_flush(buf->shbuf);-}
- static void dbuf_free(struct list_head *dbuf_list, u64 dbuf_cookie) { struct xen_drm_front_dbuf *buf, *q;
@@ -78,8 +62,8 @@ static void dbuf_free(struct list_head *dbuf_list, u64 dbuf_cookie) list_for_each_entry_safe(buf, q, dbuf_list, list) if (buf->dbuf_cookie == dbuf_cookie) { list_del(&buf->list);
xen_drm_front_shbuf_unmap(buf->shbuf);xen_drm_front_shbuf_free(buf->shbuf);
xen_front_pgdir_shbuf_unmap(&buf->shbuf);xen_front_pgdir_shbuf_free(&buf->shbuf); kfree(buf); break;@@ -91,8 +75,8 @@ static void dbuf_free_all(struct list_head *dbuf_list)
list_for_each_entry_safe(buf, q, dbuf_list, list) { list_del(&buf->list);
xen_drm_front_shbuf_unmap(buf->shbuf);xen_drm_front_shbuf_free(buf->shbuf);
xen_front_pgdir_shbuf_unmap(&buf->shbuf);xen_front_pgdir_shbuf_free(&buf->shbuf);@@ -171,9 +155,9 @@ int xen_drm_front_dbuf_create(struct xen_drm_front_info *front_info, u32 bpp, u64 size, struct page **pages) { struct xen_drm_front_evtchnl *evtchnl;
- struct xen_drm_front_shbuf *shbuf;
- struct xen_drm_front_dbuf *dbuf; struct xendispl_req *req;
- struct xen_drm_front_shbuf_cfg buf_cfg;
- struct xen_front_pgdir_shbuf_cfg buf_cfg; unsigned long flags; int ret;
@@ -181,28 +165,29 @@ int xen_drm_front_dbuf_create(struct xen_drm_front_info *front_info, if (unlikely(!evtchnl)) return -EIO;
- dbuf = kzalloc(sizeof(*dbuf), GFP_KERNEL);
- if (!dbuf)
return -ENOMEM;- dbuf_add_to_list(front_info, dbuf, dbuf_cookie);
- memset(&buf_cfg, 0, sizeof(buf_cfg)); buf_cfg.xb_dev = front_info->xb_dev;
- buf_cfg.num_pages = DIV_ROUND_UP(size, PAGE_SIZE); buf_cfg.pages = pages;
- buf_cfg.size = size;
- buf_cfg.pgdir = &dbuf->shbuf; buf_cfg.be_alloc = front_info->cfg.be_alloc;
- shbuf = xen_drm_front_shbuf_alloc(&buf_cfg);
- if (IS_ERR(shbuf))
return PTR_ERR(shbuf);- ret = dbuf_add_to_list(front_info, shbuf, dbuf_cookie);
- if (ret < 0) {
xen_drm_front_shbuf_free(shbuf);return ret;- }
ret = xen_front_pgdir_shbuf_alloc(&buf_cfg);
if (ret < 0)
goto fail_shbuf_alloc;mutex_lock(&evtchnl->u.req.req_io_lock);
spin_lock_irqsave(&front_info->io_lock, flags); req = be_prepare_req(evtchnl, XENDISPL_OP_DBUF_CREATE); req->op.dbuf_create.gref_directory =
xen_drm_front_shbuf_get_dir_start(shbuf);
xen_front_pgdir_shbuf_get_dir_start(&dbuf->shbuf);@@ -221,7 +206,7 @@ int xen_drm_front_dbuf_create(struct xen_drm_front_info *front_info, if (ret < 0) goto fail;
- ret = xen_drm_front_shbuf_map(shbuf);
- ret = xen_front_pgdir_shbuf_map(&dbuf->shbuf); if (ret < 0) goto fail;
@@ -230,6 +215,7 @@ int xen_drm_front_dbuf_create(struct xen_drm_front_info *front_info,
fail: mutex_unlock(&evtchnl->u.req.req_io_lock); +fail_shbuf_alloc: dbuf_free(&front_info->dbuf_list, dbuf_cookie); return ret; } @@ -358,7 +344,6 @@ int xen_drm_front_page_flip(struct xen_drm_front_info *front_info, if (unlikely(conn_idx >= front_info->num_evt_pairs)) return -EINVAL;
dbuf_flush_fb(&front_info->dbuf_list, fb_cookie); evtchnl = &front_info->evt_pairs[conn_idx].req;
mutex_lock(&evtchnl->u.req.req_io_lock);
diff --git a/drivers/gpu/drm/xen/xen_drm_front_gem.c b/drivers/gpu/drm/xen/xen_drm_front_gem.c index c85bfe7571cb..53be4c7dc0a4 100644 --- a/drivers/gpu/drm/xen/xen_drm_front_gem.c +++ b/drivers/gpu/drm/xen/xen_drm_front_gem.c @@ -22,7 +22,6 @@ #include <xen/balloon.h>
#include "xen_drm_front.h" -#include "xen_drm_front_shbuf.h"
struct xen_gem_object { struct drm_gem_object base; diff --git a/drivers/gpu/drm/xen/xen_drm_front_shbuf.c b/drivers/gpu/drm/xen/xen_drm_front_shbuf.c deleted file mode 100644 index d333b67cc1a0..000000000000 --- a/drivers/gpu/drm/xen/xen_drm_front_shbuf.c +++ /dev/null @@ -1,414 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 OR MIT
-/*
- Xen para-virtual DRM device
- Copyright (C) 2016-2018 EPAM Systems Inc.
- Author: Oleksandr Andrushchenko oleksandr_andrushchenko@epam.com
- */
-#include <drm/drmP.h>
-#if defined(CONFIG_X86) -#include <drm/drm_cache.h> -#endif -#include <linux/errno.h> -#include <linux/mm.h>
-#include <asm/xen/hypervisor.h> -#include <xen/balloon.h> -#include <xen/xen.h> -#include <xen/xenbus.h> -#include <xen/interface/io/ring.h> -#include <xen/interface/io/displif.h>
-#include "xen_drm_front.h" -#include "xen_drm_front_shbuf.h"
-struct xen_drm_front_shbuf_ops {
- /*
* Calculate number of grefs required to handle this buffer,* e.g. if grefs are required for page directory only or the buffer* pages as well.*/- void (*calc_num_grefs)(struct xen_drm_front_shbuf *buf);
- /* Fill page directory according to para-virtual display protocol. */
- void (*fill_page_dir)(struct xen_drm_front_shbuf *buf);
- /* Claim grant references for the pages of the buffer. */
- int (*grant_refs_for_buffer)(struct xen_drm_front_shbuf *buf,
grant_ref_t *priv_gref_head, int gref_idx);- /* Map grant references of the buffer. */
- int (*map)(struct xen_drm_front_shbuf *buf);
- /* Unmap grant references of the buffer. */
- int (*unmap)(struct xen_drm_front_shbuf *buf);
-};
-grant_ref_t xen_drm_front_shbuf_get_dir_start(struct xen_drm_front_shbuf *buf) -{
- if (!buf->grefs)
return GRANT_INVALID_REF;- return buf->grefs[0];
-}
-int xen_drm_front_shbuf_map(struct xen_drm_front_shbuf *buf) -{
- if (buf->ops->map)
return buf->ops->map(buf);- /* no need to map own grant references */
- return 0;
-}
-int xen_drm_front_shbuf_unmap(struct xen_drm_front_shbuf *buf) -{
- if (buf->ops->unmap)
return buf->ops->unmap(buf);- /* no need to unmap own grant references */
- return 0;
-}
-void xen_drm_front_shbuf_flush(struct xen_drm_front_shbuf *buf) -{ -#if defined(CONFIG_X86)
- drm_clflush_pages(buf->pages, buf->num_pages);
-#endif -}
-void xen_drm_front_shbuf_free(struct xen_drm_front_shbuf *buf) -{
- if (buf->grefs) {
int i;for (i = 0; i < buf->num_grefs; i++)if (buf->grefs[i] != GRANT_INVALID_REF)gnttab_end_foreign_access(buf->grefs[i],0, 0UL);- }
- kfree(buf->grefs);
- kfree(buf->directory);
- kfree(buf);
-}
-/*
- number of grefs a page can hold with respect to the
- struct xendispl_page_directory header
- */
-#define XEN_DRM_NUM_GREFS_PER_PAGE ((PAGE_SIZE - \
offsetof(struct xendispl_page_directory, gref)) / \sizeof(grant_ref_t))-static int get_num_pages_dir(struct xen_drm_front_shbuf *buf) -{
- /* number of pages the page directory consumes itself */
- return DIV_ROUND_UP(buf->num_pages, XEN_DRM_NUM_GREFS_PER_PAGE);
-}
-static void backend_calc_num_grefs(struct xen_drm_front_shbuf *buf) -{
- /* only for pages the page directory consumes itself */
- buf->num_grefs = get_num_pages_dir(buf);
-}
-static void guest_calc_num_grefs(struct xen_drm_front_shbuf *buf) -{
- /*
* number of pages the page directory consumes itself* plus grefs for the buffer pages*/- buf->num_grefs = get_num_pages_dir(buf) + buf->num_pages;
-}
-#define xen_page_to_vaddr(page) \
((uintptr_t)pfn_to_kaddr(page_to_xen_pfn(page)))-static int backend_unmap(struct xen_drm_front_shbuf *buf) -{
- struct gnttab_unmap_grant_ref *unmap_ops;
- int i, ret;
- if (!buf->pages || !buf->backend_map_handles || !buf->grefs)
return 0;- unmap_ops = kcalloc(buf->num_pages, sizeof(*unmap_ops),
GFP_KERNEL);- if (!unmap_ops) {
DRM_ERROR("Failed to get memory while unmapping\n");return -ENOMEM;- }
- for (i = 0; i < buf->num_pages; i++) {
phys_addr_t addr;addr = xen_page_to_vaddr(buf->pages[i]);gnttab_set_unmap_op(&unmap_ops[i], addr, GNTMAP_host_map,buf->backend_map_handles[i]);- }
- ret = gnttab_unmap_refs(unmap_ops, NULL, buf->pages,
buf->num_pages);- for (i = 0; i < buf->num_pages; i++) {
if (unlikely(unmap_ops[i].status != GNTST_okay))DRM_ERROR("Failed to unmap page %d: %d\n",i, unmap_ops[i].status);- }
- if (ret)
DRM_ERROR("Failed to unmap grant references, ret %d", ret);- kfree(unmap_ops);
- kfree(buf->backend_map_handles);
- buf->backend_map_handles = NULL;
- return ret;
-}
-static int backend_map(struct xen_drm_front_shbuf *buf) -{
- struct gnttab_map_grant_ref *map_ops = NULL;
- unsigned char *ptr;
- int ret, cur_gref, cur_dir_page, cur_page, grefs_left;
- map_ops = kcalloc(buf->num_pages, sizeof(*map_ops), GFP_KERNEL);
- if (!map_ops)
return -ENOMEM;- buf->backend_map_handles = kcalloc(buf->num_pages,
sizeof(*buf->backend_map_handles),GFP_KERNEL);- if (!buf->backend_map_handles) {
kfree(map_ops);return -ENOMEM;- }
- /*
* read page directory to get grefs from the backend: for external* buffer we only allocate buf->grefs for the page directory,* so buf->num_grefs has number of pages in the page directory itself*/- ptr = buf->directory;
- grefs_left = buf->num_pages;
- cur_page = 0;
- for (cur_dir_page = 0; cur_dir_page < buf->num_grefs; cur_dir_page++) {
struct xendispl_page_directory *page_dir =(struct xendispl_page_directory *)ptr;int to_copy = XEN_DRM_NUM_GREFS_PER_PAGE;if (to_copy > grefs_left)to_copy = grefs_left;for (cur_gref = 0; cur_gref < to_copy; cur_gref++) {phys_addr_t addr;addr = xen_page_to_vaddr(buf->pages[cur_page]);gnttab_set_map_op(&map_ops[cur_page], addr,GNTMAP_host_map,page_dir->gref[cur_gref],buf->xb_dev->otherend_id);cur_page++;}grefs_left -= to_copy;ptr += PAGE_SIZE;- }
- ret = gnttab_map_refs(map_ops, NULL, buf->pages, buf->num_pages);
- /* save handles even if error, so we can unmap */
- for (cur_page = 0; cur_page < buf->num_pages; cur_page++) {
buf->backend_map_handles[cur_page] = map_ops[cur_page].handle;if (unlikely(map_ops[cur_page].status != GNTST_okay))DRM_ERROR("Failed to map page %d: %d\n",cur_page, map_ops[cur_page].status);- }
- if (ret) {
DRM_ERROR("Failed to map grant references, ret %d", ret);backend_unmap(buf);- }
- kfree(map_ops);
- return ret;
-}
-static void backend_fill_page_dir(struct xen_drm_front_shbuf *buf) -{
- struct xendispl_page_directory *page_dir;
- unsigned char *ptr;
- int i, num_pages_dir;
- ptr = buf->directory;
- num_pages_dir = get_num_pages_dir(buf);
- /* fill only grefs for the page directory itself */
- for (i = 0; i < num_pages_dir - 1; i++) {
page_dir = (struct xendispl_page_directory *)ptr;page_dir->gref_dir_next_page = buf->grefs[i + 1];ptr += PAGE_SIZE;- }
- /* last page must say there is no more pages */
- page_dir = (struct xendispl_page_directory *)ptr;
- page_dir->gref_dir_next_page = GRANT_INVALID_REF;
-}
-static void guest_fill_page_dir(struct xen_drm_front_shbuf *buf) -{
- unsigned char *ptr;
- int cur_gref, grefs_left, to_copy, i, num_pages_dir;
- ptr = buf->directory;
- num_pages_dir = get_num_pages_dir(buf);
- /*
* while copying, skip grefs at start, they are for pages* granted for the page directory itself*/- cur_gref = num_pages_dir;
- grefs_left = buf->num_pages;
- for (i = 0; i < num_pages_dir; i++) {
struct xendispl_page_directory *page_dir =(struct xendispl_page_directory *)ptr;if (grefs_left <= XEN_DRM_NUM_GREFS_PER_PAGE) {to_copy = grefs_left;page_dir->gref_dir_next_page = GRANT_INVALID_REF;} else {to_copy = XEN_DRM_NUM_GREFS_PER_PAGE;page_dir->gref_dir_next_page = buf->grefs[i + 1];}memcpy(&page_dir->gref, &buf->grefs[cur_gref],to_copy * sizeof(grant_ref_t));ptr += PAGE_SIZE;grefs_left -= to_copy;cur_gref += to_copy;- }
-}
-static int guest_grant_refs_for_buffer(struct xen_drm_front_shbuf *buf,
grant_ref_t *priv_gref_head,int gref_idx)-{
- int i, cur_ref, otherend_id;
- otherend_id = buf->xb_dev->otherend_id;
- for (i = 0; i < buf->num_pages; i++) {
cur_ref = gnttab_claim_grant_reference(priv_gref_head);if (cur_ref < 0)return cur_ref;gnttab_grant_foreign_access_ref(cur_ref, otherend_id,xen_page_to_gfn(buf->pages[i]),0);buf->grefs[gref_idx++] = cur_ref;- }
- return 0;
-}
-static int grant_references(struct xen_drm_front_shbuf *buf) -{
- grant_ref_t priv_gref_head;
- int ret, i, j, cur_ref;
- int otherend_id, num_pages_dir;
- ret = gnttab_alloc_grant_references(buf->num_grefs, &priv_gref_head);
- if (ret < 0) {
DRM_ERROR("Cannot allocate grant references\n");return ret;- }
- otherend_id = buf->xb_dev->otherend_id;
- j = 0;
- num_pages_dir = get_num_pages_dir(buf);
- for (i = 0; i < num_pages_dir; i++) {
unsigned long frame;cur_ref = gnttab_claim_grant_reference(&priv_gref_head);if (cur_ref < 0)return cur_ref;frame = xen_page_to_gfn(virt_to_page(buf->directory +PAGE_SIZE * i));gnttab_grant_foreign_access_ref(cur_ref, otherend_id, frame, 0);buf->grefs[j++] = cur_ref;- }
- if (buf->ops->grant_refs_for_buffer) {
ret = buf->ops->grant_refs_for_buffer(buf, &priv_gref_head, j);if (ret)return ret;- }
- gnttab_free_grant_references(priv_gref_head);
- return 0;
-}
-static int alloc_storage(struct xen_drm_front_shbuf *buf) -{
- buf->grefs = kcalloc(buf->num_grefs, sizeof(*buf->grefs), GFP_KERNEL);
- if (!buf->grefs)
return -ENOMEM;- buf->directory = kcalloc(get_num_pages_dir(buf), PAGE_SIZE, GFP_KERNEL);
- if (!buf->directory)
return -ENOMEM;- return 0;
-}
-/*
- For be allocated buffers we don't need grant_refs_for_buffer as those
- grant references are allocated at backend side
- */
-static const struct xen_drm_front_shbuf_ops backend_ops = {
- .calc_num_grefs = backend_calc_num_grefs,
- .fill_page_dir = backend_fill_page_dir,
- .map = backend_map,
- .unmap = backend_unmap
-};
-/* For locally granted references we do not need to map/unmap the references */ -static const struct xen_drm_front_shbuf_ops local_ops = {
- .calc_num_grefs = guest_calc_num_grefs,
- .fill_page_dir = guest_fill_page_dir,
- .grant_refs_for_buffer = guest_grant_refs_for_buffer,
-};
-struct xen_drm_front_shbuf * -xen_drm_front_shbuf_alloc(struct xen_drm_front_shbuf_cfg *cfg) -{
- struct xen_drm_front_shbuf *buf;
- int ret;
- buf = kzalloc(sizeof(*buf), GFP_KERNEL);
- if (!buf)
return ERR_PTR(-ENOMEM);- if (cfg->be_alloc)
buf->ops = &backend_ops;- else
buf->ops = &local_ops;- buf->xb_dev = cfg->xb_dev;
- buf->num_pages = DIV_ROUND_UP(cfg->size, PAGE_SIZE);
- buf->pages = cfg->pages;
- buf->ops->calc_num_grefs(buf);
- ret = alloc_storage(buf);
- if (ret)
goto fail;- ret = grant_references(buf);
- if (ret)
goto fail;- buf->ops->fill_page_dir(buf);
- return buf;
-fail:
- xen_drm_front_shbuf_free(buf);
- return ERR_PTR(ret);
-} diff --git a/drivers/gpu/drm/xen/xen_drm_front_shbuf.h b/drivers/gpu/drm/xen/xen_drm_front_shbuf.h deleted file mode 100644 index 7545c692539e..000000000000 --- a/drivers/gpu/drm/xen/xen_drm_front_shbuf.h +++ /dev/null @@ -1,64 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 OR MIT */
-/*
- Xen para-virtual DRM device
- Copyright (C) 2016-2018 EPAM Systems Inc.
- Author: Oleksandr Andrushchenko oleksandr_andrushchenko@epam.com
- */
-#ifndef __XEN_DRM_FRONT_SHBUF_H_ -#define __XEN_DRM_FRONT_SHBUF_H_
-#include <linux/kernel.h> -#include <linux/scatterlist.h>
-#include <xen/grant_table.h>
-struct xen_drm_front_shbuf {
- /*
* number of references granted for the backend use:* - for allocated/imported dma-buf's this holds number of grant* references for the page directory and pages of the buffer* - for the buffer provided by the backend this holds number of* grant references for the page directory as grant references for* the buffer will be provided by the backend*/- int num_grefs;
- grant_ref_t *grefs;
- unsigned char *directory;
- int num_pages;
- struct page **pages;
- struct xenbus_device *xb_dev;
- /* these are the ops used internally depending on be_alloc mode */
- const struct xen_drm_front_shbuf_ops *ops;
- /* Xen map handles for the buffer allocated by the backend */
- grant_handle_t *backend_map_handles;
-};
-struct xen_drm_front_shbuf_cfg {
- struct xenbus_device *xb_dev;
- size_t size;
- struct page **pages;
- bool be_alloc;
-};
-struct xen_drm_front_shbuf * -xen_drm_front_shbuf_alloc(struct xen_drm_front_shbuf_cfg *cfg);
-grant_ref_t xen_drm_front_shbuf_get_dir_start(struct xen_drm_front_shbuf *buf);
-int xen_drm_front_shbuf_map(struct xen_drm_front_shbuf *buf);
-int xen_drm_front_shbuf_unmap(struct xen_drm_front_shbuf *buf);
-void xen_drm_front_shbuf_flush(struct xen_drm_front_shbuf *buf);
-void xen_drm_front_shbuf_free(struct xen_drm_front_shbuf *buf);
-#endif /* __XEN_DRM_FRONT_SHBUF_H_ */
bump
On 12/5/18 10:20 AM, Oleksandr Andrushchenko wrote:
Hello, Daniel!
Could you please ack/nack the patch, so either we can merge the
series or I can address your comments if any
Thank you,
Oleksandr
On 11/30/18 9:42 AM, Oleksandr Andrushchenko wrote:
From: Oleksandr Andrushchenko oleksandr_andrushchenko@epam.com
Use page directory based shared buffer implementation now available as common code for Xen frontend drivers.
Remove flushing of shared buffer on page flip as this workaround needs a proper fix.
Signed-off-by: Oleksandr Andrushchenko
oleksandr_andrushchenko@epam.com
drivers/gpu/drm/xen/Kconfig              |  1 +  drivers/gpu/drm/xen/Makefile             |  1 -  drivers/gpu/drm/xen/xen_drm_front.c      | 65 ++--  drivers/gpu/drm/xen/xen_drm_front_gem.c  |  1 -  drivers/gpu/drm/xen/xen_drm_front_shbuf.c | 414 ----------------------  drivers/gpu/drm/xen/xen_drm_front_shbuf.h | 64 ----  6 files changed, 26 insertions(+), 520 deletions(-)  delete mode 100644 drivers/gpu/drm/xen/xen_drm_front_shbuf.c  delete mode 100644 drivers/gpu/drm/xen/xen_drm_front_shbuf.h
diff --git a/drivers/gpu/drm/xen/Kconfig b/drivers/gpu/drm/xen/Kconfig index 4cca160782ab..f969d486855d 100644 --- a/drivers/gpu/drm/xen/Kconfig +++ b/drivers/gpu/drm/xen/Kconfig @@ -12,6 +12,7 @@ config DRM_XEN_FRONTEND      select DRM_KMS_HELPER      select VIDEOMODE_HELPERS      select XEN_XENBUS_FRONTEND +   select XEN_FRONT_PGDIR_SHBUF      help        Choose this option if you want to enable a para-virtualized        frontend DRM/KMS driver for Xen guest OSes. diff --git a/drivers/gpu/drm/xen/Makefile b/drivers/gpu/drm/xen/Makefile index 712afff5ffc3..825905f67faa 100644 --- a/drivers/gpu/drm/xen/Makefile +++ b/drivers/gpu/drm/xen/Makefile @@ -4,7 +4,6 @@ drm_xen_front-objs := xen_drm_front.o \                xen_drm_front_kms.o \                xen_drm_front_conn.o \                xen_drm_front_evtchnl.o \ -             xen_drm_front_shbuf.o \                xen_drm_front_cfg.o \                xen_drm_front_gem.o  diff --git a/drivers/gpu/drm/xen/xen_drm_front.c b/drivers/gpu/drm/xen/xen_drm_front.c index 6b6d5ab82ec3..4d3d36fc3a5d 100644 --- a/drivers/gpu/drm/xen/xen_drm_front.c +++ b/drivers/gpu/drm/xen/xen_drm_front.c @@ -19,6 +19,7 @@  #include <xen/xen.h>  #include <xen/xenbus.h>  +#include <xen/xen-front-pgdir-shbuf.h>  #include <xen/interface/io/displif.h>   #include "xen_drm_front.h" @@ -26,28 +27,20 @@  #include "xen_drm_front_evtchnl.h"  #include "xen_drm_front_gem.h"  #include "xen_drm_front_kms.h" -#include "xen_drm_front_shbuf.h"   struct xen_drm_front_dbuf {      struct list_head list;      u64 dbuf_cookie;      u64 fb_cookie; -   struct xen_drm_front_shbuf *shbuf;
+Â Â Â struct xen_front_pgdir_shbuf shbuf; Â }; Â -static int dbuf_add_to_list(struct xen_drm_front_info *front_info, -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â struct xen_drm_front_shbuf *shbuf, u64 dbuf_cookie) +static void dbuf_add_to_list(struct xen_drm_front_info *front_info, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â struct xen_drm_front_dbuf *dbuf, u64 dbuf_cookie) Â { -Â Â Â struct xen_drm_front_dbuf *dbuf;
-Â Â Â dbuf = kzalloc(sizeof(*dbuf), GFP_KERNEL); -Â Â Â if (!dbuf) -Â Â Â Â Â Â Â return -ENOMEM;
dbuf->dbuf_cookie = dbuf_cookie; -Â Â Â dbuf->shbuf = shbuf; Â Â Â Â Â list_add(&dbuf->list, &front_info->dbuf_list); -Â Â Â return 0; Â } Â Â static struct xen_drm_front_dbuf *dbuf_get(struct list_head *dbuf_list, @@ -62,15 +55,6 @@ static struct xen_drm_front_dbuf *dbuf_get(struct list_head *dbuf_list, Â Â Â Â Â return NULL; Â } Â -static void dbuf_flush_fb(struct list_head *dbuf_list, u64 fb_cookie) -{ -Â Â Â struct xen_drm_front_dbuf *buf, *q;
-Â Â Â list_for_each_entry_safe(buf, q, dbuf_list, list) -Â Â Â Â Â Â Â if (buf->fb_cookie == fb_cookie) -Â Â Â Â Â Â Â Â Â Â Â xen_drm_front_shbuf_flush(buf->shbuf); -}
static void dbuf_free(struct list_head *dbuf_list, u64 dbuf_cookie) Â { Â Â Â Â Â struct xen_drm_front_dbuf *buf, *q; @@ -78,8 +62,8 @@ static void dbuf_free(struct list_head *dbuf_list, u64 dbuf_cookie) Â Â Â Â Â list_for_each_entry_safe(buf, q, dbuf_list, list) Â Â Â Â Â Â Â Â Â if (buf->dbuf_cookie == dbuf_cookie) { Â Â Â Â Â Â Â Â Â Â Â Â Â list_del(&buf->list); -Â Â Â Â Â Â Â Â Â Â Â xen_drm_front_shbuf_unmap(buf->shbuf); -Â Â Â Â Â Â Â Â Â Â Â xen_drm_front_shbuf_free(buf->shbuf); +Â Â Â Â Â Â Â Â Â Â Â xen_front_pgdir_shbuf_unmap(&buf->shbuf); +Â Â Â Â Â Â Â Â Â Â Â xen_front_pgdir_shbuf_free(&buf->shbuf); Â Â Â Â Â Â Â Â Â Â Â Â Â kfree(buf); Â Â Â Â Â Â Â Â Â Â Â Â Â break; Â Â Â Â Â Â Â Â Â } @@ -91,8 +75,8 @@ static void dbuf_free_all(struct list_head *dbuf_list) Â Â Â Â Â Â list_for_each_entry_safe(buf, q, dbuf_list, list) { Â Â Â Â Â Â Â Â Â list_del(&buf->list); -Â Â Â Â Â Â Â xen_drm_front_shbuf_unmap(buf->shbuf); -Â Â Â Â Â Â Â xen_drm_front_shbuf_free(buf->shbuf); +Â Â Â Â Â Â Â xen_front_pgdir_shbuf_unmap(&buf->shbuf); +Â Â Â Â Â Â Â xen_front_pgdir_shbuf_free(&buf->shbuf); Â Â Â Â Â Â Â Â Â kfree(buf); Â Â Â Â Â } Â } @@ -171,9 +155,9 @@ int xen_drm_front_dbuf_create(struct xen_drm_front_info *front_info, Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â u32 bpp, u64 size, struct page **pages) Â { Â Â Â Â Â struct xen_drm_front_evtchnl *evtchnl; -Â Â Â struct xen_drm_front_shbuf *shbuf; +Â Â Â struct xen_drm_front_dbuf *dbuf; Â Â Â Â Â struct xendispl_req *req; -Â Â Â struct xen_drm_front_shbuf_cfg buf_cfg; +Â Â Â struct xen_front_pgdir_shbuf_cfg buf_cfg; Â Â Â Â Â unsigned long flags; Â Â Â Â Â int ret; Â @@ -181,28 +165,29 @@ int xen_drm_front_dbuf_create(struct xen_drm_front_info *front_info, Â Â Â Â Â if (unlikely(!evtchnl)) Â Â Â Â Â Â Â Â Â return -EIO; Â +Â Â Â dbuf = kzalloc(sizeof(*dbuf), GFP_KERNEL); +Â Â Â if (!dbuf) +Â Â Â Â Â Â Â return -ENOMEM;
+Â Â Â dbuf_add_to_list(front_info, dbuf, dbuf_cookie);
memset(&buf_cfg, 0, sizeof(buf_cfg)); Â Â Â Â Â buf_cfg.xb_dev = front_info->xb_dev; +Â Â Â buf_cfg.num_pages = DIV_ROUND_UP(size, PAGE_SIZE); Â Â Â Â Â buf_cfg.pages = pages; -Â Â Â buf_cfg.size = size; +Â Â Â buf_cfg.pgdir = &dbuf->shbuf; Â Â Â Â Â buf_cfg.be_alloc = front_info->cfg.be_alloc; Â -Â Â Â shbuf = xen_drm_front_shbuf_alloc(&buf_cfg); -Â Â Â if (IS_ERR(shbuf)) -Â Â Â Â Â Â Â return PTR_ERR(shbuf);
-Â Â Â ret = dbuf_add_to_list(front_info, shbuf, dbuf_cookie); -Â Â Â if (ret < 0) { -Â Â Â Â Â Â Â xen_drm_front_shbuf_free(shbuf); -Â Â Â Â Â Â Â return ret; -Â Â Â } +Â Â Â ret = xen_front_pgdir_shbuf_alloc(&buf_cfg); +Â Â Â if (ret < 0) +Â Â Â Â Â Â Â goto fail_shbuf_alloc; Â Â Â Â Â Â mutex_lock(&evtchnl->u.req.req_io_lock); Â Â Â Â Â Â spin_lock_irqsave(&front_info->io_lock, flags); Â Â Â Â Â req = be_prepare_req(evtchnl, XENDISPL_OP_DBUF_CREATE); Â Â Â Â Â req->op.dbuf_create.gref_directory = -Â Â Â Â Â Â Â Â Â Â Â xen_drm_front_shbuf_get_dir_start(shbuf);
- xen_front_pgdir_shbuf_get_dir_start(&dbuf->shbuf);
req->op.dbuf_create.buffer_sz = size; Â Â Â Â Â req->op.dbuf_create.dbuf_cookie = dbuf_cookie; Â Â Â Â Â req->op.dbuf_create.width = width; @@ -221,7 +206,7 @@ int xen_drm_front_dbuf_create(struct xen_drm_front_info *front_info, Â Â Â Â Â if (ret < 0) Â Â Â Â Â Â Â Â Â goto fail; Â -Â Â Â ret = xen_drm_front_shbuf_map(shbuf); +Â Â Â ret = xen_front_pgdir_shbuf_map(&dbuf->shbuf); Â Â Â Â Â if (ret < 0) Â Â Â Â Â Â Â Â Â goto fail; Â @@ -230,6 +215,7 @@ int xen_drm_front_dbuf_create(struct xen_drm_front_info *front_info, Â Â fail: Â Â Â Â Â mutex_unlock(&evtchnl->u.req.req_io_lock); +fail_shbuf_alloc: Â Â Â Â Â dbuf_free(&front_info->dbuf_list, dbuf_cookie); Â Â Â Â Â return ret; Â } @@ -358,7 +344,6 @@ int xen_drm_front_page_flip(struct xen_drm_front_info *front_info, Â Â Â Â Â if (unlikely(conn_idx >= front_info->num_evt_pairs)) Â Â Â Â Â Â Â Â Â return -EINVAL; Â -Â Â Â dbuf_flush_fb(&front_info->dbuf_list, fb_cookie); Â Â Â Â Â evtchnl = &front_info->evt_pairs[conn_idx].req; Â Â Â Â Â Â mutex_lock(&evtchnl->u.req.req_io_lock); diff --git a/drivers/gpu/drm/xen/xen_drm_front_gem.c b/drivers/gpu/drm/xen/xen_drm_front_gem.c index c85bfe7571cb..53be4c7dc0a4 100644 --- a/drivers/gpu/drm/xen/xen_drm_front_gem.c +++ b/drivers/gpu/drm/xen/xen_drm_front_gem.c @@ -22,7 +22,6 @@ Â #include <xen/balloon.h> Â Â #include "xen_drm_front.h" -#include "xen_drm_front_shbuf.h" Â Â struct xen_gem_object { Â Â Â Â Â struct drm_gem_object base; diff --git a/drivers/gpu/drm/xen/xen_drm_front_shbuf.c b/drivers/gpu/drm/xen/xen_drm_front_shbuf.c deleted file mode 100644 index d333b67cc1a0..000000000000 --- a/drivers/gpu/drm/xen/xen_drm_front_shbuf.c +++ /dev/null @@ -1,414 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 OR MIT
-/*
- *Â Xen para-virtual DRM device
- Copyright (C) 2016-2018 EPAM Systems Inc.
- Author: Oleksandr Andrushchenko oleksandr_andrushchenko@epam.com
- */
-#include <drm/drmP.h>
-#if defined(CONFIG_X86) -#include <drm/drm_cache.h> -#endif -#include <linux/errno.h> -#include <linux/mm.h>
-#include <asm/xen/hypervisor.h> -#include <xen/balloon.h> -#include <xen/xen.h> -#include <xen/xenbus.h> -#include <xen/interface/io/ring.h> -#include <xen/interface/io/displif.h>
-#include "xen_drm_front.h" -#include "xen_drm_front_shbuf.h"
-struct xen_drm_front_shbuf_ops { -Â Â Â /* -Â Â Â Â * Calculate number of grefs required to handle this buffer, -Â Â Â Â * e.g. if grefs are required for page directory only or the buffer -Â Â Â Â * pages as well. -Â Â Â Â */ -Â Â Â void (*calc_num_grefs)(struct xen_drm_front_shbuf *buf); -Â Â Â /* Fill page directory according to para-virtual display protocol. */ -Â Â Â void (*fill_page_dir)(struct xen_drm_front_shbuf *buf); -Â Â Â /* Claim grant references for the pages of the buffer. */ -Â Â Â int (*grant_refs_for_buffer)(struct xen_drm_front_shbuf *buf, -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â grant_ref_t *priv_gref_head, int gref_idx); -Â Â Â /* Map grant references of the buffer. */ -Â Â Â int (*map)(struct xen_drm_front_shbuf *buf); -Â Â Â /* Unmap grant references of the buffer. */ -Â Â Â int (*unmap)(struct xen_drm_front_shbuf *buf); -};
-grant_ref_t xen_drm_front_shbuf_get_dir_start(struct xen_drm_front_shbuf *buf) -{ -Â Â Â if (!buf->grefs) -Â Â Â Â Â Â Â return GRANT_INVALID_REF;
-Â Â Â return buf->grefs[0]; -}
-int xen_drm_front_shbuf_map(struct xen_drm_front_shbuf *buf) -{ -Â Â Â if (buf->ops->map) -Â Â Â Â Â Â Â return buf->ops->map(buf);
-Â Â Â /* no need to map own grant references */ -Â Â Â return 0; -}
-int xen_drm_front_shbuf_unmap(struct xen_drm_front_shbuf *buf) -{ -Â Â Â if (buf->ops->unmap) -Â Â Â Â Â Â Â return buf->ops->unmap(buf);
-Â Â Â /* no need to unmap own grant references */ -Â Â Â return 0; -}
-void xen_drm_front_shbuf_flush(struct xen_drm_front_shbuf *buf) -{ -#if defined(CONFIG_X86) -Â Â Â drm_clflush_pages(buf->pages, buf->num_pages); -#endif -}
-void xen_drm_front_shbuf_free(struct xen_drm_front_shbuf *buf) -{ -Â Â Â if (buf->grefs) { -Â Â Â Â Â Â Â int i;
-Â Â Â Â Â Â Â for (i = 0; i < buf->num_grefs; i++) -Â Â Â Â Â Â Â Â Â Â Â if (buf->grefs[i] != GRANT_INVALID_REF) -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â gnttab_end_foreign_access(buf->grefs[i], -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â 0, 0UL); -Â Â Â } -Â Â Â kfree(buf->grefs); -Â Â Â kfree(buf->directory); -Â Â Â kfree(buf); -}
-/*
- number of grefs a page can hold with respect to the
- struct xendispl_page_directory header
- */
-#define XEN_DRM_NUM_GREFS_PER_PAGE ((PAGE_SIZE - \ -Â Â Â Â Â Â Â offsetof(struct xendispl_page_directory, gref)) / \ -Â Â Â Â Â Â Â sizeof(grant_ref_t))
-static int get_num_pages_dir(struct xen_drm_front_shbuf *buf) -{ -Â Â Â /* number of pages the page directory consumes itself */ -Â Â Â return DIV_ROUND_UP(buf->num_pages, XEN_DRM_NUM_GREFS_PER_PAGE); -}
-static void backend_calc_num_grefs(struct xen_drm_front_shbuf *buf) -{ -Â Â Â /* only for pages the page directory consumes itself */ -Â Â Â buf->num_grefs = get_num_pages_dir(buf); -}
-static void guest_calc_num_grefs(struct xen_drm_front_shbuf *buf) -{ -Â Â Â /* -Â Â Â Â * number of pages the page directory consumes itself -Â Â Â Â * plus grefs for the buffer pages -Â Â Â Â */ -Â Â Â buf->num_grefs = get_num_pages_dir(buf) + buf->num_pages; -}
-#define xen_page_to_vaddr(page) \ -Â Â Â Â Â Â Â ((uintptr_t)pfn_to_kaddr(page_to_xen_pfn(page)))
-static int backend_unmap(struct xen_drm_front_shbuf *buf) -{ -Â Â Â struct gnttab_unmap_grant_ref *unmap_ops; -Â Â Â int i, ret;
-Â Â Â if (!buf->pages || !buf->backend_map_handles || !buf->grefs) -Â Â Â Â Â Â Â return 0;
-Â Â Â unmap_ops = kcalloc(buf->num_pages, sizeof(*unmap_ops), -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â GFP_KERNEL); -Â Â Â if (!unmap_ops) { -Â Â Â Â Â Â Â DRM_ERROR("Failed to get memory while unmapping\n"); -Â Â Â Â Â Â Â return -ENOMEM; -Â Â Â }
-Â Â Â for (i = 0; i < buf->num_pages; i++) { -Â Â Â Â Â Â Â phys_addr_t addr;
-Â Â Â Â Â Â Â addr = xen_page_to_vaddr(buf->pages[i]); -Â Â Â Â Â Â Â gnttab_set_unmap_op(&unmap_ops[i], addr, GNTMAP_host_map, -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â buf->backend_map_handles[i]); -Â Â Â }
-Â Â Â ret = gnttab_unmap_refs(unmap_ops, NULL, buf->pages, -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â buf->num_pages);
-Â Â Â for (i = 0; i < buf->num_pages; i++) { -Â Â Â Â Â Â Â if (unlikely(unmap_ops[i].status != GNTST_okay)) -Â Â Â Â Â Â Â Â Â Â Â DRM_ERROR("Failed to unmap page %d: %d\n", -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â i, unmap_ops[i].status); -Â Â Â }
-Â Â Â if (ret) -Â Â Â Â Â Â Â DRM_ERROR("Failed to unmap grant references, ret %d", ret);
-Â Â Â kfree(unmap_ops); -Â Â Â kfree(buf->backend_map_handles); -Â Â Â buf->backend_map_handles = NULL; -Â Â Â return ret; -}
-static int backend_map(struct xen_drm_front_shbuf *buf) -{ -Â Â Â struct gnttab_map_grant_ref *map_ops = NULL; -Â Â Â unsigned char *ptr; -Â Â Â int ret, cur_gref, cur_dir_page, cur_page, grefs_left;
-Â Â Â map_ops = kcalloc(buf->num_pages, sizeof(*map_ops), GFP_KERNEL); -Â Â Â if (!map_ops) -Â Â Â Â Â Â Â return -ENOMEM;
-Â Â Â buf->backend_map_handles = kcalloc(buf->num_pages, -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â sizeof(*buf->backend_map_handles), -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â GFP_KERNEL); -Â Â Â if (!buf->backend_map_handles) { -Â Â Â Â Â Â Â kfree(map_ops); -Â Â Â Â Â Â Â return -ENOMEM; -Â Â Â }
-Â Â Â /* -Â Â Â Â * read page directory to get grefs from the backend: for external -Â Â Â Â * buffer we only allocate buf->grefs for the page directory, -Â Â Â Â * so buf->num_grefs has number of pages in the page directory itself -Â Â Â Â */ -Â Â Â ptr = buf->directory; -Â Â Â grefs_left = buf->num_pages; -Â Â Â cur_page = 0; -Â Â Â for (cur_dir_page = 0; cur_dir_page < buf->num_grefs; cur_dir_page++) { -Â Â Â Â Â Â Â struct xendispl_page_directory *page_dir = -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â (struct xendispl_page_directory *)ptr; -Â Â Â Â Â Â Â int to_copy = XEN_DRM_NUM_GREFS_PER_PAGE;
-Â Â Â Â Â Â Â if (to_copy > grefs_left) -Â Â Â Â Â Â Â Â Â Â Â to_copy = grefs_left;
-Â Â Â Â Â Â Â for (cur_gref = 0; cur_gref < to_copy; cur_gref++) { -Â Â Â Â Â Â Â Â Â Â Â phys_addr_t addr;
-Â Â Â Â Â Â Â Â Â Â Â addr = xen_page_to_vaddr(buf->pages[cur_page]); -Â Â Â Â Â Â Â Â Â Â Â gnttab_set_map_op(&map_ops[cur_page], addr, -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â GNTMAP_host_map, -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â page_dir->gref[cur_gref], -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â buf->xb_dev->otherend_id); -Â Â Â Â Â Â Â Â Â Â Â cur_page++; -Â Â Â Â Â Â Â }
-Â Â Â Â Â Â Â grefs_left -= to_copy; -Â Â Â Â Â Â Â ptr += PAGE_SIZE; -Â Â Â } -Â Â Â ret = gnttab_map_refs(map_ops, NULL, buf->pages, buf->num_pages);
-Â Â Â /* save handles even if error, so we can unmap */ -Â Â Â for (cur_page = 0; cur_page < buf->num_pages; cur_page++) { -Â Â Â Â Â Â Â buf->backend_map_handles[cur_page] = map_ops[cur_page].handle; -Â Â Â Â Â Â Â if (unlikely(map_ops[cur_page].status != GNTST_okay)) -Â Â Â Â Â Â Â Â Â Â Â DRM_ERROR("Failed to map page %d: %d\n", -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â cur_page, map_ops[cur_page].status); -Â Â Â }
-Â Â Â if (ret) { -Â Â Â Â Â Â Â DRM_ERROR("Failed to map grant references, ret %d", ret); -Â Â Â Â Â Â Â backend_unmap(buf); -Â Â Â }
-Â Â Â kfree(map_ops); -Â Â Â return ret; -}
-static void backend_fill_page_dir(struct xen_drm_front_shbuf *buf) -{ -Â Â Â struct xendispl_page_directory *page_dir; -Â Â Â unsigned char *ptr; -Â Â Â int i, num_pages_dir;
-Â Â Â ptr = buf->directory; -Â Â Â num_pages_dir = get_num_pages_dir(buf);
-Â Â Â /* fill only grefs for the page directory itself */ -Â Â Â for (i = 0; i < num_pages_dir - 1; i++) { -Â Â Â Â Â Â Â page_dir = (struct xendispl_page_directory *)ptr;
-Â Â Â Â Â Â Â page_dir->gref_dir_next_page = buf->grefs[i + 1]; -Â Â Â Â Â Â Â ptr += PAGE_SIZE; -Â Â Â } -Â Â Â /* last page must say there is no more pages */ -Â Â Â page_dir = (struct xendispl_page_directory *)ptr; -Â Â Â page_dir->gref_dir_next_page = GRANT_INVALID_REF; -}
-static void guest_fill_page_dir(struct xen_drm_front_shbuf *buf) -{ -Â Â Â unsigned char *ptr; -Â Â Â int cur_gref, grefs_left, to_copy, i, num_pages_dir;
-Â Â Â ptr = buf->directory; -Â Â Â num_pages_dir = get_num_pages_dir(buf);
-Â Â Â /* -Â Â Â Â * while copying, skip grefs at start, they are for pages -Â Â Â Â * granted for the page directory itself -Â Â Â Â */ -Â Â Â cur_gref = num_pages_dir; -Â Â Â grefs_left = buf->num_pages; -Â Â Â for (i = 0; i < num_pages_dir; i++) { -Â Â Â Â Â Â Â struct xendispl_page_directory *page_dir = -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â (struct xendispl_page_directory *)ptr;
-Â Â Â Â Â Â Â if (grefs_left <= XEN_DRM_NUM_GREFS_PER_PAGE) { -Â Â Â Â Â Â Â Â Â Â Â to_copy = grefs_left; -Â Â Â Â Â Â Â Â Â Â Â page_dir->gref_dir_next_page = GRANT_INVALID_REF; -Â Â Â Â Â Â Â } else { -Â Â Â Â Â Â Â Â Â Â Â to_copy = XEN_DRM_NUM_GREFS_PER_PAGE; -Â Â Â Â Â Â Â Â Â Â Â page_dir->gref_dir_next_page = buf->grefs[i + 1]; -Â Â Â Â Â Â Â } -Â Â Â Â Â Â Â memcpy(&page_dir->gref, &buf->grefs[cur_gref], -Â Â Â Â Â Â Â Â Â Â Â Â Â Â to_copy * sizeof(grant_ref_t)); -Â Â Â Â Â Â Â ptr += PAGE_SIZE; -Â Â Â Â Â Â Â grefs_left -= to_copy; -Â Â Â Â Â Â Â cur_gref += to_copy; -Â Â Â } -}
-static int guest_grant_refs_for_buffer(struct xen_drm_front_shbuf *buf, -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â grant_ref_t *priv_gref_head, -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â int gref_idx) -{ -Â Â Â int i, cur_ref, otherend_id;
-Â Â Â otherend_id = buf->xb_dev->otherend_id; -Â Â Â for (i = 0; i < buf->num_pages; i++) { -Â Â Â Â Â Â Â cur_ref = gnttab_claim_grant_reference(priv_gref_head); -Â Â Â Â Â Â Â if (cur_ref < 0) -Â Â Â Â Â Â Â Â Â Â Â return cur_ref;
-Â Â Â Â Â Â Â gnttab_grant_foreign_access_ref(cur_ref, otherend_id, -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â xen_page_to_gfn(buf->pages[i]), -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â 0); -Â Â Â Â Â Â Â buf->grefs[gref_idx++] = cur_ref; -Â Â Â } -Â Â Â return 0; -}
-static int grant_references(struct xen_drm_front_shbuf *buf) -{ -Â Â Â grant_ref_t priv_gref_head; -Â Â Â int ret, i, j, cur_ref; -Â Â Â int otherend_id, num_pages_dir;
-Â Â Â ret = gnttab_alloc_grant_references(buf->num_grefs, &priv_gref_head); -Â Â Â if (ret < 0) { -Â Â Â Â Â Â Â DRM_ERROR("Cannot allocate grant references\n"); -Â Â Â Â Â Â Â return ret; -Â Â Â }
-Â Â Â otherend_id = buf->xb_dev->otherend_id; -Â Â Â j = 0; -Â Â Â num_pages_dir = get_num_pages_dir(buf); -Â Â Â for (i = 0; i < num_pages_dir; i++) { -Â Â Â Â Â Â Â unsigned long frame;
-Â Â Â Â Â Â Â cur_ref = gnttab_claim_grant_reference(&priv_gref_head); -Â Â Â Â Â Â Â if (cur_ref < 0) -Â Â Â Â Â Â Â Â Â Â Â return cur_ref;
-Â Â Â Â Â Â Â frame = xen_page_to_gfn(virt_to_page(buf->directory + -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â PAGE_SIZE * i)); -Â Â Â Â Â Â Â gnttab_grant_foreign_access_ref(cur_ref, otherend_id, frame, 0); -Â Â Â Â Â Â Â buf->grefs[j++] = cur_ref; -Â Â Â }
-Â Â Â if (buf->ops->grant_refs_for_buffer) { -Â Â Â Â Â Â Â ret = buf->ops->grant_refs_for_buffer(buf, &priv_gref_head, j); -Â Â Â Â Â Â Â if (ret) -Â Â Â Â Â Â Â Â Â Â Â return ret; -Â Â Â }
-Â Â Â gnttab_free_grant_references(priv_gref_head); -Â Â Â return 0; -}
-static int alloc_storage(struct xen_drm_front_shbuf *buf) -{ -Â Â Â buf->grefs = kcalloc(buf->num_grefs, sizeof(*buf->grefs), GFP_KERNEL); -Â Â Â if (!buf->grefs) -Â Â Â Â Â Â Â return -ENOMEM;
-Â Â Â buf->directory = kcalloc(get_num_pages_dir(buf), PAGE_SIZE, GFP_KERNEL); -Â Â Â if (!buf->directory) -Â Â Â Â Â Â Â return -ENOMEM;
-Â Â Â return 0; -}
-/*
- For be allocated buffers we don't need grant_refs_for_buffer as
those
- grant references are allocated at backend side
- */
-static const struct xen_drm_front_shbuf_ops backend_ops = { -Â Â Â .calc_num_grefs = backend_calc_num_grefs, -Â Â Â .fill_page_dir = backend_fill_page_dir, -Â Â Â .map = backend_map, -Â Â Â .unmap = backend_unmap -};
-/* For locally granted references we do not need to map/unmap the references */ -static const struct xen_drm_front_shbuf_ops local_ops = { -Â Â Â .calc_num_grefs = guest_calc_num_grefs, -Â Â Â .fill_page_dir = guest_fill_page_dir, -Â Â Â .grant_refs_for_buffer = guest_grant_refs_for_buffer, -};
-struct xen_drm_front_shbuf * -xen_drm_front_shbuf_alloc(struct xen_drm_front_shbuf_cfg *cfg) -{ -Â Â Â struct xen_drm_front_shbuf *buf; -Â Â Â int ret;
-Â Â Â buf = kzalloc(sizeof(*buf), GFP_KERNEL); -Â Â Â if (!buf) -Â Â Â Â Â Â Â return ERR_PTR(-ENOMEM);
-Â Â Â if (cfg->be_alloc) -Â Â Â Â Â Â Â buf->ops = &backend_ops; -Â Â Â else -Â Â Â Â Â Â Â buf->ops = &local_ops;
-Â Â Â buf->xb_dev = cfg->xb_dev; -Â Â Â buf->num_pages = DIV_ROUND_UP(cfg->size, PAGE_SIZE); -Â Â Â buf->pages = cfg->pages;
-Â Â Â buf->ops->calc_num_grefs(buf);
-Â Â Â ret = alloc_storage(buf); -Â Â Â if (ret) -Â Â Â Â Â Â Â goto fail;
-Â Â Â ret = grant_references(buf); -Â Â Â if (ret) -Â Â Â Â Â Â Â goto fail;
-Â Â Â buf->ops->fill_page_dir(buf);
-Â Â Â return buf;
-fail: -Â Â Â xen_drm_front_shbuf_free(buf); -Â Â Â return ERR_PTR(ret); -} diff --git a/drivers/gpu/drm/xen/xen_drm_front_shbuf.h b/drivers/gpu/drm/xen/xen_drm_front_shbuf.h deleted file mode 100644 index 7545c692539e..000000000000 --- a/drivers/gpu/drm/xen/xen_drm_front_shbuf.h +++ /dev/null @@ -1,64 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 OR MIT */
-/*
- *Â Xen para-virtual DRM device
- Copyright (C) 2016-2018 EPAM Systems Inc.
- Author: Oleksandr Andrushchenko oleksandr_andrushchenko@epam.com
- */
-#ifndef __XEN_DRM_FRONT_SHBUF_H_ -#define __XEN_DRM_FRONT_SHBUF_H_
-#include <linux/kernel.h> -#include <linux/scatterlist.h>
-#include <xen/grant_table.h>
-struct xen_drm_front_shbuf { -Â Â Â /* -Â Â Â Â * number of references granted for the backend use: -Â Â Â Â *Â - for allocated/imported dma-buf's this holds number of grant -Â Â Â Â *Â Â Â references for the page directory and pages of the buffer -Â Â Â Â *Â - for the buffer provided by the backend this holds number of -Â Â Â Â *Â Â Â grant references for the page directory as grant references for -Â Â Â Â *Â Â Â the buffer will be provided by the backend -Â Â Â Â */ -Â Â Â int num_grefs; -Â Â Â grant_ref_t *grefs; -Â Â Â unsigned char *directory;
-Â Â Â int num_pages; -Â Â Â struct page **pages;
-Â Â Â struct xenbus_device *xb_dev;
-Â Â Â /* these are the ops used internally depending on be_alloc mode */ -Â Â Â const struct xen_drm_front_shbuf_ops *ops;
-Â Â Â /* Xen map handles for the buffer allocated by the backend */ -Â Â Â grant_handle_t *backend_map_handles; -};
-struct xen_drm_front_shbuf_cfg { -Â Â Â struct xenbus_device *xb_dev; -Â Â Â size_t size; -Â Â Â struct page **pages; -Â Â Â bool be_alloc; -};
-struct xen_drm_front_shbuf * -xen_drm_front_shbuf_alloc(struct xen_drm_front_shbuf_cfg *cfg);
-grant_ref_t xen_drm_front_shbuf_get_dir_start(struct xen_drm_front_shbuf *buf);
-int xen_drm_front_shbuf_map(struct xen_drm_front_shbuf *buf);
-int xen_drm_front_shbuf_unmap(struct xen_drm_front_shbuf *buf);
-void xen_drm_front_shbuf_flush(struct xen_drm_front_shbuf *buf);
-void xen_drm_front_shbuf_free(struct xen_drm_front_shbuf *buf);
-#endif /* __XEN_DRM_FRONT_SHBUF_H_ */
Hello, Juergen, Boris!
As this DRM part of the series is the only one which needs ack/nack
(and it might take quite some time to complete) could we please
merge the patches 1 and 3 now that already have ack/r-b?
Thank you,
Oleksandr
On 12/13/18 12:16 PM, Oleksandr Andrushchenko wrote:
bump
On 12/5/18 10:20 AM, Oleksandr Andrushchenko wrote:
Hello, Daniel!
Could you please ack/nack the patch, so either we can merge the
series or I can address your comments if any
Thank you,
Oleksandr
On 11/30/18 9:42 AM, Oleksandr Andrushchenko wrote:
From: Oleksandr Andrushchenko oleksandr_andrushchenko@epam.com
Use page directory based shared buffer implementation now available as common code for Xen frontend drivers.
Remove flushing of shared buffer on page flip as this workaround needs a proper fix.
Signed-off-by: Oleksandr Andrushchenko
oleksandr_andrushchenko@epam.com
drivers/gpu/drm/xen/Kconfig              |  1 +  drivers/gpu/drm/xen/Makefile             |  1 -  drivers/gpu/drm/xen/xen_drm_front.c      | 65 ++--  drivers/gpu/drm/xen/xen_drm_front_gem.c  |  1 -  drivers/gpu/drm/xen/xen_drm_front_shbuf.c | 414
drivers/gpu/drm/xen/xen_drm_front_shbuf.h | 64 ----  6 files changed, 26 insertions(+), 520 deletions(-)  delete mode 100644 drivers/gpu/drm/xen/xen_drm_front_shbuf.c  delete mode 100644 drivers/gpu/drm/xen/xen_drm_front_shbuf.h
diff --git a/drivers/gpu/drm/xen/Kconfig b/drivers/gpu/drm/xen/Kconfig index 4cca160782ab..f969d486855d 100644 --- a/drivers/gpu/drm/xen/Kconfig +++ b/drivers/gpu/drm/xen/Kconfig @@ -12,6 +12,7 @@ config DRM_XEN_FRONTEND      select DRM_KMS_HELPER      select VIDEOMODE_HELPERS      select XEN_XENBUS_FRONTEND +   select XEN_FRONT_PGDIR_SHBUF      help        Choose this option if you want to enable a para-virtualized        frontend DRM/KMS driver for Xen guest OSes. diff --git a/drivers/gpu/drm/xen/Makefile b/drivers/gpu/drm/xen/Makefile index 712afff5ffc3..825905f67faa 100644 --- a/drivers/gpu/drm/xen/Makefile +++ b/drivers/gpu/drm/xen/Makefile @@ -4,7 +4,6 @@ drm_xen_front-objs := xen_drm_front.o \                xen_drm_front_kms.o \                xen_drm_front_conn.o \                xen_drm_front_evtchnl.o \ -             xen_drm_front_shbuf.o \                xen_drm_front_cfg.o \                xen_drm_front_gem.o  diff --git a/drivers/gpu/drm/xen/xen_drm_front.c b/drivers/gpu/drm/xen/xen_drm_front.c index 6b6d5ab82ec3..4d3d36fc3a5d 100644 --- a/drivers/gpu/drm/xen/xen_drm_front.c +++ b/drivers/gpu/drm/xen/xen_drm_front.c @@ -19,6 +19,7 @@  #include <xen/xen.h>  #include <xen/xenbus.h>  +#include <xen/xen-front-pgdir-shbuf.h>  #include <xen/interface/io/displif.h>   #include "xen_drm_front.h" @@ -26,28 +27,20 @@  #include "xen_drm_front_evtchnl.h"  #include "xen_drm_front_gem.h"  #include "xen_drm_front_kms.h" -#include "xen_drm_front_shbuf.h"   struct xen_drm_front_dbuf {      struct list_head list;      u64 dbuf_cookie;      u64 fb_cookie; -   struct xen_drm_front_shbuf *shbuf;
+Â Â Â struct xen_front_pgdir_shbuf shbuf; Â }; Â -static int dbuf_add_to_list(struct xen_drm_front_info *front_info, -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â struct xen_drm_front_shbuf *shbuf, u64 dbuf_cookie) +static void dbuf_add_to_list(struct xen_drm_front_info *front_info, +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â struct xen_drm_front_dbuf *dbuf, u64 dbuf_cookie) Â { -Â Â Â struct xen_drm_front_dbuf *dbuf;
-Â Â Â dbuf = kzalloc(sizeof(*dbuf), GFP_KERNEL); -Â Â Â if (!dbuf) -Â Â Â Â Â Â Â return -ENOMEM;
dbuf->dbuf_cookie = dbuf_cookie; -Â Â Â dbuf->shbuf = shbuf; Â Â Â Â Â list_add(&dbuf->list, &front_info->dbuf_list); -Â Â Â return 0; Â } Â Â static struct xen_drm_front_dbuf *dbuf_get(struct list_head *dbuf_list, @@ -62,15 +55,6 @@ static struct xen_drm_front_dbuf *dbuf_get(struct list_head *dbuf_list, Â Â Â Â Â return NULL; Â } Â -static void dbuf_flush_fb(struct list_head *dbuf_list, u64 fb_cookie) -{ -Â Â Â struct xen_drm_front_dbuf *buf, *q;
-Â Â Â list_for_each_entry_safe(buf, q, dbuf_list, list) -Â Â Â Â Â Â Â if (buf->fb_cookie == fb_cookie) -Â Â Â Â Â Â Â Â Â Â Â xen_drm_front_shbuf_flush(buf->shbuf); -}
static void dbuf_free(struct list_head *dbuf_list, u64 dbuf_cookie) Â { Â Â Â Â Â struct xen_drm_front_dbuf *buf, *q; @@ -78,8 +62,8 @@ static void dbuf_free(struct list_head *dbuf_list, u64 dbuf_cookie) Â Â Â Â Â list_for_each_entry_safe(buf, q, dbuf_list, list) Â Â Â Â Â Â Â Â Â if (buf->dbuf_cookie == dbuf_cookie) { Â Â Â Â Â Â Â Â Â Â Â Â Â list_del(&buf->list); -Â Â Â Â Â Â Â Â Â Â Â xen_drm_front_shbuf_unmap(buf->shbuf); -Â Â Â Â Â Â Â Â Â Â Â xen_drm_front_shbuf_free(buf->shbuf); +Â Â Â Â Â Â Â Â Â Â Â xen_front_pgdir_shbuf_unmap(&buf->shbuf); +Â Â Â Â Â Â Â Â Â Â Â xen_front_pgdir_shbuf_free(&buf->shbuf); Â Â Â Â Â Â Â Â Â Â Â Â Â kfree(buf); Â Â Â Â Â Â Â Â Â Â Â Â Â break; Â Â Â Â Â Â Â Â Â } @@ -91,8 +75,8 @@ static void dbuf_free_all(struct list_head *dbuf_list) Â Â Â Â Â Â list_for_each_entry_safe(buf, q, dbuf_list, list) { Â Â Â Â Â Â Â Â Â list_del(&buf->list); -Â Â Â Â Â Â Â xen_drm_front_shbuf_unmap(buf->shbuf); -Â Â Â Â Â Â Â xen_drm_front_shbuf_free(buf->shbuf); +Â Â Â Â Â Â Â xen_front_pgdir_shbuf_unmap(&buf->shbuf); +Â Â Â Â Â Â Â xen_front_pgdir_shbuf_free(&buf->shbuf); Â Â Â Â Â Â Â Â Â kfree(buf); Â Â Â Â Â } Â } @@ -171,9 +155,9 @@ int xen_drm_front_dbuf_create(struct xen_drm_front_info *front_info, Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â u32 bpp, u64 size, struct page **pages) Â { Â Â Â Â Â struct xen_drm_front_evtchnl *evtchnl; -Â Â Â struct xen_drm_front_shbuf *shbuf; +Â Â Â struct xen_drm_front_dbuf *dbuf; Â Â Â Â Â struct xendispl_req *req; -Â Â Â struct xen_drm_front_shbuf_cfg buf_cfg; +Â Â Â struct xen_front_pgdir_shbuf_cfg buf_cfg; Â Â Â Â Â unsigned long flags; Â Â Â Â Â int ret; Â @@ -181,28 +165,29 @@ int xen_drm_front_dbuf_create(struct xen_drm_front_info *front_info, Â Â Â Â Â if (unlikely(!evtchnl)) Â Â Â Â Â Â Â Â Â return -EIO; Â +Â Â Â dbuf = kzalloc(sizeof(*dbuf), GFP_KERNEL); +Â Â Â if (!dbuf) +Â Â Â Â Â Â Â return -ENOMEM;
+Â Â Â dbuf_add_to_list(front_info, dbuf, dbuf_cookie);
memset(&buf_cfg, 0, sizeof(buf_cfg)); Â Â Â Â Â buf_cfg.xb_dev = front_info->xb_dev; +Â Â Â buf_cfg.num_pages = DIV_ROUND_UP(size, PAGE_SIZE); Â Â Â Â Â buf_cfg.pages = pages; -Â Â Â buf_cfg.size = size; +Â Â Â buf_cfg.pgdir = &dbuf->shbuf; Â Â Â Â Â buf_cfg.be_alloc = front_info->cfg.be_alloc; Â -Â Â Â shbuf = xen_drm_front_shbuf_alloc(&buf_cfg); -Â Â Â if (IS_ERR(shbuf)) -Â Â Â Â Â Â Â return PTR_ERR(shbuf);
-Â Â Â ret = dbuf_add_to_list(front_info, shbuf, dbuf_cookie); -Â Â Â if (ret < 0) { -Â Â Â Â Â Â Â xen_drm_front_shbuf_free(shbuf); -Â Â Â Â Â Â Â return ret; -Â Â Â } +Â Â Â ret = xen_front_pgdir_shbuf_alloc(&buf_cfg); +Â Â Â if (ret < 0) +Â Â Â Â Â Â Â goto fail_shbuf_alloc; Â Â Â Â Â Â mutex_lock(&evtchnl->u.req.req_io_lock); Â Â Â Â Â Â spin_lock_irqsave(&front_info->io_lock, flags); Â Â Â Â Â req = be_prepare_req(evtchnl, XENDISPL_OP_DBUF_CREATE); Â Â Â Â Â req->op.dbuf_create.gref_directory = -Â Â Â Â Â Â Â Â Â Â Â xen_drm_front_shbuf_get_dir_start(shbuf);
- xen_front_pgdir_shbuf_get_dir_start(&dbuf->shbuf);
req->op.dbuf_create.buffer_sz = size; Â Â Â Â Â req->op.dbuf_create.dbuf_cookie = dbuf_cookie; Â Â Â Â Â req->op.dbuf_create.width = width; @@ -221,7 +206,7 @@ int xen_drm_front_dbuf_create(struct xen_drm_front_info *front_info, Â Â Â Â Â if (ret < 0) Â Â Â Â Â Â Â Â Â goto fail; Â -Â Â Â ret = xen_drm_front_shbuf_map(shbuf); +Â Â Â ret = xen_front_pgdir_shbuf_map(&dbuf->shbuf); Â Â Â Â Â if (ret < 0) Â Â Â Â Â Â Â Â Â goto fail; Â @@ -230,6 +215,7 @@ int xen_drm_front_dbuf_create(struct xen_drm_front_info *front_info, Â Â fail: Â Â Â Â Â mutex_unlock(&evtchnl->u.req.req_io_lock); +fail_shbuf_alloc: Â Â Â Â Â dbuf_free(&front_info->dbuf_list, dbuf_cookie); Â Â Â Â Â return ret; Â } @@ -358,7 +344,6 @@ int xen_drm_front_page_flip(struct xen_drm_front_info *front_info, Â Â Â Â Â if (unlikely(conn_idx >= front_info->num_evt_pairs)) Â Â Â Â Â Â Â Â Â return -EINVAL; Â -Â Â Â dbuf_flush_fb(&front_info->dbuf_list, fb_cookie); Â Â Â Â Â evtchnl = &front_info->evt_pairs[conn_idx].req; Â Â Â Â Â Â mutex_lock(&evtchnl->u.req.req_io_lock); diff --git a/drivers/gpu/drm/xen/xen_drm_front_gem.c b/drivers/gpu/drm/xen/xen_drm_front_gem.c index c85bfe7571cb..53be4c7dc0a4 100644 --- a/drivers/gpu/drm/xen/xen_drm_front_gem.c +++ b/drivers/gpu/drm/xen/xen_drm_front_gem.c @@ -22,7 +22,6 @@ Â #include <xen/balloon.h> Â Â #include "xen_drm_front.h" -#include "xen_drm_front_shbuf.h" Â Â struct xen_gem_object { Â Â Â Â Â struct drm_gem_object base; diff --git a/drivers/gpu/drm/xen/xen_drm_front_shbuf.c b/drivers/gpu/drm/xen/xen_drm_front_shbuf.c deleted file mode 100644 index d333b67cc1a0..000000000000 --- a/drivers/gpu/drm/xen/xen_drm_front_shbuf.c +++ /dev/null @@ -1,414 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 OR MIT
-/*
- *Â Xen para-virtual DRM device
- Copyright (C) 2016-2018 EPAM Systems Inc.
- Author: Oleksandr Andrushchenko oleksandr_andrushchenko@epam.com
- */
-#include <drm/drmP.h>
-#if defined(CONFIG_X86) -#include <drm/drm_cache.h> -#endif -#include <linux/errno.h> -#include <linux/mm.h>
-#include <asm/xen/hypervisor.h> -#include <xen/balloon.h> -#include <xen/xen.h> -#include <xen/xenbus.h> -#include <xen/interface/io/ring.h> -#include <xen/interface/io/displif.h>
-#include "xen_drm_front.h" -#include "xen_drm_front_shbuf.h"
-struct xen_drm_front_shbuf_ops { -Â Â Â /* -Â Â Â Â * Calculate number of grefs required to handle this buffer, -Â Â Â Â * e.g. if grefs are required for page directory only or the buffer -Â Â Â Â * pages as well. -Â Â Â Â */ -Â Â Â void (*calc_num_grefs)(struct xen_drm_front_shbuf *buf); -Â Â Â /* Fill page directory according to para-virtual display protocol. */ -Â Â Â void (*fill_page_dir)(struct xen_drm_front_shbuf *buf); -Â Â Â /* Claim grant references for the pages of the buffer. */ -Â Â Â int (*grant_refs_for_buffer)(struct xen_drm_front_shbuf *buf, -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â grant_ref_t *priv_gref_head, int gref_idx); -Â Â Â /* Map grant references of the buffer. */ -Â Â Â int (*map)(struct xen_drm_front_shbuf *buf); -Â Â Â /* Unmap grant references of the buffer. */ -Â Â Â int (*unmap)(struct xen_drm_front_shbuf *buf); -};
-grant_ref_t xen_drm_front_shbuf_get_dir_start(struct xen_drm_front_shbuf *buf) -{ -Â Â Â if (!buf->grefs) -Â Â Â Â Â Â Â return GRANT_INVALID_REF;
-Â Â Â return buf->grefs[0]; -}
-int xen_drm_front_shbuf_map(struct xen_drm_front_shbuf *buf) -{ -Â Â Â if (buf->ops->map) -Â Â Â Â Â Â Â return buf->ops->map(buf);
-Â Â Â /* no need to map own grant references */ -Â Â Â return 0; -}
-int xen_drm_front_shbuf_unmap(struct xen_drm_front_shbuf *buf) -{ -Â Â Â if (buf->ops->unmap) -Â Â Â Â Â Â Â return buf->ops->unmap(buf);
-Â Â Â /* no need to unmap own grant references */ -Â Â Â return 0; -}
-void xen_drm_front_shbuf_flush(struct xen_drm_front_shbuf *buf) -{ -#if defined(CONFIG_X86) -Â Â Â drm_clflush_pages(buf->pages, buf->num_pages); -#endif -}
-void xen_drm_front_shbuf_free(struct xen_drm_front_shbuf *buf) -{ -Â Â Â if (buf->grefs) { -Â Â Â Â Â Â Â int i;
-Â Â Â Â Â Â Â for (i = 0; i < buf->num_grefs; i++) -Â Â Â Â Â Â Â Â Â Â Â if (buf->grefs[i] != GRANT_INVALID_REF) -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â gnttab_end_foreign_access(buf->grefs[i], -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â 0, 0UL); -Â Â Â } -Â Â Â kfree(buf->grefs); -Â Â Â kfree(buf->directory); -Â Â Â kfree(buf); -}
-/*
- number of grefs a page can hold with respect to the
- struct xendispl_page_directory header
- */
-#define XEN_DRM_NUM_GREFS_PER_PAGE ((PAGE_SIZE - \ -Â Â Â Â Â Â Â offsetof(struct xendispl_page_directory, gref)) / \ -Â Â Â Â Â Â Â sizeof(grant_ref_t))
-static int get_num_pages_dir(struct xen_drm_front_shbuf *buf) -{ -Â Â Â /* number of pages the page directory consumes itself */ -Â Â Â return DIV_ROUND_UP(buf->num_pages, XEN_DRM_NUM_GREFS_PER_PAGE); -}
-static void backend_calc_num_grefs(struct xen_drm_front_shbuf *buf) -{ -Â Â Â /* only for pages the page directory consumes itself */ -Â Â Â buf->num_grefs = get_num_pages_dir(buf); -}
-static void guest_calc_num_grefs(struct xen_drm_front_shbuf *buf) -{ -Â Â Â /* -Â Â Â Â * number of pages the page directory consumes itself -Â Â Â Â * plus grefs for the buffer pages -Â Â Â Â */ -Â Â Â buf->num_grefs = get_num_pages_dir(buf) + buf->num_pages; -}
-#define xen_page_to_vaddr(page) \ -Â Â Â Â Â Â Â ((uintptr_t)pfn_to_kaddr(page_to_xen_pfn(page)))
-static int backend_unmap(struct xen_drm_front_shbuf *buf) -{ -Â Â Â struct gnttab_unmap_grant_ref *unmap_ops; -Â Â Â int i, ret;
-Â Â Â if (!buf->pages || !buf->backend_map_handles || !buf->grefs) -Â Â Â Â Â Â Â return 0;
-Â Â Â unmap_ops = kcalloc(buf->num_pages, sizeof(*unmap_ops), -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â GFP_KERNEL); -Â Â Â if (!unmap_ops) { -Â Â Â Â Â Â Â DRM_ERROR("Failed to get memory while unmapping\n"); -Â Â Â Â Â Â Â return -ENOMEM; -Â Â Â }
-Â Â Â for (i = 0; i < buf->num_pages; i++) { -Â Â Â Â Â Â Â phys_addr_t addr;
-Â Â Â Â Â Â Â addr = xen_page_to_vaddr(buf->pages[i]); -Â Â Â Â Â Â Â gnttab_set_unmap_op(&unmap_ops[i], addr, GNTMAP_host_map, -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â buf->backend_map_handles[i]); -Â Â Â }
-Â Â Â ret = gnttab_unmap_refs(unmap_ops, NULL, buf->pages, -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â buf->num_pages);
-Â Â Â for (i = 0; i < buf->num_pages; i++) { -Â Â Â Â Â Â Â if (unlikely(unmap_ops[i].status != GNTST_okay)) -Â Â Â Â Â Â Â Â Â Â Â DRM_ERROR("Failed to unmap page %d: %d\n", -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â i, unmap_ops[i].status); -Â Â Â }
-Â Â Â if (ret) -Â Â Â Â Â Â Â DRM_ERROR("Failed to unmap grant references, ret %d", ret);
-Â Â Â kfree(unmap_ops); -Â Â Â kfree(buf->backend_map_handles); -Â Â Â buf->backend_map_handles = NULL; -Â Â Â return ret; -}
-static int backend_map(struct xen_drm_front_shbuf *buf) -{ -Â Â Â struct gnttab_map_grant_ref *map_ops = NULL; -Â Â Â unsigned char *ptr; -Â Â Â int ret, cur_gref, cur_dir_page, cur_page, grefs_left;
-Â Â Â map_ops = kcalloc(buf->num_pages, sizeof(*map_ops), GFP_KERNEL); -Â Â Â if (!map_ops) -Â Â Â Â Â Â Â return -ENOMEM;
-Â Â Â buf->backend_map_handles = kcalloc(buf->num_pages, -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â sizeof(*buf->backend_map_handles), -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â GFP_KERNEL); -Â Â Â if (!buf->backend_map_handles) { -Â Â Â Â Â Â Â kfree(map_ops); -Â Â Â Â Â Â Â return -ENOMEM; -Â Â Â }
-Â Â Â /* -Â Â Â Â * read page directory to get grefs from the backend: for external -Â Â Â Â * buffer we only allocate buf->grefs for the page directory, -Â Â Â Â * so buf->num_grefs has number of pages in the page directory itself -Â Â Â Â */ -Â Â Â ptr = buf->directory; -Â Â Â grefs_left = buf->num_pages; -Â Â Â cur_page = 0; -Â Â Â for (cur_dir_page = 0; cur_dir_page < buf->num_grefs; cur_dir_page++) { -Â Â Â Â Â Â Â struct xendispl_page_directory *page_dir = -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â (struct xendispl_page_directory *)ptr; -Â Â Â Â Â Â Â int to_copy = XEN_DRM_NUM_GREFS_PER_PAGE;
-Â Â Â Â Â Â Â if (to_copy > grefs_left) -Â Â Â Â Â Â Â Â Â Â Â to_copy = grefs_left;
-Â Â Â Â Â Â Â for (cur_gref = 0; cur_gref < to_copy; cur_gref++) { -Â Â Â Â Â Â Â Â Â Â Â phys_addr_t addr;
-Â Â Â Â Â Â Â Â Â Â Â addr = xen_page_to_vaddr(buf->pages[cur_page]); -Â Â Â Â Â Â Â Â Â Â Â gnttab_set_map_op(&map_ops[cur_page], addr, -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â GNTMAP_host_map, -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â page_dir->gref[cur_gref], -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â buf->xb_dev->otherend_id); -Â Â Â Â Â Â Â Â Â Â Â cur_page++; -Â Â Â Â Â Â Â }
-Â Â Â Â Â Â Â grefs_left -= to_copy; -Â Â Â Â Â Â Â ptr += PAGE_SIZE; -Â Â Â } -Â Â Â ret = gnttab_map_refs(map_ops, NULL, buf->pages, buf->num_pages);
-Â Â Â /* save handles even if error, so we can unmap */ -Â Â Â for (cur_page = 0; cur_page < buf->num_pages; cur_page++) { -Â Â Â Â Â Â Â buf->backend_map_handles[cur_page] = map_ops[cur_page].handle; -Â Â Â Â Â Â Â if (unlikely(map_ops[cur_page].status != GNTST_okay)) -Â Â Â Â Â Â Â Â Â Â Â DRM_ERROR("Failed to map page %d: %d\n", -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â cur_page, map_ops[cur_page].status); -Â Â Â }
-Â Â Â if (ret) { -Â Â Â Â Â Â Â DRM_ERROR("Failed to map grant references, ret %d", ret); -Â Â Â Â Â Â Â backend_unmap(buf); -Â Â Â }
-Â Â Â kfree(map_ops); -Â Â Â return ret; -}
-static void backend_fill_page_dir(struct xen_drm_front_shbuf *buf) -{ -Â Â Â struct xendispl_page_directory *page_dir; -Â Â Â unsigned char *ptr; -Â Â Â int i, num_pages_dir;
-Â Â Â ptr = buf->directory; -Â Â Â num_pages_dir = get_num_pages_dir(buf);
-Â Â Â /* fill only grefs for the page directory itself */ -Â Â Â for (i = 0; i < num_pages_dir - 1; i++) { -Â Â Â Â Â Â Â page_dir = (struct xendispl_page_directory *)ptr;
-Â Â Â Â Â Â Â page_dir->gref_dir_next_page = buf->grefs[i + 1]; -Â Â Â Â Â Â Â ptr += PAGE_SIZE; -Â Â Â } -Â Â Â /* last page must say there is no more pages */ -Â Â Â page_dir = (struct xendispl_page_directory *)ptr; -Â Â Â page_dir->gref_dir_next_page = GRANT_INVALID_REF; -}
-static void guest_fill_page_dir(struct xen_drm_front_shbuf *buf) -{ -Â Â Â unsigned char *ptr; -Â Â Â int cur_gref, grefs_left, to_copy, i, num_pages_dir;
-Â Â Â ptr = buf->directory; -Â Â Â num_pages_dir = get_num_pages_dir(buf);
-Â Â Â /* -Â Â Â Â * while copying, skip grefs at start, they are for pages -Â Â Â Â * granted for the page directory itself -Â Â Â Â */ -Â Â Â cur_gref = num_pages_dir; -Â Â Â grefs_left = buf->num_pages; -Â Â Â for (i = 0; i < num_pages_dir; i++) { -Â Â Â Â Â Â Â struct xendispl_page_directory *page_dir = -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â (struct xendispl_page_directory *)ptr;
-Â Â Â Â Â Â Â if (grefs_left <= XEN_DRM_NUM_GREFS_PER_PAGE) { -Â Â Â Â Â Â Â Â Â Â Â to_copy = grefs_left; -Â Â Â Â Â Â Â Â Â Â Â page_dir->gref_dir_next_page = GRANT_INVALID_REF; -Â Â Â Â Â Â Â } else { -Â Â Â Â Â Â Â Â Â Â Â to_copy = XEN_DRM_NUM_GREFS_PER_PAGE; -Â Â Â Â Â Â Â Â Â Â Â page_dir->gref_dir_next_page = buf->grefs[i + 1]; -Â Â Â Â Â Â Â } -Â Â Â Â Â Â Â memcpy(&page_dir->gref, &buf->grefs[cur_gref], -Â Â Â Â Â Â Â Â Â Â Â Â Â Â to_copy * sizeof(grant_ref_t)); -Â Â Â Â Â Â Â ptr += PAGE_SIZE; -Â Â Â Â Â Â Â grefs_left -= to_copy; -Â Â Â Â Â Â Â cur_gref += to_copy; -Â Â Â } -}
-static int guest_grant_refs_for_buffer(struct xen_drm_front_shbuf *buf, -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â grant_ref_t *priv_gref_head, -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â int gref_idx) -{ -Â Â Â int i, cur_ref, otherend_id;
-Â Â Â otherend_id = buf->xb_dev->otherend_id; -Â Â Â for (i = 0; i < buf->num_pages; i++) { -Â Â Â Â Â Â Â cur_ref = gnttab_claim_grant_reference(priv_gref_head); -Â Â Â Â Â Â Â if (cur_ref < 0) -Â Â Â Â Â Â Â Â Â Â Â return cur_ref;
-Â Â Â Â Â Â Â gnttab_grant_foreign_access_ref(cur_ref, otherend_id, -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â xen_page_to_gfn(buf->pages[i]), -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â 0); -Â Â Â Â Â Â Â buf->grefs[gref_idx++] = cur_ref; -Â Â Â } -Â Â Â return 0; -}
-static int grant_references(struct xen_drm_front_shbuf *buf) -{ -Â Â Â grant_ref_t priv_gref_head; -Â Â Â int ret, i, j, cur_ref; -Â Â Â int otherend_id, num_pages_dir;
-Â Â Â ret = gnttab_alloc_grant_references(buf->num_grefs, &priv_gref_head); -Â Â Â if (ret < 0) { -Â Â Â Â Â Â Â DRM_ERROR("Cannot allocate grant references\n"); -Â Â Â Â Â Â Â return ret; -Â Â Â }
-Â Â Â otherend_id = buf->xb_dev->otherend_id; -Â Â Â j = 0; -Â Â Â num_pages_dir = get_num_pages_dir(buf); -Â Â Â for (i = 0; i < num_pages_dir; i++) { -Â Â Â Â Â Â Â unsigned long frame;
-Â Â Â Â Â Â Â cur_ref = gnttab_claim_grant_reference(&priv_gref_head); -Â Â Â Â Â Â Â if (cur_ref < 0) -Â Â Â Â Â Â Â Â Â Â Â return cur_ref;
-Â Â Â Â Â Â Â frame = xen_page_to_gfn(virt_to_page(buf->directory + -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â PAGE_SIZE * i)); -Â Â Â Â Â Â Â gnttab_grant_foreign_access_ref(cur_ref, otherend_id, frame, 0); -Â Â Â Â Â Â Â buf->grefs[j++] = cur_ref; -Â Â Â }
-Â Â Â if (buf->ops->grant_refs_for_buffer) { -Â Â Â Â Â Â Â ret = buf->ops->grant_refs_for_buffer(buf, &priv_gref_head, j); -Â Â Â Â Â Â Â if (ret) -Â Â Â Â Â Â Â Â Â Â Â return ret; -Â Â Â }
-Â Â Â gnttab_free_grant_references(priv_gref_head); -Â Â Â return 0; -}
-static int alloc_storage(struct xen_drm_front_shbuf *buf) -{ -Â Â Â buf->grefs = kcalloc(buf->num_grefs, sizeof(*buf->grefs), GFP_KERNEL); -Â Â Â if (!buf->grefs) -Â Â Â Â Â Â Â return -ENOMEM;
-Â Â Â buf->directory = kcalloc(get_num_pages_dir(buf), PAGE_SIZE, GFP_KERNEL); -Â Â Â if (!buf->directory) -Â Â Â Â Â Â Â return -ENOMEM;
-Â Â Â return 0; -}
-/*
- For be allocated buffers we don't need grant_refs_for_buffer as
those
- grant references are allocated at backend side
- */
-static const struct xen_drm_front_shbuf_ops backend_ops = { -Â Â Â .calc_num_grefs = backend_calc_num_grefs, -Â Â Â .fill_page_dir = backend_fill_page_dir, -Â Â Â .map = backend_map, -Â Â Â .unmap = backend_unmap -};
-/* For locally granted references we do not need to map/unmap the references */ -static const struct xen_drm_front_shbuf_ops local_ops = { -Â Â Â .calc_num_grefs = guest_calc_num_grefs, -Â Â Â .fill_page_dir = guest_fill_page_dir, -Â Â Â .grant_refs_for_buffer = guest_grant_refs_for_buffer, -};
-struct xen_drm_front_shbuf * -xen_drm_front_shbuf_alloc(struct xen_drm_front_shbuf_cfg *cfg) -{ -Â Â Â struct xen_drm_front_shbuf *buf; -Â Â Â int ret;
-Â Â Â buf = kzalloc(sizeof(*buf), GFP_KERNEL); -Â Â Â if (!buf) -Â Â Â Â Â Â Â return ERR_PTR(-ENOMEM);
-Â Â Â if (cfg->be_alloc) -Â Â Â Â Â Â Â buf->ops = &backend_ops; -Â Â Â else -Â Â Â Â Â Â Â buf->ops = &local_ops;
-Â Â Â buf->xb_dev = cfg->xb_dev; -Â Â Â buf->num_pages = DIV_ROUND_UP(cfg->size, PAGE_SIZE); -Â Â Â buf->pages = cfg->pages;
-Â Â Â buf->ops->calc_num_grefs(buf);
-Â Â Â ret = alloc_storage(buf); -Â Â Â if (ret) -Â Â Â Â Â Â Â goto fail;
-Â Â Â ret = grant_references(buf); -Â Â Â if (ret) -Â Â Â Â Â Â Â goto fail;
-Â Â Â buf->ops->fill_page_dir(buf);
-Â Â Â return buf;
-fail: -Â Â Â xen_drm_front_shbuf_free(buf); -Â Â Â return ERR_PTR(ret); -} diff --git a/drivers/gpu/drm/xen/xen_drm_front_shbuf.h b/drivers/gpu/drm/xen/xen_drm_front_shbuf.h deleted file mode 100644 index 7545c692539e..000000000000 --- a/drivers/gpu/drm/xen/xen_drm_front_shbuf.h +++ /dev/null @@ -1,64 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 OR MIT */
-/*
- *Â Xen para-virtual DRM device
- Copyright (C) 2016-2018 EPAM Systems Inc.
- Author: Oleksandr Andrushchenko oleksandr_andrushchenko@epam.com
- */
-#ifndef __XEN_DRM_FRONT_SHBUF_H_ -#define __XEN_DRM_FRONT_SHBUF_H_
-#include <linux/kernel.h> -#include <linux/scatterlist.h>
-#include <xen/grant_table.h>
-struct xen_drm_front_shbuf { -Â Â Â /* -Â Â Â Â * number of references granted for the backend use: -Â Â Â Â *Â - for allocated/imported dma-buf's this holds number of grant -Â Â Â Â *Â Â Â references for the page directory and pages of the buffer -Â Â Â Â *Â - for the buffer provided by the backend this holds number of -Â Â Â Â *Â Â Â grant references for the page directory as grant references for -Â Â Â Â *Â Â Â the buffer will be provided by the backend -Â Â Â Â */ -Â Â Â int num_grefs; -Â Â Â grant_ref_t *grefs; -Â Â Â unsigned char *directory;
-Â Â Â int num_pages; -Â Â Â struct page **pages;
-Â Â Â struct xenbus_device *xb_dev;
-Â Â Â /* these are the ops used internally depending on be_alloc mode */ -Â Â Â const struct xen_drm_front_shbuf_ops *ops;
-Â Â Â /* Xen map handles for the buffer allocated by the backend */ -Â Â Â grant_handle_t *backend_map_handles; -};
-struct xen_drm_front_shbuf_cfg { -Â Â Â struct xenbus_device *xb_dev; -Â Â Â size_t size; -Â Â Â struct page **pages; -Â Â Â bool be_alloc; -};
-struct xen_drm_front_shbuf * -xen_drm_front_shbuf_alloc(struct xen_drm_front_shbuf_cfg *cfg);
-grant_ref_t xen_drm_front_shbuf_get_dir_start(struct xen_drm_front_shbuf *buf);
-int xen_drm_front_shbuf_map(struct xen_drm_front_shbuf *buf);
-int xen_drm_front_shbuf_unmap(struct xen_drm_front_shbuf *buf);
-void xen_drm_front_shbuf_flush(struct xen_drm_front_shbuf *buf);
-void xen_drm_front_shbuf_free(struct xen_drm_front_shbuf *buf);
-#endif /* __XEN_DRM_FRONT_SHBUF_H_ */
On 12/17/18 5:19 AM, Oleksandr Andrushchenko wrote:
Hello, Juergen, Boris!
As this DRM part of the series is the only one which needs ack/nack
(and it might take quite some time to complete) could we please
merge the patches 1 and 3 now that already have ack/r-b?
TBH I am not sure it makes sense to do this without the second patch. Refactoring (and IIUIC this series is purely refactoring --- is it not?) is done to reduce amount of code, and with only first and third patch we end up with quite a significant increase in the number of LoC. (I am going purely by diffstat)
Of course, the other reason for refactoring is to eliminate code duplication, but without second patch that will not happen.
-boris
On 12/17/18 4:52 PM, Boris Ostrovsky wrote:
On 12/17/18 5:19 AM, Oleksandr Andrushchenko wrote:
Hello, Juergen, Boris!
As this DRM part of the series is the only one which needs ack/nack
(and it might take quite some time to complete) could we please
merge the patches 1 and 3 now that already have ack/r-b?
TBH I am not sure it makes sense to do this without the second patch. Refactoring (and IIUIC this series is purely refactoring --- is it not?) is done to reduce amount of code, and with only first and third patch we end up with quite a significant increase in the number of LoC. (I am going purely by diffstat)
Of course, the other reason for refactoring is to eliminate code duplication, but without second patch that will not happen.
Agree, but this is the basis for the new pv camera frontend
I am working on now [1], so even if we do not remove the code from DRM
then we at least do not add it to the camera driver
-boris
Thank you,
Oleksandr
[1] https://github.com/andr2000/linux/blob/camera_front_v1/drivers/media/xen/Kco...
On 12/17/18 10:03 AM, Oleksandr Andrushchenko wrote:
On 12/17/18 4:52 PM, Boris Ostrovsky wrote:
On 12/17/18 5:19 AM, Oleksandr Andrushchenko wrote:
Hello, Juergen, Boris!
As this DRM part of the series is the only one which needs ack/nack
(and it might take quite some time to complete) could we please
merge the patches 1 and 3 now that already have ack/r-b?
TBH I am not sure it makes sense to do this without the second patch. Refactoring (and IIUIC this series is purely refactoring --- is it not?) is done to reduce amount of code, and with only first and third patch we end up with quite a significant increase in the number of LoC. (I am going purely by diffstat)
Of course, the other reason for refactoring is to eliminate code duplication, but without second patch that will not happen.
Agree, but this is the basis for the new pv camera frontend
I am working on now [1], so even if we do not remove the code from DRM
then we at least do not add it to the camera driver
Since 1 and 3 are already ACKed you should be able to start the camera series with these two patches as pre-requisites even if patch 2 is still stalled by the time your camera code is posted (which I assume will be 4.22 or later).
-boris
-boris
Thank you,
Oleksandr
[1] https://github.com/andr2000/linux/blob/camera_front_v1/drivers/media/xen/Kco...
On 12/17/18 5:26 PM, Boris Ostrovsky wrote:
On 12/17/18 10:03 AM, Oleksandr Andrushchenko wrote:
On 12/17/18 4:52 PM, Boris Ostrovsky wrote:
On 12/17/18 5:19 AM, Oleksandr Andrushchenko wrote:
Hello, Juergen, Boris!
As this DRM part of the series is the only one which needs ack/nack
(and it might take quite some time to complete) could we please
merge the patches 1 and 3 now that already have ack/r-b?
TBH I am not sure it makes sense to do this without the second patch. Refactoring (and IIUIC this series is purely refactoring --- is it not?) is done to reduce amount of code, and with only first and third patch we end up with quite a significant increase in the number of LoC. (I am going purely by diffstat)
Of course, the other reason for refactoring is to eliminate code duplication, but without second patch that will not happen.
Agree, but this is the basis for the new pv camera frontend
I am working on now [1], so even if we do not remove the code from DRM
then we at least do not add it to the camera driver
Since 1 and 3 are already ACKed you should be able to start the camera series with these two patches as pre-requisites even if patch 2 is still stalled by the time your camera code is posted (which I assume will be 4.22 or later).
Agreed, maybe by that time DRM part will also get its r-b/ack
-boris
-boris
Thank you,
Oleksandr
[1] https://github.com/andr2000/linux/blob/camera_front_v1/drivers/media/xen/Kco...
Den 30.11.2018 08.42, skrev Oleksandr Andrushchenko:
From: Oleksandr Andrushchenko oleksandr_andrushchenko@epam.com
Use page directory based shared buffer implementation now available as common code for Xen frontend drivers.
Remove flushing of shared buffer on page flip as this workaround needs a proper fix.
Signed-off-by: Oleksandr Andrushchenko oleksandr_andrushchenko@epam.com
Reviewed-by: Noralf Trønnes noralf@tronnes.org
On 12/18/18 11:15 AM, Noralf Trønnes wrote:
Den 30.11.2018 08.42, skrev Oleksandr Andrushchenko:
From: Oleksandr Andrushchenko oleksandr_andrushchenko@epam.com
Use page directory based shared buffer implementation now available as common code for Xen frontend drivers.
Remove flushing of shared buffer on page flip as this workaround needs a proper fix.
Signed-off-by: Oleksandr Andrushchenko
oleksandr_andrushchenko@epam.com
Reviewed-by: Noralf Trønnes noralf@tronnes.org
Now that all 3 have been acked/reviewed
Applied to for-linus-4.21
On 12/18/18 20:31, Boris Ostrovsky wrote:
On 12/18/18 11:15 AM, Noralf Trønnes wrote:
Den 30.11.2018 08.42, skrev Oleksandr Andrushchenko:
From: Oleksandr Andrushchenko oleksandr_andrushchenko@epam.com
Use page directory based shared buffer implementation now available as common code for Xen frontend drivers.
Remove flushing of shared buffer on page flip as this workaround needs a proper fix.
Signed-off-by: Oleksandr Andrushchenko
oleksandr_andrushchenko@epam.com
Reviewed-by: Noralf Trønnes noralf@tronnes.org
Thank you, Noralf!
Now that all 3 have been acked/reviewed
Applied to for-linus-4.21
Thank you, Boris, Juergen!
From: Oleksandr Andrushchenko oleksandr_andrushchenko@epam.com
Use page directory based shared buffer implementation now available as common code for Xen frontend drivers.
Signed-off-by: Oleksandr Andrushchenko oleksandr_andrushchenko@epam.com --- sound/xen/Kconfig | 1 + sound/xen/Makefile | 1 - sound/xen/xen_snd_front.c | 7 +- sound/xen/xen_snd_front.h | 4 +- sound/xen/xen_snd_front_alsa.c | 102 +++++++++++++---- sound/xen/xen_snd_front_shbuf.c | 194 -------------------------------- sound/xen/xen_snd_front_shbuf.h | 36 ------ 7 files changed, 84 insertions(+), 261 deletions(-) delete mode 100644 sound/xen/xen_snd_front_shbuf.c delete mode 100644 sound/xen/xen_snd_front_shbuf.h
diff --git a/sound/xen/Kconfig b/sound/xen/Kconfig index 4f1fceea82d2..e4d7beb4df1c 100644 --- a/sound/xen/Kconfig +++ b/sound/xen/Kconfig @@ -5,6 +5,7 @@ config SND_XEN_FRONTEND depends on XEN select SND_PCM select XEN_XENBUS_FRONTEND + select XEN_FRONT_PGDIR_SHBUF help Choose this option if you want to enable a para-virtualized frontend sound driver for Xen guest OSes. diff --git a/sound/xen/Makefile b/sound/xen/Makefile index 1e6470ecc2f2..24031775b715 100644 --- a/sound/xen/Makefile +++ b/sound/xen/Makefile @@ -3,7 +3,6 @@ snd_xen_front-objs := xen_snd_front.o \ xen_snd_front_cfg.o \ xen_snd_front_evtchnl.o \ - xen_snd_front_shbuf.o \ xen_snd_front_alsa.o
obj-$(CONFIG_SND_XEN_FRONTEND) += snd_xen_front.o diff --git a/sound/xen/xen_snd_front.c b/sound/xen/xen_snd_front.c index b089b13b5160..a9e5c2cd7698 100644 --- a/sound/xen/xen_snd_front.c +++ b/sound/xen/xen_snd_front.c @@ -16,12 +16,12 @@ #include <xen/xen.h> #include <xen/xenbus.h>
+#include <xen/xen-front-pgdir-shbuf.h> #include <xen/interface/io/sndif.h>
#include "xen_snd_front.h" #include "xen_snd_front_alsa.h" #include "xen_snd_front_evtchnl.h" -#include "xen_snd_front_shbuf.h"
static struct xensnd_req * be_stream_prepare_req(struct xen_snd_front_evtchnl *evtchnl, u8 operation) @@ -82,7 +82,7 @@ int xen_snd_front_stream_query_hw_param(struct xen_snd_front_evtchnl *evtchnl, }
int xen_snd_front_stream_prepare(struct xen_snd_front_evtchnl *evtchnl, - struct xen_snd_front_shbuf *sh_buf, + struct xen_front_pgdir_shbuf *shbuf, u8 format, unsigned int channels, unsigned int rate, u32 buffer_sz, u32 period_sz) @@ -99,7 +99,8 @@ int xen_snd_front_stream_prepare(struct xen_snd_front_evtchnl *evtchnl, req->op.open.pcm_rate = rate; req->op.open.buffer_sz = buffer_sz; req->op.open.period_sz = period_sz; - req->op.open.gref_directory = xen_snd_front_shbuf_get_dir_start(sh_buf); + req->op.open.gref_directory = + xen_front_pgdir_shbuf_get_dir_start(shbuf); mutex_unlock(&evtchnl->ring_io_lock);
ret = be_stream_do_io(evtchnl); diff --git a/sound/xen/xen_snd_front.h b/sound/xen/xen_snd_front.h index a2ea2463bcc5..05611f113b94 100644 --- a/sound/xen/xen_snd_front.h +++ b/sound/xen/xen_snd_front.h @@ -16,7 +16,7 @@ struct xen_snd_front_card_info; struct xen_snd_front_evtchnl; struct xen_snd_front_evtchnl_pair; -struct xen_snd_front_shbuf; +struct xen_front_pgdir_shbuf; struct xensnd_query_hw_param;
struct xen_snd_front_info { @@ -35,7 +35,7 @@ int xen_snd_front_stream_query_hw_param(struct xen_snd_front_evtchnl *evtchnl, struct xensnd_query_hw_param *hw_param_resp);
int xen_snd_front_stream_prepare(struct xen_snd_front_evtchnl *evtchnl, - struct xen_snd_front_shbuf *sh_buf, + struct xen_front_pgdir_shbuf *shbuf, u8 format, unsigned int channels, unsigned int rate, u32 buffer_sz, u32 period_sz); diff --git a/sound/xen/xen_snd_front_alsa.c b/sound/xen/xen_snd_front_alsa.c index 129180e17db1..a17ae45ec634 100644 --- a/sound/xen/xen_snd_front_alsa.c +++ b/sound/xen/xen_snd_front_alsa.c @@ -15,17 +15,24 @@ #include <sound/pcm_params.h>
#include <xen/xenbus.h> +#include <xen/xen-front-pgdir-shbuf.h>
#include "xen_snd_front.h" #include "xen_snd_front_alsa.h" #include "xen_snd_front_cfg.h" #include "xen_snd_front_evtchnl.h" -#include "xen_snd_front_shbuf.h"
struct xen_snd_front_pcm_stream_info { struct xen_snd_front_info *front_info; struct xen_snd_front_evtchnl_pair *evt_pair; - struct xen_snd_front_shbuf sh_buf; + + /* This is the shared buffer with its backing storage. */ + struct xen_front_pgdir_shbuf shbuf; + u8 *buffer; + size_t buffer_sz; + int num_pages; + struct page **pages; + int index;
bool is_open; @@ -214,12 +221,20 @@ static void stream_clear(struct xen_snd_front_pcm_stream_info *stream) stream->out_frames = 0; atomic_set(&stream->hw_ptr, 0); xen_snd_front_evtchnl_pair_clear(stream->evt_pair); - xen_snd_front_shbuf_clear(&stream->sh_buf); + memset(&stream->shbuf, 0, sizeof(stream->shbuf)); + stream->buffer = NULL; + stream->buffer_sz = 0; + stream->pages = NULL; + stream->num_pages = 0; }
static void stream_free(struct xen_snd_front_pcm_stream_info *stream) { - xen_snd_front_shbuf_free(&stream->sh_buf); + xen_front_pgdir_shbuf_unmap(&stream->shbuf); + xen_front_pgdir_shbuf_free(&stream->shbuf); + if (stream->buffer) + free_pages_exact(stream->buffer, stream->buffer_sz); + kfree(stream->pages); stream_clear(stream); }
@@ -421,10 +436,34 @@ static int alsa_close(struct snd_pcm_substream *substream) return 0; }
+static int shbuf_setup_backstore(struct xen_snd_front_pcm_stream_info *stream, + size_t buffer_sz) +{ + int i; + + stream->buffer = alloc_pages_exact(stream->buffer_sz, GFP_KERNEL); + if (!stream->buffer) + return -ENOMEM; + + stream->buffer_sz = buffer_sz; + stream->num_pages = DIV_ROUND_UP(stream->buffer_sz, PAGE_SIZE); + stream->pages = kcalloc(stream->num_pages, sizeof(struct page *), + GFP_KERNEL); + if (!stream->pages) + return -ENOMEM; + + for (i = 0; i < stream->num_pages; i++) + stream->pages[i] = virt_to_page(stream->buffer + i * PAGE_SIZE); + + return 0; +} + static int alsa_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { struct xen_snd_front_pcm_stream_info *stream = stream_get(substream); + struct xen_snd_front_info *front_info = stream->front_info; + struct xen_front_pgdir_shbuf_cfg buf_cfg; int ret;
/* @@ -432,19 +471,32 @@ static int alsa_hw_params(struct snd_pcm_substream *substream, * so free the previously allocated shared buffer if any. */ stream_free(stream); + ret = shbuf_setup_backstore(stream, params_buffer_bytes(params)); + if (ret < 0) + goto fail;
- ret = xen_snd_front_shbuf_alloc(stream->front_info->xb_dev, - &stream->sh_buf, - params_buffer_bytes(params)); - if (ret < 0) { - stream_free(stream); - dev_err(&stream->front_info->xb_dev->dev, - "Failed to allocate buffers for stream with index %d\n", - stream->index); - return ret; - } + memset(&buf_cfg, 0, sizeof(buf_cfg)); + buf_cfg.xb_dev = front_info->xb_dev; + buf_cfg.pgdir = &stream->shbuf; + buf_cfg.num_pages = stream->num_pages; + buf_cfg.pages = stream->pages; + + ret = xen_front_pgdir_shbuf_alloc(&buf_cfg); + if (ret < 0) + goto fail; + + ret = xen_front_pgdir_shbuf_map(&stream->shbuf); + if (ret < 0) + goto fail;
return 0; + +fail: + stream_free(stream); + dev_err(&front_info->xb_dev->dev, + "Failed to allocate buffers for stream with index %d\n", + stream->index); + return ret; }
static int alsa_hw_free(struct snd_pcm_substream *substream) @@ -476,7 +528,7 @@ static int alsa_prepare(struct snd_pcm_substream *substream) sndif_format = ret;
ret = xen_snd_front_stream_prepare(&stream->evt_pair->req, - &stream->sh_buf, + &stream->shbuf, sndif_format, runtime->channels, runtime->rate, @@ -556,10 +608,10 @@ static int alsa_pb_copy_user(struct snd_pcm_substream *substream, { struct xen_snd_front_pcm_stream_info *stream = stream_get(substream);
- if (unlikely(pos + count > stream->sh_buf.buffer_sz)) + if (unlikely(pos + count > stream->buffer_sz)) return -EINVAL;
- if (copy_from_user(stream->sh_buf.buffer + pos, src, count)) + if (copy_from_user(stream->buffer + pos, src, count)) return -EFAULT;
return xen_snd_front_stream_write(&stream->evt_pair->req, pos, count); @@ -571,10 +623,10 @@ static int alsa_pb_copy_kernel(struct snd_pcm_substream *substream, { struct xen_snd_front_pcm_stream_info *stream = stream_get(substream);
- if (unlikely(pos + count > stream->sh_buf.buffer_sz)) + if (unlikely(pos + count > stream->buffer_sz)) return -EINVAL;
- memcpy(stream->sh_buf.buffer + pos, src, count); + memcpy(stream->buffer + pos, src, count);
return xen_snd_front_stream_write(&stream->evt_pair->req, pos, count); } @@ -586,14 +638,14 @@ static int alsa_cap_copy_user(struct snd_pcm_substream *substream, struct xen_snd_front_pcm_stream_info *stream = stream_get(substream); int ret;
- if (unlikely(pos + count > stream->sh_buf.buffer_sz)) + if (unlikely(pos + count > stream->buffer_sz)) return -EINVAL;
ret = xen_snd_front_stream_read(&stream->evt_pair->req, pos, count); if (ret < 0) return ret;
- return copy_to_user(dst, stream->sh_buf.buffer + pos, count) ? + return copy_to_user(dst, stream->buffer + pos, count) ? -EFAULT : 0; }
@@ -604,14 +656,14 @@ static int alsa_cap_copy_kernel(struct snd_pcm_substream *substream, struct xen_snd_front_pcm_stream_info *stream = stream_get(substream); int ret;
- if (unlikely(pos + count > stream->sh_buf.buffer_sz)) + if (unlikely(pos + count > stream->buffer_sz)) return -EINVAL;
ret = xen_snd_front_stream_read(&stream->evt_pair->req, pos, count); if (ret < 0) return ret;
- memcpy(dst, stream->sh_buf.buffer + pos, count); + memcpy(dst, stream->buffer + pos, count);
return 0; } @@ -622,10 +674,10 @@ static int alsa_pb_fill_silence(struct snd_pcm_substream *substream, { struct xen_snd_front_pcm_stream_info *stream = stream_get(substream);
- if (unlikely(pos + count > stream->sh_buf.buffer_sz)) + if (unlikely(pos + count > stream->buffer_sz)) return -EINVAL;
- memset(stream->sh_buf.buffer + pos, 0, count); + memset(stream->buffer + pos, 0, count);
return xen_snd_front_stream_write(&stream->evt_pair->req, pos, count); } diff --git a/sound/xen/xen_snd_front_shbuf.c b/sound/xen/xen_snd_front_shbuf.c deleted file mode 100644 index 07ac176a41ba..000000000000 --- a/sound/xen/xen_snd_front_shbuf.c +++ /dev/null @@ -1,194 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 OR MIT - -/* - * Xen para-virtual sound device - * - * Copyright (C) 2016-2018 EPAM Systems Inc. - * - * Author: Oleksandr Andrushchenko oleksandr_andrushchenko@epam.com - */ - -#include <linux/kernel.h> -#include <xen/xen.h> -#include <xen/xenbus.h> - -#include "xen_snd_front_shbuf.h" - -grant_ref_t xen_snd_front_shbuf_get_dir_start(struct xen_snd_front_shbuf *buf) -{ - if (!buf->grefs) - return GRANT_INVALID_REF; - - return buf->grefs[0]; -} - -void xen_snd_front_shbuf_clear(struct xen_snd_front_shbuf *buf) -{ - memset(buf, 0, sizeof(*buf)); -} - -void xen_snd_front_shbuf_free(struct xen_snd_front_shbuf *buf) -{ - int i; - - if (buf->grefs) { - for (i = 0; i < buf->num_grefs; i++) - if (buf->grefs[i] != GRANT_INVALID_REF) - gnttab_end_foreign_access(buf->grefs[i], - 0, 0UL); - kfree(buf->grefs); - } - kfree(buf->directory); - free_pages_exact(buf->buffer, buf->buffer_sz); - xen_snd_front_shbuf_clear(buf); -} - -/* - * number of grant references a page can hold with respect to the - * xensnd_page_directory header - */ -#define XENSND_NUM_GREFS_PER_PAGE ((XEN_PAGE_SIZE - \ - offsetof(struct xensnd_page_directory, gref)) / \ - sizeof(grant_ref_t)) - -static void fill_page_dir(struct xen_snd_front_shbuf *buf, - int num_pages_dir) -{ - struct xensnd_page_directory *page_dir; - unsigned char *ptr; - int i, cur_gref, grefs_left, to_copy; - - ptr = buf->directory; - grefs_left = buf->num_grefs - num_pages_dir; - /* - * skip grant references at the beginning, they are for pages granted - * for the page directory itself - */ - cur_gref = num_pages_dir; - for (i = 0; i < num_pages_dir; i++) { - page_dir = (struct xensnd_page_directory *)ptr; - if (grefs_left <= XENSND_NUM_GREFS_PER_PAGE) { - to_copy = grefs_left; - page_dir->gref_dir_next_page = GRANT_INVALID_REF; - } else { - to_copy = XENSND_NUM_GREFS_PER_PAGE; - page_dir->gref_dir_next_page = buf->grefs[i + 1]; - } - - memcpy(&page_dir->gref, &buf->grefs[cur_gref], - to_copy * sizeof(grant_ref_t)); - - ptr += XEN_PAGE_SIZE; - grefs_left -= to_copy; - cur_gref += to_copy; - } -} - -static int grant_references(struct xenbus_device *xb_dev, - struct xen_snd_front_shbuf *buf, - int num_pages_dir, int num_pages_buffer, - int num_grefs) -{ - grant_ref_t priv_gref_head; - unsigned long frame; - int ret, i, j, cur_ref; - int otherend_id; - - ret = gnttab_alloc_grant_references(num_grefs, &priv_gref_head); - if (ret) - return ret; - - buf->num_grefs = num_grefs; - otherend_id = xb_dev->otherend_id; - j = 0; - - for (i = 0; i < num_pages_dir; i++) { - cur_ref = gnttab_claim_grant_reference(&priv_gref_head); - if (cur_ref < 0) { - ret = cur_ref; - goto fail; - } - - frame = xen_page_to_gfn(virt_to_page(buf->directory + - XEN_PAGE_SIZE * i)); - gnttab_grant_foreign_access_ref(cur_ref, otherend_id, frame, 0); - buf->grefs[j++] = cur_ref; - } - - for (i = 0; i < num_pages_buffer; i++) { - cur_ref = gnttab_claim_grant_reference(&priv_gref_head); - if (cur_ref < 0) { - ret = cur_ref; - goto fail; - } - - frame = xen_page_to_gfn(virt_to_page(buf->buffer + - XEN_PAGE_SIZE * i)); - gnttab_grant_foreign_access_ref(cur_ref, otherend_id, frame, 0); - buf->grefs[j++] = cur_ref; - } - - gnttab_free_grant_references(priv_gref_head); - fill_page_dir(buf, num_pages_dir); - return 0; - -fail: - gnttab_free_grant_references(priv_gref_head); - return ret; -} - -static int alloc_int_buffers(struct xen_snd_front_shbuf *buf, - int num_pages_dir, int num_pages_buffer, - int num_grefs) -{ - buf->grefs = kcalloc(num_grefs, sizeof(*buf->grefs), GFP_KERNEL); - if (!buf->grefs) - return -ENOMEM; - - buf->directory = kcalloc(num_pages_dir, XEN_PAGE_SIZE, GFP_KERNEL); - if (!buf->directory) - goto fail; - - buf->buffer_sz = num_pages_buffer * XEN_PAGE_SIZE; - buf->buffer = alloc_pages_exact(buf->buffer_sz, GFP_KERNEL); - if (!buf->buffer) - goto fail; - - return 0; - -fail: - kfree(buf->grefs); - buf->grefs = NULL; - kfree(buf->directory); - buf->directory = NULL; - return -ENOMEM; -} - -int xen_snd_front_shbuf_alloc(struct xenbus_device *xb_dev, - struct xen_snd_front_shbuf *buf, - unsigned int buffer_sz) -{ - int num_pages_buffer, num_pages_dir, num_grefs; - int ret; - - xen_snd_front_shbuf_clear(buf); - - num_pages_buffer = DIV_ROUND_UP(buffer_sz, XEN_PAGE_SIZE); - /* number of pages the page directory consumes itself */ - num_pages_dir = DIV_ROUND_UP(num_pages_buffer, - XENSND_NUM_GREFS_PER_PAGE); - num_grefs = num_pages_buffer + num_pages_dir; - - ret = alloc_int_buffers(buf, num_pages_dir, - num_pages_buffer, num_grefs); - if (ret < 0) - return ret; - - ret = grant_references(xb_dev, buf, num_pages_dir, num_pages_buffer, - num_grefs); - if (ret < 0) - return ret; - - fill_page_dir(buf, num_pages_dir); - return 0; -} diff --git a/sound/xen/xen_snd_front_shbuf.h b/sound/xen/xen_snd_front_shbuf.h deleted file mode 100644 index d28e97c47b2c..000000000000 --- a/sound/xen/xen_snd_front_shbuf.h +++ /dev/null @@ -1,36 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 OR MIT */ - -/* - * Xen para-virtual sound device - * - * Copyright (C) 2016-2018 EPAM Systems Inc. - * - * Author: Oleksandr Andrushchenko oleksandr_andrushchenko@epam.com - */ - -#ifndef __XEN_SND_FRONT_SHBUF_H -#define __XEN_SND_FRONT_SHBUF_H - -#include <xen/grant_table.h> - -#include "xen_snd_front_evtchnl.h" - -struct xen_snd_front_shbuf { - int num_grefs; - grant_ref_t *grefs; - u8 *directory; - u8 *buffer; - size_t buffer_sz; -}; - -grant_ref_t xen_snd_front_shbuf_get_dir_start(struct xen_snd_front_shbuf *buf); - -int xen_snd_front_shbuf_alloc(struct xenbus_device *xb_dev, - struct xen_snd_front_shbuf *buf, - unsigned int buffer_sz); - -void xen_snd_front_shbuf_clear(struct xen_snd_front_shbuf *buf); - -void xen_snd_front_shbuf_free(struct xen_snd_front_shbuf *buf); - -#endif /* __XEN_SND_FRONT_SHBUF_H */
On Fri, 30 Nov 2018 08:42:05 +0100, Oleksandr Andrushchenko wrote:
From: Oleksandr Andrushchenko oleksandr_andrushchenko@epam.com
Use page directory based shared buffer implementation now available as common code for Xen frontend drivers.
Signed-off-by: Oleksandr Andrushchenko oleksandr_andrushchenko@epam.com
For the sound bits, Reviewed-by: Takashi Iwai tiwai@suse.de
I suppose the whole patchset will be taken through xen or other tree?
thanks,
Takashi
On 12/3/18 11:36 AM, Takashi Iwai wrote:
On Fri, 30 Nov 2018 08:42:05 +0100, Oleksandr Andrushchenko wrote:
From: Oleksandr Andrushchenko oleksandr_andrushchenko@epam.com
Use page directory based shared buffer implementation now available as common code for Xen frontend drivers.
Signed-off-by: Oleksandr Andrushchenko oleksandr_andrushchenko@epam.com
For the sound bits, Reviewed-by: Takashi Iwai tiwai@suse.de
Thank you
I suppose the whole patchset will be taken through xen or other tree?
Xen tree
thanks,
Takashi
Thank you,
Oleksandr
Changes in the series since v1:
- no changes to patch 1 (Xen shared code)
- ALSA: fix comment from Takashi (NULL stream->buffer)
- DRM: removed display buffer flush workaround
(proper fix is on review [1])
Thank you,
Oleksandr
On 11/30/18 9:42 AM, Oleksandr Andrushchenko wrote:
From: Oleksandr Andrushchenko oleksandr_andrushchenko@epam.com
based frontends. Currently the frontends which implement similar code for sharing big buffers between frontend and backend are para-virtualized DRM and sound drivers. Both define the same way to share grant references of a data buffer with the corresponding backend with little differences.
Move shared code into a helper module, so there is a single implementation of the same functionality for all.
This patch introduces code which is used by sound and display frontend drivers without functional changes with the intention to remove shared code from the corresponding drivers.
Signed-off-by: Oleksandr Andrushchenko oleksandr_andrushchenko@epam.com
drivers/xen/Kconfig | 3 + drivers/xen/Makefile | 1 + drivers/xen/xen-front-pgdir-shbuf.c | 553 ++++++++++++++++++++++++++++ include/xen/xen-front-pgdir-shbuf.h | 89 +++++ 4 files changed, 646 insertions(+) create mode 100644 drivers/xen/xen-front-pgdir-shbuf.c create mode 100644 include/xen/xen-front-pgdir-shbuf.h
diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig index 815b9e9bb975..838b66a9a0e7 100644 --- a/drivers/xen/Kconfig +++ b/drivers/xen/Kconfig @@ -340,4 +340,7 @@ config XEN_SYMS config XEN_HAVE_VPMU bool
+config XEN_FRONT_PGDIR_SHBUF
- tristate
- endmenu
diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile index 3e542f60f29f..c48927a58e10 100644 --- a/drivers/xen/Makefile +++ b/drivers/xen/Makefile @@ -44,3 +44,4 @@ xen-gntdev-y := gntdev.o xen-gntdev-$(CONFIG_XEN_GNTDEV_DMABUF) += gntdev-dmabuf.o xen-gntalloc-y := gntalloc.o xen-privcmd-y := privcmd.o privcmd-buf.o +obj-$(CONFIG_XEN_FRONT_PGDIR_SHBUF) += xen-front-pgdir-shbuf.o diff --git a/drivers/xen/xen-front-pgdir-shbuf.c b/drivers/xen/xen-front-pgdir-shbuf.c new file mode 100644 index 000000000000..48a658dc7ccf --- /dev/null +++ b/drivers/xen/xen-front-pgdir-shbuf.c @@ -0,0 +1,553 @@ +// SPDX-License-Identifier: GPL-2.0 OR MIT
+/*
- Xen frontend/backend page directory based shared buffer
- helper module.
- Copyright (C) 2018 EPAM Systems Inc.
- Author: Oleksandr Andrushchenko oleksandr_andrushchenko@epam.com
- */
+#include <linux/module.h> +#include <linux/errno.h> +#include <linux/mm.h>
+#include <asm/xen/hypervisor.h> +#include <xen/balloon.h> +#include <xen/xen.h> +#include <xen/xenbus.h> +#include <xen/interface/io/ring.h>
+#include <xen/xen-front-pgdir-shbuf.h>
+#ifndef GRANT_INVALID_REF +/*
- FIXME: usage of grant reference 0 as invalid grant reference:
- grant reference 0 is valid, but never exposed to a PV driver,
- because of the fact it is already in use/reserved by the PV console.
- */
+#define GRANT_INVALID_REF 0 +#endif
+/**
- This structure represents the structure of a shared page
- that contains grant references to the pages of the shared
- buffer. This structure is common to many Xen para-virtualized
- protocols at include/xen/interface/io/
- */
+struct xen_page_directory {
- grant_ref_t gref_dir_next_page;
- grant_ref_t gref[1]; /* Variable length */
+};
+/**
- Shared buffer ops which are differently implemented
- depending on the allocation mode, e.g. if the buffer
- is allocated by the corresponding backend or frontend.
- Some of the operations.
- */
+struct xen_front_pgdir_shbuf_ops {
- /*
* Calculate number of grefs required to handle this buffer,* e.g. if grefs are required for page directory only or the buffer* pages as well.*/- void (*calc_num_grefs)(struct xen_front_pgdir_shbuf *buf);
- /* Fill page directory according to para-virtual display protocol. */
- void (*fill_page_dir)(struct xen_front_pgdir_shbuf *buf);
- /* Claim grant references for the pages of the buffer. */
- int (*grant_refs_for_buffer)(struct xen_front_pgdir_shbuf *buf,
grant_ref_t *priv_gref_head, int gref_idx);- /* Map grant references of the buffer. */
- int (*map)(struct xen_front_pgdir_shbuf *buf);
- /* Unmap grant references of the buffer. */
- int (*unmap)(struct xen_front_pgdir_shbuf *buf);
+};
+/**
- Get granted reference to the very first page of the
- page directory. Usually this is passed to the backend,
- so it can find/fill the grant references to the buffer's
- pages.
- \param buf shared buffer which page directory is of interest.
- \return granted reference to the very first page of the
- page directory.
- */
+grant_ref_t +xen_front_pgdir_shbuf_get_dir_start(struct xen_front_pgdir_shbuf *buf) +{
- if (!buf->grefs)
return GRANT_INVALID_REF;- return buf->grefs[0];
+} +EXPORT_SYMBOL_GPL(xen_front_pgdir_shbuf_get_dir_start);
+/**
- Map granted references of the shared buffer.
- Depending on the shared buffer mode of allocation
- (be_alloc flag) this can either do nothing (for buffers
- shared by the frontend itself) or map the provided granted
- references onto the backing storage (buf->pages).
- \param buf shared buffer which grants to be maped.
- \return zero on success or a negative number on failure.
- */
+int xen_front_pgdir_shbuf_map(struct xen_front_pgdir_shbuf *buf) +{
- if (buf->ops && buf->ops->map)
return buf->ops->map(buf);- /* No need to map own grant references. */
- return 0;
+} +EXPORT_SYMBOL_GPL(xen_front_pgdir_shbuf_map);
+/**
- Unmap granted references of the shared buffer.
- Depending on the shared buffer mode of allocation
- (be_alloc flag) this can either do nothing (for buffers
- shared by the frontend itself) or unmap the provided granted
- references.
- \param buf shared buffer which grants to be unmaped.
- \return zero on success or a negative number on failure.
- */
+int xen_front_pgdir_shbuf_unmap(struct xen_front_pgdir_shbuf *buf) +{
- if (buf->ops && buf->ops->unmap)
return buf->ops->unmap(buf);- /* No need to unmap own grant references. */
- return 0;
+} +EXPORT_SYMBOL_GPL(xen_front_pgdir_shbuf_unmap);
+/**
- Free all the resources of the shared buffer.
- \param buf shared buffer which resources to be freed.
- */
+void xen_front_pgdir_shbuf_free(struct xen_front_pgdir_shbuf *buf) +{
- if (buf->grefs) {
int i;for (i = 0; i < buf->num_grefs; i++)if (buf->grefs[i] != GRANT_INVALID_REF)gnttab_end_foreign_access(buf->grefs[i],0, 0UL);- }
- kfree(buf->grefs);
- kfree(buf->directory);
+} +EXPORT_SYMBOL_GPL(xen_front_pgdir_shbuf_free);
+/*
- Number of grefs a page can hold with respect to the
- struct xen_page_directory header.
- */
+#define XEN_NUM_GREFS_PER_PAGE ((PAGE_SIZE - \
offsetof(struct xen_page_directory, \gref)) / sizeof(grant_ref_t))+/**
- Get the number of pages the page directory consumes itself.
- \param buf shared buffer.
- */
+static int get_num_pages_dir(struct xen_front_pgdir_shbuf *buf) +{
- return DIV_ROUND_UP(buf->num_pages, XEN_NUM_GREFS_PER_PAGE);
+}
+/**
- Calculate the number of grant references needed to share the buffer
- and its pages when backend allocates the buffer.
- \param buf shared buffer.
- */
+static void backend_calc_num_grefs(struct xen_front_pgdir_shbuf *buf) +{
- /* Only for pages the page directory consumes itself. */
- buf->num_grefs = get_num_pages_dir(buf);
+}
+/**
- Calculate the number of grant references needed to share the buffer
- and its pages when frontend allocates the buffer.
- \param buf shared buffer.
- */
+static void guest_calc_num_grefs(struct xen_front_pgdir_shbuf *buf) +{
- /*
* Number of pages the page directory consumes itself* plus grefs for the buffer pages.*/- buf->num_grefs = get_num_pages_dir(buf) + buf->num_pages;
+}
+#define xen_page_to_vaddr(page) \
- ((uintptr_t)pfn_to_kaddr(page_to_xen_pfn(page)))
+/**
- Unmap the buffer previously mapped with grant references
- provided by the backend.
- \param buf shared buffer.
- \return zero on success or a negative number on failure.
- */
+static int backend_unmap(struct xen_front_pgdir_shbuf *buf) +{
- struct gnttab_unmap_grant_ref *unmap_ops;
- int i, ret;
- if (!buf->pages || !buf->backend_map_handles || !buf->grefs)
return 0;- unmap_ops = kcalloc(buf->num_pages, sizeof(*unmap_ops),
GFP_KERNEL);- if (!unmap_ops)
return -ENOMEM;- for (i = 0; i < buf->num_pages; i++) {
phys_addr_t addr;addr = xen_page_to_vaddr(buf->pages[i]);gnttab_set_unmap_op(&unmap_ops[i], addr, GNTMAP_host_map,buf->backend_map_handles[i]);- }
- ret = gnttab_unmap_refs(unmap_ops, NULL, buf->pages,
buf->num_pages);- for (i = 0; i < buf->num_pages; i++) {
if (unlikely(unmap_ops[i].status != GNTST_okay))dev_err(&buf->xb_dev->dev,"Failed to unmap page %d: %d\n",i, unmap_ops[i].status);- }
- if (ret)
dev_err(&buf->xb_dev->dev,"Failed to unmap grant references, ret %d", ret);- kfree(unmap_ops);
- kfree(buf->backend_map_handles);
- buf->backend_map_handles = NULL;
- return ret;
+}
+/**
- Map the buffer with grant references provided by the backend.
- \param buf shared buffer.
- \return zero on success or a negative number on failure.
- */
+static int backend_map(struct xen_front_pgdir_shbuf *buf) +{
- struct gnttab_map_grant_ref *map_ops = NULL;
- unsigned char *ptr;
- int ret, cur_gref, cur_dir_page, cur_page, grefs_left;
- map_ops = kcalloc(buf->num_pages, sizeof(*map_ops), GFP_KERNEL);
- if (!map_ops)
return -ENOMEM;- buf->backend_map_handles = kcalloc(buf->num_pages,
sizeof(*buf->backend_map_handles),GFP_KERNEL);- if (!buf->backend_map_handles) {
kfree(map_ops);return -ENOMEM;- }
- /*
* Read page directory to get grefs from the backend: for external* buffer we only allocate buf->grefs for the page directory,* so buf->num_grefs has number of pages in the page directory itself.*/- ptr = buf->directory;
- grefs_left = buf->num_pages;
- cur_page = 0;
- for (cur_dir_page = 0; cur_dir_page < buf->num_grefs; cur_dir_page++) {
struct xen_page_directory *page_dir =(struct xen_page_directory *)ptr;int to_copy = XEN_NUM_GREFS_PER_PAGE;if (to_copy > grefs_left)to_copy = grefs_left;for (cur_gref = 0; cur_gref < to_copy; cur_gref++) {phys_addr_t addr;addr = xen_page_to_vaddr(buf->pages[cur_page]);gnttab_set_map_op(&map_ops[cur_page], addr,GNTMAP_host_map,page_dir->gref[cur_gref],buf->xb_dev->otherend_id);cur_page++;}grefs_left -= to_copy;ptr += PAGE_SIZE;- }
- ret = gnttab_map_refs(map_ops, NULL, buf->pages, buf->num_pages);
- /* Save handles even if error, so we can unmap. */
- for (cur_page = 0; cur_page < buf->num_pages; cur_page++) {
buf->backend_map_handles[cur_page] = map_ops[cur_page].handle;if (unlikely(map_ops[cur_page].status != GNTST_okay))dev_err(&buf->xb_dev->dev,"Failed to map page %d: %d\n",cur_page, map_ops[cur_page].status);- }
- if (ret) {
dev_err(&buf->xb_dev->dev,"Failed to map grant references, ret %d", ret);backend_unmap(buf);- }
- kfree(map_ops);
- return ret;
+}
+/**
- Fill page directory with grant references to the pages of the
- page directory itself.
- The grant references to the buffer pages are provided by the
- backend in this case.
- \param buf shared buffer.
- */
+static void backend_fill_page_dir(struct xen_front_pgdir_shbuf *buf) +{
- struct xen_page_directory *page_dir;
- unsigned char *ptr;
- int i, num_pages_dir;
- ptr = buf->directory;
- num_pages_dir = get_num_pages_dir(buf);
- /* Fill only grefs for the page directory itself. */
- for (i = 0; i < num_pages_dir - 1; i++) {
page_dir = (struct xen_page_directory *)ptr;page_dir->gref_dir_next_page = buf->grefs[i + 1];ptr += PAGE_SIZE;- }
- /* Last page must say there is no more pages. */
- page_dir = (struct xen_page_directory *)ptr;
- page_dir->gref_dir_next_page = GRANT_INVALID_REF;
+}
+/**
- Fill page directory with grant references to the pages of the
- page directory and the buffer we share with the backend.
- \param buf shared buffer.
- */
+static void guest_fill_page_dir(struct xen_front_pgdir_shbuf *buf) +{
- unsigned char *ptr;
- int cur_gref, grefs_left, to_copy, i, num_pages_dir;
- ptr = buf->directory;
- num_pages_dir = get_num_pages_dir(buf);
- /*
* While copying, skip grefs at start, they are for pages* granted for the page directory itself.*/- cur_gref = num_pages_dir;
- grefs_left = buf->num_pages;
- for (i = 0; i < num_pages_dir; i++) {
struct xen_page_directory *page_dir =(struct xen_page_directory *)ptr;if (grefs_left <= XEN_NUM_GREFS_PER_PAGE) {to_copy = grefs_left;page_dir->gref_dir_next_page = GRANT_INVALID_REF;} else {to_copy = XEN_NUM_GREFS_PER_PAGE;page_dir->gref_dir_next_page = buf->grefs[i + 1];}memcpy(&page_dir->gref, &buf->grefs[cur_gref],to_copy * sizeof(grant_ref_t));ptr += PAGE_SIZE;grefs_left -= to_copy;cur_gref += to_copy;- }
+}
+/**
- Grant references to the frontend's buffer pages.
- These will be shared with the backend, so it can
- access the buffer's data.
- \param buf shared buffer.
- \return zero on success or a negative number on failure.
- */
+static int guest_grant_refs_for_buffer(struct xen_front_pgdir_shbuf *buf,
grant_ref_t *priv_gref_head,int gref_idx)+{
- int i, cur_ref, otherend_id;
- otherend_id = buf->xb_dev->otherend_id;
- for (i = 0; i < buf->num_pages; i++) {
cur_ref = gnttab_claim_grant_reference(priv_gref_head);if (cur_ref < 0)return cur_ref;gnttab_grant_foreign_access_ref(cur_ref, otherend_id,xen_page_to_gfn(buf->pages[i]),0);buf->grefs[gref_idx++] = cur_ref;- }
- return 0;
+}
+/**
- Grant all the references needed to share the buffer.
- Grant references to the page directory pages and, if
- needed, also to the pages of the shared buffer data.
- \param buf shared buffer.
- \return zero on success or a negative number on failure.
- */
+static int grant_references(struct xen_front_pgdir_shbuf *buf) +{
- grant_ref_t priv_gref_head;
- int ret, i, j, cur_ref;
- int otherend_id, num_pages_dir;
- ret = gnttab_alloc_grant_references(buf->num_grefs, &priv_gref_head);
- if (ret < 0) {
dev_err(&buf->xb_dev->dev,"Cannot allocate grant references\n");return ret;- }
- otherend_id = buf->xb_dev->otherend_id;
- j = 0;
- num_pages_dir = get_num_pages_dir(buf);
- for (i = 0; i < num_pages_dir; i++) {
unsigned long frame;cur_ref = gnttab_claim_grant_reference(&priv_gref_head);if (cur_ref < 0)return cur_ref;frame = xen_page_to_gfn(virt_to_page(buf->directory +PAGE_SIZE * i));gnttab_grant_foreign_access_ref(cur_ref, otherend_id, frame, 0);buf->grefs[j++] = cur_ref;- }
- if (buf->ops->grant_refs_for_buffer) {
ret = buf->ops->grant_refs_for_buffer(buf, &priv_gref_head, j);if (ret)return ret;- }
- gnttab_free_grant_references(priv_gref_head);
- return 0;
+}
+/**
- Allocate all required structures to mange shared buffer.
- \param buf shared buffer.
- \return zero on success or a negative number on failure.
- */
+static int alloc_storage(struct xen_front_pgdir_shbuf *buf) +{
- buf->grefs = kcalloc(buf->num_grefs, sizeof(*buf->grefs), GFP_KERNEL);
- if (!buf->grefs)
return -ENOMEM;- buf->directory = kcalloc(get_num_pages_dir(buf), PAGE_SIZE, GFP_KERNEL);
- if (!buf->directory)
return -ENOMEM;- return 0;
+}
+/*
- For backend allocated buffers we don't need grant_refs_for_buffer
- as those grant references are allocated at backend side.
- */
+static const struct xen_front_pgdir_shbuf_ops backend_ops = {
- .calc_num_grefs = backend_calc_num_grefs,
- .fill_page_dir = backend_fill_page_dir,
- .map = backend_map,
- .unmap = backend_unmap
+};
+/*
- For locally granted references we do not need to map/unmap
- the references.
- */
+static const struct xen_front_pgdir_shbuf_ops local_ops = {
- .calc_num_grefs = guest_calc_num_grefs,
- .fill_page_dir = guest_fill_page_dir,
- .grant_refs_for_buffer = guest_grant_refs_for_buffer,
+};
+/**
- Allocate a new instance of a shared buffer.
- \param cfg configuration to be used while allocating a new shared buffer.
- \return zero on success or a negative number on failure.
- */
+int xen_front_pgdir_shbuf_alloc(struct xen_front_pgdir_shbuf_cfg *cfg) +{
- struct xen_front_pgdir_shbuf *buf = cfg->pgdir;
- int ret;
- if (cfg->be_alloc)
buf->ops = &backend_ops;- else
buf->ops = &local_ops;- buf->xb_dev = cfg->xb_dev;
- buf->num_pages = cfg->num_pages;
- buf->pages = cfg->pages;
- buf->ops->calc_num_grefs(buf);
- ret = alloc_storage(buf);
- if (ret)
goto fail;- ret = grant_references(buf);
- if (ret)
goto fail;- buf->ops->fill_page_dir(buf);
- return 0;
+fail:
- xen_front_pgdir_shbuf_free(buf);
- return ret;
+} +EXPORT_SYMBOL_GPL(xen_front_pgdir_shbuf_alloc);
+MODULE_DESCRIPTION("Xen frontend/backend page directory based "
"shared buffer handling");+MODULE_AUTHOR("Oleksandr Andrushchenko"); +MODULE_LICENSE("GPL"); diff --git a/include/xen/xen-front-pgdir-shbuf.h b/include/xen/xen-front-pgdir-shbuf.h new file mode 100644 index 000000000000..150ef7ec51ec --- /dev/null +++ b/include/xen/xen-front-pgdir-shbuf.h @@ -0,0 +1,89 @@ +/* SPDX-License-Identifier: GPL-2.0 OR MIT */
+/*
- Xen frontend/backend page directory based shared buffer
- helper module.
- Copyright (C) 2018 EPAM Systems Inc.
- Author: Oleksandr Andrushchenko oleksandr_andrushchenko@epam.com
- */
+#ifndef __XEN_FRONT_PGDIR_SHBUF_H_ +#define __XEN_FRONT_PGDIR_SHBUF_H_
+#include <linux/kernel.h>
+#include <xen/grant_table.h>
+struct xen_front_pgdir_shbuf_ops;
+struct xen_front_pgdir_shbuf {
- /*
* Number of references granted for the backend use:** - for frontend allocated/imported buffers this holds the number* of grant references for the page directory and the pages* of the buffer** - for the buffer provided by the backend this only holds the number* of grant references for the page directory itself as grant* references for the buffer will be provided by the backend.*/- int num_grefs;
- grant_ref_t *grefs;
- /* Page directory backing storage. */
- u8 *directory;
- /*
* Number of pages for the shared buffer itself (excluding the page* directory).*/- int num_pages;
- /*
* Backing storage of the shared buffer: these are the pages being* shared.*/- struct page **pages;
- struct xenbus_device *xb_dev;
- /* These are the ops used internally depending on be_alloc mode. */
- const struct xen_front_pgdir_shbuf_ops *ops;
- /* Xen map handles for the buffer allocated by the backend. */
- grant_handle_t *backend_map_handles;
+};
+struct xen_front_pgdir_shbuf_cfg {
- struct xenbus_device *xb_dev;
- /* Number of pages of the buffer backing storage. */
- int num_pages;
- /* Pages of the buffer to be shared. */
- struct page **pages;
- /*
* This is allocated outside because there are use-cases when* the buffer structure is allocated as a part of a bigger one.*/- struct xen_front_pgdir_shbuf *pgdir;
- /*
* Mode of grant reference sharing: if set then backend will share* grant references to the buffer with the frontend.*/- int be_alloc;
+};
+int xen_front_pgdir_shbuf_alloc(struct xen_front_pgdir_shbuf_cfg *cfg);
+grant_ref_t +xen_front_pgdir_shbuf_get_dir_start(struct xen_front_pgdir_shbuf *buf);
+int xen_front_pgdir_shbuf_map(struct xen_front_pgdir_shbuf *buf);
+int xen_front_pgdir_shbuf_unmap(struct xen_front_pgdir_shbuf *buf);
+void xen_front_pgdir_shbuf_free(struct xen_front_pgdir_shbuf *buf);
+#endif /* __XEN_FRONT_PGDIR_SHBUF_H_ */
On 11/30/18 2:42 AM, Oleksandr Andrushchenko wrote:
From: Oleksandr Andrushchenko oleksandr_andrushchenko@epam.com
based frontends. Currently the frontends which implement similar code for sharing big buffers between frontend and backend are para-virtualized DRM and sound drivers. Both define the same way to share grant references of a data buffer with the corresponding backend with little differences.
Move shared code into a helper module, so there is a single implementation of the same functionality for all.
This patch introduces code which is used by sound and display frontend drivers without functional changes with the intention to remove shared code from the corresponding drivers.
Signed-off-by: Oleksandr Andrushchenko oleksandr_andrushchenko@epam.com
Acked-by: Boris Ostrovsky boris.ostrovsky@oracle.com
participants (4)
-
Boris Ostrovsky -
Noralf Trønnes -
Oleksandr Andrushchenko -
Takashi Iwai