usb: gadget: udc: core: Invoke usb_gadget_connect only when started
Subsystems (2)
PATCH 1/2 usb: gadget: udc: core: Invoke usb_gadget_connect only when started
usb_udc_connect_control does not check to see if the udc has already been started. This causes gadget->ops->pullup to be called through usb_gadget_connect when invoked from usb_udc_vbus_handler even before usb_gadget_udc_start is called. Guard this by checking for udc->started in usb_udc_connect_control before invoking usb_gadget_connect.
Guarding udc_connect_control, udc->started and udc->vbus with its own mutex as usb_udc_connect_control_locked can be simulataneously invoked from different code paths.
--- drivers/usb/gadget/udc/core.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-)
drivers/usb/gadget/udc/core.c +16 -4
@@ -56,6 +56,8 @@ static LIST_HEAD(udc_list);/* Protects udc_list, udc->driver, driver->is_bound, and related calls */ static DEFINE_MUTEX (udc_lock); +/* Protects udc->vbus, udc-started and udc_connect_control_locked */ +static DEFINE_MUTEX (udc_connect_control_lock);/* ------------------------------------------------------------------------- */ /**
@@ -1078,9 +1080,10 @@ EXPORT_SYMBOL_GPL(usb_gadget_set_state);/* ------------------------------------------------------------------------- */ -static void usb_udc_connect_control (struct usb_udc *udc) +/* Acquire udc_connect_control_lock before calling this function. */ +static void usb_udc_connect_control_locked (struct usb_udc *udc) { -if (udc->vbus) +if (udc->vbus && udc->started)usb_gadget_connect (udc->gadget);else usb_gadget_disconnect (udc->gadget);
@@ -1099,10 +1102,12 @@ void usb_udc_vbus_handler(struct usb_gadget *gadget, bool status) {struct usb_udc *udc = gadget->udc; +mutex_lock (&udc_connect_control_lock);if (udc) { udc->vbus = status; -usb_udc_connect_control (udc); +usb_udc_connect_control_locked (udc); } +mutex_unlock (&udc_connect_control_lock); }EXPORT_SYMBOL_GPL (usb_udc_vbus_handler);
@@ -1140,14 +1145,18 @@ static inline int usb_gadget_udc_start(struct usb_udc *udc) {int ret; +mutex_lock (&udc_connect_control_lock);if (udc->started) {dev_err (&udc->dev,"UDC had already started\n" ); +mutex_unlock (&udc_connect_control_lock);return -EBUSY ; } ret = udc->gadget->ops->udc_start (udc->gadget, udc->driver);if (!ret) udc->started = true; +usb_udc_connect_control_locked (udc); +mutex_unlock (&udc_connect_control_lock);return ret; }
@@ -1165,13 +1174,17 @@ static inline int usb_gadget_udc_start(struct usb_udc *udc)*/ static inline void usb_gadget_udc_stop (struct usb_udc *udc) { +mutex_lock (&udc_connect_control_lock);if (!udc->started) {dev_err (&udc->dev,"UDC had already stopped\n" ); +mutex_unlock (&udc_connect_control_lock);return ; } udc->gadget->ops->udc_stop (udc->gadget); udc->started = false; +usb_udc_connect_control_locked (udc); +mutex_unlock (&udc_connect_control_lock); }/**
@@ -1527,7 +1540,6 @@ static int gadget_bind_driver(struct device *dev)if (ret) goto err_start;usb_gadget_enable_async_callbacks (udc); -usb_udc_connect_control (udc);kobject_uevent (&udc->dev.kobj,KOBJ_CHANGE );return 0 ;
base-commit: d629c0e221cd99198b843d8351a0a9bfec6c0423
Signature · 1 line
2.40.0.348.gf938b09366-goog
PATCH 2/2 usb: gadget: udc: core: Prevent redundant calls to pullup
usb_gadget_connect calls gadget->ops->pullup without checking whether gadget->connected was previously set. Make this symmetric to usb_gadget_disconnect by returning early if gadget->connected is already set.
--- drivers/usb/gadget/udc/core.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/usb/gadget/udc/core.c +3 -0
@@ -708,6 +708,9 @@ int usb_gadget_connect(struct usb_gadget *gadget) goto out; } +if (gadget->connected) + goto out; +if (gadget->deactivated) {/* * If gadget is deactivated we only save new state.
Signature · 1 line
2.40.0.348.gf938b09366-goog
Greg KH
maintainerRe: [PATCH v1 2/2] usb: gadget: udc: core: Prevent redundant calls to pullup
Quoted 9 lines · Badhri Jagan Sridharan
usb_gadget_connectcallsgadget->ops->pullupwithout checking whethergadget->connectedwas previously set. Make this symmetric tousb_gadget_disconnectby returning early ifgadget->connectedis already set.Signed-off-by Badhri Jagan Sridharan <[email protected]>Fixes 5a1da544e572 ("usb: gadget: core: do not try to disconnect gadget if it is not connected")
Same changelog comment as before.
Quoted 9 lines
--- drivers/usb/gadget/udc/core.c | 3 +++ 1 file changed, 3 insertions(+)drivers/usb/gadget/udc/core.c +0
-0
drivers/usb/gadget/udc/core.c int usb_gadget_connect(struct usb_gadget *gadget) · line 713
Quoted 6 lines
drivers/usb/gadget/udc/core.c +3
-0@@ -708,6 +708,9 @@ int usb_gadget_connect(struct usb_gadget *gadget) goto out; } +if (gadget->connected) + goto out; +
What prevents this connected value from changing right after you check this?
thanks,
greg k-h
Re: [PATCH v1 2/2] usb: gadget: udc: core: Prevent redundant calls to pullup
Quoted 7 lines · Greg KH
Quoted 5 lines · Badhri Jagan Sridharan
usb_gadget_connectcallsgadget->ops->pullupwithout checking whethergadget->connectedwas previously set. Make this symmetric tousb_gadget_disconnectby returning early ifgadget->connectedis already set.
Quoted 6 lines
Quoted 4 lines
Signed-off-by Badhri Jagan Sridharan <[email protected]>Fixes 5a1da544e572 ("usb: gadget: core: do not try to disconnect gadget if it is not connected")Same changelog comment as before.
Thanks for the feedback Greg ! Have fixed it in v2.
Quoted 13 lines
Quoted 13 lines
--- drivers/usb/gadget/udc/core.c | 3 +++ 1 file changed, 3 insertions(+)drivers/usb/gadget/udc/core.c +0
-0@@ -708,6 +708,9 @@ int usb_gadget_connect(struct usb_gadget *gadget) goto out; }
Quoted 6 lines
drivers/usb/gadget/udc/core.c int usb_gadget_connect(struct usb_gadget *gadget) · line 713
Quoted 3 lines
drivers/usb/gadget/udc/core.c +3
-0+if (gadget->connected) + goto out; +What prevents this connected value from changing right after you check this?
Nothing in V1 :) However, in v2, the newly introduced mutex guards gadget->connected
as well.
Quoted 4 lines
thanks,
greg k-h
Greg KH
maintainerQuoted 10 lines · Badhri Jagan Sridharan
usb_udc_connect_controldoes not check to see if the udc has already been started. This causesgadget->ops->pullupto be called throughusb_gadget_connectwhen invoked fromusb_udc_vbus_handlereven beforeusb_gadget_udc_startis called. Guard this by checking forudc->startedinusb_udc_connect_controlbefore invokingusb_gadget_connect.Guarding
udc_connect_control,udc->startedandudc->vbuswith its own mutex asusb_udc_connect_control_lockedcan be simulataneously invoked from different code paths.
You have a full 72 columns, please use them all :)
Quoted 5 lines
Signed-off-by Badhri Jagan Sridharan <[email protected]>Fixes 628ef0d273a6 ("usb: udc: add usb_udc_vbus_handler")
No blank line after cc: stable, and put the fixes above your signed-off-by line please.
Quoted 9 lines
--- drivers/usb/gadget/udc/core.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-)drivers/usb/gadget/udc/core.c +0
-0
drivers/usb/gadget/udc/core.c static LIST_HEAD(udc_list); · line 60
Quoted 5 lines
drivers/usb/gadget/udc/core.c +2
-0@@ -56,6 +56,8 @@ static LIST_HEAD(udc_list);/* Protects udc_list, udc->driver, driver->is_bound, and related calls */ static DEFINE_MUTEX (udc_lock); +/* Protects udc->vbus, udc-started and udc_connect_control_locked */ +static DEFINE_MUTEX (udc_connect_control_lock);
Why a global lock? Shouldn't this be a per-device lock?
Quoted 68 lines
drivers/usb/gadget/udc/core.c +14
-3/* ------------------------------------------------------------------------- */ /** @@ -1078,9 +1080,10 @@ EXPORT_SYMBOL_GPL(usb_gadget_set_state);/* ------------------------------------------------------------------------- */ -static void usb_udc_connect_control (struct usb_udc *udc) +/* Acquire udc_connect_control_lock before calling this function. */ +static void usb_udc_connect_control_locked (struct usb_udc *udc) { -if (udc->vbus) +if (udc->vbus && udc->started)usb_gadget_connect (udc->gadget);else usb_gadget_disconnect (udc->gadget);@@ -1099,10 +1102,12 @@ void usb_udc_vbus_handler(struct usb_gadget *gadget, bool status) {struct usb_udc *udc = gadget->udc; +mutex_lock (&udc_connect_control_lock);if (udc) { udc->vbus = status; -usb_udc_connect_control (udc); +usb_udc_connect_control_locked (udc); } +mutex_unlock (&udc_connect_control_lock); }EXPORT_SYMBOL_GPL (usb_udc_vbus_handler);@@ -1140,14 +1145,18 @@ static inline int usb_gadget_udc_start(struct usb_udc *udc) {int ret; +mutex_lock (&udc_connect_control_lock);if (udc->started) {dev_err (&udc->dev,"UDC had already started\n" ); +mutex_unlock (&udc_connect_control_lock);return -EBUSY ; } ret = udc->gadget->ops->udc_start (udc->gadget, udc->driver);if (!ret) udc->started = true; +usb_udc_connect_control_locked (udc); +mutex_unlock (&udc_connect_control_lock);return ret; }@@ -1165,13 +1174,17 @@ static inline int usb_gadget_udc_start(struct usb_udc *udc)*/ static inline void usb_gadget_udc_stop (struct usb_udc *udc) { +mutex_lock (&udc_connect_control_lock);if (!udc->started) {dev_err (&udc->dev,"UDC had already stopped\n" ); +mutex_unlock (&udc_connect_control_lock);return ; } udc->gadget->ops->udc_stop (udc->gadget); udc->started = false; +usb_udc_connect_control_locked (udc); +mutex_unlock (&udc_connect_control_lock); }/**
drivers/usb/gadget/udc/core.c static int gadget_bind_driver(struct device *dev) · line 1530
Quoted 4 lines
drivers/usb/gadget/udc/core.c +0
-1@@ -1527,7 +1540,6 @@ static int gadget_bind_driver(struct device *dev)if (ret) goto err_start;usb_gadget_enable_async_callbacks (udc); -usb_udc_connect_control (udc);
Why drop this call here?
thanks,
greg k-h
Quoted 7 lines · Badhri Jagan Sridharan
usb_udc_connect_controldoes not check to see if the udc has already been started. This causesgadget->ops->pullupto be called throughusb_gadget_connectwhen invoked fromusb_udc_vbus_handlereven beforeusb_gadget_udc_startis called. Guard this by checking forudc->startedinusb_udc_connect_controlbefore invokingusb_gadget_connect.
Quoted 8 lines
Guarding
udc_connect_control,udc->startedandudc->vbuswith its own mutex asusb_udc_connect_control_lockedcan be simulataneously invoked from different code paths.Signed-off-by Badhri Jagan Sridharan <[email protected]>Fixes 628ef0d273a6 ("usb: udc: add usb_udc_vbus_handler")
There's a problem with this patch.
Quoted 15 lines
--- drivers/usb/gadget/udc/core.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-)drivers/usb/gadget/udc/core.c +1
-0@@ -1140,14 +1145,18 @@ static inline int usb_gadget_udc_start(struct usb_udc *udc) {int ret; +mutex_lock (&udc_connect_control_lock);if (udc->started) {
drivers/usb/gadget/udc/core.c static inline int usb_gadget_udc_start(struct usb_udc *udc) · line 1159
Quoted 10 lines
drivers/usb/gadget/udc/core.c +3
-0dev_err (&udc->dev,"UDC had already started\n" ); +mutex_unlock (&udc_connect_control_lock);return -EBUSY ; } ret = udc->gadget->ops->udc_start (udc->gadget, udc->driver);if (!ret) udc->started = true; +usb_udc_connect_control_locked (udc); +mutex_unlock (&udc_connect_control_lock);
You moved the connect_control call up here, into usb_gadget_udc_start().
Quoted 21 lines
drivers/usb/gadget/udc/core.c +4
-0return ret; }@@ -1165,13 +1174,17 @@ static inline int usb_gadget_udc_start(struct usb_udc *udc)*/ static inline void usb_gadget_udc_stop (struct usb_udc *udc) { +mutex_lock (&udc_connect_control_lock);if (!udc->started) {dev_err (&udc->dev,"UDC had already stopped\n" ); +mutex_unlock (&udc_connect_control_lock);return ; } udc->gadget->ops->udc_stop (udc->gadget); udc->started = false; +usb_udc_connect_control_locked (udc); +mutex_unlock (&udc_connect_control_lock); }/**
drivers/usb/gadget/udc/core.c static int gadget_bind_driver(struct device *dev) · line 1530
Quoted 4 lines
drivers/usb/gadget/udc/core.c +0
-1@@ -1527,7 +1540,6 @@ static int gadget_bind_driver(struct device *dev)if (ret) goto err_start;usb_gadget_enable_async_callbacks (udc); -usb_udc_connect_control (udc);
This is where it used to be.
The problem is that in the gadget_bind_driver pathway, usb_gadget_enable_async_callbacks() has to run _before_ the gadget connects. Maybe you can fix this by leaving the function call in its original location and protecting it with the new mutex?
There may be a similar problem with disconnecting and the gadget_unbind_driver pathway (usb_gadget_disable_async_callbacks() has to run _after_ the disconnect occurs). I haven't tried to follow the patch in enough detail to see whether that's an issue.
Alan Stern
Quoted 8 lines
drivers/usb/gadget/udc/core.c +0
-0kobject_uevent (&udc->dev.kobj,KOBJ_CHANGE );return 0 ;base-commit:
d629c0e221cd99198b843d8351a0a9bfec6c0423Signature · 1 line
2.40.0.348.gf938b09366-goog
Quoted 1 line
No blank line after cc: stable, and put the fixes above your
signed-off-by line please.
Fixed all commit message related concerns.
Quoted 1 line
Why a global lock? Shouldn't this be a per-device lock?
Ack ! Addressed this in V2.
Quoted 40 lines · Alan Stern
Quoted 7 lines · Badhri Jagan Sridharan
usb_udc_connect_controldoes not check to see if the udc has already been started. This causesgadget->ops->pullupto be called throughusb_gadget_connectwhen invoked fromusb_udc_vbus_handlereven beforeusb_gadget_udc_startis called. Guard this by checking forudc->startedinusb_udc_connect_controlbefore invokingusb_gadget_connect.Quoted 8 lines
Guarding
udc_connect_control,udc->startedandudc->vbuswith its own mutex asusb_udc_connect_control_lockedcan be simulataneously invoked from different code paths.Signed-off-by Badhri Jagan Sridharan <[email protected]>Fixes 628ef0d273a6 ("usb: udc: add usb_udc_vbus_handler")There's a problem with this patch.
Quoted 20 lines
--- drivers/usb/gadget/udc/core.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-)drivers/usb/gadget/udc/core.c +2
-0@@ -1140,14 +1145,18 @@ static inline int usb_gadget_udc_start(struct usb_udc *udc) {int ret; +mutex_lock (&udc_connect_control_lock);if (udc->started) {dev_err (&udc->dev,"UDC had already started\n" ); +mutex_unlock (&udc_connect_control_lock);return -EBUSY ; }
Quoted 7 lines
drivers/usb/gadget/udc/core.c static inline int usb_gadget_udc_start(struct usb_udc *udc) · line 1159
Quoted 5 lines
drivers/usb/gadget/udc/core.c +2
-0ret = udc->gadget->ops->udc_start (udc->gadget, udc->driver);if (!ret) udc->started = true; +usb_udc_connect_control_locked (udc); +mutex_unlock (&udc_connect_control_lock);You moved the
connect_controlcall up here, intousb_gadget_udc_start().
Have moved it back into gadget_bind_driver.
Quoted 34 lines
Quoted 22 lines
drivers/usb/gadget/udc/core.c +4
-0return ret; }@@ -1165,13 +1174,17 @@ static inline int usb_gadget_udc_start(struct usb_udc *udc)*/ static inline void usb_gadget_udc_stop (struct usb_udc *udc) { +mutex_lock (&udc_connect_control_lock);if (!udc->started) {dev_err (&udc->dev,"UDC had already stopped\n" ); +mutex_unlock (&udc_connect_control_lock);return ; } udc->gadget->ops->udc_stop (udc->gadget); udc->started = false; +usb_udc_connect_control_locked (udc); +mutex_unlock (&udc_connect_control_lock); }/** drivers/usb/gadget/udc/core.c static int gadget_bind_driver(struct device *dev) · line 1530
Quoted 4 lines
drivers/usb/gadget/udc/core.c +0
-1@@ -1527,7 +1540,6 @@ static int gadget_bind_driver(struct device *dev)if (ret) goto err_start;usb_gadget_enable_async_callbacks (udc); -usb_udc_connect_control (udc);This is where it used to be.
The problem is that in the
gadget_bind_driverpathway,usb_gadget_enable_async_callbacks()has to run _before_ the gadget connects. Maybe you can fix this by leaving the function call in its original location and protecting it with the new mutex?
Quoted 4 lines
There may be a similar problem with disconnecting and the
gadget_unbind_driverpathway (usb_gadget_disable_async_callbacks()has to run _after_ the disconnect occurs). I haven't tried to follow the patch in enough detail to see whether that's an issue.
Thanks for explaining what's the expectation here. I have incorporated the feedback in v2.
The new lock now additionally guards gadget->connect and gadget->deactivate as well. Guarding all with the new lock as they are related to one another. I have made sure that the gadget_bind_driver and gadget_unbind_driver sequence remains unaltered.
Quoted 11 lines
Alan Stern
Quoted 8 lines
drivers/usb/gadget/udc/core.c +0
-0kobject_uevent (&udc->dev.kobj,KOBJ_CHANGE );return 0 ;base-commit:
d629c0e221cd99198b843d8351a0a9bfec6c0423--
2.40.0.348.gf938b09366-goog