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 X-Spam-Level: X-Spam-Status: No, score=-8.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,NICE_REPLY_A, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3D374C5517A for ; Wed, 21 Oct 2020 05:34:51 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 455A321D7B for ; Wed, 21 Oct 2020 05:34:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=nvidia.com header.i=@nvidia.com header.b="de5Cilnf" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 455A321D7B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=nvidia.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:41762 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kV6lt-0003Km-4t for qemu-devel@archiver.kernel.org; Wed, 21 Oct 2020 01:34:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34716) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kV6kz-0002t6-Bx for qemu-devel@nongnu.org; Wed, 21 Oct 2020 01:33:53 -0400 Received: from hqnvemgate25.nvidia.com ([216.228.121.64]:15693) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kV6kw-0002xh-0u for qemu-devel@nongnu.org; Wed, 21 Oct 2020 01:33:52 -0400 Received: from hqmail.nvidia.com (Not Verified[216.228.121.13]) by hqnvemgate25.nvidia.com (using TLS: TLSv1.2, AES256-SHA) id ; Tue, 20 Oct 2020 22:32:59 -0700 Received: from [10.40.101.194] (10.124.1.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Wed, 21 Oct 2020 05:33:27 +0000 Subject: Re: [PATCH v26 05/17] vfio: Add VM state change handler to know state of VM To: Cornelia Huck References: <1600817059-26721-1-git-send-email-kwankhede@nvidia.com> <1600817059-26721-6-git-send-email-kwankhede@nvidia.com> <20200924170220.0a9836fe.cohuck@redhat.com> <20200929110312.GF2826@work-vm> <3dd3fe95-c81a-de40-47b0-24f0772974d4@nvidia.com> <20201020125105.5cd790df.cohuck@redhat.com> X-Nvconfidentiality: public From: Kirti Wankhede Message-ID: <245abdf6-245d-5f88-e04b-35fad763560c@nvidia.com> Date: Wed, 21 Oct 2020 11:03:23 +0530 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:68.0) Gecko/20100101 Thunderbird/68.12.1 MIME-Version: 1.0 In-Reply-To: <20201020125105.5cd790df.cohuck@redhat.com> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [10.124.1.5] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1; t=1603258379; bh=7TNZGiJN34WY90JX7fDGjtGkplK6rSp4tTcsrxeYyMU=; h=Subject:To:CC:References:X-Nvconfidentiality:From:Message-ID:Date: User-Agent:MIME-Version:In-Reply-To:Content-Type:Content-Language: Content-Transfer-Encoding:X-Originating-IP:X-ClientProxiedBy; b=de5Cilnfs3RyQPLnLxypEpqjPnm9Y3Ok7GP+kFeQSruHInWOq1S6N9UP/n85wic6U ghLsiideDcyMqMgLML9+rLpn+PIdBoC3Ha2LqwsZMan0NwGtIxUFAiH6veJKBjNF/D yrJJBDUTBtyOV42y5SRr9p1rSr5CEZti3l8gbY0pHNCU+mGYzA0HqhdDUp4rMrujlp MLVp9CPfh+IQf2ZPUPe4hmemifKcGA4MWRnKOFKBofk1BpT8jK8sQ98wqkTIvwQKFq pyr14gCh1gRour+J1apGIaFDBMEVg2NQwdnqeN0ROfzCQXMajxpFLVQIvb7OgXQpE7 dJYporNhUYpVg== Received-SPF: pass client-ip=216.228.121.64; envelope-from=kwankhede@nvidia.com; helo=hqnvemgate25.nvidia.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/21 01:33:46 X-ACL-Warn: Detected OS = Windows 7 or 8 [fuzzy] X-Spam_score_int: -70 X-Spam_score: -7.1 X-Spam_bar: ------- X-Spam_report: (-7.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_HI=-5, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: cjia@nvidia.com, aik@ozlabs.ru, Zhengxiao.zx@alibaba-inc.com, shuangtai.tst@alibaba-inc.com, qemu-devel@nongnu.org, peterx@redhat.com, eauger@redhat.com, yi.l.liu@intel.com, quintela@redhat.com, ziye.yang@intel.com, armbru@redhat.com, mlevitsk@redhat.com, pasic@linux.ibm.com, felipe@nutanix.com, zhi.a.wang@intel.com, kevin.tian@intel.com, yan.y.zhao@intel.com, "Dr. David Alan Gilbert" , alex.williamson@redhat.com, changpeng.liu@intel.com, eskultet@redhat.com, Ken.Xue@amd.com, jonathan.davies@nutanix.com, pbonzini@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 10/20/2020 4:21 PM, Cornelia Huck wrote: > On Sun, 18 Oct 2020 01:54:56 +0530 > Kirti Wankhede wrote: > >> On 9/29/2020 4:33 PM, Dr. David Alan Gilbert wrote: >>> * Cornelia Huck (cohuck@redhat.com) wrote: >>>> On Wed, 23 Sep 2020 04:54:07 +0530 >>>> Kirti Wankhede wrote: >>>> >>>>> VM state change handler gets called on change in VM's state. This is used to set >>>>> VFIO device state to _RUNNING. >>>>> >>>>> Signed-off-by: Kirti Wankhede >>>>> Reviewed-by: Neo Jia >>>>> Reviewed-by: Dr. David Alan Gilbert >>>>> --- >>>>> hw/vfio/migration.c | 136 ++++++++++++++++++++++++++++++++++++++++++ >>>>> hw/vfio/trace-events | 3 +- >>>>> include/hw/vfio/vfio-common.h | 4 ++ >>>>> 3 files changed, 142 insertions(+), 1 deletion(-) >>>>> >>>> >>>> (...) >>>> >>>>> +static int vfio_migration_set_state(VFIODevice *vbasedev, uint32_t mask, >>>>> + uint32_t value) >>>> >>>> I think I've mentioned that before, but this function could really >>>> benefit from a comment what mask and value mean. >>>> >> >> Adding a comment as: >> >> /* >> * Write device_state field to inform the vendor driver about the >> device state >> * to be transitioned to. >> * vbasedev: VFIO device >> * mask : bits set in the mask are preserved in device_state >> * value: bits set in the value are set in device_state >> * Remaining bits in device_state are cleared. >> */ > > Maybe: > > "Change the device_state register for device @vbasedev. Bits set in > @mask are preserved, bits set in @value are set, and bits not set in > either @mask or @value are cleared in device_state. If the register > cannot be accessed, the resulting state would be invalid, or the device > enters an error state, an error is returned." ? > Ok. >> >> >>>>> +{ >>>>> + VFIOMigration *migration = vbasedev->migration; >>>>> + VFIORegion *region = &migration->region; >>>>> + off_t dev_state_off = region->fd_offset + >>>>> + offsetof(struct vfio_device_migration_info, device_state); >>>>> + uint32_t device_state; >>>>> + int ret; >>>>> + >>>>> + ret = vfio_mig_read(vbasedev, &device_state, sizeof(device_state), >>>>> + dev_state_off); >>>>> + if (ret < 0) { >>>>> + return ret; >>>>> + } >>>>> + >>>>> + device_state = (device_state & mask) | value; >>>>> + >>>>> + if (!VFIO_DEVICE_STATE_VALID(device_state)) { >>>>> + return -EINVAL; >>>>> + } >>>>> + >>>>> + ret = vfio_mig_write(vbasedev, &device_state, sizeof(device_state), >>>>> + dev_state_off); >>>>> + if (ret < 0) { >>>>> + ret = vfio_mig_read(vbasedev, &device_state, sizeof(device_state), >>>>> + dev_state_off); >>>>> + if (ret < 0) { >>>>> + return ret; >>>>> + } >>>>> + >>>>> + if (VFIO_DEVICE_STATE_IS_ERROR(device_state)) { >>>>> + hw_error("%s: Device is in error state 0x%x", >>>>> + vbasedev->name, device_state); >>>>> + return -EFAULT; >>>> >>>> Is -EFAULT a good return value here? Maybe -EIO? >>>> >> >> Ok. Changing to -EIO. >> >>>>> + } >>>>> + } >>>>> + >>>>> + vbasedev->device_state = device_state; >>>>> + trace_vfio_migration_set_state(vbasedev->name, device_state); >>>>> + return 0; >>>>> +} >>>>> + >>>>> +static void vfio_vmstate_change(void *opaque, int running, RunState state) >>>>> +{ >>>>> + VFIODevice *vbasedev = opaque; >>>>> + >>>>> + if ((vbasedev->vm_running != running)) { >>>>> + int ret; >>>>> + uint32_t value = 0, mask = 0; >>>>> + >>>>> + if (running) { >>>>> + value = VFIO_DEVICE_STATE_RUNNING; >>>>> + if (vbasedev->device_state & VFIO_DEVICE_STATE_RESUMING) { >>>>> + mask = ~VFIO_DEVICE_STATE_RESUMING; >>>> >>>> I've been staring at this for some time and I think that the desired >>>> result is >>>> - set _RUNNING >>>> - if _RESUMING was set, clear it, but leave the other bits intact >> >> Upto here, you're correct. >> >>>> - if _RESUMING was not set, clear everything previously set >>>> This would really benefit from a comment (or am I the only one >>>> struggling here?) >>>> >> >> Here mask should be ~0. Correcting it. > > Hm, now I'm confused. With value == _RUNNING, ~_RUNNING and ~0 as mask > should be equivalent, shouldn't they? > I too got confused after reading your comment. Lets walk through the device states and transitions can happen here: if running - device state could be either _SAVING or _RESUMING or _STOP. Both _SAVING and _RESUMING can't be set at a time, that is the error state. _STOP means 0. - Transition from _SAVING to _RUNNING can happen if there is migration failure, in that case we have to clear _SAVING - Transition from _RESUMING to _RUNNING can happen on resuming and we have to clear _RESUMING. - In both the above cases, we have to set _RUNNING and clear rest 2 bits. Then: mask = ~VFIO_DEVICE_STATE_MASK; value = VFIO_DEVICE_STATE_RUNNING; if !running - device state could be either _RUNNING or _SAVING|_RUNNING. Here we have to reset running bit. Then: mask = ~VFIO_DEVICE_STATE_RUNNING; value = 0; I'll add comment in the code above. >> >> >>>>> + } >>>>> + } else { >>>>> + mask = ~VFIO_DEVICE_STATE_RUNNING; >>>>> + } >>>>> + >>>>> + ret = vfio_migration_set_state(vbasedev, mask, value); >>>>> + if (ret) { >>>>> + /* >>>>> + * vm_state_notify() doesn't support reporting failure. If such >>>>> + * error reporting support added in furure, migration should be >>>>> + * aborted. >>>> >>>> >>>> "We should abort the migration in this case, but vm_state_notify() >>>> currently does not support reporting failures." >>>> >>>> ? >>>> >> >> Ok. Updating comment as suggested here. >> >>>> Can/should we mark the failing device in some way? >>> >>> I think you can call qemu_file_set_error on the migration stream to >>> force an error. >>> >> >> It should be as below, right? >> qemu_file_set_error(migrate_get_current()->to_dst_file, ret); > > Does this indicate in any way which device was causing problems? (I'm > not sure how visible the error_report would be?) > I think it doesn't indicate which device caused problem but it sets error on migration stream Thanks, Kirti >> >> >> Thanks, >> Kirti >> >>> Dave >>> >>>>> + */ >>>>> + error_report("%s: Failed to set device state 0x%x", >>>>> + vbasedev->name, value & mask); >>>>> + } >>>>> + vbasedev->vm_running = running; >>>>> + trace_vfio_vmstate_change(vbasedev->name, running, RunState_str(state), >>>>> + value & mask); >>>>> + } >>>>> +} >>>>> + >>>>> static int vfio_migration_init(VFIODevice *vbasedev, >>>>> struct vfio_region_info *info) >>>>> { >>>> >>>> (...) >> >