usb: storage: Limit transfer size to 120 kiB
RFC PATCH 1/1 usb: storage: Limit transfer size to 120 kiB
Due to constant influx of more and more weird and broken USB sticks, do as Linux does in commit 779b457f66e10de3471479373463b27fd308dc85
usb: storage: scsiglue: further describe our 240 sector limit
Just so we have some sort of documentation as to why we limit our Mass Storage transfers to 240 sectors, let's update the comment to make clearer that devices were found that would choke with larger transfers.
While at that, also make sure to clarify that other operating systems have similar, albeit different, limits on mass storage transfers.
And reduce the maximum transfer length of USB storage to 120 kiB.
--- common/usb_storage.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-)
common/usb_storage.c +17 -10
@@ -943,21 +943,28 @@ static void usb_stor_set_max_xfer_blk(struct usb_device *udev,int __maybe_unused ret;#if !CONFIG_IS_ENABLED (DM_USB ) -#ifdef CONFIG_USB_EHCI_HCD /* -* The U-Boot EHCI driver can handle any transfer length as long as -* there is enough free heap space left, but the SCSI READ(10) and -* WRITE(10) commands are limited to 65535 blocks. +* Limit the total size of a transfer to 120 KB. +* +* Some devices are known to choke with anything larger. It seems like +* the problem stems from the fact that original IDE controllers had +* only an 8-bit register to hold the number of sectors in one transfer +* and even those couldn't handle a full 256 sectors. +* +* Because we want to make sure we interoperate with as many devices as +* possible, we will maintain a 240 sector transfer size limit for USB +* Mass Storage devices. +* +* Tests show that other operating have similar limits with Microsoft +* Windows 7 limiting transfers to 128 sectors for both USB2 and USB3 +* and Apple Mac OS X 10.11 limiting transfers to 256 sectors for USB2 +* and 2048 for USB3 devices. */ - blk =USHRT_MAX ; -#else - blk =20 ; -#endif + blk =240 ;#else ret =usb_get_max_xfer_size (udev, (size_t *)&size);if (ret <0 ) { -/* unimplemented, let's use default 20 */ - blk =20 ; + blk =240 ; }else {if (size >USHRT_MAX *512 ) size =USHRT_MAX *512 ;
Signature · 1 line
2.23.0.rc1
RFC PATCH 1/1 usb: storage: Limit transfer size to 120 kiB
Quoted 51 lines · Marek Vasut
Due to constant influx of more and more weird and broken USB sticks, do as Linux does in commit
779b457f66e10de3471479373463b27fd308dc85usb: storage: scsiglue: further describe our 240 sector limit
Just so we have some sort of documentation as to why we limit our Mass Storage transfers to 240 sectors, let's update the comment to make clearer that devices were found that would choke with larger transfers.
While at that, also make sure to clarify that other operating systems have similar, albeit different, limits on mass storage transfers.
And reduce the maximum transfer length of USB storage to 120 kiB.
Signed-off-by Marek Vasut <[email protected]>Cc Bin Meng <[email protected]>Cc Simon Glass <[email protected]>--- common/usb_storage.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-)common/usb_storage.c +13
-4@@ -943,21 +943,28 @@ static void usb_stor_set_max_xfer_blk(struct usb_device *udev,int __maybe_unused ret;#if !CONFIG_IS_ENABLED (DM_USB ) -#ifdef CONFIG_USB_EHCI_HCD /* -* The U-Boot EHCI driver can handle any transfer length as long as -* there is enough free heap space left, but the SCSI READ(10) and -* WRITE(10) commands are limited to 65535 blocks. +* Limit the total size of a transfer to 120 KB. +* +* Some devices are known to choke with anything larger. It seems like +* the problem stems from the fact that original IDE controllers had +* only an 8-bit register to hold the number of sectors in one transfer +* and even those couldn't handle a full 256 sectors. +* +* Because we want to make sure we interoperate with as many devices as +* possible, we will maintain a 240 sector transfer size limit for USB +* Mass Storage devices. +* +* Tests show that other operating have similar limits with Microsoft +* Windows 7 limiting transfers to 128 sectors for both USB2 and USB3
common/usb_storage.c static void usb_stor_set_max_xfer_blk(struct usb_device *udev, · line 965
Quoted 10 lines
common/usb_storage.c +3
-4+* and Apple Mac OS X 10.11 limiting transfers to 256 sectors for USB2 +* and 2048 for USB3 devices. */ - blk =USHRT_MAX ; -#else - blk =20 ; -#endif + blk =240 ;#else ret =usb_get_max_xfer_size (udev, (size_t *)&size);
If we blindly set blk to 240 for both non-dm usb and dm usb here, which makes usb_get_max_xfer_size() useless. Should we completely drop the usb_get_max_xfer_size() call?
common/usb_storage.c static void usb_stor_set_max_xfer_blk(struct usb_device *udev,
Quoted 8 lines
common/usb_storage.c +1
-3if (ret <0 ) { -/* unimplemented, let's use default 20 */ - blk =20 ; + blk =240 ; }else {if (size >USHRT_MAX *512 ) size =USHRT_MAX *512 ; --
Regards,
Bin
RFC PATCH 1/1 usb: storage: Limit transfer size to 120 kiB
Quoted 53 lines · Bin Meng
Quoted 52 lines · Marek Vasut
Due to constant influx of more and more weird and broken USB sticks, do as Linux does in commit
779b457f66e10de3471479373463b27fd308dc85usb: storage: scsiglue: further describe our 240 sector limit
Just so we have some sort of documentation as to why we limit our Mass Storage transfers to 240 sectors, let's update the comment to make clearer that devices were found that would choke with larger transfers.
While at that, also make sure to clarify that other operating systems have similar, albeit different, limits on mass storage transfers.
And reduce the maximum transfer length of USB storage to 120 kiB.
--- common/usb_storage.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-)common/usb_storage.c +15
-5@@ -943,21 +943,28 @@ static void usb_stor_set_max_xfer_blk(struct usb_device *udev,int __maybe_unused ret;#if !CONFIG_IS_ENABLED (DM_USB ) -#ifdef CONFIG_USB_EHCI_HCD /* -* The U-Boot EHCI driver can handle any transfer length as long as -* there is enough free heap space left, but the SCSI READ(10) and -* WRITE(10) commands are limited to 65535 blocks. +* Limit the total size of a transfer to 120 KB. +* +* Some devices are known to choke with anything larger. It seems like +* the problem stems from the fact that original IDE controllers had +* only an 8-bit register to hold the number of sectors in one transfer +* and even those couldn't handle a full 256 sectors. +* +* Because we want to make sure we interoperate with as many devices as +* possible, we will maintain a 240 sector transfer size limit for USB +* Mass Storage devices. +* +* Tests show that other operating have similar limits with Microsoft +* Windows 7 limiting transfers to 128 sectors for both USB2 and USB3 +* and Apple Mac OS X 10.11 limiting transfers to 256 sectors for USB2 +* and 2048 for USB3 devices. */ - blk =USHRT_MAX ;
Quoted 8 lines
common/usb_storage.c static void usb_stor_set_max_xfer_blk(struct usb_device *udev, · line 965
Quoted 6 lines
common/usb_storage.c +1
-3-#else - blk =20 ; -#endif + blk =240 ;#else ret =usb_get_max_xfer_size (udev, (size_t *)&size);If we blindly set blk to 240 for both non-dm usb and dm usb here,
Blindly ?
Quoted 2 lines
which makes
usb_get_max_xfer_size()useless. Should we completely drop theusb_get_max_xfer_size()call?
No, I think we should keep it if we ever decided to start implementing quirks like US_FL_MAX_SECTORS_64 (cfr. Linux scsiglue.c).
Quoted 12 lines
common/usb_storage.c static void usb_stor_set_max_xfer_blk(struct usb_device *udev,
Quoted 8 lines
common/usb_storage.c +1
-3if (ret <0 ) { -/* unimplemented, let's use default 20 */ - blk =20 ; + blk =240 ; }else {if (size >USHRT_MAX *512 ) size =USHRT_MAX *512 ; --Regards,
Bin
Signature · 2 lines
Best regards, Marek Vasut
RFC PATCH 1/1 usb: storage: Limit transfer size to 120 kiB
Quoted 64 lines · Marek Vasut
Quoted 53 lines · Bin Meng
Quoted 52 lines · Marek Vasut
Due to constant influx of more and more weird and broken USB sticks, do as Linux does in commit
779b457f66e10de3471479373463b27fd308dc85usb: storage: scsiglue: further describe our 240 sector limit
Just so we have some sort of documentation as to why we limit our Mass Storage transfers to 240 sectors, let's update the comment to make clearer that devices were found that would choke with larger transfers.
While at that, also make sure to clarify that other operating systems have similar, albeit different, limits on mass storage transfers.
And reduce the maximum transfer length of USB storage to 120 kiB.
--- common/usb_storage.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-)common/usb_storage.c +15
-5@@ -943,21 +943,28 @@ static void usb_stor_set_max_xfer_blk(struct usb_device *udev,int __maybe_unused ret;#if !CONFIG_IS_ENABLED (DM_USB ) -#ifdef CONFIG_USB_EHCI_HCD /* -* The U-Boot EHCI driver can handle any transfer length as long as -* there is enough free heap space left, but the SCSI READ(10) and -* WRITE(10) commands are limited to 65535 blocks. +* Limit the total size of a transfer to 120 KB. +* +* Some devices are known to choke with anything larger. It seems like +* the problem stems from the fact that original IDE controllers had +* only an 8-bit register to hold the number of sectors in one transfer +* and even those couldn't handle a full 256 sectors. +* +* Because we want to make sure we interoperate with as many devices as +* possible, we will maintain a 240 sector transfer size limit for USB +* Mass Storage devices. +* +* Tests show that other operating have similar limits with Microsoft +* Windows 7 limiting transfers to 128 sectors for both USB2 and USB3 +* and Apple Mac OS X 10.11 limiting transfers to 256 sectors for USB2 +* and 2048 for USB3 devices. */ - blk =USHRT_MAX ;Quoted 8 lines
common/usb_storage.c static void usb_stor_set_max_xfer_blk(struct usb_device *udev, · line 965
Quoted 6 lines
common/usb_storage.c +1
-3-#else - blk =20 ; -#endif + blk =240 ;#else ret =usb_get_max_xfer_size (udev, (size_t *)&size);If we blindly set blk to 240 for both non-dm usb and dm usb here,
Quoted 1 line
Blindly ?
So based on the comments you added (also in kernel commit 779b457f66e1), it looks to me we have to set 240 for whatever usb storage devices. That suggests if usb_get_max_xfer_size() is implemented by DM USB drivers (so far only EHCI and xHCI implemented it) and return a value larger than 120KiB, some usb storage devices is subject to break.
Quoted 15 lines
Quoted 3 lines
which makes
usb_get_max_xfer_size()useless. Should we completely drop theusb_get_max_xfer_size()call?No, I think we should keep it if we ever decided to start implementing quirks like
US_FL_MAX_SECTORS_64(cfr. Linuxscsiglue.c).Quoted 8 lines
Quoted 8 lines
common/usb_storage.c +1
-3if (ret <0 ) { -/* unimplemented, let's use default 20 */ - blk =20 ; + blk =240 ; }else {if (size >USHRT_MAX *512 ) size =USHRT_MAX *512 ; --
Regards,
Bin
RFC PATCH 1/1 usb: storage: Limit transfer size to 120 kiB
Quoted 65 lines · Bin Meng
Quoted 64 lines · Marek Vasut
Quoted 61 lines · Bin Meng
Quoted 48 lines · Marek Vasut
Due to constant influx of more and more weird and broken USB sticks, do as Linux does in commit
779b457f66e10de3471479373463b27fd308dc85usb: storage: scsiglue: further describe our 240 sector limit
Just so we have some sort of documentation as to why we limit our Mass Storage transfers to 240 sectors, let's update the comment to make clearer that devices were found that would choke with larger transfers.
While at that, also make sure to clarify that other operating systems have similar, albeit different, limits on mass storage transfers.
And reduce the maximum transfer length of USB storage to 120 kiB.
--- common/usb_storage.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-)common/usb_storage.c +13
-4@@ -943,21 +943,28 @@ static void usb_stor_set_max_xfer_blk(struct usb_device *udev,int __maybe_unused ret;#if !CONFIG_IS_ENABLED (DM_USB ) -#ifdef CONFIG_USB_EHCI_HCD /* -* The U-Boot EHCI driver can handle any transfer length as long as -* there is enough free heap space left, but the SCSI READ(10) and -* WRITE(10) commands are limited to 65535 blocks. +* Limit the total size of a transfer to 120 KB. +* +* Some devices are known to choke with anything larger. It seems like +* the problem stems from the fact that original IDE controllers had +* only an 8-bit register to hold the number of sectors in one transfer +* and even those couldn't handle a full 256 sectors. +* +* Because we want to make sure we interoperate with as many devices as +* possible, we will maintain a 240 sector transfer size limit for USB +* Mass Storage devices. +* +* Tests show that other operating have similar limits with Microsoft +* Windows 7 limiting transfers to 128 sectors for both USB2 and USB3 common/usb_storage.c static void usb_stor_set_max_xfer_blk(struct usb_device *udev, · line 965
Quoted 10 lines
common/usb_storage.c +3
-4+* and Apple Mac OS X 10.11 limiting transfers to 256 sectors for USB2 +* and 2048 for USB3 devices. */ - blk =USHRT_MAX ; -#else - blk =20 ; -#endif + blk =240 ;#else ret =usb_get_max_xfer_size (udev, (size_t *)&size);If we blindly set blk to 240 for both non-dm usb and dm usb here,
Quoted 8 lines
Quoted 1 line
Blindly ?
So based on the comments you added (also in kernel commit
779b457f66e1), it looks to me we have to set 240 for whatever usb storage devices. That suggests ifusb_get_max_xfer_size()is implemented by DM USB drivers (so far only EHCI and xHCI implemented it) and return a value larger than 120KiB, some usb storage devices is subject to break.
I think we need to clamp the result of that to 240 blocks too.
Quoted 18 lines
Quoted 14 lines
Quoted 2 lines
which makes
usb_get_max_xfer_size()useless. Should we completely drop theusb_get_max_xfer_size()call?No, I think we should keep it if we ever decided to start implementing quirks like
US_FL_MAX_SECTORS_64(cfr. Linuxscsiglue.c).Quoted 8 lines
Quoted 8 lines
common/usb_storage.c +1
-3if (ret <0 ) { -/* unimplemented, let's use default 20 */ - blk =20 ; + blk =240 ; }else {if (size >USHRT_MAX *512 ) size =USHRT_MAX *512 ; --Regards,
Bin
Signature · 2 lines
Best regards, Marek Vasut