From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0B200C433EF for ; Wed, 6 Jul 2022 12:07:27 +0000 (UTC) Received: from localhost ([::1]:33224 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o93oV-0000aO-1Y for qemu-devel@archiver.kernel.org; Wed, 06 Jul 2022 08:07:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56112) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o93mS-00076y-Mq for qemu-devel@nongnu.org; Wed, 06 Jul 2022 08:05:26 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:26929) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o93mN-0005An-Ue for qemu-devel@nongnu.org; Wed, 06 Jul 2022 08:05:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1657109110; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qDOXgdJ4jxegHcJl5h5y4cWXuSfRBcfvjP6y1YsFyJw=; b=BWFHlKWNWz91oA2OnBT0HPW9+2opMDB8/CUwAUM5H6tp0tnlzwdUMTIDqv6Ti7+YiuLVMh 21jWaBwKl9EYmbsMDexH/dONXbgFLptlgq968jQumMZusmO4T9yWdFlpyZhs6y0K+bgLwl S34phhY8OmX+WhlimLkkqO1xZmO3Pk4= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-393-lB8wjecfOYqcjMsn873u-g-1; Wed, 06 Jul 2022 08:05:09 -0400 X-MC-Unique: lB8wjecfOYqcjMsn873u-g-1 Received: by mail-wr1-f72.google.com with SMTP id r17-20020adfa151000000b0021d6c4743b0so1785440wrr.10 for ; Wed, 06 Jul 2022 05:05:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=qDOXgdJ4jxegHcJl5h5y4cWXuSfRBcfvjP6y1YsFyJw=; b=XSVk16Rgxp+OslxGbZv6voe86+zRY1sRTa/iPHK0oj0ZEN8M3VmQkqYyXQdalOCfSE b+QT3JjncNWiyGSCRLxeBEesTdMief+AhpC0vH2XXx1aQdCst0A2qo8FU+AnYAebXvP7 e+6t3DwUm/TZTiNR5wlzpIT5aGg3XU1FnQgShIsjY3AI5ai+qb2+JcAg7JogNA/atQH+ swgiJyiXDycuP761h1Sh/hVRev6CVAVtzg47+whyZ9dV56RbFuaEivAH+DfYHPwD8QGh gayc8Ce6A6/cRdoKcx30FH9YZ+GpyPD4ekPSgDSIW4iOVUhUCsFiYZAAFWXYsLxdnMgS 73Cw== X-Gm-Message-State: AJIora/Nl1Jp2EWYf37Lfp7iHfRAZnAQxec5AV9jkJVGjJUKcqWK9TWI 2JdBkd+X7+McEM/91YbRyBMQvhXTuYxjMLKj2w1BDwAOLd4uWYWSvTRpufAV2xouG4+NVrmuqri yuPFLH4+6QXTqtQg= X-Received: by 2002:a05:600c:1c27:b0:3a0:5098:c8b6 with SMTP id j39-20020a05600c1c2700b003a05098c8b6mr43190527wms.69.1657109108015; Wed, 06 Jul 2022 05:05:08 -0700 (PDT) X-Google-Smtp-Source: AGRyM1s5Yp1AbjYJ9mfPele5cJS8a7+YzzQ5ae0LGhI8cnh/Bfpo7Mit/x/kY8pmDvezez0iO8eQQQ== X-Received: by 2002:a05:600c:1c27:b0:3a0:5098:c8b6 with SMTP id j39-20020a05600c1c2700b003a05098c8b6mr43190446wms.69.1657109107612; Wed, 06 Jul 2022 05:05:07 -0700 (PDT) Received: from [192.168.149.123] (58.254.164.109.static.wline.lns.sme.cust.swisscom.ch. [109.164.254.58]) by smtp.gmail.com with ESMTPSA id o4-20020a05600c378400b003a2b708c26dsm5014988wmr.40.2022.07.06.05.05.06 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 06 Jul 2022 05:05:07 -0700 (PDT) Message-ID: <95c3dae0-a8dd-1ec6-0ba1-5a4b1e92c1a3@redhat.com> Date: Wed, 6 Jul 2022 14:05:06 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.2.0 Subject: Re: [PATCH v8 08/20] blockjob.h: introduce block_job _locked() APIs Content-Language: en-US To: Vladimir Sementsov-Ogievskiy , qemu-block@nongnu.org Cc: Kevin Wolf , Hanna Reitz , Paolo Bonzini , John Snow , Vladimir Sementsov-Ogievskiy , Wen Congyang , Xie Changlong , Markus Armbruster , Stefan Hajnoczi , Fam Zheng , qemu-devel@nongnu.org References: <20220629141538.3400679-1-eesposit@redhat.com> <20220629141538.3400679-9-eesposit@redhat.com> <6c02430a-a8d8-0be3-18b4-1709e601cbf9@yandex-team.ru> From: Emanuele Giuseppe Esposito In-Reply-To: <6c02430a-a8d8-0be3-18b4-1709e601cbf9@yandex-team.ru> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=170.10.129.124; envelope-from=eesposit@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Am 05/07/2022 um 17:01 schrieb Vladimir Sementsov-Ogievskiy: > On 6/29/22 17:15, Emanuele Giuseppe Esposito wrote: >> Just as done with job.h, create _locked() functions in blockjob.h > > We modify not only blockjob.h, I'd s/blockjob.h/blockjob/ in subject. > > Also, we start to introduce _locked block_job_* APIs. > > Does it mean that BlockJob and Job share the global mutex to protect > themselves? Than I think we should document in BlockJob struct what is > protected by job_mutex. There is nothing in the struct (apart from Job) that is protected by the job lock. I can add a comment "Protected by job mutex" on top of Job job field? > > And please, let's be consistent on whether we add or not add "with mutex > held" / "with mutex not held" comments. For job API you mostly add it > for each function.. Let's do same here? Same for "temporary unlock" > comments. Where did I miss the mutex lock/unlock comments? Yes I forgot the "temporary unlock" thing but apart from that all functions have a comment saying if they take the lock or not. > >> >> 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 >> --- >>   blockjob.c               | 52 ++++++++++++++++++++++++++++++++-------- >>   include/block/blockjob.h | 15 ++++++++++++ >>   2 files changed, 57 insertions(+), 10 deletions(-) >> >> diff --git a/blockjob.c b/blockjob.c >> index 7da59a1f1c..0d59aba439 100644 >> --- a/blockjob.c >> +++ b/blockjob.c >> @@ -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)) { >> @@ -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); >> @@ -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) { >> @@ -277,7 +289,9 @@ 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) { >> @@ -285,18 +299,24 @@ bool block_job_set_speed(BlockJob *job, int64_t >> speed, Error **errp) >>       } >>         /* 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; >> @@ -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; >> @@ -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) { >> @@ -478,7 +504,7 @@ fail: >>       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) { >> @@ -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); >> diff --git a/include/block/blockjob.h b/include/block/blockjob.h >> index 6525e16fd5..3959a98612 100644 >> --- a/include/block/blockjob.h >> +++ b/include/block/blockjob.h >> @@ -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. >> @@ -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 >> @@ -145,6 +151,9 @@ 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. */ >> +bool block_job_set_speed_locked(BlockJob *job, int64_t speed, Error >> **errp); >> + >>   /** >>    * block_job_query: >>    * @job: The job to get information about. >> @@ -153,6 +162,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. >> @@ -162,6 +174,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: >>    * > >