PageRenderTime 57ms CodeModel.GetById 26ms RepoModel.GetById 0ms app.codeStats 0ms

/SPECS/linux/0006-Drivers-hv-vss-Improve-log-messages.patch

https://gitlab.com/unofficial-mirrors/vmware-photon
Patch | 105 lines | 94 code | 11 blank | 0 comment | 0 complexity | 8c7e3b47a7e1f070046366e92fab5067 MD5 | raw file
    

  1. From b1fa05201756d5ce898c4ec183737041284624c7 Mon Sep 17 00:00:00 2001
    2. 

  2. From: Alex Ng <alexng@messages.microsoft.com>
    3. 

  3. Date: Sun, 6 Nov 2016 13:14:10 -0800
    4. 

  4. Subject: [PATCH 06/13] Drivers: hv: vss: Improve log messages.
    5. 

  5. 

  6. Adding log messages to help troubleshoot error cases and transaction
    7. 

  7. handling.
    8. 

  8. 

  9. Signed-off-by: Alex Ng <alexng@microsoft.com>
    10. 

  10. Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
    11. 

  11. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    12. 

  12. Origin: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
    13. 

  13. (cherry picked from commit 23d2cc0c29eb0e7c6fe4cac88098306c31c40208)
    14. 

  14. ---
    15. 

  15.  drivers/hv/hv_snapshot.c | 25 +++++++++++++++++++------
    16. 

  16.  1 file changed, 19 insertions(+), 6 deletions(-)
    17. 

  17. 

  18. diff --git a/drivers/hv/hv_snapshot.c b/drivers/hv/hv_snapshot.c
    19. 

  19. index a76e3db0d01f..b1446d51ef45 100644
    20. 

  20. --- a/drivers/hv/hv_snapshot.c
    21. 

  21. +++ b/drivers/hv/hv_snapshot.c
    22. 

  22. @@ -121,7 +121,7 @@ static int vss_handle_handshake(struct hv_vss_msg *vss_msg)
    23. 

  23.  	default:
    24. 

  24.  		return -EINVAL;
    25. 

  25.  	}
    26. 

  26. -	pr_debug("VSS: userspace daemon ver. %d connected\n", dm_reg_value);
    27. 

  27. +	pr_info("VSS: userspace daemon ver. %d connected\n", dm_reg_value);
    28. 

  28.  	return 0;
    29. 

  29.  }
    30. 

  30.  
    31. 

  31. @@ -129,8 +129,10 @@ static int vss_on_msg(void *msg, int len)
    32. 

  32.  {
    33. 

  33.  	struct hv_vss_msg *vss_msg = (struct hv_vss_msg *)msg;
    34. 

  34.  
    35. 

  35. -	if (len != sizeof(*vss_msg))
    36. 

  36. +	if (len != sizeof(*vss_msg)) {
    37. 

  37. +		pr_debug("VSS: Message size does not match length\n");
    38. 

  38.  		return -EINVAL;
    39. 

  39. +	}
    40. 

  40.  
    41. 

  41.  	if (vss_msg->vss_hdr.operation == VSS_OP_REGISTER ||
    42. 

  42.  	    vss_msg->vss_hdr.operation == VSS_OP_REGISTER1) {
    43. 

  43. @@ -138,8 +140,11 @@ static int vss_on_msg(void *msg, int len)
    44. 

  44.  		 * Don't process registration messages if we're in the middle
    45. 

  45.  		 * of a transaction processing.
    46. 

  46.  		 */
    47. 

  47. -		if (vss_transaction.state > HVUTIL_READY)
    48. 

  48. +		if (vss_transaction.state > HVUTIL_READY) {
    49. 

  49. +			pr_debug("VSS: Got unexpected registration request\n");
    50. 

  50.  			return -EINVAL;
    51. 

  51. +		}
    52. 

  52. +
    53. 

  53.  		return vss_handle_handshake(vss_msg);
    54. 

  54.  	} else if (vss_transaction.state == HVUTIL_USERSPACE_REQ) {
    55. 

  55.  		vss_transaction.state = HVUTIL_USERSPACE_RECV;
    56. 

  56. @@ -156,7 +161,7 @@ static int vss_on_msg(void *msg, int len)
    57. 

  57.  		}
    58. 

  58.  	} else {
    59. 

  59.  		/* This is a spurious call! */
    60. 

  60. -		pr_warn("VSS: Transaction not active\n");
    61. 

  61. +		pr_debug("VSS: Transaction not active\n");
    62. 

  62.  		return -EINVAL;
    63. 

  63.  	}
    64. 

  64.  	return 0;
    65. 

  65. @@ -169,8 +174,10 @@ static void vss_send_op(void)
    66. 

  66.  	struct hv_vss_msg *vss_msg;
    67. 

  67.  
    68. 

  68.  	/* The transaction state is wrong. */
    69. 

  69. -	if (vss_transaction.state != HVUTIL_HOSTMSG_RECEIVED)
    70. 

  70. +	if (vss_transaction.state != HVUTIL_HOSTMSG_RECEIVED) {
    71. 

  71. +		pr_debug("VSS: Unexpected attempt to send to daemon\n");
    72. 

  72.  		return;
    73. 

  73. +	}
    74. 

  74.  
    75. 

  75.  	vss_msg = kzalloc(sizeof(*vss_msg), GFP_KERNEL);
    76. 

  76.  	if (!vss_msg)
    77. 

  77. @@ -211,9 +218,13 @@ static void vss_handle_request(struct work_struct *dummy)
    78. 

  78.  	case VSS_OP_HOT_BACKUP:
    79. 

  79.  		if (vss_transaction.state < HVUTIL_READY) {
    80. 

  80.  			/* Userspace is not registered yet */
    81. 

  81. +			pr_debug("VSS: Not ready for request.\n");
    82. 

  82.  			vss_respond_to_host(HV_E_FAIL);
    83. 

  83.  			return;
    84. 

  84.  		}
    85. 

  85. +
    86. 

  86. +		pr_debug("VSS: Received request for op code: %d\n",
    87. 

  87. +			vss_transaction.msg->vss_hdr.operation);
    88. 

  88.  		vss_transaction.state = HVUTIL_HOSTMSG_RECEIVED;
    89. 

  89.  		vss_send_op();
    90. 

  90.  		return;
    91. 

  91. @@ -356,8 +367,10 @@ hv_vss_init(struct hv_util_service *srv)
    92. 

  92.  
    93. 

  93.  	hvt = hvutil_transport_init(vss_devname, CN_VSS_IDX, CN_VSS_VAL,
    94. 

  94.  				    vss_on_msg, vss_on_reset);
    95. 

  95. -	if (!hvt)
    96. 

  96. +	if (!hvt) {
    97. 

  97. +		pr_warn("VSS: Failed to initialize transport\n");
    98. 

  98.  		return -EFAULT;
    99. 

  99. +	}
    100. 

  100.  
    101. 

  101.  	return 0;
    102. 

  102.  }
    103. 

  103. -- 
    104. 

  104. 2.13.0
    105. 

  105. 

  106.