Merge branches 'stable/hvc-console', 'stable/gntalloc.v6' and 'stable/balloon' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
* 'stable/hvc-console' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: xen/hvc: Disable probe_irq_on/off from poking the hvc-console IRQ line. * 'stable/gntalloc.v6' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: xen: gntdev: fix build warning xen/p2m/m2p/gnttab: do not add failed grant maps to m2p override xen-gntdev: Add cast to pointer xen-gntdev: Fix incorrect use of zero handle xen: change xen/[gntdev/gntalloc] to default m xen-gntdev: prevent using UNMAP_NOTIFY_CLEAR_BYTE on read-only mappings xen-gntdev: Avoid double-mapping memory xen-gntdev: Avoid unmapping ranges twice xen-gntdev: Use map->vma for checking map validity xen-gntdev: Fix unmap notify on PV domains xen-gntdev: Fix memory leak when mmap fails xen/gntalloc,gntdev: Add unmap notify ioctl xen-gntalloc: Userspace grant allocation driver xen-gntdev: Support mapping in HVM domains xen-gntdev: Add reference counting to maps xen-gntdev: Use find_vma rather than iterating our vma list manually xen-gntdev: Change page limit to be global instead of per-open * 'stable/balloon' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: (24 commits) xen-gntdev: Use ballooned pages for grant mappings xen-balloon: Add interface to retrieve ballooned pages xen-balloon: Move core balloon functionality out of module xen/balloon: Remove pr_info's and don't alter retry_count xen/balloon: Protect against CPU exhaust by event/x process xen/balloon: Migration from mod_timer() to schedule_delayed_work() xen/balloon: Removal of driver_pages
This commit is contained in:
Linus Torvalds
@@ -0,0 +1,25 @@
|
||||
/******************************************************************************
|
||||
* Xen balloon functionality
|
||||
*/
|
||||
|
||||
#define RETRY_UNLIMITED 0
|
||||
|
||||
struct balloon_stats {
|
||||
/* We aim for 'current allocation' == 'target allocation'. */
|
||||
unsigned long current_pages;
|
||||
unsigned long target_pages;
|
||||
/* Number of pages in high- and low-memory balloons. */
|
||||
unsigned long balloon_low;
|
||||
unsigned long balloon_high;
|
||||
unsigned long schedule_delay;
|
||||
unsigned long max_schedule_delay;
|
||||
unsigned long retry_count;
|
||||
unsigned long max_retry_count;
|
||||
};
|
||||
|
||||
extern struct balloon_stats balloon_stats;
|
||||
|
||||
void balloon_set_new_target(unsigned long target);
|
||||
|
||||
int alloc_xenballooned_pages(int nr_pages, struct page** pages);
|
||||
void free_xenballooned_pages(int nr_pages, struct page** pages);
|
||||
@@ -0,0 +1,82 @@
|
||||
/******************************************************************************
|
||||
* gntalloc.h
|
||||
*
|
||||
* Interface to /dev/xen/gntalloc.
|
||||
*
|
||||
* Author: Daniel De Graaf <dgdegra@tycho.nsa.gov>
|
||||
*
|
||||
* This file is in the public domain.
|
||||
*/
|
||||
|
||||
#ifndef __LINUX_PUBLIC_GNTALLOC_H__
|
||||
#define __LINUX_PUBLIC_GNTALLOC_H__
|
||||
|
||||
/*
|
||||
* Allocates a new page and creates a new grant reference.
|
||||
*/
|
||||
#define IOCTL_GNTALLOC_ALLOC_GREF \
|
||||
_IOC(_IOC_NONE, 'G', 5, sizeof(struct ioctl_gntalloc_alloc_gref))
|
||||
struct ioctl_gntalloc_alloc_gref {
|
||||
/* IN parameters */
|
||||
/* The ID of the domain to be given access to the grants. */
|
||||
uint16_t domid;
|
||||
/* Flags for this mapping */
|
||||
uint16_t flags;
|
||||
/* Number of pages to map */
|
||||
uint32_t count;
|
||||
/* OUT parameters */
|
||||
/* The offset to be used on a subsequent call to mmap(). */
|
||||
uint64_t index;
|
||||
/* The grant references of the newly created grant, one per page */
|
||||
/* Variable size, depending on count */
|
||||
uint32_t gref_ids[1];
|
||||
};
|
||||
|
||||
#define GNTALLOC_FLAG_WRITABLE 1
|
||||
|
||||
/*
|
||||
* Deallocates the grant reference, allowing the associated page to be freed if
|
||||
* no other domains are using it.
|
||||
*/
|
||||
#define IOCTL_GNTALLOC_DEALLOC_GREF \
|
||||
_IOC(_IOC_NONE, 'G', 6, sizeof(struct ioctl_gntalloc_dealloc_gref))
|
||||
struct ioctl_gntalloc_dealloc_gref {
|
||||
/* IN parameters */
|
||||
/* The offset returned in the map operation */
|
||||
uint64_t index;
|
||||
/* Number of references to unmap */
|
||||
uint32_t count;
|
||||
};
|
||||
|
||||
/*
|
||||
* Sets up an unmap notification within the page, so that the other side can do
|
||||
* cleanup if this side crashes. Required to implement cross-domain robust
|
||||
* mutexes or close notification on communication channels.
|
||||
*
|
||||
* Each mapped page only supports one notification; multiple calls referring to
|
||||
* the same page overwrite the previous notification. You must clear the
|
||||
* notification prior to the IOCTL_GNTALLOC_DEALLOC_GREF if you do not want it
|
||||
* to occur.
|
||||
*/
|
||||
#define IOCTL_GNTALLOC_SET_UNMAP_NOTIFY \
|
||||
_IOC(_IOC_NONE, 'G', 7, sizeof(struct ioctl_gntalloc_unmap_notify))
|
||||
struct ioctl_gntalloc_unmap_notify {
|
||||
/* IN parameters */
|
||||
/* Offset in the file descriptor for a byte within the page (same as
|
||||
* used in mmap). If using UNMAP_NOTIFY_CLEAR_BYTE, this is the byte to
|
||||
* be cleared. Otherwise, it can be any byte in the page whose
|
||||
* notification we are adjusting.
|
||||
*/
|
||||
uint64_t index;
|
||||
/* Action(s) to take on unmap */
|
||||
uint32_t action;
|
||||
/* Event channel to notify */
|
||||
uint32_t event_channel_port;
|
||||
};
|
||||
|
||||
/* Clear (set to zero) the byte specified by index */
|
||||
#define UNMAP_NOTIFY_CLEAR_BYTE 0x1
|
||||
/* Send an interrupt on the indicated event channel */
|
||||
#define UNMAP_NOTIFY_SEND_EVENT 0x2
|
||||
|
||||
#endif /* __LINUX_PUBLIC_GNTALLOC_H__ */
|
||||
@@ -116,4 +116,35 @@ struct ioctl_gntdev_set_max_grants {
|
||||
uint32_t count;
|
||||
};
|
||||
|
||||
/*
|
||||
* Sets up an unmap notification within the page, so that the other side can do
|
||||
* cleanup if this side crashes. Required to implement cross-domain robust
|
||||
* mutexes or close notification on communication channels.
|
||||
*
|
||||
* Each mapped page only supports one notification; multiple calls referring to
|
||||
* the same page overwrite the previous notification. You must clear the
|
||||
* notification prior to the IOCTL_GNTALLOC_DEALLOC_GREF if you do not want it
|
||||
* to occur.
|
||||
*/
|
||||
#define IOCTL_GNTDEV_SET_UNMAP_NOTIFY \
|
||||
_IOC(_IOC_NONE, 'G', 7, sizeof(struct ioctl_gntdev_unmap_notify))
|
||||
struct ioctl_gntdev_unmap_notify {
|
||||
/* IN parameters */
|
||||
/* Offset in the file descriptor for a byte within the page (same as
|
||||
* used in mmap). If using UNMAP_NOTIFY_CLEAR_BYTE, this is the byte to
|
||||
* be cleared. Otherwise, it can be any byte in the page whose
|
||||
* notification we are adjusting.
|
||||
*/
|
||||
uint64_t index;
|
||||
/* Action(s) to take on unmap */
|
||||
uint32_t action;
|
||||
/* Event channel to notify */
|
||||
uint32_t event_channel_port;
|
||||
};
|
||||
|
||||
/* Clear (set to zero) the byte specified by index */
|
||||
#define UNMAP_NOTIFY_CLEAR_BYTE 0x1
|
||||
/* Send an interrupt on the indicated event channel */
|
||||
#define UNMAP_NOTIFY_SEND_EVENT 0x2
|
||||
|
||||
#endif /* __LINUX_PUBLIC_GNTDEV_H__ */
|
||||
|
||||
Reference in New Issue
Block a user