Received: by 2002:ac0:bc90:0:0:0:0:0 with SMTP id a16csp1118233img; Fri, 22 Mar 2019 16:22:15 -0700 (PDT) X-Google-Smtp-Source: APXvYqxDMas7SggnE9ZehEBTDNx6iM9BLY2ACvZU4LFRohD2QqMwOo6fwapIvenlGRooSnrLWkdR X-Received: by 2002:a17:902:28e6:: with SMTP id f93mr12239799plb.264.1553296935452; Fri, 22 Mar 2019 16:22:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553296935; cv=none; d=google.com; s=arc-20160816; b=lQG9lhQ3/idGgJ6rxf0mwSWzHCIovFPL+nWHp5WbTOzLqW0u6//6cZFuHiehaJH09N 5pp93zMqLqADKXO8X8f6BwNrnhicxqsBmkJ72wH9lE/hyeJDzcjfrDYDKfhXaAKnLU2e siqgkNuU9yyMlBY+Wp/hRor+h7W/t/FG9PYPVFeJHTnGPHO1IlBVj49GRpSxOXRozoXe X02qw+Ett6XHbSFQvdaT5K7tFlyu91zQaDktSu4VuzFdA2CBtKoXY3EPte0q/tDWGTHK I6IGuh0YO5udJxq823CpB7ZK0sGf5Fki5Apx+GBVOQCJjF+8qh+zmE3L6Y2s8ekku6mb ZYMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=SUpuTPdR1RxdbQlWTOOdcBkNQ4zh5xSWNfsNLs4LBT4=; b=ExGbnqxIGqihcy/T4hnR0BbYr8aSz4pOkkyJdOy1XA/96v2dPrFDGJObCFLmwrKe4S qBM7wwX7pjv8oLKudGpiD9Uzub/kVMQDPcLngtt2e1DSONqMbeM5U1abUp1LxGKva8XH u50Sg5cOL0iUTB9BcdmksnGqjPZMykxCGfIHeoOV03nBTq8CRUNjyAoFFGWPPdJn7RIS q0MwG2K0dmNWHCmlbsmFwcXqk/FIxclvm8pABossXP61h4L7meOgd+g5WCE0qDeiyUyb 7DsqoaBc6rv+lNooFGX/u7A3xWgFVnf5ecDrhFxTG3IZRtmtLvYo/S0tu+cHOMWYTfK6 wJiQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mellanox.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f3si7585624pgs.557.2019.03.22.16.22.00; Fri, 22 Mar 2019 16:22:15 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mellanox.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728553AbfCVXVD (ORCPT + 99 others); Fri, 22 Mar 2019 19:21:03 -0400 Received: from mail-il-dmz.mellanox.com ([193.47.165.129]:56841 "EHLO mellanox.co.il" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728513AbfCVXU7 (ORCPT ); Fri, 22 Mar 2019 19:20:59 -0400 Received: from Internal Mail-Server by MTLPINE1 (envelope-from parav@mellanox.com) with ESMTPS (AES256-SHA encrypted); 23 Mar 2019 01:20:57 +0200 Received: from sw-mtx-036.mtx.labs.mlnx (sw-mtx-036.mtx.labs.mlnx [10.12.150.149]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id x2MNKaw5007896; Sat, 23 Mar 2019 01:20:55 +0200 From: Parav Pandit To: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, kwankhede@nvidia.com, alex.williamson@redhat.com Cc: parav@mellanox.com Subject: [PATCH 7/8] vfio/mdev: Fix aborting mdev child device removal if one fails Date: Fri, 22 Mar 2019 18:20:34 -0500 Message-Id: <1553296835-37522-8-git-send-email-parav@mellanox.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1553296835-37522-1-git-send-email-parav@mellanox.com> References: <1553296835-37522-1-git-send-email-parav@mellanox.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org device_for_each_child() stops executing callback function for remaining child devices, if callback hits an error. Each child mdev device is independent of each other. While unregistering parent device, mdev core must remove all child mdev devices. Therefore, mdev_device_remove_cb() always returns success so that device_for_each_child doesn't abort if one child removal hits error. While at it, improve remove and unregister functions for below simplicity. There isn't need to pass forced flag pointer during mdev parent removal which invokes mdev_device_remove(). So simplify the flow. mdev_device_remove() is called from two paths. 1. mdev_unregister_driver() mdev_device_remove_cb() mdev_device_remove() 2. remove_store() mdev_device_remove() When device is removed by user using remote_store(), device under removal is mdev device. When device is removed during parent device removal using generic child iterator, mdev check is already done using dev_is_mdev(). Hence, remove the unnecessary loop in mdev_device_remove(). Fixes: 7b96953bc640 ("vfio: Mediated device Core driver") Signed-off-by: Parav Pandit --- drivers/vfio/mdev/mdev_core.c | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/drivers/vfio/mdev/mdev_core.c b/drivers/vfio/mdev/mdev_core.c index ab05464..944a058 100644 --- a/drivers/vfio/mdev/mdev_core.c +++ b/drivers/vfio/mdev/mdev_core.c @@ -150,10 +150,10 @@ static int mdev_device_remove_ops(struct mdev_device *mdev, bool force_remove) static int mdev_device_remove_cb(struct device *dev, void *data) { - if (!dev_is_mdev(dev)) - return 0; + if (dev_is_mdev(dev)) + mdev_device_remove(dev, true); - return mdev_device_remove(dev, data ? *(bool *)data : true); + return 0; } /* @@ -241,7 +241,6 @@ int mdev_register_device(struct device *dev, const struct mdev_parent_ops *ops) void mdev_unregister_device(struct device *dev) { struct mdev_parent *parent; - bool force_remove = true; mutex_lock(&parent_list_lock); parent = __find_parent_device(dev); @@ -255,8 +254,7 @@ void mdev_unregister_device(struct device *dev) list_del(&parent->next); class_compat_remove_link(mdev_bus_compat_class, dev, NULL); - device_for_each_child(dev, (void *)&force_remove, - mdev_device_remove_cb); + device_for_each_child(dev, NULL, mdev_device_remove_cb); parent_remove_sysfs_files(parent); @@ -346,24 +344,12 @@ int mdev_device_create(struct kobject *kobj, struct device *dev, uuid_le uuid) int mdev_device_remove(struct device *dev, bool force_remove) { - struct mdev_device *mdev, *tmp; + struct mdev_device *mdev; struct mdev_parent *parent; struct mdev_type *type; int ret; mdev = to_mdev_device(dev); - - mutex_lock(&mdev_list_lock); - list_for_each_entry(tmp, &mdev_list, next) { - if (tmp == mdev) - break; - } - - if (tmp != mdev) { - mutex_unlock(&mdev_list_lock); - return -ENODEV; - } - if (!mdev->active) { mutex_unlock(&mdev_list_lock); return -EAGAIN; -- 1.8.3.1