Skip to content

Z
ZIO
Commit 76f3fcdc authored by Federico Vaga's avatar Federico Vaga
Browse files
Options

minor changes on buffer management

parents 14923d2d df8df06a
Show whitespace changes
Inline Side-by-side
Showing with 31 additions and 10 deletions
buffers/zio-buf-vmalloc.c
View file @ 76f3fcdc
...@@ -75,14 +75,17 @@ static int zbk_conf_set(struct device *dev, struct zio_attribute *zattr, ...@@ -75,14 +75,17 @@ static int zbk_conf_set(struct device *dev, struct zio_attribute *zattr,
uint32_t usr_val) uint32_t usr_val)
{ {
struct zio_bi *bi = to_zio_bi(dev); struct zio_bi *bi = to_zio_bi(dev);
struct zio_ti *ti = NULL;
struct zbk_instance *zbki = to_zbki(bi); struct zbk_instance *zbki = to_zbki(bi);
struct zio_block *block; struct zio_block *block;
unsigned long flags, bflags; unsigned long flags, bflags, tflags;
void *data; void *data;
int ret = 0; int ret = 0;
switch (zattr->id) { switch (zattr->id) {
case ZIO_ATTR_ZBUF_MAXKB: case ZIO_ATTR_ZBUF_MAXKB:
if (usr_val == zattr->value)
return 0; /* nothing to do */
/* Lock and disable */ /* Lock and disable */
spin_lock_irqsave(&bi->lock, flags); spin_lock_irqsave(&bi->lock, flags);
if (atomic_read(&zbki->map_count)) { if (atomic_read(&zbki->map_count)) {
...@@ -93,6 +96,14 @@ static int zbk_conf_set(struct device *dev, struct zio_attribute *zattr, ...@@ -93,6 +96,14 @@ static int zbk_conf_set(struct device *dev, struct zio_attribute *zattr,
bi->flags |= ZIO_DISABLED; bi->flags |= ZIO_DISABLED;
spin_unlock_irqrestore(&bi->lock, flags); spin_unlock_irqrestore(&bi->lock, flags);
/*
* Disable trigger while resizing buffer to avoid
* problems with blocks that point to a different
* vmalloc() area
*/
ti = bi->cset->ti;
tflags = zio_trigger_abort_disable(ti->cset, 1);
/* Flush the buffer */ /* Flush the buffer */
while ((block = bi->b_op->retr_block(bi))) while ((block = bi->b_op->retr_block(bi)))
bi->b_op->free_block(bi, block); bi->b_op->free_block(bi, block);
...@@ -109,10 +120,18 @@ static int zbk_conf_set(struct device *dev, struct zio_attribute *zattr, ...@@ -109,10 +120,18 @@ static int zbk_conf_set(struct device *dev, struct zio_attribute *zattr,
} else { } else {
ret = -ENOMEM; ret = -ENOMEM;
} }
/* Lock and restore flags */ /* Lock and restore flags */
spin_lock_irqsave(&bi->lock, flags); spin_lock_irqsave(&bi->lock, flags);
bi->flags = bflags; bi->flags = bflags;
spin_unlock_irqrestore(&bi->lock, flags); spin_unlock_irqrestore(&bi->lock, flags);
/* Restore trigger */
if (ti && ((tflags & ZIO_STATUS) == ZIO_ENABLED))
ti->flags = (ti->flags & ~ZIO_STATUS) | ZIO_ENABLED;
if (ti && (tflags & ZIO_TI_ARMED))
zio_arm_trigger(ti);
return ret; return ret;
case ZBK_ATTR_MERGE_DATA: case ZBK_ATTR_MERGE_DATA:
......
chardev.c
View file @ 76f3fcdc
...@@ -303,7 +303,7 @@ static int zio_can_r_ctrl(struct zio_f_priv *priv) ...@@ -303,7 +303,7 @@ static int zio_can_r_ctrl(struct zio_f_priv *priv)
/* Control: if not yet done, we can read */ /* Control: if not yet done, we can read */
if (chan->user_block) { if (chan->user_block) {
if (zio_is_cdone(chan->user_block)) { if (zio_is_cdone(chan->user_block)) {
bi->b_op->free_block(bi, chan->user_block); zio_buffer_free_block(bi, chan->user_block);
chan->user_block = NULL; chan->user_block = NULL;
} else{ } else{
mutex_unlock(&chan->user_lock); mutex_unlock(&chan->user_lock);
...@@ -380,7 +380,7 @@ static int zio_can_w_ctrl(struct zio_f_priv *priv) ...@@ -380,7 +380,7 @@ static int zio_can_w_ctrl(struct zio_f_priv *priv)
if (ctrl->nsamples) if (ctrl->nsamples)
zio_buffer_store_block(bi, block); zio_buffer_store_block(bi, block);
else else
chan->bi->b_op->free_block(chan->bi, block); zio_buffer_free_block(chan->bi, block);
block = NULL; block = NULL;
} }
/* if no block is there, get a new one */ /* if no block is there, get a new one */
...@@ -482,7 +482,7 @@ static ssize_t zio_generic_read(struct file *f, char __user *ubuf, ...@@ -482,7 +482,7 @@ static ssize_t zio_generic_read(struct file *f, char __user *ubuf,
block->uoff += count; block->uoff += count;
if (block->uoff == block->datalen) { if (block->uoff == block->datalen) {
chan->user_block = NULL; chan->user_block = NULL;
bi->b_op->free_block(bi, block); zio_buffer_free_block(bi, block);
} }
} }
mutex_unlock(&chan->user_lock); mutex_unlock(&chan->user_lock);
...@@ -628,7 +628,7 @@ static int zio_generic_release(struct inode *inode, struct file *f) ...@@ -628,7 +628,7 @@ static int zio_generic_release(struct inode *inode, struct file *f)
mutex_lock(&chan->user_lock); mutex_lock(&chan->user_lock);
if (atomic_read(&chan->bi->use_count) == 1 && chan->user_block) { if (atomic_read(&chan->bi->use_count) == 1 && chan->user_block) {
chan->bi->b_op->free_block(chan->bi, block); zio_buffer_free_block(chan->bi, block);
chan->user_block = NULL; chan->user_block = NULL;
} }
mutex_unlock(&chan->user_lock); mutex_unlock(&chan->user_lock);
......
helpers.c
View file @ 76f3fcdc
...@@ -24,8 +24,7 @@ static void __zio_internal_abort_free(struct zio_cset *cset) ...@@ -24,8 +24,7 @@ static void __zio_internal_abort_free(struct zio_cset *cset)
chan_for_each(chan, cset) { chan_for_each(chan, cset) {
block = chan->active_block; block = chan->active_block;
if (block) zio_buffer_free_block(chan->bi, block);
cset->zbuf->b_op->free_block(chan->bi, block);
chan->active_block = NULL; chan->active_block = NULL;
} }
} }
......
include/linux/zio-buffer.h
View file @ 76f3fcdc
...@@ -172,6 +172,8 @@ static inline void zio_buffer_store_block(struct zio_bi *bi, struct zio_block *b ...@@ -172,6 +172,8 @@ static inline void zio_buffer_store_block(struct zio_bi *bi, struct zio_block *b
static inline int zio_buffer_free_block(struct zio_bi *bi, static inline int zio_buffer_free_block(struct zio_bi *bi,
struct zio_block *block) struct zio_block *block)
{ {
if (unlikely(!block))
return -1;
bi->b_op->free_block(bi, block); bi->b_op->free_block(bi, block);
return 0; return 0;
......
include/linux/zio-trigger.h
View file @ 76f3fcdc
...@@ -170,7 +170,7 @@ static inline int zio_generic_data_done(struct zio_cset *cset) ...@@ -170,7 +170,7 @@ static inline int zio_generic_data_done(struct zio_cset *cset)
} }
if (unlikely((ti->flags & ZIO_DIR) == ZIO_DIR_OUTPUT)) { if (unlikely((ti->flags & ZIO_DIR) == ZIO_DIR_OUTPUT)) {
zbuf->b_op->free_block(chan->bi, block); zio_buffer_free_block(chan->bi, block);
} else { /* DIR_INPUT */ } else { /* DIR_INPUT */
memcpy(zio_get_ctrl(block), ctrl, memcpy(zio_get_ctrl(block), ctrl,
zio_control_size(chan)); zio_control_size(chan));
......
sysfs.c
View file @ 76f3fcdc
...@@ -757,7 +757,8 @@ static ssize_t zio_buf_flush(struct device *dev, ...@@ -757,7 +757,8 @@ static ssize_t zio_buf_flush(struct device *dev,
bi->flags |= ZIO_DISABLED; bi->flags |= ZIO_DISABLED;
spin_unlock_irqrestore(&bi->lock, flags); spin_unlock_irqrestore(&bi->lock, flags);
/* Flushing blocks. It does not use helpers to prevent deadlock */ /* Flushing blocks. Buffer helpers may use locks, so we not use helpers
here to prevent deadlock */
while ((block = bi->b_op->retr_block(bi))) { while ((block = bi->b_op->retr_block(bi))) {
dev_dbg(dev, "Flushing ... (%d)\n", n++); dev_dbg(dev, "Flushing ... (%d)\n", n++);
bi->b_op->free_block(bi, block); bi->b_op->free_block(bi, block);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment