* [PATCH] Xen backend support for paged out grant targets.
@ 2012-08-27 16:51 andres
2012-08-31 14:32 ` David Vrabel
0 siblings, 1 reply; 23+ messages in thread
From: andres @ 2012-08-27 16:51 UTC (permalink / raw)
To: xen-devel, xen-devel
Cc: Andres Lagar-Cavilla, Andres Lagar-Cavilla, Konrad Rzeszutek Wilk
From: Andres Lagar-Cavilla <andres@lagarcavilla.org>
Since Xen-4.2, hvm domains may have portions of their memory paged out. When a
foreign domain (such as dom0) attempts to map these frames, the map will
initially fail. The hypervisor returns a suitable errno, and kicks an
asynchronous page-in operation carried out by a helper. The foreign domain is
expected to retry the mapping operation until it eventually succeeds. The
foreign domain is not put to sleep because itself could be the one running the
pager assist (typical scenario for dom0).
This patch adds support for this mechanism for backend drivers using grant
mapping and copying operations. Specifically, this covers the blkback and
gntdev drivers (which map foregin grants), and the netback driver (which copies
foreign grants).
* Add GNTST_eagain, already exposed by Xen, to the grant interface.
* Add a retry method for grants that fail with GNTST_eagain (i.e. because the
target foregin frame is paged out).
* Insert hooks with appropriate macro decorators in the aforementioned drivers.
The retry loop is only invoked if the grant operation status is GNTST_eagain.
It guarantees to leave a new status code different from GNTST_eagain. Any other
status code results in identical code execution as before.
The retry loop performs 256 attempts with increasing time intervals through a
32 second period. It uses msleep to yield while waiting for the next retry.
Signed-off-by: Andres Lagar-Cavilla <andres@lagarcavilla.org>
---
drivers/net/xen-netback/netback.c | 13 +++++++++++++
drivers/xen/grant-table.c | 25 +++++++++++++++++++++++++
drivers/xen/xenbus/xenbus_client.c | 6 ++----
include/xen/grant_table.h | 25 +++++++++++++++++++++++++
include/xen/interface/grant_table.h | 2 ++
5 files changed, 67 insertions(+), 4 deletions(-)
diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
index 682633b..063adf5 100644
--- a/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@ -548,6 +548,8 @@ static int netbk_check_gop(struct xenvif *vif, int nr_meta_slots,
for (i = 0; i < nr_meta_slots; i++) {
copy_op = npo->copy + npo->copy_cons++;
+ if (copy_op->status == GNTST_eagain)
+ gnttab_retry_eagain_copy(copy_op);
if (copy_op->status != GNTST_okay) {
netdev_dbg(vif->dev,
"Bad status %d from copy to DOM%d.\n",
@@ -976,6 +978,11 @@ static int xen_netbk_tx_check_gop(struct xen_netbk *netbk,
/* Check status of header. */
err = gop->status;
+ if (unlikely(err == GNTST_eagain))
+ {
+ gnttab_retry_eagain_copy(gop);
+ err = gop->status;
+ }
if (unlikely(err)) {
pending_ring_idx_t index;
index = pending_index(netbk->pending_prod++);
@@ -1001,6 +1008,12 @@ static int xen_netbk_tx_check_gop(struct xen_netbk *netbk,
if (unlikely(err))
xen_netbk_idx_release(netbk, pending_idx);
continue;
+ } else {
+ if (newerr == GNTST_eagain)
+ {
+ gnttab_retry_eagain_copy(gop);
+ newerr = gop->status;
+ }
}
/* Error on this fragment: respond to client with an error. */
diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c
index eea81cf..2b62a63 100644
--- a/drivers/xen/grant-table.c
+++ b/drivers/xen/grant-table.c
@@ -38,6 +38,7 @@
#include <linux/vmalloc.h>
#include <linux/uaccess.h>
#include <linux/io.h>
+#include <linux/delay.h>
#include <linux/hardirq.h>
#include <xen/xen.h>
@@ -823,6 +824,25 @@ unsigned int gnttab_max_grant_frames(void)
}
EXPORT_SYMBOL_GPL(gnttab_max_grant_frames);
+void
+gnttab_retry_eagain_gop(unsigned int cmd, void *gop, int16_t *status,
+ const char *func)
+{
+ u8 delay = 1;
+
+ do {
+ BUG_ON(HYPERVISOR_grant_table_op(cmd, gop, 1));
+ if (*status == GNTST_eagain)
+ msleep(delay++);
+ } while ((*status == GNTST_eagain) && delay);
+
+ if (delay == 0) {
+ printk(KERN_ERR "%s: %s eagain grant\n", func, current->comm);
+ *status = GNTST_bad_page;
+ }
+}
+EXPORT_SYMBOL_GPL(gnttab_retry_eagain_gop);
+
int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops,
struct gnttab_map_grant_ref *kmap_ops,
struct page **pages, unsigned int count)
@@ -836,6 +856,11 @@ int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops,
if (ret)
return ret;
+ /* Retry eagain maps */
+ for (i = 0; i < count; i++)
+ if (map_ops[i].status == GNTST_eagain)
+ gnttab_retry_eagain_map(map_ops + i);
+
if (xen_feature(XENFEAT_auto_translated_physmap))
return ret;
diff --git a/drivers/xen/xenbus/xenbus_client.c b/drivers/xen/xenbus/xenbus_client.c
index b3e146e..749f6a3 100644
--- a/drivers/xen/xenbus/xenbus_client.c
+++ b/drivers/xen/xenbus/xenbus_client.c
@@ -490,8 +490,7 @@ static int xenbus_map_ring_valloc_pv(struct xenbus_device *dev,
op.host_addr = arbitrary_virt_to_machine(pte).maddr;
- if (HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, &op, 1))
- BUG();
+ gnttab_map_grant_no_eagain(&op);
if (op.status != GNTST_okay) {
free_vm_area(area);
@@ -572,8 +571,7 @@ int xenbus_map_ring(struct xenbus_device *dev, int gnt_ref,
gnttab_set_map_op(&op, (unsigned long)vaddr, GNTMAP_host_map, gnt_ref,
dev->otherend_id);
- if (HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, &op, 1))
- BUG();
+ gnttab_map_grant_no_eagain(&op);
if (op.status != GNTST_okay) {
xenbus_dev_fatal(dev, op.status,
diff --git a/include/xen/grant_table.h b/include/xen/grant_table.h
index 11e27c3..0f75184 100644
--- a/include/xen/grant_table.h
+++ b/include/xen/grant_table.h
@@ -183,6 +183,31 @@ unsigned int gnttab_max_grant_frames(void);
#define gnttab_map_vaddr(map) ((void *)(map.host_virt_addr))
+/* Retry a grant map/copy operation when the hypervisor returns GNTST_eagain.
+ * This is typically due to paged out target frames.
+ * Generic entry-point, use macro decorators below for specific grant
+ * operations.
+ * Will retry for 1, 2, ... 255 ms, i.e. 256 times during 32 seconds.
+ * Return value in *status guaranteed to no longer be GNTST_eagain. */
+void gnttab_retry_eagain_gop(unsigned int cmd, void *gop, int16_t *status,
+ const char *func);
+
+#define gnttab_retry_eagain_map(_gop) \
+ gnttab_retry_eagain_gop(GNTTABOP_map_grant_ref, (_gop), \
+ &(_gop)->status, __func__)
+
+#define gnttab_retry_eagain_copy(_gop) \
+ gnttab_retry_eagain_gop(GNTTABOP_copy, (_gop), \
+ &(_gop)->status, __func__)
+
+#define gnttab_map_grant_no_eagain(_gop) \
+do { \
+ if ( HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, (_gop), 1)) \
+ BUG(); \
+ if ((_gop)->status == GNTST_eagain) \
+ gnttab_retry_eagain_map((_gop)); \
+} while(0)
+
int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops,
struct gnttab_map_grant_ref *kmap_ops,
struct page **pages, unsigned int count);
diff --git a/include/xen/interface/grant_table.h b/include/xen/interface/grant_table.h
index 7da811b..66cb734 100644
--- a/include/xen/interface/grant_table.h
+++ b/include/xen/interface/grant_table.h
@@ -520,6 +520,7 @@ DEFINE_GUEST_HANDLE_STRUCT(gnttab_get_version);
#define GNTST_permission_denied (-8) /* Not enough privilege for operation. */
#define GNTST_bad_page (-9) /* Specified page was invalid for op. */
#define GNTST_bad_copy_arg (-10) /* copy arguments cross page boundary */
+#define GNTST_eagain (-12) /* Retry. */
#define GNTTABOP_error_msgs { \
"okay", \
@@ -533,6 +534,7 @@ DEFINE_GUEST_HANDLE_STRUCT(gnttab_get_version);
"permission denied", \
"bad page", \
"copy arguments cross page boundary" \
+ "retry" \
}
#endif /* __XEN_PUBLIC_GRANT_TABLE_H__ */
--
1.7.5.4
^ permalink raw reply related [flat|nested] 23+ messages in thread
* Re: [PATCH] Xen backend support for paged out grant targets.
2012-08-27 16:51 [PATCH] Xen backend support for paged out grant targets andres
@ 2012-08-31 14:32 ` David Vrabel
2012-08-31 14:45 ` Andres Lagar-Cavilla
0 siblings, 1 reply; 23+ messages in thread
From: David Vrabel @ 2012-08-31 14:32 UTC (permalink / raw)
To: andres; +Cc: Andres Lagar-Cavilla, Konrad Rzeszutek Wilk, xen-devel
On 27/08/12 17:51, andres@lagarcavilla.org wrote:
> From: Andres Lagar-Cavilla <andres@lagarcavilla.org>
>
> Since Xen-4.2, hvm domains may have portions of their memory paged out. When a
> foreign domain (such as dom0) attempts to map these frames, the map will
> initially fail. The hypervisor returns a suitable errno, and kicks an
> asynchronous page-in operation carried out by a helper. The foreign domain is
> expected to retry the mapping operation until it eventually succeeds. The
> foreign domain is not put to sleep because itself could be the one running the
> pager assist (typical scenario for dom0).
>
> This patch adds support for this mechanism for backend drivers using grant
> mapping and copying operations. Specifically, this covers the blkback and
> gntdev drivers (which map foregin grants), and the netback driver (which copies
> foreign grants).
>
> * Add GNTST_eagain, already exposed by Xen, to the grant interface.
> * Add a retry method for grants that fail with GNTST_eagain (i.e. because the
> target foregin frame is paged out).
> * Insert hooks with appropriate macro decorators in the aforementioned drivers.
I think you should implement wrappers around HYPERVISOR_grant_table_op()
have have the wrapper do the retries instead of every backend having to
check for EAGAIN and issue the retries itself. Similar to the
gnttab_map_grant_no_eagain() function you've already added.
Why do some operations not retry anyway?
> +void
> +gnttab_retry_eagain_gop(unsigned int cmd, void *gop, int16_t *status,
> + const char *func)
> +{
> + u8 delay = 1;
> +
> + do {
> + BUG_ON(HYPERVISOR_grant_table_op(cmd, gop, 1));
> + if (*status == GNTST_eagain)
> + msleep(delay++);
> + } while ((*status == GNTST_eagain) && delay);
Terminating the loop when delay wraps is a bit subtle. Why not make
delay unsigned and check delay <= MAX_DELAY?
Would it be sensible to ramp the delay faster? Perhaps double each
iteration with a maximum possible delay of e.g., 256 ms.
> +#define gnttab_map_grant_no_eagain(_gop) \
> +do { \
> + if ( HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, (_gop), 1)) \
> + BUG(); \
> + if ((_gop)->status == GNTST_eagain) \
> + gnttab_retry_eagain_map((_gop)); \
> +} while(0)
Inline functions, please.
David
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH] Xen backend support for paged out grant targets.
2012-08-31 14:32 ` David Vrabel
@ 2012-08-31 14:45 ` Andres Lagar-Cavilla
2012-08-31 15:42 ` Andres Lagar-Cavilla
0 siblings, 1 reply; 23+ messages in thread
From: Andres Lagar-Cavilla @ 2012-08-31 14:45 UTC (permalink / raw)
To: David Vrabel; +Cc: Konrad Rzeszutek Wilk, andres, xen-devel
On Aug 31, 2012, at 10:32 AM, David Vrabel wrote:
> On 27/08/12 17:51, andres@lagarcavilla.org wrote:
>> From: Andres Lagar-Cavilla <andres@lagarcavilla.org>
>>
>> Since Xen-4.2, hvm domains may have portions of their memory paged out. When a
>> foreign domain (such as dom0) attempts to map these frames, the map will
>> initially fail. The hypervisor returns a suitable errno, and kicks an
>> asynchronous page-in operation carried out by a helper. The foreign domain is
>> expected to retry the mapping operation until it eventually succeeds. The
>> foreign domain is not put to sleep because itself could be the one running the
>> pager assist (typical scenario for dom0).
>>
>> This patch adds support for this mechanism for backend drivers using grant
>> mapping and copying operations. Specifically, this covers the blkback and
>> gntdev drivers (which map foregin grants), and the netback driver (which copies
>> foreign grants).
>>
>> * Add GNTST_eagain, already exposed by Xen, to the grant interface.
>> * Add a retry method for grants that fail with GNTST_eagain (i.e. because the
>> target foregin frame is paged out).
>> * Insert hooks with appropriate macro decorators in the aforementioned drivers.
>
> I think you should implement wrappers around HYPERVISOR_grant_table_op()
> have have the wrapper do the retries instead of every backend having to
> check for EAGAIN and issue the retries itself. Similar to the
> gnttab_map_grant_no_eagain() function you've already added.
>
> Why do some operations not retry anyway?
All operations retry. The reason why I could not make it as elegant as you suggest is because grant operations are submitted in batches and their status(es?) later checked individually elsewhere. This is the case for netback. Note that both blkback and gntdev use a more linear structure with the gnttab_map_refs helper, which allows me to hide all the retry gore from those drivers into grant table code. Likewise for xenbus ring mapping.
In summary, outside of core grant table code, only the netback driver needs to check explicitly for retries, due to its batch-copy-delayed-per-slot-check structure.
>
>> +void
>> +gnttab_retry_eagain_gop(unsigned int cmd, void *gop, int16_t *status,
>> + const char *func)
>> +{
>> + u8 delay = 1;
>> +
>> + do {
>> + BUG_ON(HYPERVISOR_grant_table_op(cmd, gop, 1));
>> + if (*status == GNTST_eagain)
>> + msleep(delay++);
>> + } while ((*status == GNTST_eagain) && delay);
>
> Terminating the loop when delay wraps is a bit subtle. Why not make
> delay unsigned and check delay <= MAX_DELAY?
Good idea (MAX_DELAY == 256). I'd like to get Konrad's feedback before a re-spin.
>
> Would it be sensible to ramp the delay faster? Perhaps double each
> iteration with a maximum possible delay of e.g., 256 ms.
Generally speaking we've never seen past three retries. I am open to changing the algorithm but there is a significant possibility it won't matter at all.
>
>> +#define gnttab_map_grant_no_eagain(_gop) \
>> +do { \
>> + if ( HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, (_gop), 1)) \
>> + BUG(); \
>> + if ((_gop)->status == GNTST_eagain) \
>> + gnttab_retry_eagain_map((_gop)); \
>> +} while(0)
>
> Inline functions, please.
I want to retain the original context for debugging. Eventually we print __func__ if things go wrong.
Thanks, great feedback
Andres
>
> David
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH] Xen backend support for paged out grant targets.
2012-08-31 14:45 ` Andres Lagar-Cavilla
@ 2012-08-31 15:42 ` Andres Lagar-Cavilla
2012-08-31 16:10 ` David Vrabel
2012-08-31 16:54 ` Konrad Rzeszutek Wilk
0 siblings, 2 replies; 23+ messages in thread
From: Andres Lagar-Cavilla @ 2012-08-31 15:42 UTC (permalink / raw)
To: Andres Lagar-Cavilla
Cc: xen-devel, David Vrabel, Konrad Rzeszutek Wilk, andres
Actually acted upon your feedback ipso facto:
commit d5fab912caa1f0cf6be0a6773f502d3417a207b6
Author: Andres Lagar-Cavilla <andres@lagarcavilla.org>
Date: Sun Aug 26 09:45:57 2012 -0400
Xen backend support for paged out grant targets.
Since Xen-4.2, hvm domains may have portions of their memory paged out. When a
foreign domain (such as dom0) attempts to map these frames, the map will
initially fail. The hypervisor returns a suitable errno, and kicks an
asynchronous page-in operation carried out by a helper. The foreign domain is
expected to retry the mapping operation until it eventually succeeds. The
foreign domain is not put to sleep because itself could be the one running the
pager assist (typical scenario for dom0).
This patch adds support for this mechanism for backend drivers using grant
mapping and copying operations. Specifically, this covers the blkback and
gntdev drivers (which map foregin grants), and the netback driver (which copies
foreign grants).
* Add GNTST_eagain, already exposed by Xen, to the grant interface.
* Add a retry method for grants that fail with GNTST_eagain (i.e. because the
target foregin frame is paged out).
* Insert hooks with appropriate macro decorators in the aforementioned drivers.
The retry loop is only invoked if the grant operation status is GNTST_eagain.
It guarantees to leave a new status code different from GNTST_eagain. Any other
status code results in identical code execution as before.
The retry loop performs 256 attempts with increasing time intervals through a
32 second period. It uses msleep to yield while waiting for the next retry.
V2 after feedback from David Vrabel:
* Explicit MAX_DELAY instead of wrap-around delay into zero
* Abstract GNTST_eagain check into core grant table code for netback module.
Signed-off-by: Andres Lagar-Cavilla <andres@lagarcavilla.org>
diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
index 682633b..5610fd8 100644
--- a/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@ -635,9 +635,7 @@ static void xen_netbk_rx_action(struct xen_netbk *netbk)
return;
BUG_ON(npo.copy_prod > ARRAY_SIZE(netbk->grant_copy_op));
- ret = HYPERVISOR_grant_table_op(GNTTABOP_copy, &netbk->grant_copy_op,
- npo.copy_prod);
- BUG_ON(ret != 0);
+ gnttab_batch_copy_no_eagain(netbk->grant_copy_op, npo.copy_prod);
while ((skb = __skb_dequeue(&rxq)) != NULL) {
sco = (struct skb_cb_overlay *)skb->cb;
@@ -1460,18 +1458,15 @@ static void xen_netbk_tx_submit(struct xen_netbk *netbk)
static void xen_netbk_tx_action(struct xen_netbk *netbk)
{
unsigned nr_gops;
- int ret;
nr_gops = xen_netbk_tx_build_gops(netbk);
if (nr_gops == 0)
return;
- ret = HYPERVISOR_grant_table_op(GNTTABOP_copy,
- netbk->tx_copy_ops, nr_gops);
- BUG_ON(ret);
- xen_netbk_tx_submit(netbk);
+ gnttab_batch_copy_no_eagain(netbk->tx_copy_ops, nr_gops);
+ xen_netbk_tx_submit(netbk);
}
static void xen_netbk_idx_release(struct xen_netbk *netbk, u16 pending_idx)
diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c
index eea81cf..96543b2 100644
--- a/drivers/xen/grant-table.c
+++ b/drivers/xen/grant-table.c
@@ -38,6 +38,7 @@
#include <linux/vmalloc.h>
#include <linux/uaccess.h>
#include <linux/io.h>
+#include <linux/delay.h>
#include <linux/hardirq.h>
#include <xen/xen.h>
@@ -823,6 +824,26 @@ unsigned int gnttab_max_grant_frames(void)
}
EXPORT_SYMBOL_GPL(gnttab_max_grant_frames);
+#define MAX_DELAY 256
+void
+gnttab_retry_eagain_gop(unsigned int cmd, void *gop, int16_t *status,
+ const char *func)
+{
+ unsigned delay = 1;
+
+ do {
+ BUG_ON(HYPERVISOR_grant_table_op(cmd, gop, 1));
+ if (*status == GNTST_eagain)
+ msleep(delay++);
+ } while ((*status == GNTST_eagain) && (delay < MAX_DELAY));
+
+ if (delay >= MAX_DELAY) {
+ printk(KERN_ERR "%s: %s eagain grant\n", func, current->comm);
+ *status = GNTST_bad_page;
+ }
+}
+EXPORT_SYMBOL_GPL(gnttab_retry_eagain_gop);
+
int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops,
struct gnttab_map_grant_ref *kmap_ops,
struct page **pages, unsigned int count)
@@ -836,6 +857,11 @@ int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops,
if (ret)
return ret;
+ /* Retry eagain maps */
+ for (i = 0; i < count; i++)
+ if (map_ops[i].status == GNTST_eagain)
+ gnttab_retry_eagain_map(map_ops + i);
+
if (xen_feature(XENFEAT_auto_translated_physmap))
return ret;
diff --git a/drivers/xen/xenbus/xenbus_client.c b/drivers/xen/xenbus/xenbus_client.c
index b3e146e..749f6a3 100644
--- a/drivers/xen/xenbus/xenbus_client.c
+++ b/drivers/xen/xenbus/xenbus_client.c
@@ -490,8 +490,7 @@ static int xenbus_map_ring_valloc_pv(struct xenbus_device *dev,
op.host_addr = arbitrary_virt_to_machine(pte).maddr;
- if (HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, &op, 1))
- BUG();
+ gnttab_map_grant_no_eagain(&op);
if (op.status != GNTST_okay) {
free_vm_area(area);
@@ -572,8 +571,7 @@ int xenbus_map_ring(struct xenbus_device *dev, int gnt_ref,
gnttab_set_map_op(&op, (unsigned long)vaddr, GNTMAP_host_map, gnt_ref,
dev->otherend_id);
- if (HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, &op, 1))
- BUG();
+ gnttab_map_grant_no_eagain(&op);
if (op.status != GNTST_okay) {
xenbus_dev_fatal(dev, op.status,
diff --git a/include/xen/grant_table.h b/include/xen/grant_table.h
index 11e27c3..2fecfab 100644
--- a/include/xen/grant_table.h
+++ b/include/xen/grant_table.h
@@ -43,6 +43,7 @@
#include <xen/interface/grant_table.h>
#include <asm/xen/hypervisor.h>
+#include <asm/xen/hypercall.h>
#include <xen/features.h>
@@ -183,6 +184,43 @@ unsigned int gnttab_max_grant_frames(void);
#define gnttab_map_vaddr(map) ((void *)(map.host_virt_addr))
+/* Retry a grant map/copy operation when the hypervisor returns GNTST_eagain.
+ * This is typically due to paged out target frames.
+ * Generic entry-point, use macro decorators below for specific grant
+ * operations.
+ * Will retry for 1, 2, ... 255 ms, i.e. 256 times during 32 seconds.
+ * Return value in *status guaranteed to no longer be GNTST_eagain. */
+void gnttab_retry_eagain_gop(unsigned int cmd, void *gop, int16_t *status,
+ const char *func);
+
+#define gnttab_retry_eagain_map(_gop) \
+ gnttab_retry_eagain_gop(GNTTABOP_map_grant_ref, (_gop), \
+ &(_gop)->status, __func__)
+
+#define gnttab_retry_eagain_copy(_gop) \
+ gnttab_retry_eagain_gop(GNTTABOP_copy, (_gop), \
+ &(_gop)->status, __func__)
+
+#define gnttab_map_grant_no_eagain(_gop) \
+do { \
+ if (HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, (_gop), 1)) \
+ BUG(); \
+ if ((_gop)->status == GNTST_eagain) \
+ gnttab_retry_eagain_map((_gop)); \
+} while(0)
+
+static inline void
+gnttab_batch_copy_no_eagain(struct gnttab_copy *batch, unsigned count)
+{
+ unsigned i;
+ struct gnttab_copy *op;
+
+ BUG_ON(HYPERVISOR_grant_table_op(GNTTABOP_copy, batch, count));
+ for (i = 0, op = batch; i < count; i++, op++)
+ if (op->status == GNTST_eagain)
+ gnttab_retry_eagain_copy(op);
+}
+
int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops,
struct gnttab_map_grant_ref *kmap_ops,
struct page **pages, unsigned int count);
diff --git a/include/xen/interface/grant_table.h b/include/xen/interface/grant_table.h
index 7da811b..66cb734 100644
--- a/include/xen/interface/grant_table.h
+++ b/include/xen/interface/grant_table.h
@@ -520,6 +520,7 @@ DEFINE_GUEST_HANDLE_STRUCT(gnttab_get_version);
#define GNTST_permission_denied (-8) /* Not enough privilege for operation. */
#define GNTST_bad_page (-9) /* Specified page was invalid for op. */
#define GNTST_bad_copy_arg (-10) /* copy arguments cross page boundary */
+#define GNTST_eagain (-12) /* Retry. */
#define GNTTABOP_error_msgs { \
"okay", \
@@ -533,6 +534,7 @@ DEFINE_GUEST_HANDLE_STRUCT(gnttab_get_version);
"permission denied", \
"bad page", \
"copy arguments cross page boundary" \
+ "retry" \
}
#endif /* __XEN_PUBLIC_GRANT_TABLE_H__ */
On Aug 31, 2012, at 10:45 AM, Andres Lagar-Cavilla wrote:
>
> On Aug 31, 2012, at 10:32 AM, David Vrabel wrote:
>
>> On 27/08/12 17:51, andres@lagarcavilla.org wrote:
>>> From: Andres Lagar-Cavilla <andres@lagarcavilla.org>
>>>
>>> Since Xen-4.2, hvm domains may have portions of their memory paged out. When a
>>> foreign domain (such as dom0) attempts to map these frames, the map will
>>> initially fail. The hypervisor returns a suitable errno, and kicks an
>>> asynchronous page-in operation carried out by a helper. The foreign domain is
>>> expected to retry the mapping operation until it eventually succeeds. The
>>> foreign domain is not put to sleep because itself could be the one running the
>>> pager assist (typical scenario for dom0).
>>>
>>> This patch adds support for this mechanism for backend drivers using grant
>>> mapping and copying operations. Specifically, this covers the blkback and
>>> gntdev drivers (which map foregin grants), and the netback driver (which copies
>>> foreign grants).
>>>
>>> * Add GNTST_eagain, already exposed by Xen, to the grant interface.
>>> * Add a retry method for grants that fail with GNTST_eagain (i.e. because the
>>> target foregin frame is paged out).
>>> * Insert hooks with appropriate macro decorators in the aforementioned drivers.
>>
>> I think you should implement wrappers around HYPERVISOR_grant_table_op()
>> have have the wrapper do the retries instead of every backend having to
>> check for EAGAIN and issue the retries itself. Similar to the
>> gnttab_map_grant_no_eagain() function you've already added.
>>
>> Why do some operations not retry anyway?
>
> All operations retry. The reason why I could not make it as elegant as you suggest is because grant operations are submitted in batches and their status(es?) later checked individually elsewhere. This is the case for netback. Note that both blkback and gntdev use a more linear structure with the gnttab_map_refs helper, which allows me to hide all the retry gore from those drivers into grant table code. Likewise for xenbus ring mapping.
>
> In summary, outside of core grant table code, only the netback driver needs to check explicitly for retries, due to its batch-copy-delayed-per-slot-check structure.
>
>>
>>> +void
>>> +gnttab_retry_eagain_gop(unsigned int cmd, void *gop, int16_t *status,
>>> + const char *func)
>>> +{
>>> + u8 delay = 1;
>>> +
>>> + do {
>>> + BUG_ON(HYPERVISOR_grant_table_op(cmd, gop, 1));
>>> + if (*status == GNTST_eagain)
>>> + msleep(delay++);
>>> + } while ((*status == GNTST_eagain) && delay);
>>
>> Terminating the loop when delay wraps is a bit subtle. Why not make
>> delay unsigned and check delay <= MAX_DELAY?
> Good idea (MAX_DELAY == 256). I'd like to get Konrad's feedback before a re-spin.
>
>>
>> Would it be sensible to ramp the delay faster? Perhaps double each
>> iteration with a maximum possible delay of e.g., 256 ms.
> Generally speaking we've never seen past three retries. I am open to changing the algorithm but there is a significant possibility it won't matter at all.
>
>>
>>> +#define gnttab_map_grant_no_eagain(_gop) \
>>> +do { \
>>> + if ( HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, (_gop), 1)) \
>>> + BUG(); \
>>> + if ((_gop)->status == GNTST_eagain) \
>>> + gnttab_retry_eagain_map((_gop)); \
>>> +} while(0)
>>
>> Inline functions, please.
>
> I want to retain the original context for debugging. Eventually we print __func__ if things go wrong.
>
> Thanks, great feedback
> Andres
>
>>
>> David
>
^ permalink raw reply related [flat|nested] 23+ messages in thread
* Re: [PATCH] Xen backend support for paged out grant targets.
2012-08-31 15:42 ` Andres Lagar-Cavilla
@ 2012-08-31 16:10 ` David Vrabel
2012-09-05 16:27 ` Konrad Rzeszutek Wilk
2012-08-31 16:54 ` Konrad Rzeszutek Wilk
1 sibling, 1 reply; 23+ messages in thread
From: David Vrabel @ 2012-08-31 16:10 UTC (permalink / raw)
To: Andres Lagar-Cavilla
Cc: Andres Lagar-Cavilla, Konrad Rzeszutek Wilk, andres, xen-devel
On 31/08/12 16:42, Andres Lagar-Cavilla wrote:
> Actually acted upon your feedback ipso facto:
>
> commit d5fab912caa1f0cf6be0a6773f502d3417a207b6
> Author: Andres Lagar-Cavilla <andres@lagarcavilla.org>
> Date: Sun Aug 26 09:45:57 2012 -0400
>
> Xen backend support for paged out grant targets.
This looks mostly fine expect for the #define instead of inline functions.
> +#define gnttab_map_grant_no_eagain(_gop) \
This name tripped me up previously. As I read this as:
gnttab_map_grant_no_[retries_for]_eagain().
Perhaps gnttab_map_grant_with_retries() ? Or similar?
David
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH] Xen backend support for paged out grant targets.
2012-08-31 15:42 ` Andres Lagar-Cavilla
2012-08-31 16:10 ` David Vrabel
@ 2012-08-31 16:54 ` Konrad Rzeszutek Wilk
2012-08-31 19:33 ` Andres Lagar-Cavilla
1 sibling, 1 reply; 23+ messages in thread
From: Konrad Rzeszutek Wilk @ 2012-08-31 16:54 UTC (permalink / raw)
To: Andres Lagar-Cavilla
Cc: Andres Lagar-Cavilla, xen-devel, David Vrabel, andres
On Fri, Aug 31, 2012 at 11:42:32AM -0400, Andres Lagar-Cavilla wrote:
> Actually acted upon your feedback ipso facto:
>
> commit d5fab912caa1f0cf6be0a6773f502d3417a207b6
> Author: Andres Lagar-Cavilla <andres@lagarcavilla.org>
> Date: Sun Aug 26 09:45:57 2012 -0400
>
> Xen backend support for paged out grant targets.
>
> Since Xen-4.2, hvm domains may have portions of their memory paged out. When a
> foreign domain (such as dom0) attempts to map these frames, the map will
> initially fail. The hypervisor returns a suitable errno, and kicks an
> asynchronous page-in operation carried out by a helper. The foreign domain is
> expected to retry the mapping operation until it eventually succeeds. The
> foreign domain is not put to sleep because itself could be the one running the
> pager assist (typical scenario for dom0).
>
> This patch adds support for this mechanism for backend drivers using grant
> mapping and copying operations. Specifically, this covers the blkback and
> gntdev drivers (which map foregin grants), and the netback driver (which copies
> foreign grants).
>
> * Add GNTST_eagain, already exposed by Xen, to the grant interface.
> * Add a retry method for grants that fail with GNTST_eagain (i.e. because the
> target foregin frame is paged out).
> * Insert hooks with appropriate macro decorators in the aforementioned drivers.
>
> The retry loop is only invoked if the grant operation status is GNTST_eagain.
> It guarantees to leave a new status code different from GNTST_eagain. Any other
> status code results in identical code execution as before.
>
> The retry loop performs 256 attempts with increasing time intervals through a
> 32 second period. It uses msleep to yield while waiting for the next retry.
>
Would it make sense to yield to other processes (so call schedule)? Or
perhaps have this in a workqueue ?
I mean the 'msleep' just looks like a hack. .. 32 seconds of doing
'msleep' on 1VCPU dom0 could trigger the watchdog I think?
> V2 after feedback from David Vrabel:
> * Explicit MAX_DELAY instead of wrap-around delay into zero
> * Abstract GNTST_eagain check into core grant table code for netback module.
>
> Signed-off-by: Andres Lagar-Cavilla <andres@lagarcavilla.org>
>
> diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
> index 682633b..5610fd8 100644
> --- a/drivers/net/xen-netback/netback.c
> +++ b/drivers/net/xen-netback/netback.c
> @@ -635,9 +635,7 @@ static void xen_netbk_rx_action(struct xen_netbk *netbk)
> return;
>
> BUG_ON(npo.copy_prod > ARRAY_SIZE(netbk->grant_copy_op));
> - ret = HYPERVISOR_grant_table_op(GNTTABOP_copy, &netbk->grant_copy_op,
> - npo.copy_prod);
> - BUG_ON(ret != 0);
> + gnttab_batch_copy_no_eagain(netbk->grant_copy_op, npo.copy_prod);
>
> while ((skb = __skb_dequeue(&rxq)) != NULL) {
> sco = (struct skb_cb_overlay *)skb->cb;
> @@ -1460,18 +1458,15 @@ static void xen_netbk_tx_submit(struct xen_netbk *netbk)
> static void xen_netbk_tx_action(struct xen_netbk *netbk)
> {
> unsigned nr_gops;
> - int ret;
>
> nr_gops = xen_netbk_tx_build_gops(netbk);
>
> if (nr_gops == 0)
> return;
> - ret = HYPERVISOR_grant_table_op(GNTTABOP_copy,
> - netbk->tx_copy_ops, nr_gops);
> - BUG_ON(ret);
>
> - xen_netbk_tx_submit(netbk);
> + gnttab_batch_copy_no_eagain(netbk->tx_copy_ops, nr_gops);
>
> + xen_netbk_tx_submit(netbk);
> }
>
> static void xen_netbk_idx_release(struct xen_netbk *netbk, u16 pending_idx)
> diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c
> index eea81cf..96543b2 100644
> --- a/drivers/xen/grant-table.c
> +++ b/drivers/xen/grant-table.c
> @@ -38,6 +38,7 @@
> #include <linux/vmalloc.h>
> #include <linux/uaccess.h>
> #include <linux/io.h>
> +#include <linux/delay.h>
> #include <linux/hardirq.h>
>
> #include <xen/xen.h>
> @@ -823,6 +824,26 @@ unsigned int gnttab_max_grant_frames(void)
> }
> EXPORT_SYMBOL_GPL(gnttab_max_grant_frames);
>
> +#define MAX_DELAY 256
> +void
> +gnttab_retry_eagain_gop(unsigned int cmd, void *gop, int16_t *status,
> + const char *func)
> +{
> + unsigned delay = 1;
> +
> + do {
> + BUG_ON(HYPERVISOR_grant_table_op(cmd, gop, 1));
> + if (*status == GNTST_eagain)
> + msleep(delay++);
> + } while ((*status == GNTST_eagain) && (delay < MAX_DELAY));
> +
> + if (delay >= MAX_DELAY) {
> + printk(KERN_ERR "%s: %s eagain grant\n", func, current->comm);
> + *status = GNTST_bad_page;
> + }
> +}
> +EXPORT_SYMBOL_GPL(gnttab_retry_eagain_gop);
> +
> int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops,
> struct gnttab_map_grant_ref *kmap_ops,
> struct page **pages, unsigned int count)
> @@ -836,6 +857,11 @@ int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops,
> if (ret)
> return ret;
>
> + /* Retry eagain maps */
> + for (i = 0; i < count; i++)
> + if (map_ops[i].status == GNTST_eagain)
> + gnttab_retry_eagain_map(map_ops + i);
> +
> if (xen_feature(XENFEAT_auto_translated_physmap))
> return ret;
>
> diff --git a/drivers/xen/xenbus/xenbus_client.c b/drivers/xen/xenbus/xenbus_client.c
> index b3e146e..749f6a3 100644
> --- a/drivers/xen/xenbus/xenbus_client.c
> +++ b/drivers/xen/xenbus/xenbus_client.c
> @@ -490,8 +490,7 @@ static int xenbus_map_ring_valloc_pv(struct xenbus_device *dev,
>
> op.host_addr = arbitrary_virt_to_machine(pte).maddr;
>
> - if (HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, &op, 1))
> - BUG();
> + gnttab_map_grant_no_eagain(&op);
>
> if (op.status != GNTST_okay) {
> free_vm_area(area);
> @@ -572,8 +571,7 @@ int xenbus_map_ring(struct xenbus_device *dev, int gnt_ref,
> gnttab_set_map_op(&op, (unsigned long)vaddr, GNTMAP_host_map, gnt_ref,
> dev->otherend_id);
>
> - if (HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, &op, 1))
> - BUG();
> + gnttab_map_grant_no_eagain(&op);
>
> if (op.status != GNTST_okay) {
> xenbus_dev_fatal(dev, op.status,
> diff --git a/include/xen/grant_table.h b/include/xen/grant_table.h
> index 11e27c3..2fecfab 100644
> --- a/include/xen/grant_table.h
> +++ b/include/xen/grant_table.h
> @@ -43,6 +43,7 @@
> #include <xen/interface/grant_table.h>
>
> #include <asm/xen/hypervisor.h>
> +#include <asm/xen/hypercall.h>
>
> #include <xen/features.h>
>
> @@ -183,6 +184,43 @@ unsigned int gnttab_max_grant_frames(void);
>
> #define gnttab_map_vaddr(map) ((void *)(map.host_virt_addr))
>
> +/* Retry a grant map/copy operation when the hypervisor returns GNTST_eagain.
> + * This is typically due to paged out target frames.
> + * Generic entry-point, use macro decorators below for specific grant
> + * operations.
> + * Will retry for 1, 2, ... 255 ms, i.e. 256 times during 32 seconds.
> + * Return value in *status guaranteed to no longer be GNTST_eagain. */
> +void gnttab_retry_eagain_gop(unsigned int cmd, void *gop, int16_t *status,
> + const char *func);
> +
> +#define gnttab_retry_eagain_map(_gop) \
> + gnttab_retry_eagain_gop(GNTTABOP_map_grant_ref, (_gop), \
> + &(_gop)->status, __func__)
> +
> +#define gnttab_retry_eagain_copy(_gop) \
> + gnttab_retry_eagain_gop(GNTTABOP_copy, (_gop), \
> + &(_gop)->status, __func__)
> +
> +#define gnttab_map_grant_no_eagain(_gop) \
> +do { \
> + if (HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, (_gop), 1)) \
> + BUG(); \
> + if ((_gop)->status == GNTST_eagain) \
> + gnttab_retry_eagain_map((_gop)); \
> +} while(0)
> +
> +static inline void
> +gnttab_batch_copy_no_eagain(struct gnttab_copy *batch, unsigned count)
> +{
> + unsigned i;
> + struct gnttab_copy *op;
> +
> + BUG_ON(HYPERVISOR_grant_table_op(GNTTABOP_copy, batch, count));
> + for (i = 0, op = batch; i < count; i++, op++)
> + if (op->status == GNTST_eagain)
> + gnttab_retry_eagain_copy(op);
> +}
> +
> int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops,
> struct gnttab_map_grant_ref *kmap_ops,
> struct page **pages, unsigned int count);
> diff --git a/include/xen/interface/grant_table.h b/include/xen/interface/grant_table.h
> index 7da811b..66cb734 100644
> --- a/include/xen/interface/grant_table.h
> +++ b/include/xen/interface/grant_table.h
> @@ -520,6 +520,7 @@ DEFINE_GUEST_HANDLE_STRUCT(gnttab_get_version);
> #define GNTST_permission_denied (-8) /* Not enough privilege for operation. */
> #define GNTST_bad_page (-9) /* Specified page was invalid for op. */
> #define GNTST_bad_copy_arg (-10) /* copy arguments cross page boundary */
> +#define GNTST_eagain (-12) /* Retry. */
>
> #define GNTTABOP_error_msgs { \
> "okay", \
> @@ -533,6 +534,7 @@ DEFINE_GUEST_HANDLE_STRUCT(gnttab_get_version);
> "permission denied", \
> "bad page", \
> "copy arguments cross page boundary" \
> + "retry" \
> }
>
> #endif /* __XEN_PUBLIC_GRANT_TABLE_H__ */
>
>
> On Aug 31, 2012, at 10:45 AM, Andres Lagar-Cavilla wrote:
>
> >
> > On Aug 31, 2012, at 10:32 AM, David Vrabel wrote:
> >
> >> On 27/08/12 17:51, andres@lagarcavilla.org wrote:
> >>> From: Andres Lagar-Cavilla <andres@lagarcavilla.org>
> >>>
> >>> Since Xen-4.2, hvm domains may have portions of their memory paged out. When a
> >>> foreign domain (such as dom0) attempts to map these frames, the map will
> >>> initially fail. The hypervisor returns a suitable errno, and kicks an
> >>> asynchronous page-in operation carried out by a helper. The foreign domain is
> >>> expected to retry the mapping operation until it eventually succeeds. The
> >>> foreign domain is not put to sleep because itself could be the one running the
> >>> pager assist (typical scenario for dom0).
> >>>
> >>> This patch adds support for this mechanism for backend drivers using grant
> >>> mapping and copying operations. Specifically, this covers the blkback and
> >>> gntdev drivers (which map foregin grants), and the netback driver (which copies
> >>> foreign grants).
> >>>
> >>> * Add GNTST_eagain, already exposed by Xen, to the grant interface.
> >>> * Add a retry method for grants that fail with GNTST_eagain (i.e. because the
> >>> target foregin frame is paged out).
> >>> * Insert hooks with appropriate macro decorators in the aforementioned drivers.
> >>
> >> I think you should implement wrappers around HYPERVISOR_grant_table_op()
> >> have have the wrapper do the retries instead of every backend having to
> >> check for EAGAIN and issue the retries itself. Similar to the
> >> gnttab_map_grant_no_eagain() function you've already added.
> >>
> >> Why do some operations not retry anyway?
> >
> > All operations retry. The reason why I could not make it as elegant as you suggest is because grant operations are submitted in batches and their status(es?) later checked individually elsewhere. This is the case for netback. Note that both blkback and gntdev use a more linear structure with the gnttab_map_refs helper, which allows me to hide all the retry gore from those drivers into grant table code. Likewise for xenbus ring mapping.
> >
> > In summary, outside of core grant table code, only the netback driver needs to check explicitly for retries, due to its batch-copy-delayed-per-slot-check structure.
> >
> >>
> >>> +void
> >>> +gnttab_retry_eagain_gop(unsigned int cmd, void *gop, int16_t *status,
> >>> + const char *func)
> >>> +{
> >>> + u8 delay = 1;
> >>> +
> >>> + do {
> >>> + BUG_ON(HYPERVISOR_grant_table_op(cmd, gop, 1));
> >>> + if (*status == GNTST_eagain)
> >>> + msleep(delay++);
> >>> + } while ((*status == GNTST_eagain) && delay);
> >>
> >> Terminating the loop when delay wraps is a bit subtle. Why not make
> >> delay unsigned and check delay <= MAX_DELAY?
> > Good idea (MAX_DELAY == 256). I'd like to get Konrad's feedback before a re-spin.
> >
> >>
> >> Would it be sensible to ramp the delay faster? Perhaps double each
> >> iteration with a maximum possible delay of e.g., 256 ms.
> > Generally speaking we've never seen past three retries. I am open to changing the algorithm but there is a significant possibility it won't matter at all.
> >
> >>
> >>> +#define gnttab_map_grant_no_eagain(_gop) \
> >>> +do { \
> >>> + if ( HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, (_gop), 1)) \
> >>> + BUG(); \
> >>> + if ((_gop)->status == GNTST_eagain) \
> >>> + gnttab_retry_eagain_map((_gop)); \
> >>> +} while(0)
> >>
> >> Inline functions, please.
> >
> > I want to retain the original context for debugging. Eventually we print __func__ if things go wrong.
> >
> > Thanks, great feedback
> > Andres
> >
> >>
> >> David
> >
>
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH] Xen backend support for paged out grant targets.
2012-08-31 16:54 ` Konrad Rzeszutek Wilk
@ 2012-08-31 19:33 ` Andres Lagar-Cavilla
2012-08-31 21:14 ` Konrad Rzeszutek Wilk
0 siblings, 1 reply; 23+ messages in thread
From: Andres Lagar-Cavilla @ 2012-08-31 19:33 UTC (permalink / raw)
To: Konrad Rzeszutek Wilk
Cc: andres.lagarcavilla, xen-devel, Andres Lagar-Cavilla, David Vrabel
[-- Attachment #1.1: Type: text/plain, Size: 14485 bytes --]
But msleep will wind up calling schedule(). We definitely cannot afford to
pin down a dom0 vcpu when the pager itself is in dom0.
Iiuc....
Andres
On Aug 31, 2012 12:55 PM, "Konrad Rzeszutek Wilk" <konrad.wilk@oracle.com>
wrote:
> On Fri, Aug 31, 2012 at 11:42:32AM -0400, Andres Lagar-Cavilla wrote:
> > Actually acted upon your feedback ipso facto:
> >
> > commit d5fab912caa1f0cf6be0a6773f502d3417a207b6
> > Author: Andres Lagar-Cavilla <andres@lagarcavilla.org>
> > Date: Sun Aug 26 09:45:57 2012 -0400
> >
> > Xen backend support for paged out grant targets.
> >
> > Since Xen-4.2, hvm domains may have portions of their memory paged
> out. When a
> > foreign domain (such as dom0) attempts to map these frames, the map
> will
> > initially fail. The hypervisor returns a suitable errno, and kicks an
> > asynchronous page-in operation carried out by a helper. The foreign
> domain is
> > expected to retry the mapping operation until it eventually
> succeeds. The
> > foreign domain is not put to sleep because itself could be the one
> running the
> > pager assist (typical scenario for dom0).
> >
> > This patch adds support for this mechanism for backend drivers using
> grant
> > mapping and copying operations. Specifically, this covers the
> blkback and
> > gntdev drivers (which map foregin grants), and the netback driver
> (which copies
> > foreign grants).
> >
> > * Add GNTST_eagain, already exposed by Xen, to the grant interface.
> > * Add a retry method for grants that fail with GNTST_eagain (i.e.
> because the
> > target foregin frame is paged out).
> > * Insert hooks with appropriate macro decorators in the
> aforementioned drivers.
> >
> > The retry loop is only invoked if the grant operation status is
> GNTST_eagain.
> > It guarantees to leave a new status code different from
> GNTST_eagain. Any other
> > status code results in identical code execution as before.
> >
> > The retry loop performs 256 attempts with increasing time intervals
> through a
> > 32 second period. It uses msleep to yield while waiting for the next
> retry.
> >
>
>
> Would it make sense to yield to other processes (so call schedule)? Or
> perhaps have this in a workqueue ?
>
> I mean the 'msleep' just looks like a hack. .. 32 seconds of doing
> 'msleep' on 1VCPU dom0 could trigger the watchdog I think?
>
> > V2 after feedback from David Vrabel:
> > * Explicit MAX_DELAY instead of wrap-around delay into zero
> > * Abstract GNTST_eagain check into core grant table code for netback
> module.
> >
> > Signed-off-by: Andres Lagar-Cavilla <andres@lagarcavilla.org>
> >
> > diff --git a/drivers/net/xen-netback/netback.c
> b/drivers/net/xen-netback/netback.c
> > index 682633b..5610fd8 100644
> > --- a/drivers/net/xen-netback/netback.c
> > +++ b/drivers/net/xen-netback/netback.c
> > @@ -635,9 +635,7 @@ static void xen_netbk_rx_action(struct xen_netbk
> *netbk)
> > return;
> >
> > BUG_ON(npo.copy_prod > ARRAY_SIZE(netbk->grant_copy_op));
> > - ret = HYPERVISOR_grant_table_op(GNTTABOP_copy,
> &netbk->grant_copy_op,
> > - npo.copy_prod);
> > - BUG_ON(ret != 0);
> > + gnttab_batch_copy_no_eagain(netbk->grant_copy_op, npo.copy_prod);
> >
> > while ((skb = __skb_dequeue(&rxq)) != NULL) {
> > sco = (struct skb_cb_overlay *)skb->cb;
> > @@ -1460,18 +1458,15 @@ static void xen_netbk_tx_submit(struct xen_netbk
> *netbk)
> > static void xen_netbk_tx_action(struct xen_netbk *netbk)
> > {
> > unsigned nr_gops;
> > - int ret;
> >
> > nr_gops = xen_netbk_tx_build_gops(netbk);
> >
> > if (nr_gops == 0)
> > return;
> > - ret = HYPERVISOR_grant_table_op(GNTTABOP_copy,
> > - netbk->tx_copy_ops, nr_gops);
> > - BUG_ON(ret);
> >
> > - xen_netbk_tx_submit(netbk);
> > + gnttab_batch_copy_no_eagain(netbk->tx_copy_ops, nr_gops);
> >
> > + xen_netbk_tx_submit(netbk);
> > }
> >
> > static void xen_netbk_idx_release(struct xen_netbk *netbk, u16
> pending_idx)
> > diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c
> > index eea81cf..96543b2 100644
> > --- a/drivers/xen/grant-table.c
> > +++ b/drivers/xen/grant-table.c
> > @@ -38,6 +38,7 @@
> > #include <linux/vmalloc.h>
> > #include <linux/uaccess.h>
> > #include <linux/io.h>
> > +#include <linux/delay.h>
> > #include <linux/hardirq.h>
> >
> > #include <xen/xen.h>
> > @@ -823,6 +824,26 @@ unsigned int gnttab_max_grant_frames(void)
> > }
> > EXPORT_SYMBOL_GPL(gnttab_max_grant_frames);
> >
> > +#define MAX_DELAY 256
> > +void
> > +gnttab_retry_eagain_gop(unsigned int cmd, void *gop, int16_t *status,
> > + const char *func)
> > +{
> > + unsigned delay = 1;
> > +
> > + do {
> > + BUG_ON(HYPERVISOR_grant_table_op(cmd, gop, 1));
> > + if (*status == GNTST_eagain)
> > + msleep(delay++);
> > + } while ((*status == GNTST_eagain) && (delay < MAX_DELAY));
> > +
> > + if (delay >= MAX_DELAY) {
> > + printk(KERN_ERR "%s: %s eagain grant\n", func,
> current->comm);
> > + *status = GNTST_bad_page;
> > + }
> > +}
> > +EXPORT_SYMBOL_GPL(gnttab_retry_eagain_gop);
> > +
> > int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops,
> > struct gnttab_map_grant_ref *kmap_ops,
> > struct page **pages, unsigned int count)
> > @@ -836,6 +857,11 @@ int gnttab_map_refs(struct gnttab_map_grant_ref
> *map_ops,
> > if (ret)
> > return ret;
> >
> > + /* Retry eagain maps */
> > + for (i = 0; i < count; i++)
> > + if (map_ops[i].status == GNTST_eagain)
> > + gnttab_retry_eagain_map(map_ops + i);
> > +
> > if (xen_feature(XENFEAT_auto_translated_physmap))
> > return ret;
> >
> > diff --git a/drivers/xen/xenbus/xenbus_client.c
> b/drivers/xen/xenbus/xenbus_client.c
> > index b3e146e..749f6a3 100644
> > --- a/drivers/xen/xenbus/xenbus_client.c
> > +++ b/drivers/xen/xenbus/xenbus_client.c
> > @@ -490,8 +490,7 @@ static int xenbus_map_ring_valloc_pv(struct
> xenbus_device *dev,
> >
> > op.host_addr = arbitrary_virt_to_machine(pte).maddr;
> >
> > - if (HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, &op, 1))
> > - BUG();
> > + gnttab_map_grant_no_eagain(&op);
> >
> > if (op.status != GNTST_okay) {
> > free_vm_area(area);
> > @@ -572,8 +571,7 @@ int xenbus_map_ring(struct xenbus_device *dev, int
> gnt_ref,
> > gnttab_set_map_op(&op, (unsigned long)vaddr, GNTMAP_host_map,
> gnt_ref,
> > dev->otherend_id);
> >
> > - if (HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, &op, 1))
> > - BUG();
> > + gnttab_map_grant_no_eagain(&op);
> >
> > if (op.status != GNTST_okay) {
> > xenbus_dev_fatal(dev, op.status,
> > diff --git a/include/xen/grant_table.h b/include/xen/grant_table.h
> > index 11e27c3..2fecfab 100644
> > --- a/include/xen/grant_table.h
> > +++ b/include/xen/grant_table.h
> > @@ -43,6 +43,7 @@
> > #include <xen/interface/grant_table.h>
> >
> > #include <asm/xen/hypervisor.h>
> > +#include <asm/xen/hypercall.h>
> >
> > #include <xen/features.h>
> >
> > @@ -183,6 +184,43 @@ unsigned int gnttab_max_grant_frames(void);
> >
> > #define gnttab_map_vaddr(map) ((void *)(map.host_virt_addr))
> >
> > +/* Retry a grant map/copy operation when the hypervisor returns
> GNTST_eagain.
> > + * This is typically due to paged out target frames.
> > + * Generic entry-point, use macro decorators below for specific grant
> > + * operations.
> > + * Will retry for 1, 2, ... 255 ms, i.e. 256 times during 32 seconds.
> > + * Return value in *status guaranteed to no longer be GNTST_eagain. */
> > +void gnttab_retry_eagain_gop(unsigned int cmd, void *gop, int16_t
> *status,
> > + const char *func);
> > +
> > +#define gnttab_retry_eagain_map(_gop) \
> > + gnttab_retry_eagain_gop(GNTTABOP_map_grant_ref, (_gop), \
> > + &(_gop)->status, __func__)
> > +
> > +#define gnttab_retry_eagain_copy(_gop) \
> > + gnttab_retry_eagain_gop(GNTTABOP_copy, (_gop), \
> > + &(_gop)->status, __func__)
> > +
> > +#define gnttab_map_grant_no_eagain(_gop)
> \
> > +do {
> \
> > + if (HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, (_gop), 1))
> \
> > + BUG();
> \
> > + if ((_gop)->status == GNTST_eagain)
> \
> > + gnttab_retry_eagain_map((_gop));
> \
> > +} while(0)
> > +
> > +static inline void
> > +gnttab_batch_copy_no_eagain(struct gnttab_copy *batch, unsigned count)
> > +{
> > + unsigned i;
> > + struct gnttab_copy *op;
> > +
> > + BUG_ON(HYPERVISOR_grant_table_op(GNTTABOP_copy, batch, count));
> > + for (i = 0, op = batch; i < count; i++, op++)
> > + if (op->status == GNTST_eagain)
> > + gnttab_retry_eagain_copy(op);
> > +}
> > +
> > int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops,
> > struct gnttab_map_grant_ref *kmap_ops,
> > struct page **pages, unsigned int count);
> > diff --git a/include/xen/interface/grant_table.h
> b/include/xen/interface/grant_table.h
> > index 7da811b..66cb734 100644
> > --- a/include/xen/interface/grant_table.h
> > +++ b/include/xen/interface/grant_table.h
> > @@ -520,6 +520,7 @@ DEFINE_GUEST_HANDLE_STRUCT(gnttab_get_version);
> > #define GNTST_permission_denied (-8) /* Not enough privilege for
> operation. */
> > #define GNTST_bad_page (-9) /* Specified page was invalid for
> op. */
> > #define GNTST_bad_copy_arg (-10) /* copy arguments cross page
> boundary */
> > +#define GNTST_eagain (-12) /* Retry.
> */
> >
> > #define GNTTABOP_error_msgs { \
> > "okay", \
> > @@ -533,6 +534,7 @@ DEFINE_GUEST_HANDLE_STRUCT(gnttab_get_version);
> > "permission denied", \
> > "bad page", \
> > "copy arguments cross page boundary" \
> > + "retry" \
> > }
> >
> > #endif /* __XEN_PUBLIC_GRANT_TABLE_H__ */
> >
> >
> > On Aug 31, 2012, at 10:45 AM, Andres Lagar-Cavilla wrote:
> >
> > >
> > > On Aug 31, 2012, at 10:32 AM, David Vrabel wrote:
> > >
> > >> On 27/08/12 17:51, andres@lagarcavilla.org wrote:
> > >>> From: Andres Lagar-Cavilla <andres@lagarcavilla.org>
> > >>>
> > >>> Since Xen-4.2, hvm domains may have portions of their memory paged
> out. When a
> > >>> foreign domain (such as dom0) attempts to map these frames, the map
> will
> > >>> initially fail. The hypervisor returns a suitable errno, and kicks an
> > >>> asynchronous page-in operation carried out by a helper. The foreign
> domain is
> > >>> expected to retry the mapping operation until it eventually
> succeeds. The
> > >>> foreign domain is not put to sleep because itself could be the one
> running the
> > >>> pager assist (typical scenario for dom0).
> > >>>
> > >>> This patch adds support for this mechanism for backend drivers using
> grant
> > >>> mapping and copying operations. Specifically, this covers the
> blkback and
> > >>> gntdev drivers (which map foregin grants), and the netback driver
> (which copies
> > >>> foreign grants).
> > >>>
> > >>> * Add GNTST_eagain, already exposed by Xen, to the grant interface.
> > >>> * Add a retry method for grants that fail with GNTST_eagain (i.e.
> because the
> > >>> target foregin frame is paged out).
> > >>> * Insert hooks with appropriate macro decorators in the
> aforementioned drivers.
> > >>
> > >> I think you should implement wrappers around
> HYPERVISOR_grant_table_op()
> > >> have have the wrapper do the retries instead of every backend having
> to
> > >> check for EAGAIN and issue the retries itself. Similar to the
> > >> gnttab_map_grant_no_eagain() function you've already added.
> > >>
> > >> Why do some operations not retry anyway?
> > >
> > > All operations retry. The reason why I could not make it as elegant as
> you suggest is because grant operations are submitted in batches and their
> status(es?) later checked individually elsewhere. This is the case for
> netback. Note that both blkback and gntdev use a more linear structure with
> the gnttab_map_refs helper, which allows me to hide all the retry gore from
> those drivers into grant table code. Likewise for xenbus ring mapping.
> > >
> > > In summary, outside of core grant table code, only the netback driver
> needs to check explicitly for retries, due to its
> batch-copy-delayed-per-slot-check structure.
> > >
> > >>
> > >>> +void
> > >>> +gnttab_retry_eagain_gop(unsigned int cmd, void *gop, int16_t
> *status,
> > >>> + const char *func)
> > >>> +{
> > >>> + u8 delay = 1;
> > >>> +
> > >>> + do {
> > >>> + BUG_ON(HYPERVISOR_grant_table_op(cmd, gop, 1));
> > >>> + if (*status == GNTST_eagain)
> > >>> + msleep(delay++);
> > >>> + } while ((*status == GNTST_eagain) && delay);
> > >>
> > >> Terminating the loop when delay wraps is a bit subtle. Why not make
> > >> delay unsigned and check delay <= MAX_DELAY?
> > > Good idea (MAX_DELAY == 256). I'd like to get Konrad's feedback before
> a re-spin.
> > >
> > >>
> > >> Would it be sensible to ramp the delay faster? Perhaps double each
> > >> iteration with a maximum possible delay of e.g., 256 ms.
> > > Generally speaking we've never seen past three retries. I am open to
> changing the algorithm but there is a significant possibility it won't
> matter at all.
> > >
> > >>
> > >>> +#define gnttab_map_grant_no_eagain(_gop)
> \
> > >>> +do {
> \
> > >>> + if ( HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, (_gop),
> 1)) \
> > >>> + BUG();
> \
> > >>> + if ((_gop)->status == GNTST_eagain)
> \
> > >>> + gnttab_retry_eagain_map((_gop));
> \
> > >>> +} while(0)
> > >>
> > >> Inline functions, please.
> > >
> > > I want to retain the original context for debugging. Eventually we
> print __func__ if things go wrong.
> > >
> > > Thanks, great feedback
> > > Andres
> > >
> > >>
> > >> David
> > >
> >
>
[-- Attachment #1.2: Type: text/html, Size: 17912 bytes --]
[-- Attachment #2: Type: text/plain, Size: 126 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH] Xen backend support for paged out grant targets.
2012-08-31 19:33 ` Andres Lagar-Cavilla
@ 2012-08-31 21:14 ` Konrad Rzeszutek Wilk
0 siblings, 0 replies; 23+ messages in thread
From: Konrad Rzeszutek Wilk @ 2012-08-31 21:14 UTC (permalink / raw)
To: Andres Lagar-Cavilla
Cc: andres.lagarcavilla, xen-devel, Andres Lagar-Cavilla, David Vrabel
On Fri, Aug 31, 2012 at 03:33:17PM -0400, Andres Lagar-Cavilla wrote:
> But msleep will wind up calling schedule(). We definitely cannot afford to
> pin down a dom0 vcpu when the pager itself is in dom0.
Duh! Somehow I was thinking it just do a dumb loop. Maybe I am thinking
about a different type of early XYZsleep variant.
>
> Iiuc....
>
> Andres
> On Aug 31, 2012 12:55 PM, "Konrad Rzeszutek Wilk" <konrad.wilk@oracle.com>
> wrote:
>
> > On Fri, Aug 31, 2012 at 11:42:32AM -0400, Andres Lagar-Cavilla wrote:
> > > Actually acted upon your feedback ipso facto:
> > >
> > > commit d5fab912caa1f0cf6be0a6773f502d3417a207b6
> > > Author: Andres Lagar-Cavilla <andres@lagarcavilla.org>
> > > Date: Sun Aug 26 09:45:57 2012 -0400
> > >
> > > Xen backend support for paged out grant targets.
> > >
> > > Since Xen-4.2, hvm domains may have portions of their memory paged
> > out. When a
> > > foreign domain (such as dom0) attempts to map these frames, the map
> > will
> > > initially fail. The hypervisor returns a suitable errno, and kicks an
> > > asynchronous page-in operation carried out by a helper. The foreign
> > domain is
> > > expected to retry the mapping operation until it eventually
> > succeeds. The
> > > foreign domain is not put to sleep because itself could be the one
> > running the
> > > pager assist (typical scenario for dom0).
> > >
> > > This patch adds support for this mechanism for backend drivers using
> > grant
> > > mapping and copying operations. Specifically, this covers the
> > blkback and
> > > gntdev drivers (which map foregin grants), and the netback driver
> > (which copies
> > > foreign grants).
> > >
> > > * Add GNTST_eagain, already exposed by Xen, to the grant interface.
> > > * Add a retry method for grants that fail with GNTST_eagain (i.e.
> > because the
> > > target foregin frame is paged out).
> > > * Insert hooks with appropriate macro decorators in the
> > aforementioned drivers.
> > >
> > > The retry loop is only invoked if the grant operation status is
> > GNTST_eagain.
> > > It guarantees to leave a new status code different from
> > GNTST_eagain. Any other
> > > status code results in identical code execution as before.
> > >
> > > The retry loop performs 256 attempts with increasing time intervals
> > through a
> > > 32 second period. It uses msleep to yield while waiting for the next
> > retry.
> > >
> >
> >
> > Would it make sense to yield to other processes (so call schedule)? Or
> > perhaps have this in a workqueue ?
> >
> > I mean the 'msleep' just looks like a hack. .. 32 seconds of doing
> > 'msleep' on 1VCPU dom0 could trigger the watchdog I think?
> >
> > > V2 after feedback from David Vrabel:
> > > * Explicit MAX_DELAY instead of wrap-around delay into zero
> > > * Abstract GNTST_eagain check into core grant table code for netback
> > module.
> > >
> > > Signed-off-by: Andres Lagar-Cavilla <andres@lagarcavilla.org>
> > >
> > > diff --git a/drivers/net/xen-netback/netback.c
> > b/drivers/net/xen-netback/netback.c
> > > index 682633b..5610fd8 100644
> > > --- a/drivers/net/xen-netback/netback.c
> > > +++ b/drivers/net/xen-netback/netback.c
> > > @@ -635,9 +635,7 @@ static void xen_netbk_rx_action(struct xen_netbk
> > *netbk)
> > > return;
> > >
> > > BUG_ON(npo.copy_prod > ARRAY_SIZE(netbk->grant_copy_op));
> > > - ret = HYPERVISOR_grant_table_op(GNTTABOP_copy,
> > &netbk->grant_copy_op,
> > > - npo.copy_prod);
> > > - BUG_ON(ret != 0);
> > > + gnttab_batch_copy_no_eagain(netbk->grant_copy_op, npo.copy_prod);
> > >
> > > while ((skb = __skb_dequeue(&rxq)) != NULL) {
> > > sco = (struct skb_cb_overlay *)skb->cb;
> > > @@ -1460,18 +1458,15 @@ static void xen_netbk_tx_submit(struct xen_netbk
> > *netbk)
> > > static void xen_netbk_tx_action(struct xen_netbk *netbk)
> > > {
> > > unsigned nr_gops;
> > > - int ret;
> > >
> > > nr_gops = xen_netbk_tx_build_gops(netbk);
> > >
> > > if (nr_gops == 0)
> > > return;
> > > - ret = HYPERVISOR_grant_table_op(GNTTABOP_copy,
> > > - netbk->tx_copy_ops, nr_gops);
> > > - BUG_ON(ret);
> > >
> > > - xen_netbk_tx_submit(netbk);
> > > + gnttab_batch_copy_no_eagain(netbk->tx_copy_ops, nr_gops);
> > >
> > > + xen_netbk_tx_submit(netbk);
> > > }
> > >
> > > static void xen_netbk_idx_release(struct xen_netbk *netbk, u16
> > pending_idx)
> > > diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c
> > > index eea81cf..96543b2 100644
> > > --- a/drivers/xen/grant-table.c
> > > +++ b/drivers/xen/grant-table.c
> > > @@ -38,6 +38,7 @@
> > > #include <linux/vmalloc.h>
> > > #include <linux/uaccess.h>
> > > #include <linux/io.h>
> > > +#include <linux/delay.h>
> > > #include <linux/hardirq.h>
> > >
> > > #include <xen/xen.h>
> > > @@ -823,6 +824,26 @@ unsigned int gnttab_max_grant_frames(void)
> > > }
> > > EXPORT_SYMBOL_GPL(gnttab_max_grant_frames);
> > >
> > > +#define MAX_DELAY 256
> > > +void
> > > +gnttab_retry_eagain_gop(unsigned int cmd, void *gop, int16_t *status,
> > > + const char *func)
> > > +{
> > > + unsigned delay = 1;
> > > +
> > > + do {
> > > + BUG_ON(HYPERVISOR_grant_table_op(cmd, gop, 1));
> > > + if (*status == GNTST_eagain)
> > > + msleep(delay++);
> > > + } while ((*status == GNTST_eagain) && (delay < MAX_DELAY));
> > > +
> > > + if (delay >= MAX_DELAY) {
> > > + printk(KERN_ERR "%s: %s eagain grant\n", func,
> > current->comm);
> > > + *status = GNTST_bad_page;
> > > + }
> > > +}
> > > +EXPORT_SYMBOL_GPL(gnttab_retry_eagain_gop);
> > > +
> > > int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops,
> > > struct gnttab_map_grant_ref *kmap_ops,
> > > struct page **pages, unsigned int count)
> > > @@ -836,6 +857,11 @@ int gnttab_map_refs(struct gnttab_map_grant_ref
> > *map_ops,
> > > if (ret)
> > > return ret;
> > >
> > > + /* Retry eagain maps */
> > > + for (i = 0; i < count; i++)
> > > + if (map_ops[i].status == GNTST_eagain)
> > > + gnttab_retry_eagain_map(map_ops + i);
> > > +
> > > if (xen_feature(XENFEAT_auto_translated_physmap))
> > > return ret;
> > >
> > > diff --git a/drivers/xen/xenbus/xenbus_client.c
> > b/drivers/xen/xenbus/xenbus_client.c
> > > index b3e146e..749f6a3 100644
> > > --- a/drivers/xen/xenbus/xenbus_client.c
> > > +++ b/drivers/xen/xenbus/xenbus_client.c
> > > @@ -490,8 +490,7 @@ static int xenbus_map_ring_valloc_pv(struct
> > xenbus_device *dev,
> > >
> > > op.host_addr = arbitrary_virt_to_machine(pte).maddr;
> > >
> > > - if (HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, &op, 1))
> > > - BUG();
> > > + gnttab_map_grant_no_eagain(&op);
> > >
> > > if (op.status != GNTST_okay) {
> > > free_vm_area(area);
> > > @@ -572,8 +571,7 @@ int xenbus_map_ring(struct xenbus_device *dev, int
> > gnt_ref,
> > > gnttab_set_map_op(&op, (unsigned long)vaddr, GNTMAP_host_map,
> > gnt_ref,
> > > dev->otherend_id);
> > >
> > > - if (HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, &op, 1))
> > > - BUG();
> > > + gnttab_map_grant_no_eagain(&op);
> > >
> > > if (op.status != GNTST_okay) {
> > > xenbus_dev_fatal(dev, op.status,
> > > diff --git a/include/xen/grant_table.h b/include/xen/grant_table.h
> > > index 11e27c3..2fecfab 100644
> > > --- a/include/xen/grant_table.h
> > > +++ b/include/xen/grant_table.h
> > > @@ -43,6 +43,7 @@
> > > #include <xen/interface/grant_table.h>
> > >
> > > #include <asm/xen/hypervisor.h>
> > > +#include <asm/xen/hypercall.h>
> > >
> > > #include <xen/features.h>
> > >
> > > @@ -183,6 +184,43 @@ unsigned int gnttab_max_grant_frames(void);
> > >
> > > #define gnttab_map_vaddr(map) ((void *)(map.host_virt_addr))
> > >
> > > +/* Retry a grant map/copy operation when the hypervisor returns
> > GNTST_eagain.
> > > + * This is typically due to paged out target frames.
> > > + * Generic entry-point, use macro decorators below for specific grant
> > > + * operations.
> > > + * Will retry for 1, 2, ... 255 ms, i.e. 256 times during 32 seconds.
> > > + * Return value in *status guaranteed to no longer be GNTST_eagain. */
> > > +void gnttab_retry_eagain_gop(unsigned int cmd, void *gop, int16_t
> > *status,
> > > + const char *func);
> > > +
> > > +#define gnttab_retry_eagain_map(_gop) \
> > > + gnttab_retry_eagain_gop(GNTTABOP_map_grant_ref, (_gop), \
> > > + &(_gop)->status, __func__)
> > > +
> > > +#define gnttab_retry_eagain_copy(_gop) \
> > > + gnttab_retry_eagain_gop(GNTTABOP_copy, (_gop), \
> > > + &(_gop)->status, __func__)
> > > +
> > > +#define gnttab_map_grant_no_eagain(_gop)
> > \
> > > +do {
> > \
> > > + if (HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, (_gop), 1))
> > \
> > > + BUG();
> > \
> > > + if ((_gop)->status == GNTST_eagain)
> > \
> > > + gnttab_retry_eagain_map((_gop));
> > \
> > > +} while(0)
> > > +
> > > +static inline void
> > > +gnttab_batch_copy_no_eagain(struct gnttab_copy *batch, unsigned count)
> > > +{
> > > + unsigned i;
> > > + struct gnttab_copy *op;
> > > +
> > > + BUG_ON(HYPERVISOR_grant_table_op(GNTTABOP_copy, batch, count));
> > > + for (i = 0, op = batch; i < count; i++, op++)
> > > + if (op->status == GNTST_eagain)
> > > + gnttab_retry_eagain_copy(op);
> > > +}
> > > +
> > > int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops,
> > > struct gnttab_map_grant_ref *kmap_ops,
> > > struct page **pages, unsigned int count);
> > > diff --git a/include/xen/interface/grant_table.h
> > b/include/xen/interface/grant_table.h
> > > index 7da811b..66cb734 100644
> > > --- a/include/xen/interface/grant_table.h
> > > +++ b/include/xen/interface/grant_table.h
> > > @@ -520,6 +520,7 @@ DEFINE_GUEST_HANDLE_STRUCT(gnttab_get_version);
> > > #define GNTST_permission_denied (-8) /* Not enough privilege for
> > operation. */
> > > #define GNTST_bad_page (-9) /* Specified page was invalid for
> > op. */
> > > #define GNTST_bad_copy_arg (-10) /* copy arguments cross page
> > boundary */
> > > +#define GNTST_eagain (-12) /* Retry.
> > */
> > >
> > > #define GNTTABOP_error_msgs { \
> > > "okay", \
> > > @@ -533,6 +534,7 @@ DEFINE_GUEST_HANDLE_STRUCT(gnttab_get_version);
> > > "permission denied", \
> > > "bad page", \
> > > "copy arguments cross page boundary" \
> > > + "retry" \
> > > }
> > >
> > > #endif /* __XEN_PUBLIC_GRANT_TABLE_H__ */
> > >
> > >
> > > On Aug 31, 2012, at 10:45 AM, Andres Lagar-Cavilla wrote:
> > >
> > > >
> > > > On Aug 31, 2012, at 10:32 AM, David Vrabel wrote:
> > > >
> > > >> On 27/08/12 17:51, andres@lagarcavilla.org wrote:
> > > >>> From: Andres Lagar-Cavilla <andres@lagarcavilla.org>
> > > >>>
> > > >>> Since Xen-4.2, hvm domains may have portions of their memory paged
> > out. When a
> > > >>> foreign domain (such as dom0) attempts to map these frames, the map
> > will
> > > >>> initially fail. The hypervisor returns a suitable errno, and kicks an
> > > >>> asynchronous page-in operation carried out by a helper. The foreign
> > domain is
> > > >>> expected to retry the mapping operation until it eventually
> > succeeds. The
> > > >>> foreign domain is not put to sleep because itself could be the one
> > running the
> > > >>> pager assist (typical scenario for dom0).
> > > >>>
> > > >>> This patch adds support for this mechanism for backend drivers using
> > grant
> > > >>> mapping and copying operations. Specifically, this covers the
> > blkback and
> > > >>> gntdev drivers (which map foregin grants), and the netback driver
> > (which copies
> > > >>> foreign grants).
> > > >>>
> > > >>> * Add GNTST_eagain, already exposed by Xen, to the grant interface.
> > > >>> * Add a retry method for grants that fail with GNTST_eagain (i.e.
> > because the
> > > >>> target foregin frame is paged out).
> > > >>> * Insert hooks with appropriate macro decorators in the
> > aforementioned drivers.
> > > >>
> > > >> I think you should implement wrappers around
> > HYPERVISOR_grant_table_op()
> > > >> have have the wrapper do the retries instead of every backend having
> > to
> > > >> check for EAGAIN and issue the retries itself. Similar to the
> > > >> gnttab_map_grant_no_eagain() function you've already added.
> > > >>
> > > >> Why do some operations not retry anyway?
> > > >
> > > > All operations retry. The reason why I could not make it as elegant as
> > you suggest is because grant operations are submitted in batches and their
> > status(es?) later checked individually elsewhere. This is the case for
> > netback. Note that both blkback and gntdev use a more linear structure with
> > the gnttab_map_refs helper, which allows me to hide all the retry gore from
> > those drivers into grant table code. Likewise for xenbus ring mapping.
> > > >
> > > > In summary, outside of core grant table code, only the netback driver
> > needs to check explicitly for retries, due to its
> > batch-copy-delayed-per-slot-check structure.
> > > >
> > > >>
> > > >>> +void
> > > >>> +gnttab_retry_eagain_gop(unsigned int cmd, void *gop, int16_t
> > *status,
> > > >>> + const char *func)
> > > >>> +{
> > > >>> + u8 delay = 1;
> > > >>> +
> > > >>> + do {
> > > >>> + BUG_ON(HYPERVISOR_grant_table_op(cmd, gop, 1));
> > > >>> + if (*status == GNTST_eagain)
> > > >>> + msleep(delay++);
> > > >>> + } while ((*status == GNTST_eagain) && delay);
> > > >>
> > > >> Terminating the loop when delay wraps is a bit subtle. Why not make
> > > >> delay unsigned and check delay <= MAX_DELAY?
> > > > Good idea (MAX_DELAY == 256). I'd like to get Konrad's feedback before
> > a re-spin.
> > > >
> > > >>
> > > >> Would it be sensible to ramp the delay faster? Perhaps double each
> > > >> iteration with a maximum possible delay of e.g., 256 ms.
> > > > Generally speaking we've never seen past three retries. I am open to
> > changing the algorithm but there is a significant possibility it won't
> > matter at all.
> > > >
> > > >>
> > > >>> +#define gnttab_map_grant_no_eagain(_gop)
> > \
> > > >>> +do {
> > \
> > > >>> + if ( HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, (_gop),
> > 1)) \
> > > >>> + BUG();
> > \
> > > >>> + if ((_gop)->status == GNTST_eagain)
> > \
> > > >>> + gnttab_retry_eagain_map((_gop));
> > \
> > > >>> +} while(0)
> > > >>
> > > >> Inline functions, please.
> > > >
> > > > I want to retain the original context for debugging. Eventually we
> > print __func__ if things go wrong.
> > > >
> > > > Thanks, great feedback
> > > > Andres
> > > >
> > > >>
> > > >> David
> > > >
> > >
> >
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH] Xen backend support for paged out grant targets.
2012-08-31 16:10 ` David Vrabel
@ 2012-09-05 16:27 ` Konrad Rzeszutek Wilk
2012-09-05 17:21 ` Andres Lagar-Cavilla
0 siblings, 1 reply; 23+ messages in thread
From: Konrad Rzeszutek Wilk @ 2012-09-05 16:27 UTC (permalink / raw)
To: David Vrabel
Cc: Andres Lagar-Cavilla, Andres Lagar-Cavilla, andres, xen-devel
On Fri, Aug 31, 2012 at 05:10:56PM +0100, David Vrabel wrote:
> On 31/08/12 16:42, Andres Lagar-Cavilla wrote:
> > Actually acted upon your feedback ipso facto:
> >
> > commit d5fab912caa1f0cf6be0a6773f502d3417a207b6
> > Author: Andres Lagar-Cavilla <andres@lagarcavilla.org>
> > Date: Sun Aug 26 09:45:57 2012 -0400
> >
> > Xen backend support for paged out grant targets.
>
> This looks mostly fine expect for the #define instead of inline functions.
>
> > +#define gnttab_map_grant_no_eagain(_gop) \
>
> This name tripped me up previously. As I read this as:
>
> gnttab_map_grant_no_[retries_for]_eagain().
>
> Perhaps gnttab_map_grant_with_retries() ? Or similar?
gnttab_map_grant_retry ?
Besides that, it looks good to me. Ian Campbell needs to Ack so that
David Miller (the network maintainer) can pick it up. Please CC them
both and also LKML.
>
> David
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH] Xen backend support for paged out grant targets.
2012-09-05 16:27 ` Konrad Rzeszutek Wilk
@ 2012-09-05 17:21 ` Andres Lagar-Cavilla
2012-09-12 13:20 ` Andres Lagar-Cavilla
0 siblings, 1 reply; 23+ messages in thread
From: Andres Lagar-Cavilla @ 2012-09-05 17:21 UTC (permalink / raw)
To: Konrad Rzeszutek Wilk
Cc: Andres Lagar-Cavilla, Ian Campbell, xen-devel, David Vrabel,
Andres Lagar-Cavilla
On Sep 5, 2012, at 12:27 PM, Konrad Rzeszutek Wilk wrote:
> On Fri, Aug 31, 2012 at 05:10:56PM +0100, David Vrabel wrote:
>> On 31/08/12 16:42, Andres Lagar-Cavilla wrote:
>>> Actually acted upon your feedback ipso facto:
>>>
>>> commit d5fab912caa1f0cf6be0a6773f502d3417a207b6
>>> Author: Andres Lagar-Cavilla <andres@lagarcavilla.org>
>>> Date: Sun Aug 26 09:45:57 2012 -0400
>>>
>>> Xen backend support for paged out grant targets.
>>
>> This looks mostly fine expect for the #define instead of inline functions.
>>
>>> +#define gnttab_map_grant_no_eagain(_gop) \
>>
>> This name tripped me up previously. As I read this as:
>>
>> gnttab_map_grant_no_[retries_for]_eagain().
>>
>> Perhaps gnttab_map_grant_with_retries() ? Or similar?
>
> gnttab_map_grant_retry ?
>
> Besides that, it looks good to me. Ian Campbell needs to Ack so that
> David Miller (the network maintainer) can pick it up. Please CC them
> both and also LKML.
Sure will do. However, I need to bring attention to the following hunk:
diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
index 682633b..5610fd8 100644
--- a/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@ -635,9 +635,7 @@ static void xen_netbk_rx_action(struct xen_netbk *netbk)
return;
BUG_ON(npo.copy_prod > ARRAY_SIZE(netbk->grant_copy_op));
- ret = HYPERVISOR_grant_table_op(GNTTABOP_copy, &netbk->grant_copy_op,
- npo.copy_prod);
- BUG_ON(ret != 0);
+ gnttab_batch_copy_no_eagain(netbk->grant_copy_op, npo.copy_prod);
It seems like the (extant) code passes a struct gnttab_copy ** to the grant table hypercall (&netbk->grant_copy_op, defined as struct gnttab_copy [])
I "fixed" it to pass a struct gnttab_copy * (netbk->grant_copy_op, no '&'). This matches the other invocation of the grant copy hyper call (in netbk_tx_action). Did I fix it, though? I am confused as to how this could have ever worked.
(cc'ing Ian Campbell for more insight)
Andres
>>
>> David
^ permalink raw reply related [flat|nested] 23+ messages in thread
* Re: [PATCH] Xen backend support for paged out grant targets.
2012-09-05 17:21 ` Andres Lagar-Cavilla
@ 2012-09-12 13:20 ` Andres Lagar-Cavilla
2012-09-12 18:30 ` Konrad Rzeszutek Wilk
0 siblings, 1 reply; 23+ messages in thread
From: Andres Lagar-Cavilla @ 2012-09-12 13:20 UTC (permalink / raw)
To: Konrad Rzeszutek Wilk, Ian Campbell
Cc: xen-devel, David Vrabel, Andres Lagar-Cavilla
On Sep 5, 2012, at 1:21 PM, Andres Lagar-Cavilla wrote:
>
> On Sep 5, 2012, at 12:27 PM, Konrad Rzeszutek Wilk wrote:
>
>> On Fri, Aug 31, 2012 at 05:10:56PM +0100, David Vrabel wrote:
>>> On 31/08/12 16:42, Andres Lagar-Cavilla wrote:
>>>> Actually acted upon your feedback ipso facto:
>>>>
>>>> commit d5fab912caa1f0cf6be0a6773f502d3417a207b6
>>>> Author: Andres Lagar-Cavilla <andres@lagarcavilla.org>
>>>> Date: Sun Aug 26 09:45:57 2012 -0400
>>>>
>>>> Xen backend support for paged out grant targets.
>>>
>>> This looks mostly fine expect for the #define instead of inline functions.
>>>
>>>> +#define gnttab_map_grant_no_eagain(_gop) \
>>>
>>> This name tripped me up previously. As I read this as:
>>>
>>> gnttab_map_grant_no_[retries_for]_eagain().
>>>
>>> Perhaps gnttab_map_grant_with_retries() ? Or similar?
>>
>> gnttab_map_grant_retry ?
>>
>> Besides that, it looks good to me. Ian Campbell needs to Ack so that
>> David Miller (the network maintainer) can pick it up. Please CC them
>> both and also LKML
Konrad, Ian, can I get some insight on the question I pose below. I have otherwise cleaned up the patch for 3.7.
Thanks
Andres
>> .
>
> Sure will do. However, I need to bring attention to the following hunk:
> diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
> index 682633b..5610fd8 100644
> --- a/drivers/net/xen-netback/netback.c
> +++ b/drivers/net/xen-netback/netback.c
> @@ -635,9 +635,7 @@ static void xen_netbk_rx_action(struct xen_netbk *netbk)
> return;
>
> BUG_ON(npo.copy_prod > ARRAY_SIZE(netbk->grant_copy_op));
> - ret = HYPERVISOR_grant_table_op(GNTTABOP_copy, &netbk->grant_copy_op,
> - npo.copy_prod);
> - BUG_ON(ret != 0);
> + gnttab_batch_copy_no_eagain(netbk->grant_copy_op, npo.copy_prod);
>
> It seems like the (extant) code passes a struct gnttab_copy ** to the grant table hypercall (&netbk->grant_copy_op, defined as struct gnttab_copy [])
>
> I "fixed" it to pass a struct gnttab_copy * (netbk->grant_copy_op, no '&'). This matches the other invocation of the grant copy hyper call (in netbk_tx_action). Did I fix it, though? I am confused as to how this could have ever worked.
>
> (cc'ing Ian Campbell for more insight)
> Andres
>>>
>>> David
>
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH] Xen backend support for paged out grant targets.
2012-09-12 13:20 ` Andres Lagar-Cavilla
@ 2012-09-12 18:30 ` Konrad Rzeszutek Wilk
0 siblings, 0 replies; 23+ messages in thread
From: Konrad Rzeszutek Wilk @ 2012-09-12 18:30 UTC (permalink / raw)
To: Andres Lagar-Cavilla
Cc: xen-devel, Ian Campbell, Andres Lagar-Cavilla, David Vrabel
On Wed, Sep 12, 2012 at 09:20:24AM -0400, Andres Lagar-Cavilla wrote:
> On Sep 5, 2012, at 1:21 PM, Andres Lagar-Cavilla wrote:
>
> >
> > On Sep 5, 2012, at 12:27 PM, Konrad Rzeszutek Wilk wrote:
> >
> >> On Fri, Aug 31, 2012 at 05:10:56PM +0100, David Vrabel wrote:
> >>> On 31/08/12 16:42, Andres Lagar-Cavilla wrote:
> >>>> Actually acted upon your feedback ipso facto:
> >>>>
> >>>> commit d5fab912caa1f0cf6be0a6773f502d3417a207b6
> >>>> Author: Andres Lagar-Cavilla <andres@lagarcavilla.org>
> >>>> Date: Sun Aug 26 09:45:57 2012 -0400
> >>>>
> >>>> Xen backend support for paged out grant targets.
> >>>
> >>> This looks mostly fine expect for the #define instead of inline functions.
> >>>
> >>>> +#define gnttab_map_grant_no_eagain(_gop) \
> >>>
> >>> This name tripped me up previously. As I read this as:
> >>>
> >>> gnttab_map_grant_no_[retries_for]_eagain().
> >>>
> >>> Perhaps gnttab_map_grant_with_retries() ? Or similar?
> >>
> >> gnttab_map_grant_retry ?
> >>
> >> Besides that, it looks good to me. Ian Campbell needs to Ack so that
> >> David Miller (the network maintainer) can pick it up. Please CC them
> >> both and also LKML
> Konrad, Ian, can I get some insight on the question I pose below. I have otherwise cleaned up the patch for 3.7.
Can you re-send a cleanup patch and CC the relevant folks pls.
>
> Thanks
> Andres
> >> .
> >
> > Sure will do. However, I need to bring attention to the following hunk:
> > diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
> > index 682633b..5610fd8 100644
> > --- a/drivers/net/xen-netback/netback.c
> > +++ b/drivers/net/xen-netback/netback.c
> > @@ -635,9 +635,7 @@ static void xen_netbk_rx_action(struct xen_netbk *netbk)
> > return;
> >
> > BUG_ON(npo.copy_prod > ARRAY_SIZE(netbk->grant_copy_op));
> > - ret = HYPERVISOR_grant_table_op(GNTTABOP_copy, &netbk->grant_copy_op,
> > - npo.copy_prod);
> > - BUG_ON(ret != 0);
> > + gnttab_batch_copy_no_eagain(netbk->grant_copy_op, npo.copy_prod);
> >
> > It seems like the (extant) code passes a struct gnttab_copy ** to the grant table hypercall (&netbk->grant_copy_op, defined as struct gnttab_copy [])
> >
> > I "fixed" it to pass a struct gnttab_copy * (netbk->grant_copy_op, no '&'). This matches the other invocation of the grant copy hyper call (in netbk_tx_action). Did I fix it, though? I am confused as to how this could have ever worked.
> >
> > (cc'ing Ian Campbell for more insight)
> > Andres
> >>>
> >>> David
> >
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH] Xen backend support for paged out grant targets.
2012-09-14 12:44 ` Konrad Rzeszutek Wilk
@ 2012-09-14 14:27 ` Andres Lagar-Cavilla
0 siblings, 0 replies; 23+ messages in thread
From: Andres Lagar-Cavilla @ 2012-09-14 14:27 UTC (permalink / raw)
To: Konrad Rzeszutek Wilk
Cc: Ian Campbell, Andres Lagar-Cavilla, xen-devel, David Vrabel,
David Miller, linux-kernel, netdev
On Sep 14, 2012, at 8:44 AM, Konrad Rzeszutek Wilk wrote:
> On Fri, Sep 14, 2012 at 08:19:01AM +0100, Ian Campbell wrote:
>> On Thu, 2012-09-13 at 20:45 +0100, Andres Lagar-Cavilla wrote:
>>> On Sep 13, 2012, at 2:11 PM, Ian Campbell wrote:
>>>
>>>> On Thu, 2012-09-13 at 18:28 +0100, Andres Lagar-Cavilla wrote:
>>>>>
>>>>> * Add placeholder in array of grant table error descriptions for
>>>>> unrelated error code we jump over.
>>>>
>>>> Why not just define it, it's listed here:
>>>> http://xenbits.xen.org/docs/unstable/hypercall/include,public,grant_table.h.html#Enum_grant_status
>>> Well, a) we'd be defining something no one will be using (for the
>>> moment)
>>
>> Even if no one in the kernel is using it, having "placeholder" as an
>> entry in GNTTABOP_error_msgs is just silly, even things which don't
>> understand GNTST_address_too_big directly could end up looking it up
>> here.
>>
>>> b) I would be signing-off on something unrelated.
>>
>> Lets take this patch instead then.
>>
>> 8<------------------------------------------------
>>
>>> From cb9daaf3029accb6d5fef58b450a625b27190429 Mon Sep 17 00:00:00 2001
>> From: Ian Campbell <ian.campbell@citrix.com>
>> Date: Fri, 14 Sep 2012 08:10:06 +0100
>> Subject: [PATCH] xen: resynchronise grant table status codes with upstream
>>
>> Adds GNTST_address_too_big and GNTST_eagain.
>>
>> Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
>
> applied.
Thanks. Rebased on top of this and just sent.
Andres
>
>> ---
>> include/xen/interface/grant_table.h | 8 ++++++--
>> 1 file changed, 6 insertions(+), 2 deletions(-)
>>
>> diff --git a/include/xen/interface/grant_table.h b/include/xen/interface/grant_table.h
>> index a17d844..84a8fbf 100644
>> --- a/include/xen/interface/grant_table.h
>> +++ b/include/xen/interface/grant_table.h
>> @@ -519,7 +519,9 @@ DEFINE_GUEST_HANDLE_STRUCT(gnttab_get_version);
>> #define GNTST_no_device_space (-7) /* Out of space in I/O MMU. */
>> #define GNTST_permission_denied (-8) /* Not enough privilege for operation. */
>> #define GNTST_bad_page (-9) /* Specified page was invalid for op. */
>> -#define GNTST_bad_copy_arg (-10) /* copy arguments cross page boundary */
>> +#define GNTST_bad_copy_arg (-10) /* copy arguments cross page boundary. */
>> +#define GNTST_address_too_big (-11) /* transfer page address too large. */
>> +#define GNTST_eagain (-12) /* Operation not done; try again. */
>>
>> #define GNTTABOP_error_msgs { \
>> "okay", \
>> @@ -532,7 +534,9 @@ DEFINE_GUEST_HANDLE_STRUCT(gnttab_get_version);
>> "no spare translation slot in the I/O MMU", \
>> "permission denied", \
>> "bad page", \
>> - "copy arguments cross page boundary" \
>> + "copy arguments cross page boundary", \
>> + "page address size too large", \
>> + "operation not done; try again" \
>> }
>>
>> #endif /* __XEN_PUBLIC_GRANT_TABLE_H__ */
>> --
>> 1.7.10.4
>>
>>
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH] Xen backend support for paged out grant targets.
2012-09-14 7:19 ` Ian Campbell
@ 2012-09-14 12:44 ` Konrad Rzeszutek Wilk
2012-09-14 14:27 ` Andres Lagar-Cavilla
0 siblings, 1 reply; 23+ messages in thread
From: Konrad Rzeszutek Wilk @ 2012-09-14 12:44 UTC (permalink / raw)
To: Ian Campbell
Cc: Andres Lagar-Cavilla, Andres Lagar-Cavilla, xen-devel,
David Vrabel, David Miller, linux-kernel, netdev
On Fri, Sep 14, 2012 at 08:19:01AM +0100, Ian Campbell wrote:
> On Thu, 2012-09-13 at 20:45 +0100, Andres Lagar-Cavilla wrote:
> > On Sep 13, 2012, at 2:11 PM, Ian Campbell wrote:
> >
> > > On Thu, 2012-09-13 at 18:28 +0100, Andres Lagar-Cavilla wrote:
> > >>
> > >> * Add placeholder in array of grant table error descriptions for
> > >> unrelated error code we jump over.
> > >
> > > Why not just define it, it's listed here:
> > > http://xenbits.xen.org/docs/unstable/hypercall/include,public,grant_table.h.html#Enum_grant_status
> > Well, a) we'd be defining something no one will be using (for the
> > moment)
>
> Even if no one in the kernel is using it, having "placeholder" as an
> entry in GNTTABOP_error_msgs is just silly, even things which don't
> understand GNTST_address_too_big directly could end up looking it up
> here.
>
> > b) I would be signing-off on something unrelated.
>
> Lets take this patch instead then.
>
> 8<------------------------------------------------
>
> >From cb9daaf3029accb6d5fef58b450a625b27190429 Mon Sep 17 00:00:00 2001
> From: Ian Campbell <ian.campbell@citrix.com>
> Date: Fri, 14 Sep 2012 08:10:06 +0100
> Subject: [PATCH] xen: resynchronise grant table status codes with upstream
>
> Adds GNTST_address_too_big and GNTST_eagain.
>
> Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
applied.
> ---
> include/xen/interface/grant_table.h | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/include/xen/interface/grant_table.h b/include/xen/interface/grant_table.h
> index a17d844..84a8fbf 100644
> --- a/include/xen/interface/grant_table.h
> +++ b/include/xen/interface/grant_table.h
> @@ -519,7 +519,9 @@ DEFINE_GUEST_HANDLE_STRUCT(gnttab_get_version);
> #define GNTST_no_device_space (-7) /* Out of space in I/O MMU. */
> #define GNTST_permission_denied (-8) /* Not enough privilege for operation. */
> #define GNTST_bad_page (-9) /* Specified page was invalid for op. */
> -#define GNTST_bad_copy_arg (-10) /* copy arguments cross page boundary */
> +#define GNTST_bad_copy_arg (-10) /* copy arguments cross page boundary. */
> +#define GNTST_address_too_big (-11) /* transfer page address too large. */
> +#define GNTST_eagain (-12) /* Operation not done; try again. */
>
> #define GNTTABOP_error_msgs { \
> "okay", \
> @@ -532,7 +534,9 @@ DEFINE_GUEST_HANDLE_STRUCT(gnttab_get_version);
> "no spare translation slot in the I/O MMU", \
> "permission denied", \
> "bad page", \
> - "copy arguments cross page boundary" \
> + "copy arguments cross page boundary", \
> + "page address size too large", \
> + "operation not done; try again" \
> }
>
> #endif /* __XEN_PUBLIC_GRANT_TABLE_H__ */
> --
> 1.7.10.4
>
>
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH] Xen backend support for paged out grant targets.
2012-09-13 19:45 ` Andres Lagar-Cavilla
@ 2012-09-14 7:19 ` Ian Campbell
2012-09-14 12:44 ` Konrad Rzeszutek Wilk
0 siblings, 1 reply; 23+ messages in thread
From: Ian Campbell @ 2012-09-14 7:19 UTC (permalink / raw)
To: Andres Lagar-Cavilla
Cc: Andres Lagar-Cavilla, xen-devel, Konrad Rzeszutek Wilk,
David Vrabel, David Miller, linux-kernel, netdev
On Thu, 2012-09-13 at 20:45 +0100, Andres Lagar-Cavilla wrote:
> On Sep 13, 2012, at 2:11 PM, Ian Campbell wrote:
>
> > On Thu, 2012-09-13 at 18:28 +0100, Andres Lagar-Cavilla wrote:
> >>
> >> * Add placeholder in array of grant table error descriptions for
> >> unrelated error code we jump over.
> >
> > Why not just define it, it's listed here:
> > http://xenbits.xen.org/docs/unstable/hypercall/include,public,grant_table.h.html#Enum_grant_status
> Well, a) we'd be defining something no one will be using (for the
> moment)
Even if no one in the kernel is using it, having "placeholder" as an
entry in GNTTABOP_error_msgs is just silly, even things which don't
understand GNTST_address_too_big directly could end up looking it up
here.
> b) I would be signing-off on something unrelated.
Lets take this patch instead then.
8<------------------------------------------------
>From cb9daaf3029accb6d5fef58b450a625b27190429 Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@citrix.com>
Date: Fri, 14 Sep 2012 08:10:06 +0100
Subject: [PATCH] xen: resynchronise grant table status codes with upstream
Adds GNTST_address_too_big and GNTST_eagain.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
include/xen/interface/grant_table.h | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/include/xen/interface/grant_table.h b/include/xen/interface/grant_table.h
index a17d844..84a8fbf 100644
--- a/include/xen/interface/grant_table.h
+++ b/include/xen/interface/grant_table.h
@@ -519,7 +519,9 @@ DEFINE_GUEST_HANDLE_STRUCT(gnttab_get_version);
#define GNTST_no_device_space (-7) /* Out of space in I/O MMU. */
#define GNTST_permission_denied (-8) /* Not enough privilege for operation. */
#define GNTST_bad_page (-9) /* Specified page was invalid for op. */
-#define GNTST_bad_copy_arg (-10) /* copy arguments cross page boundary */
+#define GNTST_bad_copy_arg (-10) /* copy arguments cross page boundary. */
+#define GNTST_address_too_big (-11) /* transfer page address too large. */
+#define GNTST_eagain (-12) /* Operation not done; try again. */
#define GNTTABOP_error_msgs { \
"okay", \
@@ -532,7 +534,9 @@ DEFINE_GUEST_HANDLE_STRUCT(gnttab_get_version);
"no spare translation slot in the I/O MMU", \
"permission denied", \
"bad page", \
- "copy arguments cross page boundary" \
+ "copy arguments cross page boundary", \
+ "page address size too large", \
+ "operation not done; try again" \
}
#endif /* __XEN_PUBLIC_GRANT_TABLE_H__ */
--
1.7.10.4
^ permalink raw reply related [flat|nested] 23+ messages in thread
* Re: [PATCH] Xen backend support for paged out grant targets.
2012-09-13 18:11 ` Ian Campbell
@ 2012-09-13 19:45 ` Andres Lagar-Cavilla
2012-09-14 7:19 ` Ian Campbell
0 siblings, 1 reply; 23+ messages in thread
From: Andres Lagar-Cavilla @ 2012-09-13 19:45 UTC (permalink / raw)
To: Ian Campbell
Cc: Andres Lagar-Cavilla, xen-devel, Konrad Rzeszutek Wilk,
David Vrabel, David Miller, linux-kernel, netdev
On Sep 13, 2012, at 2:11 PM, Ian Campbell wrote:
> On Thu, 2012-09-13 at 18:28 +0100, Andres Lagar-Cavilla wrote:
>>
>> * Add placeholder in array of grant table error descriptions for
>> unrelated error code we jump over.
>
> Why not just define it, it's listed here:
> http://xenbits.xen.org/docs/unstable/hypercall/include,public,grant_table.h.html#Enum_grant_status
Well, a) we'd be defining something no one will be using (for the moment) b) I would be signing-off on something unrelated.
>
> I notice the specific wording of the error msg is different here too.
That should not be, I'll re-spin the patch.
Thanks
Andres
> It'd probably be best to use the same wording as the Xen definition, so
> all OSes end up with the same name for the same condition (else bug
> reports will be confusing).
>
> Ian.
>
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH] Xen backend support for paged out grant targets.
2012-09-13 17:28 Andres Lagar-Cavilla
@ 2012-09-13 18:11 ` Ian Campbell
2012-09-13 19:45 ` Andres Lagar-Cavilla
0 siblings, 1 reply; 23+ messages in thread
From: Ian Campbell @ 2012-09-13 18:11 UTC (permalink / raw)
To: Andres Lagar-Cavilla
Cc: xen-devel, Konrad Rzeszutek Wilk, David Vrabel, David Miller,
linux-kernel, netdev
On Thu, 2012-09-13 at 18:28 +0100, Andres Lagar-Cavilla wrote:
>
> * Add placeholder in array of grant table error descriptions for
> unrelated error code we jump over.
Why not just define it, it's listed here:
http://xenbits.xen.org/docs/unstable/hypercall/include,public,grant_table.h.html#Enum_grant_status
I notice the specific wording of the error msg is different here too.
It'd probably be best to use the same wording as the Xen definition, so
all OSes end up with the same name for the same condition (else bug
reports will be confusing).
Ian.
^ permalink raw reply [flat|nested] 23+ messages in thread
* [PATCH] Xen backend support for paged out grant targets.
@ 2012-09-13 17:28 Andres Lagar-Cavilla
2012-09-13 18:11 ` Ian Campbell
0 siblings, 1 reply; 23+ messages in thread
From: Andres Lagar-Cavilla @ 2012-09-13 17:28 UTC (permalink / raw)
To: xen-devel
Cc: Konrad Rzeszutek Wilk, Ian Campbell, David Vrabel, David Miller,
linux-kernel, netdev, Andres Lagar-Cavilla
Since Xen-4.2, hvm domains may have portions of their memory paged out. When a
foreign domain (such as dom0) attempts to map these frames, the map will
initially fail. The hypervisor returns a suitable errno, and kicks an
asynchronous page-in operation carried out by a helper. The foreign domain is
expected to retry the mapping operation until it eventually succeeds. The
foreign domain is not put to sleep because itself could be the one running the
pager assist (typical scenario for dom0).
This patch adds support for this mechanism for backend drivers using grant
mapping and copying operations. Specifically, this covers the blkback and
gntdev drivers (which map foregin grants), and the netback driver (which copies
foreign grants).
* Add GNTST_eagain, already exposed by Xen, to the grant interface.
* Add a retry method for grants that fail with GNTST_eagain (i.e. because the
target foregin frame is paged out).
* Insert hooks with appropriate macro decorators in the aforementioned drivers.
The retry loop is only invoked if the grant operation status is GNTST_eagain.
It guarantees to leave a new status code different from GNTST_eagain. Any other
status code results in identical code execution as before.
The retry loop performs 256 attempts with increasing time intervals through a
32 second period. It uses msleep to yield while waiting for the next retry.
V2 after feedback from David Vrabel:
* Explicit MAX_DELAY instead of wrap-around delay into zero
* Abstract GNTST_eagain check into core grant table code for netback module.
V3 after feedback from Ian Campbell:
* Add placeholder in array of grant table error descriptions for unrelated
error code we jump over.
* Eliminate single map and retry macro in favor of a generic batch flavor.
* Some renaming.
* Bury most implementation in grant_table.c, cleaner interface.
Signed-off-by: Andres Lagar-Cavilla <andres@lagarcavilla.org>
---
drivers/net/xen-netback/netback.c | 11 ++------
drivers/xen/grant-table.c | 53 +++++++++++++++++++++++++++++++++++
drivers/xen/xenbus/xenbus_client.c | 6 ++--
include/xen/grant_table.h | 12 ++++++++
include/xen/interface/grant_table.h | 5 +++-
5 files changed, 74 insertions(+), 13 deletions(-)
diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
index 682633b..05593d8 100644
--- a/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@ -635,9 +635,7 @@ static void xen_netbk_rx_action(struct xen_netbk *netbk)
return;
BUG_ON(npo.copy_prod > ARRAY_SIZE(netbk->grant_copy_op));
- ret = HYPERVISOR_grant_table_op(GNTTABOP_copy, &netbk->grant_copy_op,
- npo.copy_prod);
- BUG_ON(ret != 0);
+ gnttab_batch_copy(netbk->grant_copy_op, npo.copy_prod);
while ((skb = __skb_dequeue(&rxq)) != NULL) {
sco = (struct skb_cb_overlay *)skb->cb;
@@ -1460,18 +1458,15 @@ static void xen_netbk_tx_submit(struct xen_netbk *netbk)
static void xen_netbk_tx_action(struct xen_netbk *netbk)
{
unsigned nr_gops;
- int ret;
nr_gops = xen_netbk_tx_build_gops(netbk);
if (nr_gops == 0)
return;
- ret = HYPERVISOR_grant_table_op(GNTTABOP_copy,
- netbk->tx_copy_ops, nr_gops);
- BUG_ON(ret);
- xen_netbk_tx_submit(netbk);
+ gnttab_batch_copy(netbk->tx_copy_ops, nr_gops);
+ xen_netbk_tx_submit(netbk);
}
static void xen_netbk_idx_release(struct xen_netbk *netbk, u16 pending_idx)
diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c
index eea81cf..f5681c8 100644
--- a/drivers/xen/grant-table.c
+++ b/drivers/xen/grant-table.c
@@ -38,6 +38,7 @@
#include <linux/vmalloc.h>
#include <linux/uaccess.h>
#include <linux/io.h>
+#include <linux/delay.h>
#include <linux/hardirq.h>
#include <xen/xen.h>
@@ -823,6 +824,52 @@ unsigned int gnttab_max_grant_frames(void)
}
EXPORT_SYMBOL_GPL(gnttab_max_grant_frames);
+/* Handling of paged out grant targets (GNTST_eagain) */
+#define MAX_DELAY 256
+static inline void
+gnttab_retry_eagain_gop(unsigned int cmd, void *gop, int16_t *status,
+ const char *func)
+{
+ unsigned delay = 1;
+
+ do {
+ BUG_ON(HYPERVISOR_grant_table_op(cmd, gop, 1));
+ if (*status == GNTST_eagain)
+ msleep(delay++);
+ } while ((*status == GNTST_eagain) && (delay < MAX_DELAY));
+
+ if (delay >= MAX_DELAY) {
+ printk(KERN_ERR "%s: %s eagain grant\n", func, current->comm);
+ *status = GNTST_bad_page;
+ }
+}
+
+void gnttab_batch_map(struct gnttab_map_grant_ref *batch, unsigned count)
+{
+ struct gnttab_map_grant_ref *op;
+
+ if (HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, batch, count))
+ BUG();
+ for (op = batch; op < batch + count; op++)
+ if (op->status == GNTST_eagain)
+ gnttab_retry_eagain_gop(GNTTABOP_map_grant_ref, op,
+ &op->status, __func__);
+}
+EXPORT_SYMBOL_GPL(gnttab_batch_map);
+
+void gnttab_batch_copy(struct gnttab_copy *batch, unsigned count)
+{
+ struct gnttab_copy *op;
+
+ if (HYPERVISOR_grant_table_op(GNTTABOP_copy, batch, count))
+ BUG();
+ for (op = batch; op < batch + count; op++)
+ if (op->status == GNTST_eagain)
+ gnttab_retry_eagain_gop(GNTTABOP_copy, op, &op->status,
+ __func__);
+}
+EXPORT_SYMBOL_GPL(gnttab_batch_copy);
+
int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops,
struct gnttab_map_grant_ref *kmap_ops,
struct page **pages, unsigned int count)
@@ -836,6 +883,12 @@ int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops,
if (ret)
return ret;
+ /* Retry eagain maps */
+ for (i = 0; i < count; i++)
+ if (map_ops[i].status == GNTST_eagain)
+ gnttab_retry_eagain_gop(GNTTABOP_map_grant_ref, map_ops + i,
+ &map_ops[i].status, __func__);
+
if (xen_feature(XENFEAT_auto_translated_physmap))
return ret;
diff --git a/drivers/xen/xenbus/xenbus_client.c b/drivers/xen/xenbus/xenbus_client.c
index b3e146e..bcf3ba4 100644
--- a/drivers/xen/xenbus/xenbus_client.c
+++ b/drivers/xen/xenbus/xenbus_client.c
@@ -490,8 +490,7 @@ static int xenbus_map_ring_valloc_pv(struct xenbus_device *dev,
op.host_addr = arbitrary_virt_to_machine(pte).maddr;
- if (HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, &op, 1))
- BUG();
+ gnttab_batch_map(&op, 1);
if (op.status != GNTST_okay) {
free_vm_area(area);
@@ -572,8 +571,7 @@ int xenbus_map_ring(struct xenbus_device *dev, int gnt_ref,
gnttab_set_map_op(&op, (unsigned long)vaddr, GNTMAP_host_map, gnt_ref,
dev->otherend_id);
- if (HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, &op, 1))
- BUG();
+ gnttab_batch_map(&op, 1);
if (op.status != GNTST_okay) {
xenbus_dev_fatal(dev, op.status,
diff --git a/include/xen/grant_table.h b/include/xen/grant_table.h
index 11e27c3..da9386e 100644
--- a/include/xen/grant_table.h
+++ b/include/xen/grant_table.h
@@ -189,4 +189,16 @@ int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops,
int gnttab_unmap_refs(struct gnttab_unmap_grant_ref *unmap_ops,
struct page **pages, unsigned int count, bool clear_pte);
+/* Perform a batch of grant map/copy operations. Retry every batch slot
+ * for which the hypervisor returns GNTST_eagain. This is typically due
+ * to paged out target frames.
+ *
+ * Will retry for 1, 2, ... 255 ms, i.e. 256 times during 32 seconds.
+ *
+ * Return value in each iand every status field of the batch guaranteed
+ * to not be GNTST_eagain.
+ */
+void gnttab_batch_map(struct gnttab_map_grant_ref *batch, unsigned count);
+void gnttab_batch_copy(struct gnttab_copy *batch, unsigned count);
+
#endif /* __ASM_GNTTAB_H__ */
diff --git a/include/xen/interface/grant_table.h b/include/xen/interface/grant_table.h
index 7da811b..2f912d9 100644
--- a/include/xen/interface/grant_table.h
+++ b/include/xen/interface/grant_table.h
@@ -520,6 +520,7 @@ DEFINE_GUEST_HANDLE_STRUCT(gnttab_get_version);
#define GNTST_permission_denied (-8) /* Not enough privilege for operation. */
#define GNTST_bad_page (-9) /* Specified page was invalid for op. */
#define GNTST_bad_copy_arg (-10) /* copy arguments cross page boundary */
+#define GNTST_eagain (-12) /* Retry. */
#define GNTTABOP_error_msgs { \
"okay", \
@@ -532,7 +533,9 @@ DEFINE_GUEST_HANDLE_STRUCT(gnttab_get_version);
"no spare translation slot in the I/O MMU", \
"permission denied", \
"bad page", \
- "copy arguments cross page boundary" \
+ "copy arguments cross page boundary", \
+ "_placeholder_", \
+ "retry" \
}
#endif /* __XEN_PUBLIC_GRANT_TABLE_H__ */
--
1.7.9.5
^ permalink raw reply related [flat|nested] 23+ messages in thread
* Re: [PATCH] Xen backend support for paged out grant targets.
[not found] ` <1347520482.25803.46.camel@dagon.hellion.org.uk>
@ 2012-09-13 14:24 ` Andres Lagar-Cavilla
0 siblings, 0 replies; 23+ messages in thread
From: Andres Lagar-Cavilla @ 2012-09-13 14:24 UTC (permalink / raw)
To: Ian Campbell
Cc: Andres Lagar-Cavilla, xen-devel, Konrad Rzeszutek Wilk,
David Vrabel, David Miller, linux-kernel
On Sep 13, 2012, at 3:14 AM, Ian Campbell wrote:
> On Wed, 2012-09-12 at 20:45 +0100, Andres Lagar-Cavilla wrote:
>> diff --git a/include/xen/interface/grant_table.h b/include/xen/interface/grant_table.h
>> index 7da811b..66cb734 100644
>> --- a/include/xen/interface/grant_table.h
>> +++ b/include/xen/interface/grant_table.h
>> @@ -520,6 +520,7 @@ DEFINE_GUEST_HANDLE_STRUCT(gnttab_get_version);
>> #define GNTST_permission_denied (-8) /* Not enough privilege for operation. */
>> #define GNTST_bad_page (-9) /* Specified page was invalid for op. */
>> #define GNTST_bad_copy_arg (-10) /* copy arguments cross page boundary */
>
> What is -11?
-11 is something called GNTST_address_too_big on the xen public includes. Since it is not relevant too this patch I decided to skip over it. I will add a "placeholder" entry to the message array below to keep things properly aligned.
Thanks
Andres
>
> Because...
>
>> +#define GNTST_eagain (-12) /* Retry. */
>>
>> #define GNTTABOP_error_msgs { \
>> "okay", \
>> @@ -533,6 +534,7 @@ DEFINE_GUEST_HANDLE_STRUCT(gnttab_get_version);
>> "permission denied", \
>> "bad page", \
>> "copy arguments cross page boundary" \
>
> ... it should go here, otherwise retry is in the wrong place.
>
> Perhaps we should switch this to the
> [GNTTABOP_foo] = "foo"
> style of initialiser?
>
>> + "retry" \
>> }
>>
>> #endif /* __XEN_PUBLIC_GRANT_TABLE_H__ */
>
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH] Xen backend support for paged out grant targets.
2012-09-12 20:21 ` Andres Lagar-Cavilla
@ 2012-09-13 0:04 ` Andres Lagar-Cavilla
0 siblings, 0 replies; 23+ messages in thread
From: Andres Lagar-Cavilla @ 2012-09-13 0:04 UTC (permalink / raw)
To: Konrad Rzeszutek Wilk
Cc: Andres Lagar-Cavilla, xen-devel, Ian Campbell, David Vrabel,
David Miller, linux-kernel, netdev
On Sep 12, 2012, at 4:21 PM, Andres Lagar-Cavilla wrote:
>
> On Sep 12, 2012, at 4:06 PM, Konrad Rzeszutek Wilk wrote:
>
>> On Wed, Sep 12, 2012 at 03:45:53PM -0400, Andres Lagar-Cavilla wrote:
>>> Since Xen-4.2, hvm domains may have portions of their memory paged out. When a
>>> foreign domain (such as dom0) attempts to map these frames, the map will
>>> initially fail. The hypervisor returns a suitable errno, and kicks an
>>> asynchronous page-in operation carried out by a helper. The foreign domain is
>>> expected to retry the mapping operation until it eventually succeeds. The
>>> foreign domain is not put to sleep because itself could be the one running the
>>> pager assist (typical scenario for dom0).
>>
>> Looks ok to me. You forgot to put on the CC LKML and netdev mailing list
>> so I did that for you.
> Thanks. I have a concern though (re-posting from xen-devel). I need to bring attention to the following hunk:
> diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
> index 682633b..5610fd8 100644
> --- a/drivers/net/xen-netback/netback.c
> +++ b/drivers/net/xen-netback/netback.c
> @@ -635,9 +635,7 @@ static void xen_netbk_rx_action(struct xen_netbk *netbk)
> return;
>
> BUG_ON(npo.copy_prod > ARRAY_SIZE(netbk->grant_copy_op));
> - ret = HYPERVISOR_grant_table_op(GNTTABOP_copy, &netbk->grant_copy_op,
> - npo.copy_prod);
> - BUG_ON(ret != 0);
> + gnttab_batch_copy_no_eagain(netbk->grant_copy_op, npo.copy_prod);
>
> It seems like the (extant) code passes a struct gnttab_copy ** to the grant table hypercall (&netbk->grant_copy_op, defined as struct gnttab_copy [])
>
> I "fixed" it to pass a struct gnttab_copy * (netbk->grant_copy_op, no '&'). This matches the other invocation of the grant copy hyper call (in netbk_tx_action). Did I fix it, though? I am confused as to how this could have ever worked.
Well, a bit of a faceslap moment for me.
netbk->grant_copy_op and &netbk->grant_copy_op yield the same pointer, thanks to obscure rule number foo:
"""Under ANSI/ISO Standard C, &array yields a pointer, of type pointer-to-array-of-T, to the entire array. Under pre-ANSI C, the & in &array generally elicited a warning, and was generally ignored. Under all C compilers, an unadorned reference to an array yields a pointer, of type pointer-to-T, to the array's first element. """
Please review patch as is.
Thanks and pardon the noise.
Andres
>
> Andres
>
>>
>>>
>>> This patch adds support for this mechanism for backend drivers using grant
>>> mapping and copying operations. Specifically, this covers the blkback and
>>> gntdev drivers (which map foregin grants), and the netback driver (which copies
>>> foreign grants).
>>>
>>> * Add GNTST_eagain, already exposed by Xen, to the grant interface.
>>> * Add a retry method for grants that fail with GNTST_eagain (i.e. because the
>>> target foregin frame is paged out).
>>> * Insert hooks with appropriate macro decorators in the aforementioned drivers.
>>>
>>> The retry loop is only invoked if the grant operation status is GNTST_eagain.
>>> It guarantees to leave a new status code different from GNTST_eagain. Any other
>>> status code results in identical code execution as before.
>>>
>>> The retry loop performs 256 attempts with increasing time intervals through a
>>> 32 second period. It uses msleep to yield while waiting for the next retry.
>>>
>>> V2 after feedback from David Vrabel:
>>> * Explicit MAX_DELAY instead of wrap-around delay into zero
>>> * Abstract GNTST_eagain check into core grant table code for netback module.
>>>
>>> Signed-off-by: Andres Lagar-Cavilla <andres@lagarcavilla.org>
>>> ---
>>> drivers/net/xen-netback/netback.c | 11 +++-------
>>> drivers/xen/grant-table.c | 26 ++++++++++++++++++++++++
>>> drivers/xen/xenbus/xenbus_client.c | 6 ++----
>>> include/xen/grant_table.h | 38 +++++++++++++++++++++++++++++++++++
>>> include/xen/interface/grant_table.h | 2 ++
>>> 5 files changed, 71 insertions(+), 12 deletions(-)
>>>
>>> diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
>>> index 682633b..fc40258 100644
>>> --- a/drivers/net/xen-netback/netback.c
>>> +++ b/drivers/net/xen-netback/netback.c
>>> @@ -635,9 +635,7 @@ static void xen_netbk_rx_action(struct xen_netbk *netbk)
>>> return;
>>>
>>> BUG_ON(npo.copy_prod > ARRAY_SIZE(netbk->grant_copy_op));
>>> - ret = HYPERVISOR_grant_table_op(GNTTABOP_copy, &netbk->grant_copy_op,
>>> - npo.copy_prod);
>>> - BUG_ON(ret != 0);
>>> + gnttab_batch_copy_retry_eagain(netbk->grant_copy_op, npo.copy_prod);
>>>
>>> while ((skb = __skb_dequeue(&rxq)) != NULL) {
>>> sco = (struct skb_cb_overlay *)skb->cb;
>>> @@ -1460,18 +1458,15 @@ static void xen_netbk_tx_submit(struct xen_netbk *netbk)
>>> static void xen_netbk_tx_action(struct xen_netbk *netbk)
>>> {
>>> unsigned nr_gops;
>>> - int ret;
>>>
>>> nr_gops = xen_netbk_tx_build_gops(netbk);
>>>
>>> if (nr_gops == 0)
>>> return;
>>> - ret = HYPERVISOR_grant_table_op(GNTTABOP_copy,
>>> - netbk->tx_copy_ops, nr_gops);
>>> - BUG_ON(ret);
>>>
>>> - xen_netbk_tx_submit(netbk);
>>> + gnttab_batch_copy_retry_eagain(netbk->tx_copy_ops, nr_gops);
>>>
>>> + xen_netbk_tx_submit(netbk);
>>> }
>>>
>>> static void xen_netbk_idx_release(struct xen_netbk *netbk, u16 pending_idx)
>>> diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c
>>> index eea81cf..96543b2 100644
>>> --- a/drivers/xen/grant-table.c
>>> +++ b/drivers/xen/grant-table.c
>>> @@ -38,6 +38,7 @@
>>> #include <linux/vmalloc.h>
>>> #include <linux/uaccess.h>
>>> #include <linux/io.h>
>>> +#include <linux/delay.h>
>>> #include <linux/hardirq.h>
>>>
>>> #include <xen/xen.h>
>>> @@ -823,6 +824,26 @@ unsigned int gnttab_max_grant_frames(void)
>>> }
>>> EXPORT_SYMBOL_GPL(gnttab_max_grant_frames);
>>>
>>> +#define MAX_DELAY 256
>>> +void
>>> +gnttab_retry_eagain_gop(unsigned int cmd, void *gop, int16_t *status,
>>> + const char *func)
>>> +{
>>> + unsigned delay = 1;
>>> +
>>> + do {
>>> + BUG_ON(HYPERVISOR_grant_table_op(cmd, gop, 1));
>>> + if (*status == GNTST_eagain)
>>> + msleep(delay++);
>>> + } while ((*status == GNTST_eagain) && (delay < MAX_DELAY));
>>> +
>>> + if (delay >= MAX_DELAY) {
>>> + printk(KERN_ERR "%s: %s eagain grant\n", func, current->comm);
>>> + *status = GNTST_bad_page;
>>> + }
>>> +}
>>> +EXPORT_SYMBOL_GPL(gnttab_retry_eagain_gop);
>>> +
>>> int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops,
>>> struct gnttab_map_grant_ref *kmap_ops,
>>> struct page **pages, unsigned int count)
>>> @@ -836,6 +857,11 @@ int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops,
>>> if (ret)
>>> return ret;
>>>
>>> + /* Retry eagain maps */
>>> + for (i = 0; i < count; i++)
>>> + if (map_ops[i].status == GNTST_eagain)
>>> + gnttab_retry_eagain_map(map_ops + i);
>>> +
>>> if (xen_feature(XENFEAT_auto_translated_physmap))
>>> return ret;
>>>
>>> diff --git a/drivers/xen/xenbus/xenbus_client.c b/drivers/xen/xenbus/xenbus_client.c
>>> index b3e146e..a6e07ea 100644
>>> --- a/drivers/xen/xenbus/xenbus_client.c
>>> +++ b/drivers/xen/xenbus/xenbus_client.c
>>> @@ -490,8 +490,7 @@ static int xenbus_map_ring_valloc_pv(struct xenbus_device *dev,
>>>
>>> op.host_addr = arbitrary_virt_to_machine(pte).maddr;
>>>
>>> - if (HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, &op, 1))
>>> - BUG();
>>> + gnttab_map_grant_retry_eagain(&op);
>>>
>>> if (op.status != GNTST_okay) {
>>> free_vm_area(area);
>>> @@ -572,8 +571,7 @@ int xenbus_map_ring(struct xenbus_device *dev, int gnt_ref,
>>> gnttab_set_map_op(&op, (unsigned long)vaddr, GNTMAP_host_map, gnt_ref,
>>> dev->otherend_id);
>>>
>>> - if (HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, &op, 1))
>>> - BUG();
>>> + gnttab_map_grant_retry_eagain(&op);
>>>
>>> if (op.status != GNTST_okay) {
>>> xenbus_dev_fatal(dev, op.status,
>>> diff --git a/include/xen/grant_table.h b/include/xen/grant_table.h
>>> index 11e27c3..c829c83 100644
>>> --- a/include/xen/grant_table.h
>>> +++ b/include/xen/grant_table.h
>>> @@ -43,6 +43,7 @@
>>> #include <xen/interface/grant_table.h>
>>>
>>> #include <asm/xen/hypervisor.h>
>>> +#include <asm/xen/hypercall.h>
>>>
>>> #include <xen/features.h>
>>>
>>> @@ -183,6 +184,43 @@ unsigned int gnttab_max_grant_frames(void);
>>>
>>> #define gnttab_map_vaddr(map) ((void *)(map.host_virt_addr))
>>>
>>> +/* Retry a grant map/copy operation when the hypervisor returns GNTST_eagain.
>>> + * This is typically due to paged out target frames.
>>> + * Generic entry-point, use macro decorators below for specific grant
>>> + * operations.
>>> + * Will retry for 1, 2, ... 255 ms, i.e. 256 times during 32 seconds.
>>> + * Return value in *status guaranteed to no longer be GNTST_eagain. */
>>> +void gnttab_retry_eagain_gop(unsigned int cmd, void *gop, int16_t *status,
>>> + const char *func);
>>> +
>>> +#define gnttab_retry_eagain_map(_gop) \
>>> + gnttab_retry_eagain_gop(GNTTABOP_map_grant_ref, (_gop), \
>>> + &(_gop)->status, __func__)
>>> +
>>> +#define gnttab_retry_eagain_copy(_gop) \
>>> + gnttab_retry_eagain_gop(GNTTABOP_copy, (_gop), \
>>> + &(_gop)->status, __func__)
>>> +
>>> +static inline void
>>> +gnttab_map_grant_retry_eagain(struct gnttab_map_grant_ref *op)
>>> +{
>>> + BUG_ON((HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, op, 1)));
>>> + if (op->status == GNTST_eagain)
>>> + gnttab_retry_eagain_map(op);
>>> +}
>>> +
>>> +static inline void
>>> +gnttab_batch_copy_retry_eagain(struct gnttab_copy *batch, unsigned count)
>>> +{
>>> + unsigned i;
>>> + struct gnttab_copy *op;
>>> +
>>> + BUG_ON(HYPERVISOR_grant_table_op(GNTTABOP_copy, batch, count));
>>> + for (i = 0, op = batch; i < count; i++, op++)
>>> + if (op->status == GNTST_eagain)
>>> + gnttab_retry_eagain_copy(op);
>>> +}
>>> +
>>> int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops,
>>> struct gnttab_map_grant_ref *kmap_ops,
>>> struct page **pages, unsigned int count);
>>> diff --git a/include/xen/interface/grant_table.h b/include/xen/interface/grant_table.h
>>> index 7da811b..66cb734 100644
>>> --- a/include/xen/interface/grant_table.h
>>> +++ b/include/xen/interface/grant_table.h
>>> @@ -520,6 +520,7 @@ DEFINE_GUEST_HANDLE_STRUCT(gnttab_get_version);
>>> #define GNTST_permission_denied (-8) /* Not enough privilege for operation. */
>>> #define GNTST_bad_page (-9) /* Specified page was invalid for op. */
>>> #define GNTST_bad_copy_arg (-10) /* copy arguments cross page boundary */
>>> +#define GNTST_eagain (-12) /* Retry. */
>>>
>>> #define GNTTABOP_error_msgs { \
>>> "okay", \
>>> @@ -533,6 +534,7 @@ DEFINE_GUEST_HANDLE_STRUCT(gnttab_get_version);
>>> "permission denied", \
>>> "bad page", \
>>> "copy arguments cross page boundary" \
>>> + "retry" \
>>> }
>>>
>>> #endif /* __XEN_PUBLIC_GRANT_TABLE_H__ */
>>> --
>>> 1.7.9.5
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>> Please read the FAQ at http://www.tux.org/lkml/
>
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH] Xen backend support for paged out grant targets.
2012-09-12 20:06 ` Konrad Rzeszutek Wilk
@ 2012-09-12 20:21 ` Andres Lagar-Cavilla
2012-09-13 0:04 ` Andres Lagar-Cavilla
0 siblings, 1 reply; 23+ messages in thread
From: Andres Lagar-Cavilla @ 2012-09-12 20:21 UTC (permalink / raw)
To: Konrad Rzeszutek Wilk
Cc: Andres Lagar-Cavilla, xen-devel, Ian Campbell, David Vrabel,
David Miller, linux-kernel, netdev
On Sep 12, 2012, at 4:06 PM, Konrad Rzeszutek Wilk wrote:
> On Wed, Sep 12, 2012 at 03:45:53PM -0400, Andres Lagar-Cavilla wrote:
>> Since Xen-4.2, hvm domains may have portions of their memory paged out. When a
>> foreign domain (such as dom0) attempts to map these frames, the map will
>> initially fail. The hypervisor returns a suitable errno, and kicks an
>> asynchronous page-in operation carried out by a helper. The foreign domain is
>> expected to retry the mapping operation until it eventually succeeds. The
>> foreign domain is not put to sleep because itself could be the one running the
>> pager assist (typical scenario for dom0).
>
> Looks ok to me. You forgot to put on the CC LKML and netdev mailing list
> so I did that for you.
Thanks. I have a concern though (re-posting from xen-devel). I need to bring attention to the following hunk:
diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
index 682633b..5610fd8 100644
--- a/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@ -635,9 +635,7 @@ static void xen_netbk_rx_action(struct xen_netbk *netbk)
return;
BUG_ON(npo.copy_prod > ARRAY_SIZE(netbk->grant_copy_op));
- ret = HYPERVISOR_grant_table_op(GNTTABOP_copy, &netbk->grant_copy_op,
- npo.copy_prod);
- BUG_ON(ret != 0);
+ gnttab_batch_copy_no_eagain(netbk->grant_copy_op, npo.copy_prod);
It seems like the (extant) code passes a struct gnttab_copy ** to the grant table hypercall (&netbk->grant_copy_op, defined as struct gnttab_copy [])
I "fixed" it to pass a struct gnttab_copy * (netbk->grant_copy_op, no '&'). This matches the other invocation of the grant copy hyper call (in netbk_tx_action). Did I fix it, though? I am confused as to how this could have ever worked.
Andres
>
>>
>> This patch adds support for this mechanism for backend drivers using grant
>> mapping and copying operations. Specifically, this covers the blkback and
>> gntdev drivers (which map foregin grants), and the netback driver (which copies
>> foreign grants).
>>
>> * Add GNTST_eagain, already exposed by Xen, to the grant interface.
>> * Add a retry method for grants that fail with GNTST_eagain (i.e. because the
>> target foregin frame is paged out).
>> * Insert hooks with appropriate macro decorators in the aforementioned drivers.
>>
>> The retry loop is only invoked if the grant operation status is GNTST_eagain.
>> It guarantees to leave a new status code different from GNTST_eagain. Any other
>> status code results in identical code execution as before.
>>
>> The retry loop performs 256 attempts with increasing time intervals through a
>> 32 second period. It uses msleep to yield while waiting for the next retry.
>>
>> V2 after feedback from David Vrabel:
>> * Explicit MAX_DELAY instead of wrap-around delay into zero
>> * Abstract GNTST_eagain check into core grant table code for netback module.
>>
>> Signed-off-by: Andres Lagar-Cavilla <andres@lagarcavilla.org>
>> ---
>> drivers/net/xen-netback/netback.c | 11 +++-------
>> drivers/xen/grant-table.c | 26 ++++++++++++++++++++++++
>> drivers/xen/xenbus/xenbus_client.c | 6 ++----
>> include/xen/grant_table.h | 38 +++++++++++++++++++++++++++++++++++
>> include/xen/interface/grant_table.h | 2 ++
>> 5 files changed, 71 insertions(+), 12 deletions(-)
>>
>> diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
>> index 682633b..fc40258 100644
>> --- a/drivers/net/xen-netback/netback.c
>> +++ b/drivers/net/xen-netback/netback.c
>> @@ -635,9 +635,7 @@ static void xen_netbk_rx_action(struct xen_netbk *netbk)
>> return;
>>
>> BUG_ON(npo.copy_prod > ARRAY_SIZE(netbk->grant_copy_op));
>> - ret = HYPERVISOR_grant_table_op(GNTTABOP_copy, &netbk->grant_copy_op,
>> - npo.copy_prod);
>> - BUG_ON(ret != 0);
>> + gnttab_batch_copy_retry_eagain(netbk->grant_copy_op, npo.copy_prod);
>>
>> while ((skb = __skb_dequeue(&rxq)) != NULL) {
>> sco = (struct skb_cb_overlay *)skb->cb;
>> @@ -1460,18 +1458,15 @@ static void xen_netbk_tx_submit(struct xen_netbk *netbk)
>> static void xen_netbk_tx_action(struct xen_netbk *netbk)
>> {
>> unsigned nr_gops;
>> - int ret;
>>
>> nr_gops = xen_netbk_tx_build_gops(netbk);
>>
>> if (nr_gops == 0)
>> return;
>> - ret = HYPERVISOR_grant_table_op(GNTTABOP_copy,
>> - netbk->tx_copy_ops, nr_gops);
>> - BUG_ON(ret);
>>
>> - xen_netbk_tx_submit(netbk);
>> + gnttab_batch_copy_retry_eagain(netbk->tx_copy_ops, nr_gops);
>>
>> + xen_netbk_tx_submit(netbk);
>> }
>>
>> static void xen_netbk_idx_release(struct xen_netbk *netbk, u16 pending_idx)
>> diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c
>> index eea81cf..96543b2 100644
>> --- a/drivers/xen/grant-table.c
>> +++ b/drivers/xen/grant-table.c
>> @@ -38,6 +38,7 @@
>> #include <linux/vmalloc.h>
>> #include <linux/uaccess.h>
>> #include <linux/io.h>
>> +#include <linux/delay.h>
>> #include <linux/hardirq.h>
>>
>> #include <xen/xen.h>
>> @@ -823,6 +824,26 @@ unsigned int gnttab_max_grant_frames(void)
>> }
>> EXPORT_SYMBOL_GPL(gnttab_max_grant_frames);
>>
>> +#define MAX_DELAY 256
>> +void
>> +gnttab_retry_eagain_gop(unsigned int cmd, void *gop, int16_t *status,
>> + const char *func)
>> +{
>> + unsigned delay = 1;
>> +
>> + do {
>> + BUG_ON(HYPERVISOR_grant_table_op(cmd, gop, 1));
>> + if (*status == GNTST_eagain)
>> + msleep(delay++);
>> + } while ((*status == GNTST_eagain) && (delay < MAX_DELAY));
>> +
>> + if (delay >= MAX_DELAY) {
>> + printk(KERN_ERR "%s: %s eagain grant\n", func, current->comm);
>> + *status = GNTST_bad_page;
>> + }
>> +}
>> +EXPORT_SYMBOL_GPL(gnttab_retry_eagain_gop);
>> +
>> int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops,
>> struct gnttab_map_grant_ref *kmap_ops,
>> struct page **pages, unsigned int count)
>> @@ -836,6 +857,11 @@ int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops,
>> if (ret)
>> return ret;
>>
>> + /* Retry eagain maps */
>> + for (i = 0; i < count; i++)
>> + if (map_ops[i].status == GNTST_eagain)
>> + gnttab_retry_eagain_map(map_ops + i);
>> +
>> if (xen_feature(XENFEAT_auto_translated_physmap))
>> return ret;
>>
>> diff --git a/drivers/xen/xenbus/xenbus_client.c b/drivers/xen/xenbus/xenbus_client.c
>> index b3e146e..a6e07ea 100644
>> --- a/drivers/xen/xenbus/xenbus_client.c
>> +++ b/drivers/xen/xenbus/xenbus_client.c
>> @@ -490,8 +490,7 @@ static int xenbus_map_ring_valloc_pv(struct xenbus_device *dev,
>>
>> op.host_addr = arbitrary_virt_to_machine(pte).maddr;
>>
>> - if (HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, &op, 1))
>> - BUG();
>> + gnttab_map_grant_retry_eagain(&op);
>>
>> if (op.status != GNTST_okay) {
>> free_vm_area(area);
>> @@ -572,8 +571,7 @@ int xenbus_map_ring(struct xenbus_device *dev, int gnt_ref,
>> gnttab_set_map_op(&op, (unsigned long)vaddr, GNTMAP_host_map, gnt_ref,
>> dev->otherend_id);
>>
>> - if (HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, &op, 1))
>> - BUG();
>> + gnttab_map_grant_retry_eagain(&op);
>>
>> if (op.status != GNTST_okay) {
>> xenbus_dev_fatal(dev, op.status,
>> diff --git a/include/xen/grant_table.h b/include/xen/grant_table.h
>> index 11e27c3..c829c83 100644
>> --- a/include/xen/grant_table.h
>> +++ b/include/xen/grant_table.h
>> @@ -43,6 +43,7 @@
>> #include <xen/interface/grant_table.h>
>>
>> #include <asm/xen/hypervisor.h>
>> +#include <asm/xen/hypercall.h>
>>
>> #include <xen/features.h>
>>
>> @@ -183,6 +184,43 @@ unsigned int gnttab_max_grant_frames(void);
>>
>> #define gnttab_map_vaddr(map) ((void *)(map.host_virt_addr))
>>
>> +/* Retry a grant map/copy operation when the hypervisor returns GNTST_eagain.
>> + * This is typically due to paged out target frames.
>> + * Generic entry-point, use macro decorators below for specific grant
>> + * operations.
>> + * Will retry for 1, 2, ... 255 ms, i.e. 256 times during 32 seconds.
>> + * Return value in *status guaranteed to no longer be GNTST_eagain. */
>> +void gnttab_retry_eagain_gop(unsigned int cmd, void *gop, int16_t *status,
>> + const char *func);
>> +
>> +#define gnttab_retry_eagain_map(_gop) \
>> + gnttab_retry_eagain_gop(GNTTABOP_map_grant_ref, (_gop), \
>> + &(_gop)->status, __func__)
>> +
>> +#define gnttab_retry_eagain_copy(_gop) \
>> + gnttab_retry_eagain_gop(GNTTABOP_copy, (_gop), \
>> + &(_gop)->status, __func__)
>> +
>> +static inline void
>> +gnttab_map_grant_retry_eagain(struct gnttab_map_grant_ref *op)
>> +{
>> + BUG_ON((HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, op, 1)));
>> + if (op->status == GNTST_eagain)
>> + gnttab_retry_eagain_map(op);
>> +}
>> +
>> +static inline void
>> +gnttab_batch_copy_retry_eagain(struct gnttab_copy *batch, unsigned count)
>> +{
>> + unsigned i;
>> + struct gnttab_copy *op;
>> +
>> + BUG_ON(HYPERVISOR_grant_table_op(GNTTABOP_copy, batch, count));
>> + for (i = 0, op = batch; i < count; i++, op++)
>> + if (op->status == GNTST_eagain)
>> + gnttab_retry_eagain_copy(op);
>> +}
>> +
>> int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops,
>> struct gnttab_map_grant_ref *kmap_ops,
>> struct page **pages, unsigned int count);
>> diff --git a/include/xen/interface/grant_table.h b/include/xen/interface/grant_table.h
>> index 7da811b..66cb734 100644
>> --- a/include/xen/interface/grant_table.h
>> +++ b/include/xen/interface/grant_table.h
>> @@ -520,6 +520,7 @@ DEFINE_GUEST_HANDLE_STRUCT(gnttab_get_version);
>> #define GNTST_permission_denied (-8) /* Not enough privilege for operation. */
>> #define GNTST_bad_page (-9) /* Specified page was invalid for op. */
>> #define GNTST_bad_copy_arg (-10) /* copy arguments cross page boundary */
>> +#define GNTST_eagain (-12) /* Retry. */
>>
>> #define GNTTABOP_error_msgs { \
>> "okay", \
>> @@ -533,6 +534,7 @@ DEFINE_GUEST_HANDLE_STRUCT(gnttab_get_version);
>> "permission denied", \
>> "bad page", \
>> "copy arguments cross page boundary" \
>> + "retry" \
>> }
>>
>> #endif /* __XEN_PUBLIC_GRANT_TABLE_H__ */
>> --
>> 1.7.9.5
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
^ permalink raw reply related [flat|nested] 23+ messages in thread
* Re: [PATCH] Xen backend support for paged out grant targets.
[not found] <1347479153-441-1-git-send-email-andres@lagarcavilla.org>
@ 2012-09-12 20:06 ` Konrad Rzeszutek Wilk
2012-09-12 20:21 ` Andres Lagar-Cavilla
[not found] ` <1347520482.25803.46.camel@dagon.hellion.org.uk>
1 sibling, 1 reply; 23+ messages in thread
From: Konrad Rzeszutek Wilk @ 2012-09-12 20:06 UTC (permalink / raw)
To: Andres Lagar-Cavilla
Cc: xen-devel, Ian Campbell, David Vrabel, David Miller,
linux-kernel, netdev
On Wed, Sep 12, 2012 at 03:45:53PM -0400, Andres Lagar-Cavilla wrote:
> Since Xen-4.2, hvm domains may have portions of their memory paged out. When a
> foreign domain (such as dom0) attempts to map these frames, the map will
> initially fail. The hypervisor returns a suitable errno, and kicks an
> asynchronous page-in operation carried out by a helper. The foreign domain is
> expected to retry the mapping operation until it eventually succeeds. The
> foreign domain is not put to sleep because itself could be the one running the
> pager assist (typical scenario for dom0).
Looks ok to me. You forgot to put on the CC LKML and netdev mailing list
so I did that for you.
>
> This patch adds support for this mechanism for backend drivers using grant
> mapping and copying operations. Specifically, this covers the blkback and
> gntdev drivers (which map foregin grants), and the netback driver (which copies
> foreign grants).
>
> * Add GNTST_eagain, already exposed by Xen, to the grant interface.
> * Add a retry method for grants that fail with GNTST_eagain (i.e. because the
> target foregin frame is paged out).
> * Insert hooks with appropriate macro decorators in the aforementioned drivers.
>
> The retry loop is only invoked if the grant operation status is GNTST_eagain.
> It guarantees to leave a new status code different from GNTST_eagain. Any other
> status code results in identical code execution as before.
>
> The retry loop performs 256 attempts with increasing time intervals through a
> 32 second period. It uses msleep to yield while waiting for the next retry.
>
> V2 after feedback from David Vrabel:
> * Explicit MAX_DELAY instead of wrap-around delay into zero
> * Abstract GNTST_eagain check into core grant table code for netback module.
>
> Signed-off-by: Andres Lagar-Cavilla <andres@lagarcavilla.org>
> ---
> drivers/net/xen-netback/netback.c | 11 +++-------
> drivers/xen/grant-table.c | 26 ++++++++++++++++++++++++
> drivers/xen/xenbus/xenbus_client.c | 6 ++----
> include/xen/grant_table.h | 38 +++++++++++++++++++++++++++++++++++
> include/xen/interface/grant_table.h | 2 ++
> 5 files changed, 71 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
> index 682633b..fc40258 100644
> --- a/drivers/net/xen-netback/netback.c
> +++ b/drivers/net/xen-netback/netback.c
> @@ -635,9 +635,7 @@ static void xen_netbk_rx_action(struct xen_netbk *netbk)
> return;
>
> BUG_ON(npo.copy_prod > ARRAY_SIZE(netbk->grant_copy_op));
> - ret = HYPERVISOR_grant_table_op(GNTTABOP_copy, &netbk->grant_copy_op,
> - npo.copy_prod);
> - BUG_ON(ret != 0);
> + gnttab_batch_copy_retry_eagain(netbk->grant_copy_op, npo.copy_prod);
>
> while ((skb = __skb_dequeue(&rxq)) != NULL) {
> sco = (struct skb_cb_overlay *)skb->cb;
> @@ -1460,18 +1458,15 @@ static void xen_netbk_tx_submit(struct xen_netbk *netbk)
> static void xen_netbk_tx_action(struct xen_netbk *netbk)
> {
> unsigned nr_gops;
> - int ret;
>
> nr_gops = xen_netbk_tx_build_gops(netbk);
>
> if (nr_gops == 0)
> return;
> - ret = HYPERVISOR_grant_table_op(GNTTABOP_copy,
> - netbk->tx_copy_ops, nr_gops);
> - BUG_ON(ret);
>
> - xen_netbk_tx_submit(netbk);
> + gnttab_batch_copy_retry_eagain(netbk->tx_copy_ops, nr_gops);
>
> + xen_netbk_tx_submit(netbk);
> }
>
> static void xen_netbk_idx_release(struct xen_netbk *netbk, u16 pending_idx)
> diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c
> index eea81cf..96543b2 100644
> --- a/drivers/xen/grant-table.c
> +++ b/drivers/xen/grant-table.c
> @@ -38,6 +38,7 @@
> #include <linux/vmalloc.h>
> #include <linux/uaccess.h>
> #include <linux/io.h>
> +#include <linux/delay.h>
> #include <linux/hardirq.h>
>
> #include <xen/xen.h>
> @@ -823,6 +824,26 @@ unsigned int gnttab_max_grant_frames(void)
> }
> EXPORT_SYMBOL_GPL(gnttab_max_grant_frames);
>
> +#define MAX_DELAY 256
> +void
> +gnttab_retry_eagain_gop(unsigned int cmd, void *gop, int16_t *status,
> + const char *func)
> +{
> + unsigned delay = 1;
> +
> + do {
> + BUG_ON(HYPERVISOR_grant_table_op(cmd, gop, 1));
> + if (*status == GNTST_eagain)
> + msleep(delay++);
> + } while ((*status == GNTST_eagain) && (delay < MAX_DELAY));
> +
> + if (delay >= MAX_DELAY) {
> + printk(KERN_ERR "%s: %s eagain grant\n", func, current->comm);
> + *status = GNTST_bad_page;
> + }
> +}
> +EXPORT_SYMBOL_GPL(gnttab_retry_eagain_gop);
> +
> int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops,
> struct gnttab_map_grant_ref *kmap_ops,
> struct page **pages, unsigned int count)
> @@ -836,6 +857,11 @@ int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops,
> if (ret)
> return ret;
>
> + /* Retry eagain maps */
> + for (i = 0; i < count; i++)
> + if (map_ops[i].status == GNTST_eagain)
> + gnttab_retry_eagain_map(map_ops + i);
> +
> if (xen_feature(XENFEAT_auto_translated_physmap))
> return ret;
>
> diff --git a/drivers/xen/xenbus/xenbus_client.c b/drivers/xen/xenbus/xenbus_client.c
> index b3e146e..a6e07ea 100644
> --- a/drivers/xen/xenbus/xenbus_client.c
> +++ b/drivers/xen/xenbus/xenbus_client.c
> @@ -490,8 +490,7 @@ static int xenbus_map_ring_valloc_pv(struct xenbus_device *dev,
>
> op.host_addr = arbitrary_virt_to_machine(pte).maddr;
>
> - if (HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, &op, 1))
> - BUG();
> + gnttab_map_grant_retry_eagain(&op);
>
> if (op.status != GNTST_okay) {
> free_vm_area(area);
> @@ -572,8 +571,7 @@ int xenbus_map_ring(struct xenbus_device *dev, int gnt_ref,
> gnttab_set_map_op(&op, (unsigned long)vaddr, GNTMAP_host_map, gnt_ref,
> dev->otherend_id);
>
> - if (HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, &op, 1))
> - BUG();
> + gnttab_map_grant_retry_eagain(&op);
>
> if (op.status != GNTST_okay) {
> xenbus_dev_fatal(dev, op.status,
> diff --git a/include/xen/grant_table.h b/include/xen/grant_table.h
> index 11e27c3..c829c83 100644
> --- a/include/xen/grant_table.h
> +++ b/include/xen/grant_table.h
> @@ -43,6 +43,7 @@
> #include <xen/interface/grant_table.h>
>
> #include <asm/xen/hypervisor.h>
> +#include <asm/xen/hypercall.h>
>
> #include <xen/features.h>
>
> @@ -183,6 +184,43 @@ unsigned int gnttab_max_grant_frames(void);
>
> #define gnttab_map_vaddr(map) ((void *)(map.host_virt_addr))
>
> +/* Retry a grant map/copy operation when the hypervisor returns GNTST_eagain.
> + * This is typically due to paged out target frames.
> + * Generic entry-point, use macro decorators below for specific grant
> + * operations.
> + * Will retry for 1, 2, ... 255 ms, i.e. 256 times during 32 seconds.
> + * Return value in *status guaranteed to no longer be GNTST_eagain. */
> +void gnttab_retry_eagain_gop(unsigned int cmd, void *gop, int16_t *status,
> + const char *func);
> +
> +#define gnttab_retry_eagain_map(_gop) \
> + gnttab_retry_eagain_gop(GNTTABOP_map_grant_ref, (_gop), \
> + &(_gop)->status, __func__)
> +
> +#define gnttab_retry_eagain_copy(_gop) \
> + gnttab_retry_eagain_gop(GNTTABOP_copy, (_gop), \
> + &(_gop)->status, __func__)
> +
> +static inline void
> +gnttab_map_grant_retry_eagain(struct gnttab_map_grant_ref *op)
> +{
> + BUG_ON((HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, op, 1)));
> + if (op->status == GNTST_eagain)
> + gnttab_retry_eagain_map(op);
> +}
> +
> +static inline void
> +gnttab_batch_copy_retry_eagain(struct gnttab_copy *batch, unsigned count)
> +{
> + unsigned i;
> + struct gnttab_copy *op;
> +
> + BUG_ON(HYPERVISOR_grant_table_op(GNTTABOP_copy, batch, count));
> + for (i = 0, op = batch; i < count; i++, op++)
> + if (op->status == GNTST_eagain)
> + gnttab_retry_eagain_copy(op);
> +}
> +
> int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops,
> struct gnttab_map_grant_ref *kmap_ops,
> struct page **pages, unsigned int count);
> diff --git a/include/xen/interface/grant_table.h b/include/xen/interface/grant_table.h
> index 7da811b..66cb734 100644
> --- a/include/xen/interface/grant_table.h
> +++ b/include/xen/interface/grant_table.h
> @@ -520,6 +520,7 @@ DEFINE_GUEST_HANDLE_STRUCT(gnttab_get_version);
> #define GNTST_permission_denied (-8) /* Not enough privilege for operation. */
> #define GNTST_bad_page (-9) /* Specified page was invalid for op. */
> #define GNTST_bad_copy_arg (-10) /* copy arguments cross page boundary */
> +#define GNTST_eagain (-12) /* Retry. */
>
> #define GNTTABOP_error_msgs { \
> "okay", \
> @@ -533,6 +534,7 @@ DEFINE_GUEST_HANDLE_STRUCT(gnttab_get_version);
> "permission denied", \
> "bad page", \
> "copy arguments cross page boundary" \
> + "retry" \
> }
>
> #endif /* __XEN_PUBLIC_GRANT_TABLE_H__ */
> --
> 1.7.9.5
^ permalink raw reply [flat|nested] 23+ messages in thread
* [PATCH] Xen backend support for paged out grant targets.
@ 2012-09-12 19:50 Andres Lagar-Cavilla
0 siblings, 0 replies; 23+ messages in thread
From: Andres Lagar-Cavilla @ 2012-09-12 19:50 UTC (permalink / raw)
To: xen-devel
Cc: Konrad Rzeszutek Wilk, Ian Campbell, David Vrabel, David Miller,
linux-kernel, Andres Lagar-Cavilla
Since Xen-4.2, hvm domains may have portions of their memory paged out. When a
foreign domain (such as dom0) attempts to map these frames, the map will
initially fail. The hypervisor returns a suitable errno, and kicks an
asynchronous page-in operation carried out by a helper. The foreign domain is
expected to retry the mapping operation until it eventually succeeds. The
foreign domain is not put to sleep because itself could be the one running the
pager assist (typical scenario for dom0).
This patch adds support for this mechanism for backend drivers using grant
mapping and copying operations. Specifically, this covers the blkback and
gntdev drivers (which map foregin grants), and the netback driver (which copies
foreign grants).
* Add GNTST_eagain, already exposed by Xen, to the grant interface.
* Add a retry method for grants that fail with GNTST_eagain (i.e. because the
target foregin frame is paged out).
* Insert hooks with appropriate macro decorators in the aforementioned drivers.
The retry loop is only invoked if the grant operation status is GNTST_eagain.
It guarantees to leave a new status code different from GNTST_eagain. Any other
status code results in identical code execution as before.
The retry loop performs 256 attempts with increasing time intervals through a
32 second period. It uses msleep to yield while waiting for the next retry.
V2 after feedback from David Vrabel:
* Explicit MAX_DELAY instead of wrap-around delay into zero
* Abstract GNTST_eagain check into core grant table code for netback module.
Signed-off-by: Andres Lagar-Cavilla <andres@lagarcavilla.org>
---
drivers/net/xen-netback/netback.c | 11 +++-------
drivers/xen/grant-table.c | 26 ++++++++++++++++++++++++
drivers/xen/xenbus/xenbus_client.c | 6 ++----
include/xen/grant_table.h | 38 +++++++++++++++++++++++++++++++++++
include/xen/interface/grant_table.h | 2 ++
5 files changed, 71 insertions(+), 12 deletions(-)
diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
index 682633b..fc40258 100644
--- a/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@ -635,9 +635,7 @@ static void xen_netbk_rx_action(struct xen_netbk *netbk)
return;
BUG_ON(npo.copy_prod > ARRAY_SIZE(netbk->grant_copy_op));
- ret = HYPERVISOR_grant_table_op(GNTTABOP_copy, &netbk->grant_copy_op,
- npo.copy_prod);
- BUG_ON(ret != 0);
+ gnttab_batch_copy_retry_eagain(netbk->grant_copy_op, npo.copy_prod);
while ((skb = __skb_dequeue(&rxq)) != NULL) {
sco = (struct skb_cb_overlay *)skb->cb;
@@ -1460,18 +1458,15 @@ static void xen_netbk_tx_submit(struct xen_netbk *netbk)
static void xen_netbk_tx_action(struct xen_netbk *netbk)
{
unsigned nr_gops;
- int ret;
nr_gops = xen_netbk_tx_build_gops(netbk);
if (nr_gops == 0)
return;
- ret = HYPERVISOR_grant_table_op(GNTTABOP_copy,
- netbk->tx_copy_ops, nr_gops);
- BUG_ON(ret);
- xen_netbk_tx_submit(netbk);
+ gnttab_batch_copy_retry_eagain(netbk->tx_copy_ops, nr_gops);
+ xen_netbk_tx_submit(netbk);
}
static void xen_netbk_idx_release(struct xen_netbk *netbk, u16 pending_idx)
diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c
index eea81cf..96543b2 100644
--- a/drivers/xen/grant-table.c
+++ b/drivers/xen/grant-table.c
@@ -38,6 +38,7 @@
#include <linux/vmalloc.h>
#include <linux/uaccess.h>
#include <linux/io.h>
+#include <linux/delay.h>
#include <linux/hardirq.h>
#include <xen/xen.h>
@@ -823,6 +824,26 @@ unsigned int gnttab_max_grant_frames(void)
}
EXPORT_SYMBOL_GPL(gnttab_max_grant_frames);
+#define MAX_DELAY 256
+void
+gnttab_retry_eagain_gop(unsigned int cmd, void *gop, int16_t *status,
+ const char *func)
+{
+ unsigned delay = 1;
+
+ do {
+ BUG_ON(HYPERVISOR_grant_table_op(cmd, gop, 1));
+ if (*status == GNTST_eagain)
+ msleep(delay++);
+ } while ((*status == GNTST_eagain) && (delay < MAX_DELAY));
+
+ if (delay >= MAX_DELAY) {
+ printk(KERN_ERR "%s: %s eagain grant\n", func, current->comm);
+ *status = GNTST_bad_page;
+ }
+}
+EXPORT_SYMBOL_GPL(gnttab_retry_eagain_gop);
+
int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops,
struct gnttab_map_grant_ref *kmap_ops,
struct page **pages, unsigned int count)
@@ -836,6 +857,11 @@ int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops,
if (ret)
return ret;
+ /* Retry eagain maps */
+ for (i = 0; i < count; i++)
+ if (map_ops[i].status == GNTST_eagain)
+ gnttab_retry_eagain_map(map_ops + i);
+
if (xen_feature(XENFEAT_auto_translated_physmap))
return ret;
diff --git a/drivers/xen/xenbus/xenbus_client.c b/drivers/xen/xenbus/xenbus_client.c
index b3e146e..a6e07ea 100644
--- a/drivers/xen/xenbus/xenbus_client.c
+++ b/drivers/xen/xenbus/xenbus_client.c
@@ -490,8 +490,7 @@ static int xenbus_map_ring_valloc_pv(struct xenbus_device *dev,
op.host_addr = arbitrary_virt_to_machine(pte).maddr;
- if (HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, &op, 1))
- BUG();
+ gnttab_map_grant_retry_eagain(&op);
if (op.status != GNTST_okay) {
free_vm_area(area);
@@ -572,8 +571,7 @@ int xenbus_map_ring(struct xenbus_device *dev, int gnt_ref,
gnttab_set_map_op(&op, (unsigned long)vaddr, GNTMAP_host_map, gnt_ref,
dev->otherend_id);
- if (HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, &op, 1))
- BUG();
+ gnttab_map_grant_retry_eagain(&op);
if (op.status != GNTST_okay) {
xenbus_dev_fatal(dev, op.status,
diff --git a/include/xen/grant_table.h b/include/xen/grant_table.h
index 11e27c3..c829c83 100644
--- a/include/xen/grant_table.h
+++ b/include/xen/grant_table.h
@@ -43,6 +43,7 @@
#include <xen/interface/grant_table.h>
#include <asm/xen/hypervisor.h>
+#include <asm/xen/hypercall.h>
#include <xen/features.h>
@@ -183,6 +184,43 @@ unsigned int gnttab_max_grant_frames(void);
#define gnttab_map_vaddr(map) ((void *)(map.host_virt_addr))
+/* Retry a grant map/copy operation when the hypervisor returns GNTST_eagain.
+ * This is typically due to paged out target frames.
+ * Generic entry-point, use macro decorators below for specific grant
+ * operations.
+ * Will retry for 1, 2, ... 255 ms, i.e. 256 times during 32 seconds.
+ * Return value in *status guaranteed to no longer be GNTST_eagain. */
+void gnttab_retry_eagain_gop(unsigned int cmd, void *gop, int16_t *status,
+ const char *func);
+
+#define gnttab_retry_eagain_map(_gop) \
+ gnttab_retry_eagain_gop(GNTTABOP_map_grant_ref, (_gop), \
+ &(_gop)->status, __func__)
+
+#define gnttab_retry_eagain_copy(_gop) \
+ gnttab_retry_eagain_gop(GNTTABOP_copy, (_gop), \
+ &(_gop)->status, __func__)
+
+static inline void
+gnttab_map_grant_retry_eagain(struct gnttab_map_grant_ref *op)
+{
+ BUG_ON((HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, op, 1)));
+ if (op->status == GNTST_eagain)
+ gnttab_retry_eagain_map(op);
+}
+
+static inline void
+gnttab_batch_copy_retry_eagain(struct gnttab_copy *batch, unsigned count)
+{
+ unsigned i;
+ struct gnttab_copy *op;
+
+ BUG_ON(HYPERVISOR_grant_table_op(GNTTABOP_copy, batch, count));
+ for (i = 0, op = batch; i < count; i++, op++)
+ if (op->status == GNTST_eagain)
+ gnttab_retry_eagain_copy(op);
+}
+
int gnttab_map_refs(struct gnttab_map_grant_ref *map_ops,
struct gnttab_map_grant_ref *kmap_ops,
struct page **pages, unsigned int count);
diff --git a/include/xen/interface/grant_table.h b/include/xen/interface/grant_table.h
index 7da811b..66cb734 100644
--- a/include/xen/interface/grant_table.h
+++ b/include/xen/interface/grant_table.h
@@ -520,6 +520,7 @@ DEFINE_GUEST_HANDLE_STRUCT(gnttab_get_version);
#define GNTST_permission_denied (-8) /* Not enough privilege for operation. */
#define GNTST_bad_page (-9) /* Specified page was invalid for op. */
#define GNTST_bad_copy_arg (-10) /* copy arguments cross page boundary */
+#define GNTST_eagain (-12) /* Retry. */
#define GNTTABOP_error_msgs { \
"okay", \
@@ -533,6 +534,7 @@ DEFINE_GUEST_HANDLE_STRUCT(gnttab_get_version);
"permission denied", \
"bad page", \
"copy arguments cross page boundary" \
+ "retry" \
}
#endif /* __XEN_PUBLIC_GRANT_TABLE_H__ */
--
1.7.9.5
^ permalink raw reply related [flat|nested] 23+ messages in thread
end of thread, other threads:[~2012-09-14 14:28 UTC | newest]
Thread overview: 23+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-08-27 16:51 [PATCH] Xen backend support for paged out grant targets andres
2012-08-31 14:32 ` David Vrabel
2012-08-31 14:45 ` Andres Lagar-Cavilla
2012-08-31 15:42 ` Andres Lagar-Cavilla
2012-08-31 16:10 ` David Vrabel
2012-09-05 16:27 ` Konrad Rzeszutek Wilk
2012-09-05 17:21 ` Andres Lagar-Cavilla
2012-09-12 13:20 ` Andres Lagar-Cavilla
2012-09-12 18:30 ` Konrad Rzeszutek Wilk
2012-08-31 16:54 ` Konrad Rzeszutek Wilk
2012-08-31 19:33 ` Andres Lagar-Cavilla
2012-08-31 21:14 ` Konrad Rzeszutek Wilk
2012-09-12 19:50 Andres Lagar-Cavilla
[not found] <1347479153-441-1-git-send-email-andres@lagarcavilla.org>
2012-09-12 20:06 ` Konrad Rzeszutek Wilk
2012-09-12 20:21 ` Andres Lagar-Cavilla
2012-09-13 0:04 ` Andres Lagar-Cavilla
[not found] ` <1347520482.25803.46.camel@dagon.hellion.org.uk>
2012-09-13 14:24 ` Andres Lagar-Cavilla
2012-09-13 17:28 Andres Lagar-Cavilla
2012-09-13 18:11 ` Ian Campbell
2012-09-13 19:45 ` Andres Lagar-Cavilla
2012-09-14 7:19 ` Ian Campbell
2012-09-14 12:44 ` Konrad Rzeszutek Wilk
2012-09-14 14:27 ` Andres Lagar-Cavilla
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.