rsxx: Restructured DMA cancel scheme.
PATCH 2/11 rsxx: Restructured DMA cancel scheme.
From: Philip J Kelleher <[email protected]>
Before, DMAs would never be cancelled if there was a data stall or an EEH Permenant failure which would cause an unrecoverable I/O hang.
The DMA cancellation mechanism has been modified to fix these issues and allows DMAs to be cancelled during the above mentioned events.
Signed-off-by Philip J Kelleher <[email protected]>
-------------------------------------------------------------------------------
drivers/block/rsxx/core.c +15 -4
@@ -368,15 +368,26 @@ static void rsxx_eeh_failure(struct pci_ {struct rsxx_cardinfo *card =pci_get_drvdata (dev);int i; +int cnt =0 ;dev_err (&dev->dev,"IBM FlashSystem PCI: disabling failed card.\n" ); card->eeh_state =1 ; + card->halt =1 ; -for (i =0 ; i < card->n_targets; i++) -del_timer_sync (&card->ctrl[i].activity_timer); - -rsxx_eeh_cancel_dmas (card); +for (i =0 ; i < card->n_targets; i++) { +spin_lock_bh (&card->ctrl[i].queue_lock); + cnt =rsxx_cleanup_dma_queue (&card->ctrl[i], + &card->ctrl[i].queue); +spin_unlock_bh (&card->ctrl[i].queue_lock); + + cnt +=rsxx_dma_cancel (&card->ctrl[i]); + +if (cnt) +dev_info (CARD_TO_DEV (card), +"Freed %d queued DMAs on channel %d\n" , + cnt, card->ctrl[i].id); + } }static int rsxx_eeh_fifo_flush_poll (struct rsxx_cardinfo *card)
drivers/block/rsxx/dev.c +4 -2
@@ -155,7 +155,8 @@ static void bio_dma_done_cb(struct rsxx_atomic_set (&meta->error,1 );if (atomic_dec_and_test (&meta->pending_dmas)) { -disk_stats_complete (card, meta->bio, meta->start_time); +if (!card->eeh_state && card->gendisk) +disk_stats_complete (card, meta->bio, meta->start_time);bio_endio (meta->bio,atomic_read (&meta->error) ? -EIO :0 );kmem_cache_free (bio_meta_pool, meta);
@@ -196,7 +197,8 @@ static void rsxx_make_request(struct reqatomic_set (&bio_meta->pending_dmas,0 ); bio_meta->start_time = jiffies; -disk_stats_start (card, bio); +if (!unlikely (card->halt)) +disk_stats_start (card, bio); dev_dbg(CARD_TO_DEV(card), "BIO[%c]: meta: %p addr8: x%llx size: %d\n", bio_data_dir(bio) ? 'W' : 'R', bio_meta,
drivers/block/rsxx/dma.c +74 -87
276 lines not on this page · raw message
drivers/block/rsxx/rsxx_priv.h +3 -1
@@ -39,6 +39,7 @@#include <linux/vmalloc.h> #include <linux/timer.h> #include <linux/ioctl.h> +#include <linux/delay.h> #include "rsxx.h" #include "rsxx_cfg.h"
@@ -374,6 +375,8 @@ typedef void (*rsxx_dma_cb)(struct rsxx_int rsxx_dma_setup (struct rsxx_cardinfo *card);void rsxx_dma_destroy (struct rsxx_cardinfo *card);int rsxx_dma_init (void ); +int rsxx_cleanup_dma_queue (struct rsxx_dma_ctrl *ctrl,struct list_head *q); +int rsxx_dma_cancel (struct rsxx_dma_ctrl *ctrl);void rsxx_dma_cleanup (void );void rsxx_dma_queue_reset (struct rsxx_cardinfo *card);int rsxx_dma_configure (struct rsxx_cardinfo *card);
@@ -384,7 +387,6 @@ int rsxx_dma_queue_bio(struct rsxx_cardi void *cb_data);int rsxx_hw_buffers_init (struct pci_dev *dev,struct rsxx_dma_ctrl *ctrl);int rsxx_eeh_save_issued_dmas (struct rsxx_cardinfo *card); -void rsxx_eeh_cancel_dmas (struct rsxx_cardinfo *card);int rsxx_eeh_remap_dmas (struct rsxx_cardinfo *card);/***** cregs.c *****/