summaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorYoung Xiao <YangX92@hotmail.com>2018-11-28 13:36:39 +0100
committerJens Axboe <axboe@kernel.dk>2018-11-28 14:23:12 +0100
commita11f6ca9aef989b56cd31ff4ee2af4fb31a172ec (patch)
tree2c0e93f3b4c1ad0a91131633d738d9d3ead22ed3 /drivers/block
parentblock: sum requests in the plug structure (diff)
downloadlinux-a11f6ca9aef989b56cd31ff4ee2af4fb31a172ec.tar.xz
linux-a11f6ca9aef989b56cd31ff4ee2af4fb31a172ec.zip
sunvdc: Do not spin in an infinite loop when vio_ldc_send() returns EAGAIN
__vdc_tx_trigger should only loop on EAGAIN a finite number of times. See commit adddc32d6fde ("sunvnet: Do not spin in an infinite loop when vio_ldc_send() returns EAGAIN") for detail. Signed-off-by: Young Xiao <YangX92@hotmail.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/sunvdc.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/block/sunvdc.c b/drivers/block/sunvdc.c
index 175a64619602..9c0553dd13e7 100644
--- a/drivers/block/sunvdc.c
+++ b/drivers/block/sunvdc.c
@@ -45,6 +45,8 @@ MODULE_VERSION(DRV_MODULE_VERSION);
#define WAITING_FOR_GEN_CMD 0x04
#define WAITING_FOR_ANY -1
+#define VDC_MAX_RETRIES 10
+
static struct workqueue_struct *sunvdc_wq;
struct vdc_req_entry {
@@ -431,6 +433,7 @@ static int __vdc_tx_trigger(struct vdc_port *port)
.end_idx = dr->prod,
};
int err, delay;
+ int retries = 0;
hdr.seq = dr->snd_nxt;
delay = 1;
@@ -443,6 +446,8 @@ static int __vdc_tx_trigger(struct vdc_port *port)
udelay(delay);
if ((delay <<= 1) > 128)
delay = 128;
+ if (retries++ > VDC_MAX_RETRIES)
+ break;
} while (err == -EAGAIN);
if (err == -ENOTCONN)