* [PATCH 2/4] usb: f_mass_storage: Check bh->state in sleep_thread
2021-07-08 17:14 [PATCH 1/4] cmd: usb_mass_storage: Use part_get_info_by_dev_and_name_or_num Sean Anderson
@ 2021-07-08 17:14 ` Sean Anderson
2021-07-08 17:14 ` [PATCH 3/4] usb: f_mass_storage: Drop wakeup_needed Sean Anderson
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Sean Anderson @ 2021-07-08 17:14 UTC (permalink / raw)
To: u-boot, Lukasz Majewski
Cc: Maxime Ripard, Jun Li, Andre Przywara, Jagan Teki, Marek Vasut,
Marek Szyprowski, Ye Li, Peng Fan, Bryan O'Donoghue,
Sean Anderson
Every caller of sleep_thread except one wraps it in a second loop which
waits for a buffer head to be filled. Since sleep_thread is already
(infinitely) looping, we can move this check down. Some parts of the code
have been reorganized to better take advantage of this property and and be
structured closer to their Linux counterparts.
In addition, sleep_thread now returns -EINTR if we need to wake up,
mirroring Linux. This takes advantage of the existing logic regarding
sleep_thread, which typically returns immediately on error. With this
change, any exception causes the current operation to be backed out of
immediately.
Lastly, we only clear thread_wakeup_needed in handle_exception, mirroring
Linux's signal-handling logic. Any subsequent calls to sleep_thread will
still wake up.
While these changes are conceptually different, their implementation is
interdependent, so they are all performed at once.
These changes are primarily inspired by Linux commit 225785aec726 ("USB:
f_mass_storage: improve memory barriers and synchronization").
Signed-off-by: Sean Anderson <sean.anderson@seco.com>
---
drivers/usb/gadget/f_mass_storage.c | 225 ++++++++++++----------------
drivers/usb/gadget/storage_common.c | 2 +-
2 files changed, 100 insertions(+), 127 deletions(-)
diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c
index 45f0504b6e..99935fe9a3 100644
--- a/drivers/usb/gadget/f_mass_storage.c
+++ b/drivers/usb/gadget/f_mass_storage.c
@@ -652,15 +652,17 @@ static void busy_indicator(void)
state = 0;
}
-static int sleep_thread(struct fsg_common *common)
+static int sleep_thread(struct fsg_common *common, struct fsg_buffhd *bh)
{
- int rc = 0;
int i = 0, k = 0;
- /* Wait until a signal arrives or we are woken up */
- for (;;) {
- if (common->thread_wakeup_needed)
- break;
+ /*
+ * Wait until a signal arrives, we are woken up, or the buffer head is
+ * full.
+ */
+ while (!bh || bh->state == BUF_STATE_BUSY) {
+ if (exception_in_progress(common))
+ return -EINTR;
if (++i == 20000) {
busy_indicator();
@@ -682,8 +684,7 @@ static int sleep_thread(struct fsg_common *common)
usb_gadget_handle_interrupts(controller_index);
}
- common->thread_wakeup_needed = 0;
- return rc;
+ return 0;
}
/*-------------------------------------------------------------------------*/
@@ -744,11 +745,9 @@ static int do_read(struct fsg_common *common)
/* Wait for the next buffer to become available */
bh = common->next_buffhd_to_fill;
- while (bh->state != BUF_STATE_EMPTY) {
- rc = sleep_thread(common);
- if (rc)
- return rc;
- }
+ rc = sleep_thread(common, bh);
+ if (rc)
+ return rc;
/* If we were asked to read past the end of file,
* end with an empty buffer. */
@@ -922,67 +921,64 @@ static int do_write(struct fsg_common *common)
bh = common->next_buffhd_to_drain;
if (bh->state == BUF_STATE_EMPTY && !get_some_more)
break; /* We stopped early */
- if (bh->state == BUF_STATE_FULL) {
- common->next_buffhd_to_drain = bh->next;
- bh->state = BUF_STATE_EMPTY;
- /* Did something go wrong with the transfer? */
- if (bh->outreq->status != 0) {
- curlun->sense_data = SS_COMMUNICATION_FAILURE;
- curlun->info_valid = 1;
- break;
- }
+ rc = sleep_thread(common, bh);
+ if (rc)
+ return rc;
- amount = bh->outreq->actual;
+ common->next_buffhd_to_drain = bh->next;
+ bh->state = BUF_STATE_EMPTY;
- /* Perform the write */
- rc = ums[common->lun].write_sector(&ums[common->lun],
- file_offset / SECTOR_SIZE,
- amount / SECTOR_SIZE,
- (char __user *)bh->buf);
- if (!rc)
- return -EIO;
- nwritten = rc * SECTOR_SIZE;
+ /* Did something go wrong with the transfer? */
+ if (bh->outreq->status != 0) {
+ curlun->sense_data = SS_COMMUNICATION_FAILURE;
+ curlun->info_valid = 1;
+ break;
+ }
- VLDBG(curlun, "file write %u @ %llu -> %d\n", amount,
- (unsigned long long) file_offset,
- (int) nwritten);
+ amount = bh->outreq->actual;
- if (nwritten < 0) {
- LDBG(curlun, "error in file write: %d\n",
- (int) nwritten);
- nwritten = 0;
- } else if (nwritten < amount) {
- LDBG(curlun, "partial file write: %d/%u\n",
- (int) nwritten, amount);
- nwritten -= (nwritten & 511);
- /* Round down to a block */
- }
- file_offset += nwritten;
- amount_left_to_write -= nwritten;
- common->residue -= nwritten;
-
- /* If an error occurred, report it and its position */
- if (nwritten < amount) {
- printf("nwritten:%zd amount:%u\n", nwritten,
- amount);
- curlun->sense_data = SS_WRITE_ERROR;
- curlun->info_valid = 1;
- break;
- }
+ /* Perform the write */
+ rc = ums[common->lun].write_sector(&ums[common->lun],
+ file_offset / SECTOR_SIZE,
+ amount / SECTOR_SIZE,
+ (char __user *)bh->buf);
+ if (!rc)
+ return -EIO;
+ nwritten = rc * SECTOR_SIZE;
- /* Did the host decide to stop early? */
- if (bh->outreq->actual != bh->outreq->length) {
- common->short_packet_received = 1;
- break;
- }
- continue;
+ VLDBG(curlun, "file write %u @ %llu -> %d\n", amount,
+ (unsigned long long) file_offset,
+ (int) nwritten);
+
+ if (nwritten < 0) {
+ LDBG(curlun, "error in file write: %d\n",
+ (int) nwritten);
+ nwritten = 0;
+ } else if (nwritten < amount) {
+ LDBG(curlun, "partial file write: %d/%u\n",
+ (int) nwritten, amount);
+ nwritten -= (nwritten & 511);
+ /* Round down to a block */
}
+ file_offset += nwritten;
+ amount_left_to_write -= nwritten;
+ common->residue -= nwritten;
- /* Wait for something to happen */
- rc = sleep_thread(common);
- if (rc)
- return rc;
+ /* If an error occurred, report it and its position */
+ if (nwritten < amount) {
+ printf("nwritten:%zd amount:%u\n", nwritten,
+ amount);
+ curlun->sense_data = SS_WRITE_ERROR;
+ curlun->info_valid = 1;
+ break;
+ }
+
+ /* Did the host decide to stop early? */
+ if (bh->outreq->actual != bh->outreq->length) {
+ common->short_packet_received = 1;
+ break;
+ }
}
return -EIO; /* No default reply */
@@ -1430,13 +1426,10 @@ static int pad_with_zeros(struct fsg_dev *fsg)
bh->state = BUF_STATE_EMPTY; /* For the first iteration */
fsg->common->usb_amount_left = nkeep + fsg->common->residue;
while (fsg->common->usb_amount_left > 0) {
-
/* Wait for the next buffer to be free */
- while (bh->state != BUF_STATE_EMPTY) {
- rc = sleep_thread(fsg->common);
- if (rc)
- return rc;
- }
+ rc = sleep_thread(fsg->common, bh);
+ if (rc)
+ return rc;
nsend = min(fsg->common->usb_amount_left, FSG_BUFLEN);
memset(bh->buf + nkeep, 0, nsend - nkeep);
@@ -1461,23 +1454,7 @@ static int throw_away_data(struct fsg_common *common)
bh->state != BUF_STATE_EMPTY || common->usb_amount_left > 0;
bh = common->next_buffhd_to_drain) {
- /* Throw away the data in a filled buffer */
- if (bh->state == BUF_STATE_FULL) {
- bh->state = BUF_STATE_EMPTY;
- common->next_buffhd_to_drain = bh->next;
-
- /* A short packet or an error ends everything */
- if (bh->outreq->actual != bh->outreq->length ||
- bh->outreq->status != 0) {
- raise_exception(common,
- FSG_STATE_ABORT_BULK_OUT);
- return -EINTR;
- }
- continue;
- }
-
/* Try to submit another request if we need one */
- bh = common->next_buffhd_to_fill;
if (bh->state == BUF_STATE_EMPTY
&& common->usb_amount_left > 0) {
amount = min(common->usb_amount_left, FSG_BUFLEN);
@@ -1494,13 +1471,24 @@ static int throw_away_data(struct fsg_common *common)
return -EIO;
common->next_buffhd_to_fill = bh->next;
common->usb_amount_left -= amount;
- continue;
}
- /* Otherwise wait for something to happen */
- rc = sleep_thread(common);
+ /* Wait for the data to be received */
+ rc = sleep_thread(common, bh);
if (rc)
return rc;
+
+ /* Throw away the data in a filled buffer */
+ bh->state = BUF_STATE_EMPTY;
+ common->next_buffhd_to_drain = bh->next;
+
+ /* A short packet or an error ends everything */
+ if (bh->outreq->actual != bh->outreq->length ||
+ bh->outreq->status != 0) {
+ raise_exception(common,
+ FSG_STATE_ABORT_BULK_OUT);
+ return -EINTR;
+ }
}
return 0;
}
@@ -1613,11 +1601,9 @@ static int send_status(struct fsg_common *common)
/* Wait for the next buffer to become available */
bh = common->next_buffhd_to_fill;
- while (bh->state != BUF_STATE_EMPTY) {
- rc = sleep_thread(common);
- if (rc)
- return rc;
- }
+ rc = sleep_thread(common, bh);
+ if (rc)
+ return rc;
if (curlun)
sd = curlun->sense_data;
@@ -1790,11 +1776,9 @@ static int do_scsi_command(struct fsg_common *common)
/* Wait for the next buffer to become available for data or status */
bh = common->next_buffhd_to_fill;
common->next_buffhd_to_drain = bh;
- while (bh->state != BUF_STATE_EMPTY) {
- rc = sleep_thread(common);
- if (rc)
- return rc;
- }
+ rc = sleep_thread(common, bh);
+ if (rc)
+ return rc;
common->phase_error = 0;
common->short_packet_received = 0;
@@ -2118,11 +2102,9 @@ static int get_next_command(struct fsg_common *common)
/* Wait for the next buffer to become available */
bh = common->next_buffhd_to_fill;
- while (bh->state != BUF_STATE_EMPTY) {
- rc = sleep_thread(common);
- if (rc)
- return rc;
- }
+ rc = sleep_thread(common, bh);
+ if (rc)
+ return rc;
/* Queue a request to read a Bulk-only CBW */
set_bulk_out_req_length(common, bh, USB_BULK_CB_WRAP_LEN);
@@ -2137,11 +2119,9 @@ static int get_next_command(struct fsg_common *common)
* next_buffhd_to_fill. */
/* Wait for the CBW to arrive */
- while (bh->state != BUF_STATE_FULL) {
- rc = sleep_thread(common);
- if (rc)
- return rc;
- }
+ rc = sleep_thread(common, bh);
+ if (rc)
+ return rc;
rc = fsg_is_set(common) ? received_cbw(common->fsg, bh) : -EIO;
bh->state = BUF_STATE_EMPTY;
@@ -2291,6 +2271,7 @@ static void handle_exception(struct fsg_common *common)
struct fsg_lun *curlun;
unsigned int exception_req_tag;
+ common->thread_wakeup_needed = 0;
/* Cancel all the pending transfers */
if (common->fsg) {
for (i = 0; i < FSG_NUM_BUFFERS; ++i) {
@@ -2300,18 +2281,9 @@ static void handle_exception(struct fsg_common *common)
if (bh->outreq_busy)
usb_ep_dequeue(common->fsg->bulk_out,
bh->outreq);
- }
- /* Wait until everything is idle */
- for (;;) {
- int num_active = 0;
- for (i = 0; i < FSG_NUM_BUFFERS; ++i) {
- bh = &common->buffhds[i];
- num_active += bh->inreq_busy + bh->outreq_busy;
- }
- if (num_active == 0)
- break;
- if (sleep_thread(common))
+ /* Wait until the transfer is idle */
+ if (sleep_thread(common, bh))
return;
}
@@ -2403,15 +2375,16 @@ int fsg_main_thread(void *common_)
}
if (!common->running) {
- ret = sleep_thread(common);
- if (ret)
+ ret = sleep_thread(common, NULL);
+ if (ret != -EINTR)
return ret;
-
continue;
}
ret = get_next_command(common);
- if (ret)
+ if (ret == -EINTR)
+ continue;
+ else if (ret)
return ret;
if (!exception_in_progress(common))
diff --git a/drivers/usb/gadget/storage_common.c b/drivers/usb/gadget/storage_common.c
index 5674e8fe49..723549ef09 100644
--- a/drivers/usb/gadget/storage_common.c
+++ b/drivers/usb/gadget/storage_common.c
@@ -318,7 +318,7 @@ static struct fsg_lun *fsg_lun_from_dev(struct device *dev)
enum fsg_buffer_state {
BUF_STATE_EMPTY = 0,
BUF_STATE_FULL,
- BUF_STATE_BUSY
+ BUF_STATE_BUSY,
};
struct fsg_buffhd {
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3/4] usb: f_mass_storage: Drop wakeup_needed
2021-07-08 17:14 [PATCH 1/4] cmd: usb_mass_storage: Use part_get_info_by_dev_and_name_or_num Sean Anderson
2021-07-08 17:14 ` [PATCH 2/4] usb: f_mass_storage: Check bh->state in sleep_thread Sean Anderson
@ 2021-07-08 17:14 ` Sean Anderson
2021-07-08 17:14 ` [PATCH 4/4] usb: f_mass_storage: Stop after the host deconfigures us Sean Anderson
2021-07-08 17:23 ` [PATCH 1/4] cmd: usb_mass_storage: Use part_get_info_by_dev_and_name_or_num Marek Vasut
3 siblings, 0 replies; 6+ messages in thread
From: Sean Anderson @ 2021-07-08 17:14 UTC (permalink / raw)
To: u-boot, Lukasz Majewski
Cc: Maxime Ripard, Jun Li, Andre Przywara, Jagan Teki, Marek Vasut,
Marek Szyprowski, Ye Li, Peng Fan, Bryan O'Donoghue,
Sean Anderson
Now that we check bh->state in sleep_thread, there is no need to have a
separate wakeup_needed flag. Drop it.
Signed-off-by: Sean Anderson <sean.anderson@seco.com>
---
drivers/usb/gadget/f_mass_storage.c | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c
index 99935fe9a3..190053590f 100644
--- a/drivers/usb/gadget/f_mass_storage.c
+++ b/drivers/usb/gadget/f_mass_storage.c
@@ -328,7 +328,6 @@ struct fsg_common {
unsigned int bad_lun_okay:1;
unsigned int running:1;
- int thread_wakeup_needed;
struct completion thread_notifier;
struct task_struct *thread_task;
@@ -455,12 +454,6 @@ static int fsg_set_halt(struct fsg_dev *fsg, struct usb_ep *ep)
/* These routines may be called in process context or in_irq */
-/* Caller must hold fsg->lock */
-static void wakeup_thread(struct fsg_common *common)
-{
- common->thread_wakeup_needed = 1;
-}
-
static void raise_exception(struct fsg_common *common, enum fsg_state new_state)
{
/* Do nothing if a higher-priority exception is already in progress.
@@ -469,7 +462,6 @@ static void raise_exception(struct fsg_common *common, enum fsg_state new_state)
if (common->state <= new_state) {
common->exception_req_tag = common->ep0_req_tag;
common->state = new_state;
- common->thread_wakeup_needed = 1;
}
}
@@ -508,7 +500,6 @@ static void bulk_in_complete(struct usb_ep *ep, struct usb_request *req)
/* Hold the lock while we update the request and buffer states */
bh->inreq_busy = 0;
bh->state = BUF_STATE_EMPTY;
- wakeup_thread(common);
}
static void bulk_out_complete(struct usb_ep *ep, struct usb_request *req)
@@ -527,7 +518,6 @@ static void bulk_out_complete(struct usb_ep *ep, struct usb_request *req)
/* Hold the lock while we update the request and buffer states */
bh->outreq_busy = 0;
bh->state = BUF_STATE_FULL;
- wakeup_thread(common);
}
/*-------------------------------------------------------------------------*/
@@ -2271,7 +2261,6 @@ static void handle_exception(struct fsg_common *common)
struct fsg_lun *curlun;
unsigned int exception_req_tag;
- common->thread_wakeup_needed = 0;
/* Cancel all the pending transfers */
if (common->fsg) {
for (i = 0; i < FSG_NUM_BUFFERS; ++i) {
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 4/4] usb: f_mass_storage: Stop after the host deconfigures us
2021-07-08 17:14 [PATCH 1/4] cmd: usb_mass_storage: Use part_get_info_by_dev_and_name_or_num Sean Anderson
2021-07-08 17:14 ` [PATCH 2/4] usb: f_mass_storage: Check bh->state in sleep_thread Sean Anderson
2021-07-08 17:14 ` [PATCH 3/4] usb: f_mass_storage: Drop wakeup_needed Sean Anderson
@ 2021-07-08 17:14 ` Sean Anderson
2021-07-08 17:23 ` [PATCH 1/4] cmd: usb_mass_storage: Use part_get_info_by_dev_and_name_or_num Marek Vasut
3 siblings, 0 replies; 6+ messages in thread
From: Sean Anderson @ 2021-07-08 17:14 UTC (permalink / raw)
To: u-boot, Lukasz Majewski
Cc: Maxime Ripard, Jun Li, Andre Przywara, Jagan Teki, Marek Vasut,
Marek Szyprowski, Ye Li, Peng Fan, Bryan O'Donoghue,
Sean Anderson
At the moment there is no way to signal to U-Boot from the host that we
are done reading/writing data. This stops the gadget after the host
deconfigures us by selecting config 0. In theory, the host could later
select this configuration again, but this rarely happens.
On Linux this may be accomplished by running
udisksctl power-off -b /dev/sdX
Signed-off-by: Sean Anderson <sean.anderson@seco.com>
---
cmd/usb_mass_storage.c | 3 +++
drivers/usb/gadget/f_mass_storage.c | 7 ++++++-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/cmd/usb_mass_storage.c b/cmd/usb_mass_storage.c
index d4e619b842..bac4ad87b9 100644
--- a/cmd/usb_mass_storage.c
+++ b/cmd/usb_mass_storage.c
@@ -227,6 +227,9 @@ static int do_usb_mass_storage(struct cmd_tbl *cmdtp, int flag,
if (rc == -EPIPE)
printf("\rCTRL+C - Operation aborted\n");
+ if (rc == -ENOLINK)
+ printf("\rHost closed connection\n");
+
rc = CMD_RET_SUCCESS;
goto cleanup_register;
}
diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c
index 190053590f..5968146b1c 100644
--- a/drivers/usb/gadget/f_mass_storage.c
+++ b/drivers/usb/gadget/f_mass_storage.c
@@ -2248,7 +2248,10 @@ static void fsg_disable(struct usb_function *f)
{
struct fsg_dev *fsg = fsg_from_func(f);
fsg->common->new_fsg = NULL;
- raise_exception(fsg->common, FSG_STATE_CONFIG_CHANGE);
+ if (fsg->common->running)
+ raise_exception(fsg->common, FSG_STATE_EXIT);
+ else
+ raise_exception(fsg->common, FSG_STATE_CONFIG_CHANGE);
}
/*-------------------------------------------------------------------------*/
@@ -2394,6 +2397,8 @@ int fsg_main_thread(void *common_)
common->thread_task = NULL;
+ if (common->state == FSG_STATE_TERMINATED)
+ return -ENOLINK;
return 0;
}
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread