From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49905) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dPybP-0008E2-Lr for qemu-devel@nongnu.org; Tue, 27 Jun 2017 18:04:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dPybL-0000NG-NC for qemu-devel@nongnu.org; Tue, 27 Jun 2017 18:04:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:40124) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dPybL-0000Mp-Gq for qemu-devel@nongnu.org; Tue, 27 Jun 2017 18:04:51 -0400 From: Stefano Stabellini Date: Tue, 27 Jun 2017 15:04:42 -0700 Message-Id: <1498601083-11799-2-git-send-email-sstabellini@kernel.org> In-Reply-To: <1498601083-11799-1-git-send-email-sstabellini@kernel.org> References: <1498601083-11799-1-git-send-email-sstabellini@kernel.org> Subject: [Qemu-devel] [PULL 2/3] xen-disk: only advertize feature-persistent if grant copy is not available List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: peter.maydell@linaro.org, stefanha@gmail.com Cc: sstabellini@kernel.org, stefanha@redhat.com, anthony.perard@citrix.com, xen-devel@lists.xenproject.org, qemu-devel@nongnu.org, Paul Durrant From: Paul Durrant If grant copy is available then it will always be used in preference to persistent maps. In this case feature-persistent should not be advertized to the frontend, otherwise it may needlessly copy data into persistently granted buffers. Signed-off-by: Paul Durrant Signed-off-by: Stefano Stabellini Reviewed-by: Stefano Stabellini --- hw/block/xen_disk.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/hw/block/xen_disk.c b/hw/block/xen_disk.c index 9200511..8218741 100644 --- a/hw/block/xen_disk.c +++ b/hw/block/xen_disk.c @@ -1022,11 +1022,18 @@ static int blk_init(struct XenDevice *xendev) blkdev->file_blk = BLOCK_SIZE; + blkdev->feature_grant_copy = + (xengnttab_grant_copy(blkdev->xendev.gnttabdev, 0, NULL) == 0); + + xen_pv_printf(&blkdev->xendev, 3, "grant copy operation %s\n", + blkdev->feature_grant_copy ? "enabled" : "disabled"); + /* fill info * blk_connect supplies sector-size and sectors */ xenstore_write_be_int(&blkdev->xendev, "feature-flush-cache", 1); - xenstore_write_be_int(&blkdev->xendev, "feature-persistent", 1); + xenstore_write_be_int(&blkdev->xendev, "feature-persistent", + !blkdev->feature_grant_copy); xenstore_write_be_int(&blkdev->xendev, "info", info); blk_parse_discard(blkdev); @@ -1201,12 +1208,6 @@ static int blk_connect(struct XenDevice *xendev) xen_be_bind_evtchn(&blkdev->xendev); - blkdev->feature_grant_copy = - (xengnttab_grant_copy(blkdev->xendev.gnttabdev, 0, NULL) == 0); - - xen_pv_printf(&blkdev->xendev, 3, "grant copy operation %s\n", - blkdev->feature_grant_copy ? "enabled" : "disabled"); - xen_pv_printf(&blkdev->xendev, 1, "ok: proto %s, ring-ref %d, " "remote port %d, local port %d\n", blkdev->xendev.protocol, blkdev->ring_ref, -- 1.9.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Stabellini Subject: [PULL 2/3] xen-disk: only advertize feature-persistent if grant copy is not available Date: Tue, 27 Jun 2017 15:04:42 -0700 Message-ID: <1498601083-11799-2-git-send-email-sstabellini@kernel.org> References: <1498601083-11799-1-git-send-email-sstabellini@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dPybN-0002z9-7S for xen-devel@lists.xenproject.org; Tue, 27 Jun 2017 22:04:53 +0000 In-Reply-To: <1498601083-11799-1-git-send-email-sstabellini@kernel.org> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: peter.maydell@linaro.org, stefanha@gmail.com Cc: sstabellini@kernel.org, qemu-devel@nongnu.org, Paul Durrant , stefanha@redhat.com, anthony.perard@citrix.com, xen-devel@lists.xenproject.org List-Id: xen-devel@lists.xenproject.org RnJvbTogUGF1bCBEdXJyYW50IDxwYXVsLmR1cnJhbnRAY2l0cml4LmNvbT4KCklmIGdyYW50IGNv cHkgaXMgYXZhaWxhYmxlIHRoZW4gaXQgd2lsbCBhbHdheXMgYmUgdXNlZCBpbiBwcmVmZXJlbmNl IHRvCnBlcnNpc3RlbnQgbWFwcy4gSW4gdGhpcyBjYXNlIGZlYXR1cmUtcGVyc2lzdGVudCBzaG91 bGQgbm90IGJlIGFkdmVydGl6ZWQKdG8gdGhlIGZyb250ZW5kLCBvdGhlcndpc2UgaXQgbWF5IG5l ZWRsZXNzbHkgY29weSBkYXRhIGludG8gcGVyc2lzdGVudGx5CmdyYW50ZWQgYnVmZmVycy4KClNp Z25lZC1vZmYtYnk6IFBhdWwgRHVycmFudCA8cGF1bC5kdXJyYW50QGNpdHJpeC5jb20+ClNpZ25l ZC1vZmYtYnk6IFN0ZWZhbm8gU3RhYmVsbGluaSA8c3N0YWJlbGxpbmlAa2VybmVsLm9yZz4KUmV2 aWV3ZWQtYnk6IFN0ZWZhbm8gU3RhYmVsbGluaSA8c3N0YWJlbGxpbmlAa2VybmVsLm9yZz4KLS0t CiBody9ibG9jay94ZW5fZGlzay5jIHwgMTUgKysrKysrKystLS0tLS0tCiAxIGZpbGUgY2hhbmdl ZCwgOCBpbnNlcnRpb25zKCspLCA3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2h3L2Jsb2Nr L3hlbl9kaXNrLmMgYi9ody9ibG9jay94ZW5fZGlzay5jCmluZGV4IDkyMDA1MTEuLjgyMTg3NDEg MTAwNjQ0Ci0tLSBhL2h3L2Jsb2NrL3hlbl9kaXNrLmMKKysrIGIvaHcvYmxvY2sveGVuX2Rpc2su YwpAQCAtMTAyMiwxMSArMTAyMiwxOCBAQCBzdGF0aWMgaW50IGJsa19pbml0KHN0cnVjdCBYZW5E ZXZpY2UgKnhlbmRldikKIAogICAgIGJsa2Rldi0+ZmlsZV9ibGsgID0gQkxPQ0tfU0laRTsKIAor ICAgIGJsa2Rldi0+ZmVhdHVyZV9ncmFudF9jb3B5ID0KKyAgICAgICAgICAgICAgICAoeGVuZ250 dGFiX2dyYW50X2NvcHkoYmxrZGV2LT54ZW5kZXYuZ250dGFiZGV2LCAwLCBOVUxMKSA9PSAwKTsK KworICAgIHhlbl9wdl9wcmludGYoJmJsa2Rldi0+eGVuZGV2LCAzLCAiZ3JhbnQgY29weSBvcGVy YXRpb24gJXNcbiIsCisgICAgICAgICAgICAgICAgICBibGtkZXYtPmZlYXR1cmVfZ3JhbnRfY29w eSA/ICJlbmFibGVkIiA6ICJkaXNhYmxlZCIpOworCiAgICAgLyogZmlsbCBpbmZvCiAgICAgICog YmxrX2Nvbm5lY3Qgc3VwcGxpZXMgc2VjdG9yLXNpemUgYW5kIHNlY3RvcnMKICAgICAgKi8KICAg ICB4ZW5zdG9yZV93cml0ZV9iZV9pbnQoJmJsa2Rldi0+eGVuZGV2LCAiZmVhdHVyZS1mbHVzaC1j YWNoZSIsIDEpOwotICAgIHhlbnN0b3JlX3dyaXRlX2JlX2ludCgmYmxrZGV2LT54ZW5kZXYsICJm ZWF0dXJlLXBlcnNpc3RlbnQiLCAxKTsKKyAgICB4ZW5zdG9yZV93cml0ZV9iZV9pbnQoJmJsa2Rl di0+eGVuZGV2LCAiZmVhdHVyZS1wZXJzaXN0ZW50IiwKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgIWJsa2Rldi0+ZmVhdHVyZV9ncmFudF9jb3B5KTsKICAgICB4ZW5zdG9yZV93cml0ZV9iZV9p bnQoJmJsa2Rldi0+eGVuZGV2LCAiaW5mbyIsIGluZm8pOwogCiAgICAgYmxrX3BhcnNlX2Rpc2Nh cmQoYmxrZGV2KTsKQEAgLTEyMDEsMTIgKzEyMDgsNiBAQCBzdGF0aWMgaW50IGJsa19jb25uZWN0 KHN0cnVjdCBYZW5EZXZpY2UgKnhlbmRldikKIAogICAgIHhlbl9iZV9iaW5kX2V2dGNobigmYmxr ZGV2LT54ZW5kZXYpOwogCi0gICAgYmxrZGV2LT5mZWF0dXJlX2dyYW50X2NvcHkgPQotICAgICAg ICAgICAgICAgICh4ZW5nbnR0YWJfZ3JhbnRfY29weShibGtkZXYtPnhlbmRldi5nbnR0YWJkZXYs IDAsIE5VTEwpID09IDApOwotCi0gICAgeGVuX3B2X3ByaW50ZigmYmxrZGV2LT54ZW5kZXYsIDMs ICJncmFudCBjb3B5IG9wZXJhdGlvbiAlc1xuIiwKLSAgICAgICAgICAgICAgICAgIGJsa2Rldi0+ ZmVhdHVyZV9ncmFudF9jb3B5ID8gImVuYWJsZWQiIDogImRpc2FibGVkIik7Ci0KICAgICB4ZW5f cHZfcHJpbnRmKCZibGtkZXYtPnhlbmRldiwgMSwgIm9rOiBwcm90byAlcywgcmluZy1yZWYgJWQs ICIKICAgICAgICAgICAgICAgICAgICJyZW1vdGUgcG9ydCAlZCwgbG9jYWwgcG9ydCAlZFxuIiwK ICAgICAgICAgICAgICAgICAgIGJsa2Rldi0+eGVuZGV2LnByb3RvY29sLCBibGtkZXYtPnJpbmdf cmVmLAotLSAKMS45LjEKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW4ub3JnCmh0 dHBzOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK