From: Oliver Neukum <oneukum@suse.com>
To: himadrispandya@gmail.com, gregKH@linuxfoundation.org,
stern@rowland.harvard.edu, linux-usb@vger.kernel.org
Cc: Oliver Neukum <oneukum@suse.com>
Subject: [RFC 01/14] Revert "USB: core: hub.c: use usb_control_msg_send() in a few places"
Date: Wed, 23 Sep 2020 15:43:35 +0200 [thread overview]
Message-ID: <20200923134348.23862-2-oneukum@suse.com> (raw)
In-Reply-To: <20200923134348.23862-1-oneukum@suse.com>
This reverts commit d6a499249543356002a1efbb26254c7272e62f4c.
Control messages are needed in contexts when memory allocations
are restricted, such as handling device resets and runtime PM.
For this reason the control message API internally uses GFP_NOIO.
This is a band aid introduced because when we recognized the issue,
the call chains were highly convoluted. Continuing this trend
is not a good idea.
So I am shooting the whole kennel here.
Signed-off-by: Oliver Neukum <oneukum@suse.com>
---
drivers/usb/core/hub.c | 99 ++++++++++++++++++++++++++++++--------------------
1 file changed, 59 insertions(+), 40 deletions(-)
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 5742ddeb0455..5b768b80d1ee 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -410,8 +410,8 @@ static int get_hub_descriptor(struct usb_device *hdev,
*/
static int clear_hub_feature(struct usb_device *hdev, int feature)
{
- return usb_control_msg_send(hdev, 0, USB_REQ_CLEAR_FEATURE, USB_RT_HUB,
- feature, 0, NULL, 0, 1000);
+ return usb_control_msg(hdev, usb_sndctrlpipe(hdev, 0),
+ USB_REQ_CLEAR_FEATURE, USB_RT_HUB, feature, 0, NULL, 0, 1000);
}
/*
@@ -419,8 +419,9 @@ static int clear_hub_feature(struct usb_device *hdev, int feature)
*/
int usb_clear_port_feature(struct usb_device *hdev, int port1, int feature)
{
- return usb_control_msg_send(hdev, 0, USB_REQ_CLEAR_FEATURE, USB_RT_PORT,
- feature, port1, NULL, 0, 1000);
+ return usb_control_msg(hdev, usb_sndctrlpipe(hdev, 0),
+ USB_REQ_CLEAR_FEATURE, USB_RT_PORT, feature, port1,
+ NULL, 0, 1000);
}
/*
@@ -428,8 +429,9 @@ int usb_clear_port_feature(struct usb_device *hdev, int port1, int feature)
*/
static int set_port_feature(struct usb_device *hdev, int port1, int feature)
{
- return usb_control_msg_send(hdev, 0, USB_REQ_SET_FEATURE, USB_RT_PORT,
- feature, port1, NULL, 0, 1000);
+ return usb_control_msg(hdev, usb_sndctrlpipe(hdev, 0),
+ USB_REQ_SET_FEATURE, USB_RT_PORT, feature, port1,
+ NULL, 0, 1000);
}
static char *to_led_name(int selector)
@@ -753,14 +755,15 @@ hub_clear_tt_buffer(struct usb_device *hdev, u16 devinfo, u16 tt)
/* Need to clear both directions for control ep */
if (((devinfo >> 11) & USB_ENDPOINT_XFERTYPE_MASK) ==
USB_ENDPOINT_XFER_CONTROL) {
- int status = usb_control_msg_send(hdev, 0,
- HUB_CLEAR_TT_BUFFER, USB_RT_PORT,
- devinfo ^ 0x8000, tt, NULL, 0, 1000);
+ int status = usb_control_msg(hdev, usb_sndctrlpipe(hdev, 0),
+ HUB_CLEAR_TT_BUFFER, USB_RT_PORT,
+ devinfo ^ 0x8000, tt, NULL, 0, 1000);
if (status)
return status;
}
- return usb_control_msg_send(hdev, 0, HUB_CLEAR_TT_BUFFER, USB_RT_PORT,
- devinfo, tt, NULL, 0, 1000);
+ return usb_control_msg(hdev, usb_sndctrlpipe(hdev, 0),
+ HUB_CLEAR_TT_BUFFER, USB_RT_PORT, devinfo,
+ tt, NULL, 0, 1000);
}
/*
@@ -1046,10 +1049,11 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type)
*/
if (type != HUB_RESUME) {
if (hdev->parent && hub_is_superspeed(hdev)) {
- ret = usb_control_msg_send(hdev, 0, HUB_SET_DEPTH, USB_RT_HUB,
- hdev->level - 1, 0, NULL, 0,
- USB_CTRL_SET_TIMEOUT);
- if (ret)
+ ret = usb_control_msg(hdev, usb_sndctrlpipe(hdev, 0),
+ HUB_SET_DEPTH, USB_RT_HUB,
+ hdev->level - 1, 0, NULL, 0,
+ USB_CTRL_SET_TIMEOUT);
+ if (ret < 0)
dev_err(hub->intfdev,
"set hub depth failed\n");
}
@@ -2325,10 +2329,13 @@ static int usb_enumerate_device_otg(struct usb_device *udev)
/* enable HNP before suspend, it's simpler */
if (port1 == bus->otg_port) {
bus->b_hnp_enable = 1;
- err = usb_control_msg_send(udev, 0, USB_REQ_SET_FEATURE, 0,
- USB_DEVICE_B_HNP_ENABLE, 0,
- NULL, 0, USB_CTRL_SET_TIMEOUT);
- if (err) {
+ err = usb_control_msg(udev,
+ usb_sndctrlpipe(udev, 0),
+ USB_REQ_SET_FEATURE, 0,
+ USB_DEVICE_B_HNP_ENABLE,
+ 0, NULL, 0,
+ USB_CTRL_SET_TIMEOUT);
+ if (err < 0) {
/*
* OTG MESSAGE: report errors here,
* customize to match your product.
@@ -2340,10 +2347,13 @@ static int usb_enumerate_device_otg(struct usb_device *udev)
} else if (desc->bLength == sizeof
(struct usb_otg_descriptor)) {
/* Set a_alt_hnp_support for legacy otg device */
- err = usb_control_msg_send(udev, 0, USB_REQ_SET_FEATURE, 0,
- USB_DEVICE_A_ALT_HNP_SUPPORT, 0,
- NULL, 0, USB_CTRL_SET_TIMEOUT);
- if (err)
+ err = usb_control_msg(udev,
+ usb_sndctrlpipe(udev, 0),
+ USB_REQ_SET_FEATURE, 0,
+ USB_DEVICE_A_ALT_HNP_SUPPORT,
+ 0, NULL, 0,
+ USB_CTRL_SET_TIMEOUT);
+ if (err < 0)
dev_err(&udev->dev,
"set a_alt_hnp_support failed: %d\n",
err);
@@ -3111,8 +3121,10 @@ int usb_disable_ltm(struct usb_device *udev)
if (!udev->actconfig)
return 0;
- return usb_control_msg_send(udev, 0, USB_REQ_CLEAR_FEATURE, USB_RECIP_DEVICE,
- USB_DEVICE_LTM_ENABLE, 0, NULL, 0, USB_CTRL_SET_TIMEOUT);
+ return usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
+ USB_REQ_CLEAR_FEATURE, USB_RECIP_DEVICE,
+ USB_DEVICE_LTM_ENABLE, 0, NULL, 0,
+ USB_CTRL_SET_TIMEOUT);
}
EXPORT_SYMBOL_GPL(usb_disable_ltm);
@@ -3131,8 +3143,10 @@ void usb_enable_ltm(struct usb_device *udev)
if (!udev->actconfig)
return;
- usb_control_msg_send(udev, 0, USB_REQ_SET_FEATURE, USB_RECIP_DEVICE,
- USB_DEVICE_LTM_ENABLE, 0, NULL, 0, USB_CTRL_SET_TIMEOUT);
+ usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
+ USB_REQ_SET_FEATURE, USB_RECIP_DEVICE,
+ USB_DEVICE_LTM_ENABLE, 0, NULL, 0,
+ USB_CTRL_SET_TIMEOUT);
}
EXPORT_SYMBOL_GPL(usb_enable_ltm);
@@ -3149,14 +3163,17 @@ EXPORT_SYMBOL_GPL(usb_enable_ltm);
static int usb_enable_remote_wakeup(struct usb_device *udev)
{
if (udev->speed < USB_SPEED_SUPER)
- return usb_control_msg_send(udev, 0, USB_REQ_SET_FEATURE, USB_RECIP_DEVICE,
- USB_DEVICE_REMOTE_WAKEUP, 0,
- NULL, 0, USB_CTRL_SET_TIMEOUT);
+ return usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
+ USB_REQ_SET_FEATURE, USB_RECIP_DEVICE,
+ USB_DEVICE_REMOTE_WAKEUP, 0, NULL, 0,
+ USB_CTRL_SET_TIMEOUT);
else
- return usb_control_msg_send(udev, 0, USB_REQ_SET_FEATURE, USB_RECIP_INTERFACE,
- USB_INTRF_FUNC_SUSPEND,
- USB_INTRF_FUNC_SUSPEND_RW | USB_INTRF_FUNC_SUSPEND_LP,
- NULL, 0, USB_CTRL_SET_TIMEOUT);
+ return usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
+ USB_REQ_SET_FEATURE, USB_RECIP_INTERFACE,
+ USB_INTRF_FUNC_SUSPEND,
+ USB_INTRF_FUNC_SUSPEND_RW |
+ USB_INTRF_FUNC_SUSPEND_LP,
+ NULL, 0, USB_CTRL_SET_TIMEOUT);
}
/*
@@ -3172,13 +3189,15 @@ static int usb_enable_remote_wakeup(struct usb_device *udev)
static int usb_disable_remote_wakeup(struct usb_device *udev)
{
if (udev->speed < USB_SPEED_SUPER)
- return usb_control_msg_send(udev, 0, USB_REQ_CLEAR_FEATURE, USB_RECIP_DEVICE,
- USB_DEVICE_REMOTE_WAKEUP, 0, NULL, 0,
- USB_CTRL_SET_TIMEOUT);
+ return usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
+ USB_REQ_CLEAR_FEATURE, USB_RECIP_DEVICE,
+ USB_DEVICE_REMOTE_WAKEUP, 0, NULL, 0,
+ USB_CTRL_SET_TIMEOUT);
else
- return usb_control_msg_send(udev, 0, USB_REQ_SET_FEATURE, USB_RECIP_INTERFACE,
- USB_INTRF_FUNC_SUSPEND, 0, NULL, 0,
- USB_CTRL_SET_TIMEOUT);
+ return usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
+ USB_REQ_SET_FEATURE, USB_RECIP_INTERFACE,
+ USB_INTRF_FUNC_SUSPEND, 0, NULL, 0,
+ USB_CTRL_SET_TIMEOUT);
}
/* Count of wakeup-enabled devices at or below udev */
--
2.16.4
next prev parent reply other threads:[~2020-09-23 13:44 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-23 13:43 [RFC] change the new message to provide for memory allocations Oliver Neukum
2020-09-23 13:43 ` Oliver Neukum [this message]
2020-09-23 13:43 ` [RFC 02/14] Revert "Bluetooth: ath3k: use usb_control_msg_send() and usb_control_msg_recv()" Oliver Neukum
2020-09-23 13:43 ` [RFC 03/14] Revert "sound: hiface: move to use usb_control_msg_send()" Oliver Neukum
2020-09-23 13:43 ` [RFC 04/14] Revert "sound: line6: move to use usb_control_msg_send() and usb_control_msg_recv()" Oliver Neukum
2020-09-23 13:43 ` [RFC 05/14] Revert "sound: 6fire: " Oliver Neukum
2020-09-23 13:43 ` [RFC 06/14] Revert "sound: usx2y: move to use usb_control_msg_send()" Oliver Neukum
2020-09-23 13:43 ` [RFC 07/14] Revert "USB: legousbtower: use usb_control_msg_recv()" Oliver Neukum
2020-09-23 13:43 ` [RFC 08/14] USB: correct API of usb_control_msg_send/recv Oliver Neukum
2020-09-25 9:31 ` [PATCH 0/2] [usb] Petko Manolov
2020-09-25 9:31 ` [PATCH 1/2] net: pegasus: convert control messages to the new send/recv scheme Petko Manolov
2020-09-25 14:37 ` Greg KH
2020-09-25 16:01 ` [PATCH 0/2] [patch v2] utilize the new control message send and receive API Petko Manolov
2020-09-25 16:01 ` [PATCH 1/2] net: pegasus: convert control messages to the new send/recv scheme Petko Manolov
2020-09-26 5:44 ` Greg KH
2020-09-26 8:21 ` Petko Manolov
2020-09-26 12:45 ` Greg KH
2020-09-25 16:02 ` [PATCH 2/2] net: rtl8150: " Petko Manolov
2020-09-25 20:14 ` kernel test robot
2020-09-25 20:14 ` kernel test robot
2020-09-25 16:05 ` [PATCH 1/2] net: pegasus: " Petko Manolov
2020-09-26 5:45 ` Greg KH
2020-09-25 9:31 ` [PATCH 2/2] net: rtl8150: " Petko Manolov
2020-09-25 14:37 ` Greg KH
2020-09-26 9:13 ` [PATCH v3 0/2] Use the new usb control message API Petko Manolov
2020-09-26 9:13 ` [PATCH v3 1/2] net: pegasus: " Petko Manolov
2020-09-26 9:13 ` [PATCH v3 2/2] net: rtl8150: " Petko Manolov
2020-09-27 10:16 ` [PATCH v3 0/2] " Greg KH
2020-09-27 12:56 ` Petko Manolov
2020-09-27 12:49 ` [PATCH RESEND " Petko Manolov
2020-09-27 12:49 ` [PATCH RESEND v3 1/2] net: pegasus: " Petko Manolov
2020-09-27 12:49 ` [PATCH RESEND v3 2/2] net: rtl8150: " Petko Manolov
2020-09-28 23:00 ` [PATCH RESEND v3 0/2] " David Miller
2020-09-29 4:59 ` Petko Manolov
2020-09-29 19:58 ` David Miller
2020-09-30 6:23 ` Greg KH
2020-09-23 13:43 ` [RFC 09/14] sound: usx2y: move to use usb_control_msg_send() Oliver Neukum
2020-09-25 14:32 ` Greg KH
2020-09-23 13:43 ` [RFC 10/14] sound: 6fire: move to use usb_control_msg_send() and usb_control_msg_recv() Oliver Neukum
2020-09-23 13:43 ` [RFC 11/14] USB: legousbtower: use usb_control_msg_recv() Oliver Neukum
2020-09-23 13:43 ` [RFC 12/14] sound: line6: move to use usb_control_msg_send() and usb_control_msg_recv() Oliver Neukum
2020-09-23 13:43 ` [RFC 13/14] sound: hiface: move to use usb_control_msg_send() Oliver Neukum
2020-09-23 13:43 ` [RFC 14/14] Bluetooth: ath3k: use usb_control_msg_send() and usb_control_msg_recv() Oliver Neukum
2020-09-23 17:21 ` [RFC] change the new message to provide for memory allocations Greg KH
2020-09-23 17:32 ` Oliver Neukum
2020-09-23 17:46 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200923134348.23862-2-oneukum@suse.com \
--to=oneukum@suse.com \
--cc=gregKH@linuxfoundation.org \
--cc=himadrispandya@gmail.com \
--cc=linux-usb@vger.kernel.org \
--cc=stern@rowland.harvard.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.