@@ -32,8 +32,8 @@ static void balloon_page_enqueue_one(struct balloon_dev_info *b_dev_info,
3232 * @b_dev_info: balloon device descriptor where we will insert a new page to
3333 * @pages: pages to enqueue - allocated using balloon_page_alloc.
3434 *
35- * Driver must call it to properly enqueue a balloon pages before definitively
36- * removing it from the guest system.
35+ * Driver must call this function to properly enqueue balloon pages before
36+ * definitively removing them from the guest system.
3737 *
3838 * Return: number of pages that were enqueued.
3939 */
@@ -63,12 +63,13 @@ EXPORT_SYMBOL_GPL(balloon_page_list_enqueue);
6363 * @n_req_pages: number of requested pages.
6464 *
6565 * Driver must call this function to properly de-allocate a previous enlisted
66- * balloon pages before definetively releasing it back to the guest system.
66+ * balloon pages before definitively releasing it back to the guest system.
6767 * This function tries to remove @n_req_pages from the ballooned pages and
6868 * return them to the caller in the @pages list.
6969 *
70- * Note that this function may fail to dequeue some pages temporarily empty due
71- * to compaction isolated pages.
70+ * Note that this function may fail to dequeue some pages even if the balloon
71+ * isn't empty - since the page list can be temporarily empty due to compaction
72+ * of isolated pages.
7273 *
7374 * Return: number of pages that were added to the @pages list.
7475 */
@@ -112,12 +113,13 @@ EXPORT_SYMBOL_GPL(balloon_page_list_dequeue);
112113
113114/*
114115 * balloon_page_alloc - allocates a new page for insertion into the balloon
115- * page list.
116+ * page list.
116117 *
117- * Driver must call it to properly allocate a new enlisted balloon page.
118- * Driver must call balloon_page_enqueue before definitively removing it from
119- * the guest system. This function returns the page address for the recently
120- * allocated page or NULL in the case we fail to allocate a new page this turn.
118+ * Driver must call this function to properly allocate a new balloon page.
119+ * Driver must call balloon_page_enqueue before definitively removing the page
120+ * from the guest system.
121+ *
122+ * Return: struct page for the allocated page or NULL on allocation failure.
121123 */
122124struct page * balloon_page_alloc (void )
123125{
@@ -130,19 +132,15 @@ EXPORT_SYMBOL_GPL(balloon_page_alloc);
130132/*
131133 * balloon_page_enqueue - inserts a new page into the balloon page list.
132134 *
133- * @b_dev_info: balloon device descriptor where we will insert a new page to
135+ * @b_dev_info: balloon device descriptor where we will insert a new page
134136 * @page: new page to enqueue - allocated using balloon_page_alloc.
135137 *
136- * Driver must call it to properly enqueue a new allocated balloon page
137- * before definitively removing it from the guest system.
138+ * Drivers must call this function to properly enqueue a new allocated balloon
139+ * page before definitively removing the page from the guest system.
138140 *
139- * Drivers must not call balloon_page_enqueue on pages that have been
140- * pushed to a list with balloon_page_push before removing them with
141- * balloon_page_pop. To all pages on a list, use balloon_page_list_enqueue
142- * instead.
143- *
144- * This function returns the page address for the recently enqueued page or
145- * NULL in the case we fail to allocate a new page this turn.
141+ * Drivers must not call balloon_page_enqueue on pages that have been pushed to
142+ * a list with balloon_page_push before removing them with balloon_page_pop. To
143+ * enqueue a list of pages, use balloon_page_list_enqueue instead.
146144 */
147145void balloon_page_enqueue (struct balloon_dev_info * b_dev_info ,
148146 struct page * page )
@@ -157,14 +155,23 @@ EXPORT_SYMBOL_GPL(balloon_page_enqueue);
157155
158156/*
159157 * balloon_page_dequeue - removes a page from balloon's page list and returns
160- * the its address to allow the driver release the page.
158+ * its address to allow the driver to release the page.
161159 * @b_dev_info: balloon device decriptor where we will grab a page from.
162160 *
163- * Driver must call it to properly de-allocate a previous enlisted balloon page
164- * before definetively releasing it back to the guest system.
165- * This function returns the page address for the recently dequeued page or
166- * NULL in the case we find balloon's page list temporarily empty due to
167- * compaction isolated pages.
161+ * Driver must call this function to properly dequeue a previously enqueued page
162+ * before definitively releasing it back to the guest system.
163+ *
164+ * Caller must perform its own accounting to ensure that this
165+ * function is called only if some pages are actually enqueued.
166+ *
167+ * Note that this function may fail to dequeue some pages even if there are
168+ * some enqueued pages - since the page list can be temporarily empty due to
169+ * the compaction of isolated pages.
170+ *
171+ * TODO: remove the caller accounting requirements, and allow caller to wait
172+ * until all pages can be dequeued.
173+ *
174+ * Return: struct page for the dequeued page, or NULL if no page was dequeued.
168175 */
169176struct page * balloon_page_dequeue (struct balloon_dev_info * b_dev_info )
170177{
@@ -177,9 +184,9 @@ struct page *balloon_page_dequeue(struct balloon_dev_info *b_dev_info)
177184 if (n_pages != 1 ) {
178185 /*
179186 * If we are unable to dequeue a balloon page because the page
180- * list is empty and there is no isolated pages, then something
187+ * list is empty and there are no isolated pages, then something
181188 * went out of track and some balloon pages are lost.
182- * BUG() here, otherwise the balloon driver may get stuck into
189+ * BUG() here, otherwise the balloon driver may get stuck in
183190 * an infinite loop while attempting to release all its pages.
184191 */
185192 spin_lock_irqsave (& b_dev_info -> pages_lock , flags );
@@ -230,8 +237,8 @@ int balloon_page_migrate(struct address_space *mapping,
230237
231238 /*
232239 * We can not easily support the no copy case here so ignore it as it
233- * is unlikely to be use with ballon pages. See include/linux/hmm.h for
234- * user of the MIGRATE_SYNC_NO_COPY mode.
240+ * is unlikely to be used with balloon pages. See include/linux/hmm.h
241+ * for a user of the MIGRATE_SYNC_NO_COPY mode.
235242 */
236243 if (mode == MIGRATE_SYNC_NO_COPY )
237244 return - EINVAL ;
0 commit comments