Pete Zaitcev wrote:
Hi, Kristian:
I only looked briefly at SBP-2, and at submit/callback paths it pulled,
because I do not understand most of the other issues.
Great, thanks for giving this a look-over, much appreciated.
Executive summary: please implement proper ORB cancellation. This is
how you verify that your locking model is worth anything: by interaction
of normal transactions with ->remove, ->suspend and SCSI aborts.
Currently, there's no telling if the code is sane or not.
Good catch, my ORB cancellation is a bit rough, and I believe there are a
couple of races there, though I haven't been able to actually trigger these.
When cancelling an ORB I need to cancel the ORB, the pending transaction and
potentially the packet queued for DMA in the fw-ohci driver. This is not
fully in place yet and I need to sit down and audit this path.
I see that ORBs are always allocated with a call (like SKB) and not
embedded into drivers (like URBs). It's great, keep it up. Also,
never allow drivers to pass DMA-mapped buffers into fw_send_request
and friends. We made both of these mistakes in USB, and it hurts.
Oh, the ORBs are SBP-2 specific data structures, struct fw_transaction is
probably what corresponds to USB URBs. This struct is defined in
fw-transaction.h and is available for embedding into other structs, such as
struct sbp2_orb in fw-sbp2. Is that what you're suggesting against, and what
are the problems with this approach?
As for passing DMA-mapped buffers, do you mean that fw_send_request (or code
below that function) should map the payload as it currently does as opposed to
callers pre-mapping DMA buffers?
Now, about small things:
diff --git a/fw-sbp2.c b/fw-sbp2.c
index 8888f27..3a65095 100644
--- a/fw-sbp2.c
+++ b/fw-sbp2.c
@@ -303,7 +303,7 @@ complete_transaction(struct fw_card *card, int rcode,
unsigned long flags;
orb->rcode = rcode;
- if (rcode != RCODE_COMPLETE) {
+ if (rcode != RCODE_COMPLETE) { /* Huh? */
spin_lock_irqsave(&card->lock, flags);
list_del(&orb->link);
spin_unlock_irqrestore(&card->lock, flags);
This looks like an inverted test. Who does remove ORB from the list
if it's completed normally?
An SBP-2 ORB transaction sequence consists of a number of FireWire
transactions. First the initiator prepares an SBP-2 ORB (object request
block) in host memory and maps this for DMA. Then the initiators sends its
bus address and the physical address of the ORB to the SBP-2 device. This is
the request that complete_transaction deals with. If we get rcode ==
RCODE_COMPLETE here, we successfully wrote the ORB address to the SBP-2 device
and we leave the ORB in the list so the SBP-2 transaction can continue. Any
other rcode means that the write failed and we need to back out the
transaction and leave it to upper layers to retry.
The rest of the SBP-2 transaction continues with the SBP-2 device issuing a
FireWire read transaction to read out the ORB from host memory and then carry
out the instructions in the ORB. Once the device has completed the ORB it
will do a status write to the status address specified in the ORB, at which
point the SBP-2 transaction is complete.
@@ -320,8 +320,7 @@ sbp2_send_orb(struct sbp2_orb *orb, struct fw_unit *unit,
unsigned long flags;
orb->pointer.high = 0;
- orb->pointer.low = orb->request_bus;
- fw_memcpy_to_be32(&orb->pointer, &orb->pointer, sizeof orb->pointer);
+ orb->pointer.low = cpu_to_be32(orb->request_bus);
spin_lock_irqsave(&device->card->lock, flags);
list_add_tail(&orb->link, &sd->orb_list);
I'll whine later about this
@@ -347,6 +346,7 @@ static void sbp2_cancel_orbs(struct fw_unit *unit)
list_splice_init(&sd->orb_list, &list);
spin_unlock_irqrestore(&device->card->lock, flags);
+ /* XXX Notify the hardware -- show-stopper. */
Yes, agreed.
list_for_each_entry_safe(orb, next, &list, link) {
orb->rcode = RCODE_CANCELLED;
orb->callback(orb, NULL);
@@ -364,6 +364,9 @@ complete_management_orb(struct sbp2_orb *base_orb, struct sbp2_status *status)
complete(&orb->done);
}
+/*
+ * This function must be called from a process context.
+ */
static int
sbp2_send_management_orb(struct fw_unit *unit, int node_id, int generation,
int function, int lun, void *response)
@@ -374,9 +377,9 @@ sbp2_send_management_orb(struct fw_unit *unit, int node_id, int generation,
unsigned long timeout;
int retval = -ENOMEM;
- orb = kzalloc(sizeof *orb, GFP_ATOMIC);
+ orb = kzalloc(sizeof *orb, GFP_KERNEL);
if (orb == NULL)
- return -ENOMEM;
+ goto out_orballoc;
/* The sbp2 device is going to send a block read request to
* read out the request from host memory, so map it for
No reason to use the atomic pool, this function sleeps later anyway.
Oh, true.
@@ -384,17 +387,22 @@ sbp2_send_management_orb(struct fw_unit *unit, int node_id, int generation,
orb->base.request_bus =
dma_map_single(device->card->device, &orb->request,
sizeof orb->request, DMA_TO_DEVICE);
- if (orb->base.request_bus == 0)
- goto out;
+ if (dma_mapping_error(orb->base.request_bus))
+ goto out_orbreq;
orb->response_bus =
dma_map_single(device->card->device, &orb->response,
sizeof orb->response, DMA_FROM_DEVICE);
- if (orb->response_bus == 0)
- goto out;
+ if (dma_mapping_error(orb->response_bus))
+ goto out_orbresp;
orb->request.response.high = 0;
orb->request.response.low = orb->response_bus;
+ /*
+ * XXX Kristian, what exactly makes you think that DMA address
+ * is 32 bits wide above? This is only guaranteed if device->
+ * card->device has mask 0xffffffff. Where is that set?
+ */
I guess that should be in pci_probe in fw-ohci.c, but it isn't. If the
allocation is in physical memory above the 4G limit, will dma_map_single set
up a trampoline buffer below 4G if the device DMA mask is 0xffffffff? I have
a similar problem when mapping the buffer passed down from the SCSI stack, in
that I don't know for sure that these buffers are accessible within the first 4G.
Didn't know about dma_mapping_error, cool, will use that.
orb->request.misc =
management_orb_notify |
Obvious.
Huh? What do you mean?
@@ -450,16 +458,18 @@ sbp2_send_management_orb(struct fw_unit *unit, int node_id, int generation,
retval = 0;
out:
- dma_unmap_single(device->card->device, orb->base.request_bus,
- sizeof orb->request, DMA_TO_DEVICE);
dma_unmap_single(device->card->device, orb->response_bus,
sizeof orb->response, DMA_FROM_DEVICE);
+ out_orbresp:
+ dma_unmap_single(device->card->device, orb->base.request_bus,
+ sizeof orb->request, DMA_TO_DEVICE);
+ out_orbreq:
if (response)
fw_memcpy_from_be32(response,
orb->response, sizeof orb->response);
kfree(orb);
-
+ out_orballoc:
return retval;
}
This is how to use "out" labels properly, kernel style.
Yeah, I guess... I did actually track down every function call in the destroy
path to make sure that they're safe to call on the values that kzalloc sets
them to.
@@ -746,6 +756,7 @@ complete_command_orb(struct sbp2_orb *base_orb, struct sbp2_status *status)
struct fw_unit *unit = orb->unit;
struct fw_device *device = fw_device(unit->device.parent);
struct scatterlist *sg;
+ struct scsi_cmnd *cmd;
int result;
if (status != NULL) {
@@ -798,10 +809,11 @@ complete_command_orb(struct sbp2_orb *base_orb, struct sbp2_status *status)
sizeof orb->request_buffer_bus,
DMA_FROM_DEVICE);
- orb->cmd->result = result << 16;
- orb->done(orb->cmd);
-
+ cmd = orb->cmd;
kfree(orb);
+
+ cmd->result = result << 16;
+ cmd->done(cmd);
}
static void sbp2_command_orb_map_scatterlist(struct sbp2_command_orb *orb)
Just a stylistic sugar.
@@ -896,6 +908,7 @@ static int sbp2_scsi_queuecommand(struct scsi_cmnd *cmd, scsi_done_fn_t done)
struct fw_device *device = fw_device(unit->device.parent);
struct sbp2_device *sd = unit->device.driver_data;
struct sbp2_command_orb *orb;
+ u32 misc;
/* Bidirectional commands are not yet implemented, and unknown
* transfer direction not handled. */
@@ -917,28 +930,32 @@ static int sbp2_scsi_queuecommand(struct scsi_cmnd *cmd, scsi_done_fn_t done)
orb->base.request_bus =
dma_map_single(device->card->device, &orb->request,
sizeof orb->request, DMA_TO_DEVICE);
+ if (dma_mapping_error(orb->base.request_bus)) {
+ kfree(orb);
+ cmd->result = DID_ERROR << 16; /* XXX Better error? */
+ done(cmd);
+ return 0;
+ }
Yikes, I thought I had most of the dma_map_single error cases handled.
orb->unit = unit;
- orb->done = done;
orb->cmd = cmd;
- orb->request.next.high = SBP2_ORB_NULL;
+ orb->request.next.high = cpu_to_be32(SBP2_ORB_NULL);
orb->request.next.low = 0x0;
/* At speed 100 we can do 512 bytes per packet, at speed 200,
* 1024 bytes per packet etc. The SBP-2 max_payload field
* specifies the max payload size as 2 ^ (max_payload + 2), so
* if we set this to max_speed + 7, we get the right value. */
- orb->request.misc =
+ misc =
command_orb_max_payload(device->node->max_speed + 7) |
command_orb_speed(device->node->max_speed) |
command_orb_notify;
if (cmd->sc_data_direction == DMA_FROM_DEVICE)
- orb->request.misc |=
- command_orb_direction(SBP2_DIRECTION_FROM_MEDIA);
+ misc |= command_orb_direction(SBP2_DIRECTION_FROM_MEDIA);
else if (cmd->sc_data_direction == DMA_TO_DEVICE)
- orb->request.misc |=
- command_orb_direction(SBP2_DIRECTION_TO_MEDIA);
+ misc |= command_orb_direction(SBP2_DIRECTION_TO_MEDIA);
+ orb->request.misc = cpu_to_be32(misc);
if (cmd->use_sg) {
sbp2_command_orb_map_scatterlist(orb);
@@ -947,6 +964,7 @@ static int sbp2_scsi_queuecommand(struct scsi_cmnd *cmd, scsi_done_fn_t done)
* could we get the scsi or blk layer to do that by
* reporting our max supported block size? */
fw_error("command > 64k\n");
+ kfree(orb);
cmd->result = DID_ERROR << 16;
done(cmd);
return 0;
@@ -954,11 +972,7 @@ static int sbp2_scsi_queuecommand(struct scsi_cmnd *cmd, scsi_done_fn_t done)
sbp2_command_orb_map_buffer(orb);
}
- fw_memcpy_to_be32(&orb->request, &orb->request, sizeof orb->request);
-
- memset(orb->request.command_block,
- 0, sizeof orb->request.command_block);
- memcpy(orb->request.command_block, cmd->cmnd, COMMAND_SIZE(*cmd->cmnd));
+ memcpy(orb->request.command_block, cmd->cmnd, 12);
orb->base.callback = complete_command_orb;
The way you byteswap irks me. You make the job of static analisys
tools harder, for no benefit. The sensible rule of thumb is, use wire
order for untyped arrays of bytes (you do that), use CPU order when
kernel knows structures (you kinda do it, but in a very messy way
by swapping 32-bit values; now all you need is one 16-bit value for
the whole idea to unravel), and never mix them! Alas, this is how
fw_send_request is designed: the payload can be header, or can be data.
Yeah, your changes for fw-sbp2.c makes sense, the byteswapping in-place always
felt kinda iffy. None of the wire structs have any 16-bit fields, though,
I've intentionally made them all 32 bit values. The SBP-2 ORBs have 16 bit
values in them but they never cross 32 bit boundaries, and they're shifted and
or'ed together so that when they're byteswapped they end up in the right
places. But your changes make it a little more clear and I can then use
__be32 in the wirte structs.
For fw-transaction.c and code touching the FireWire headers
(fw_packet::header[4]) the rule is that it's CPU endian data. This is the
only way to avoid unecessary swaps. The OHCI controller will expect the
headers to be little endian but byteswap them as 32 bit words as it sends out
the packets. So, ironically, on big endian architechtures we need to byteswap
the headers to little endian when setting up DMA. So since the header byte
swapping depends on the host controller, it only makes sense that the stack
doesn't swap, but leaves that to the controller.
But like I said, it's small bananas.
Cheers,
-- Pete
P.S. If I were using git, I would clone a Linus git tree and work
there. All this out-of-tree module stuff is just a waste of time.
You even wrote an RPM spec! What for? Not to mention that the
blacklists that you install interfere with non-jujufied kernels.
If you work with a cloned repo, your pre-integration history will
also be available post-integration. I presume you want to integrate
into mainline eventually, don't you?
Indeed, I've just moved to an in-tree development model now. I still think
the out-off-tree model is a good way to prototype, get started and reach
"critical mass" with your driver. But as I'm starting to integrate and sync
with Stefans tree now, an in-tree model is a lot easier to work with. The
tree is here
git://people.freedesktop.org/~krh/linux-2.6
with gitweb available here:
http://gitweb.freedesktop.org/?p=users/krh/linux-2.6.git;a=summary
cheers,
Kristian
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
