From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49644) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aKmxB-0004wi-D7 for qemu-devel@nongnu.org; Sun, 17 Jan 2016 08:01:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aKmx8-0007fl-6F for qemu-devel@nongnu.org; Sun, 17 Jan 2016 08:01:09 -0500 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:35176) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aKmx7-0007el-Rm for qemu-devel@nongnu.org; Sun, 17 Jan 2016 08:01:06 -0500 Received: by mail-wm0-x244.google.com with SMTP id 123so4232507wmz.2 for ; Sun, 17 Jan 2016 05:01:05 -0800 (PST) References: <1ca0cc63189f7d7913457e0aceec7b9223ecc38e.1452564770.git.chen.fan.fnst@cn.fujitsu.com> From: Marcel Apfelbaum Message-ID: <569B908E.6070404@gmail.com> Date: Sun, 17 Jan 2016 15:01:02 +0200 MIME-Version: 1.0 In-Reply-To: <1ca0cc63189f7d7913457e0aceec7b9223ecc38e.1452564770.git.chen.fan.fnst@cn.fujitsu.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v16 02/14] vfio: squeeze out vfio_pci_do_hot_reset for support bus reset Reply-To: marcel@redhat.com List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Cao jin , qemu-devel@nongnu.org Cc: chen.fan.fnst@cn.fujitsu.com, izumi.taku@jp.fujitsu.com, alex.williamson@redhat.com, mst@redhat.com On 01/12/2016 04:43 AM, Cao jin wrote: > From: Chen Fan > > squeeze out vfio_pci_do_hot_reset to do host bus reset when AER recovery. > > Signed-off-by: Chen Fan > --- > hw/vfio/pci.c | 75 +++++++++++++++++++++++++++++++++++------------------------ > 1 file changed, 44 insertions(+), 31 deletions(-) > > diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c > index efcd3cd..a63cf85 100644 > --- a/hw/vfio/pci.c > +++ b/hw/vfio/pci.c > @@ -1699,6 +1699,48 @@ error: > return ret; > } > > +static int vfio_pci_do_hot_reset(VFIOPCIDevice *vdev, > + struct vfio_pci_hot_reset_info *info) > +{ > + VFIOGroup *group; > + struct vfio_pci_hot_reset *reset; > + int32_t *fds; > + int ret, i, count; > + struct vfio_pci_dependent_device *devices; > + > + /* Determine how many group fds need to be passed */ > + count = 0; > + devices = &info->devices[0]; > + QLIST_FOREACH(group, &vfio_group_list, next) { > + for (i = 0; i < info->count; i++) { > + if (group->groupid == devices[i].group_id) { > + count++; > + break; > + } > + } > + } > + > + reset = g_malloc0(sizeof(*reset) + (count * sizeof(*fds))); > + reset->argsz = sizeof(*reset) + (count * sizeof(*fds)); > + fds = &reset->group_fds[0]; > + > + /* Fill in group fds */ > + QLIST_FOREACH(group, &vfio_group_list, next) { > + for (i = 0; i < info->count; i++) { > + if (group->groupid == devices[i].group_id) { > + fds[reset->count++] = group->fd; > + break; > + } > + } > + } > + > + /* Bus reset! */ > + ret = ioctl(vdev->vbasedev.fd, VFIO_DEVICE_PCI_HOT_RESET, reset); > + g_free(reset); > + > + return ret; > +} > + > static int vfio_add_std_cap(VFIOPCIDevice *vdev, uint8_t pos) > { > PCIDevice *pdev = &vdev->pdev; > @@ -1840,9 +1882,7 @@ static int vfio_pci_hot_reset(VFIOPCIDevice *vdev, bool single) > VFIOGroup *group; > struct vfio_pci_hot_reset_info *info = NULL; > struct vfio_pci_dependent_device *devices; > - struct vfio_pci_hot_reset *reset; > - int32_t *fds; > - int ret, i, count; > + int ret, i; > bool multi = false; > > trace_vfio_pci_hot_reset(vdev->vbasedev.name, single ? "one" : "multi"); > @@ -1921,34 +1961,7 @@ static int vfio_pci_hot_reset(VFIOPCIDevice *vdev, bool single) > goto out_single; > } > > - /* Determine how many group fds need to be passed */ > - count = 0; > - QLIST_FOREACH(group, &vfio_group_list, next) { > - for (i = 0; i < info->count; i++) { > - if (group->groupid == devices[i].group_id) { > - count++; > - break; > - } > - } > - } > - > - reset = g_malloc0(sizeof(*reset) + (count * sizeof(*fds))); > - reset->argsz = sizeof(*reset) + (count * sizeof(*fds)); > - fds = &reset->group_fds[0]; > - > - /* Fill in group fds */ > - QLIST_FOREACH(group, &vfio_group_list, next) { > - for (i = 0; i < info->count; i++) { > - if (group->groupid == devices[i].group_id) { > - fds[reset->count++] = group->fd; > - break; > - } > - } > - } > - > - /* Bus reset! */ > - ret = ioctl(vdev->vbasedev.fd, VFIO_DEVICE_PCI_HOT_RESET, reset); > - g_free(reset); > + ret = vfio_pci_do_hot_reset(vdev, info); > > trace_vfio_pci_hot_reset_result(vdev->vbasedev.name, > ret ? "%m" : "Success"); > The commit message may be improved, other than that it looks OK to me. Reviewed-by: Marcel Apfelbaum Thanks, Marcel