Skip to content

Commit

Permalink
blockjob: introduce block_job _locked() APIs
Browse files Browse the repository at this point in the history 
Just as done with job.h, create _locked() functions in blockjob.h

These functions will be later useful when caller has already taken
the lock. All blockjob _locked functions call job _locked functions.

Note: at this stage, job_{lock/unlock} and job lock guard macros
are *nop*.

Signed-off-by: Emanuele Giuseppe Esposito <[email protected]>
Reviewed-by: Vladimir Sementsov-Ogievskiy <[email protected]>
Reviewed-by: Kevin Wolf <[email protected]>
Reviewed-by: Stefan Hajnoczi <[email protected]>
Message-Id: <[email protected]>
Signed-off-by: Kevin Wolf <[email protected]>
  • Loading branch information
@esposem @kevmw
esposem authored and kevmw committed Oct 7, 2022
1 parent bf61c58 commit f41ab73
Show file tree
Hide file tree
Showing 2 changed files with 60 additions and 10 deletions.
52 changes: 42 additions & 10 deletions blockjob.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,21 +44,27 @@ static bool is_block_job(Job *job)
job_type(job) == JOB_TYPE_STREAM;
}

BlockJob *block_job_next(BlockJob *bjob)
BlockJob *block_job_next_locked(BlockJob *bjob)
{
Job *job = bjob ? &bjob->job : NULL;
GLOBAL_STATE_CODE();

do {
job = job_next(job);
job = job_next_locked(job);
} while (job && !is_block_job(job));

return job ? container_of(job, BlockJob, job) : NULL;
}

BlockJob *block_job_get(const char *id)
BlockJob *block_job_next(BlockJob *bjob)
{
Job *job = job_get(id);
JOB_LOCK_GUARD();
return block_job_next_locked(bjob);
}

BlockJob *block_job_get_locked(const char *id)
{
Job *job = job_get_locked(id);
GLOBAL_STATE_CODE();

if (job && is_block_job(job)) {
Expand All @@ -68,6 +74,12 @@ BlockJob *block_job_get(const char *id)
}
}

BlockJob *block_job_get(const char *id)
{
JOB_LOCK_GUARD();
return block_job_get_locked(id);
}

void block_job_free(Job *job)
{
BlockJob *bjob = container_of(job, BlockJob, job);
Expand Down Expand Up @@ -256,14 +268,14 @@ static bool job_timer_pending(Job *job)
return timer_pending(&job->sleep_timer);
}

bool block_job_set_speed(BlockJob *job, int64_t speed, Error **errp)
bool block_job_set_speed_locked(BlockJob *job, int64_t speed, Error **errp)
{
const BlockJobDriver *drv = block_job_driver(job);
int64_t old_speed = job->speed;

GLOBAL_STATE_CODE();

if (job_apply_verb(&job->job, JOB_VERB_SET_SPEED, errp) < 0) {
if (job_apply_verb_locked(&job->job, JOB_VERB_SET_SPEED, errp) < 0) {
return false;
}
if (speed < 0) {
Expand All @@ -277,26 +289,34 @@ bool block_job_set_speed(BlockJob *job, int64_t speed, Error **errp)
job->speed = speed;

if (drv->set_speed) {
job_unlock();
drv->set_speed(job, speed);
job_lock();
}

if (speed && speed <= old_speed) {
return true;
}

/* kick only if a timer is pending */
job_enter_cond(&job->job, job_timer_pending);
job_enter_cond_locked(&job->job, job_timer_pending);

return true;
}

bool block_job_set_speed(BlockJob *job, int64_t speed, Error **errp)
{
JOB_LOCK_GUARD();
return block_job_set_speed_locked(job, speed, errp);
}

int64_t block_job_ratelimit_get_delay(BlockJob *job, uint64_t n)
{
IO_CODE();
return ratelimit_calculate_delay(&job->limit, n);
}

BlockJobInfo *block_job_query(BlockJob *job, Error **errp)
BlockJobInfo *block_job_query_locked(BlockJob *job, Error **errp)
{
BlockJobInfo *info;
uint64_t progress_current, progress_total;
Expand All @@ -320,7 +340,7 @@ BlockJobInfo *block_job_query(BlockJob *job, Error **errp)
info->len = progress_total;
info->speed = job->speed;
info->io_status = job->iostatus;
info->ready = job_is_ready(&job->job),
info->ready = job_is_ready_locked(&job->job),
info->status = job->job.status;
info->auto_finalize = job->job.auto_finalize;
info->auto_dismiss = job->job.auto_dismiss;
Expand All @@ -333,6 +353,12 @@ BlockJobInfo *block_job_query(BlockJob *job, Error **errp)
return info;
}

BlockJobInfo *block_job_query(BlockJob *job, Error **errp)
{
JOB_LOCK_GUARD();
return block_job_query_locked(job, errp);
}

static void block_job_iostatus_set_err(BlockJob *job, int error)
{
if (job->iostatus == BLOCK_DEVICE_IO_STATUS_OK) {
Expand Down Expand Up @@ -478,7 +504,7 @@ void *block_job_create(const char *job_id, const BlockJobDriver *driver,
return NULL;
}

void block_job_iostatus_reset(BlockJob *job)
void block_job_iostatus_reset_locked(BlockJob *job)
{
GLOBAL_STATE_CODE();
if (job->iostatus == BLOCK_DEVICE_IO_STATUS_OK) {
Expand All @@ -488,6 +514,12 @@ void block_job_iostatus_reset(BlockJob *job)
job->iostatus = BLOCK_DEVICE_IO_STATUS_OK;
}

void block_job_iostatus_reset(BlockJob *job)
{
JOB_LOCK_GUARD();
block_job_iostatus_reset_locked(job);
}

void block_job_user_resume(Job *job)
{
BlockJob *bjob = container_of(job, BlockJob, job);
Expand Down
18 changes: 18 additions & 0 deletions include/block/blockjob.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,9 @@ typedef struct BlockJob {
*/
BlockJob *block_job_next(BlockJob *job);

/* Same as block_job_next(), but called with job lock held. */
BlockJob *block_job_next_locked(BlockJob *job);

/**
* block_job_get:
* @id: The id of the block job.
Expand All @@ -102,6 +105,9 @@ BlockJob *block_job_next(BlockJob *job);
*/
BlockJob *block_job_get(const char *id);

/* Same as block_job_get(), but called with job lock held. */
BlockJob *block_job_get_locked(const char *id);

/**
* block_job_add_bdrv:
* @job: A block job
Expand Down Expand Up @@ -145,6 +151,12 @@ bool block_job_has_bdrv(BlockJob *job, BlockDriverState *bs);
*/
bool block_job_set_speed(BlockJob *job, int64_t speed, Error **errp);

/*
* Same as block_job_set_speed(), but called with job lock held.
* Might release the lock temporarily.
*/
bool block_job_set_speed_locked(BlockJob *job, int64_t speed, Error **errp);

/**
* block_job_query:
* @job: The job to get information about.
Expand All @@ -153,6 +165,9 @@ bool block_job_set_speed(BlockJob *job, int64_t speed, Error **errp);
*/
BlockJobInfo *block_job_query(BlockJob *job, Error **errp);

/* Same as block_job_query(), but called with job lock held. */
BlockJobInfo *block_job_query_locked(BlockJob *job, Error **errp);

/**
* block_job_iostatus_reset:
* @job: The job whose I/O status should be reset.
Expand All @@ -162,6 +177,9 @@ BlockJobInfo *block_job_query(BlockJob *job, Error **errp);
*/
void block_job_iostatus_reset(BlockJob *job);

/* Same as block_job_iostatus_reset(), but called with job lock held. */
void block_job_iostatus_reset_locked(BlockJob *job);

/*
* block_job_get_aio_context:
*
Expand Down

0 comments on commit f41ab73

Please sign in to comment.