Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[mirror_ubuntu-bionic-kernel.git] / drivers / hv / hv_snapshot.c

diff --git a/drivers/hv/hv_snapshot.c b/drivers/hv/hv_snapshot.c
index a6707133c297c7a1435b1bdcda446256671fc080..eee238cc60bd09da1e260863f5d0532a893cbd7d 100644 (file)
--- a/drivers/hv/hv_snapshot.c
+++ b/drivers/hv/hv_snapshot.c
@@ -31,7 +31,10 @@
 #define VSS_MINOR  0
 #define VSS_VERSION    (VSS_MAJOR << 16 | VSS_MINOR)
 
-#define VSS_USERSPACE_TIMEOUT (msecs_to_jiffies(10 * 1000))
+/*
+ * Timeout values are based on expecations from host
+ */
+#define VSS_FREEZE_TIMEOUT (15 * 60)
 
 /*
  * Global state maintained for transaction that is being processed. For a class
@@ -120,7 +123,7 @@ static int vss_handle_handshake(struct hv_vss_msg *vss_msg)
        default:
                return -EINVAL;
        }
-       pr_debug("VSS: userspace daemon ver. %d connected\n", dm_reg_value);
+       pr_info("VSS: userspace daemon ver. %d connected\n", dm_reg_value);
        return 0;
 }
 
@@ -128,8 +131,10 @@ static int vss_on_msg(void *msg, int len)
 {
        struct hv_vss_msg *vss_msg = (struct hv_vss_msg *)msg;
 
-       if (len != sizeof(*vss_msg))
+       if (len != sizeof(*vss_msg)) {
+               pr_debug("VSS: Message size does not match length\n");
                return -EINVAL;
+       }
 
        if (vss_msg->vss_hdr.operation == VSS_OP_REGISTER ||
            vss_msg->vss_hdr.operation == VSS_OP_REGISTER1) {
@@ -137,8 +142,11 @@ static int vss_on_msg(void *msg, int len)
                 * Don't process registration messages if we're in the middle
                 * of a transaction processing.
                 */
-               if (vss_transaction.state > HVUTIL_READY)
+               if (vss_transaction.state > HVUTIL_READY) {
+                       pr_debug("VSS: Got unexpected registration request\n");
                        return -EINVAL;
+               }
+
                return vss_handle_handshake(vss_msg);
        } else if (vss_transaction.state == HVUTIL_USERSPACE_REQ) {
                vss_transaction.state = HVUTIL_USERSPACE_RECV;
@@ -155,7 +163,7 @@ static int vss_on_msg(void *msg, int len)
                }
        } else {
                /* This is a spurious call! */
-               pr_warn("VSS: Transaction not active\n");
+               pr_debug("VSS: Transaction not active\n");
                return -EINVAL;
        }
        return 0;
@@ -168,8 +176,10 @@ static void vss_send_op(void)
        struct hv_vss_msg *vss_msg;
 
        /* The transaction state is wrong. */
-       if (vss_transaction.state != HVUTIL_HOSTMSG_RECEIVED)
+       if (vss_transaction.state != HVUTIL_HOSTMSG_RECEIVED) {
+               pr_debug("VSS: Unexpected attempt to send to daemon\n");
                return;
+       }
 
        vss_msg = kzalloc(sizeof(*vss_msg), GFP_KERNEL);
        if (!vss_msg)
@@ -179,7 +189,8 @@ static void vss_send_op(void)
 
        vss_transaction.state = HVUTIL_USERSPACE_REQ;
 
-       schedule_delayed_work(&vss_timeout_work, VSS_USERSPACE_TIMEOUT);
+       schedule_delayed_work(&vss_timeout_work, op == VSS_OP_FREEZE ?
+                       VSS_FREEZE_TIMEOUT * HZ : HV_UTIL_TIMEOUT * HZ);
 
        rc = hvutil_transport_send(hvt, vss_msg, sizeof(*vss_msg), NULL);
        if (rc) {
@@ -210,9 +221,13 @@ static void vss_handle_request(struct work_struct *dummy)
        case VSS_OP_HOT_BACKUP:
                if (vss_transaction.state < HVUTIL_READY) {
                        /* Userspace is not registered yet */
+                       pr_debug("VSS: Not ready for request.\n");
                        vss_respond_to_host(HV_E_FAIL);
                        return;
                }
+
+               pr_debug("VSS: Received request for op code: %d\n",
+                       vss_transaction.msg->vss_hdr.operation);
                vss_transaction.state = HVUTIL_HOSTMSG_RECEIVED;
                vss_send_op();
                return;
@@ -353,8 +368,10 @@ hv_vss_init(struct hv_util_service *srv)
 
        hvt = hvutil_transport_init(vss_devname, CN_VSS_IDX, CN_VSS_VAL,
                                    vss_on_msg, vss_on_reset);
-       if (!hvt)
+       if (!hvt) {
+               pr_warn("VSS: Failed to initialize transport\n");
                return -EFAULT;
+       }
 
        return 0;
 }