Home Explore Help
Register Sign In
wareck
/
openwrt-archive
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Tree: 2f76d8f3a7
Branches Tags
openwrt-archive
/
target
/
linux
/
brcm2708
/
patches-4.4
/
0210-vchiq_arm-Access-the-dequeue_pending-flag-locked.patch

0210-vchiq_arm-Access-the-dequeue_pending-flag-locked.patch 1.9 KB
History Raw

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758 
  1. From 1111ae49a509d672b43194d2e483f297f98d78ad Mon Sep 17 00:00:00 2001
    2. 

  2. From: Phil Elwell <phil@raspberrypi.org>
    3. 

  3. Date: Wed, 23 Mar 2016 14:16:25 +0000
    4. 

  4. Subject: [PATCH 210/381] vchiq_arm: Access the dequeue_pending flag locked
    5. 

  5. 

  6. Reading through this code looking for another problem (now found in userland)
    7. 

  7. the use of dequeue_pending outside a lock didn't seem safe.
    8. 

  8. 

  9. Signed-off-by: Phil Elwell <phil@raspberrypi.org>
    10. 

  10. ---
    11. 

  11.  .../misc/vc04_services/interface/vchiq_arm/vchiq_arm.c  | 17 ++++++++++++-----
    12. 

  12.  1 file changed, 12 insertions(+), 5 deletions(-)
    13. 

  13. 

  14. --- a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c
    15. 

  15. +++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_arm.c
    16. 

  16. @@ -279,6 +279,7 @@ service_callback(VCHIQ_REASON_T reason,
    17. 

  17.  	USER_SERVICE_T *user_service;
    18. 

  18.  	VCHIQ_SERVICE_T *service;
    19. 

  19.  	VCHIQ_INSTANCE_T instance;
    20. 

  20. +	int skip_completion = 0;
    21. 

  21.  	DEBUG_INITIALISE(g_state.local)
    22. 

  22.  
    23. 

  23.  	DEBUG_TRACE(SERVICE_CALLBACK_LINE);
    24. 

  24. @@ -345,9 +346,6 @@ service_callback(VCHIQ_REASON_T reason,
    25. 

  25.  		user_service->msg_queue[user_service->msg_insert &
    26. 

  26.  			(MSG_QUEUE_SIZE - 1)] = header;
    27. 

  27.  		user_service->msg_insert++;
    28. 

  28. -		spin_unlock(&msg_queue_spinlock);
    29. 

  29. -
    30. 

  30. -		up(&user_service->insert_event);
    31. 

  31.  
    32. 

  32.  		/* If there is a thread waiting in DEQUEUE_MESSAGE, or if
    33. 

  33.  		** there is a MESSAGE_AVAILABLE in the completion queue then
    34. 

  34. @@ -356,13 +354,22 @@ service_callback(VCHIQ_REASON_T reason,
    35. 

  35.  		if (((user_service->message_available_pos -
    36. 

  36.  			instance->completion_remove) >= 0) ||
    37. 

  37.  			user_service->dequeue_pending) {
    38. 

  38. -			DEBUG_TRACE(SERVICE_CALLBACK_LINE);
    39. 

  39.  			user_service->dequeue_pending = 0;
    40. 

  40. -			return VCHIQ_SUCCESS;
    41. 

  41. +			skip_completion = 1;
    42. 

  42.  		}
    43. 

  43.  
    44. 

  44. +		spin_unlock(&msg_queue_spinlock);
    45. 

  45. +
    46. 

  46. +		up(&user_service->insert_event);
    47. 

  47. +
    48. 

  48.  		header = NULL;
    49. 

  49.  	}
    50. 

  50. +
    51. 

  51. +	if (skip_completion) {
    52. 

  52. +		DEBUG_TRACE(SERVICE_CALLBACK_LINE);
    53. 

  53. +		return VCHIQ_SUCCESS;
    54. 

  54. +	}
    55. 

  55. +
    56. 

  56.  	DEBUG_TRACE(SERVICE_CALLBACK_LINE);
    57. 

  57.  
    58. 

  58.  	return add_completion(instance, reason, header, user_service,
    59.