From patchwork Fri Apr 17 07:58:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caspar Zhang X-Patchwork-Id: 6229121 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D8457BF4A6 for ; Fri, 17 Apr 2015 07:59:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E566F2026D for ; Fri, 17 Apr 2015 07:59:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D677C201BC for ; Fri, 17 Apr 2015 07:59:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752647AbbDQH7f (ORCPT ); Fri, 17 Apr 2015 03:59:35 -0400 Received: from mail-pd0-f173.google.com ([209.85.192.173]:33017 "EHLO mail-pd0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750951AbbDQH7d (ORCPT ); Fri, 17 Apr 2015 03:59:33 -0400 Received: by pdbnk13 with SMTP id nk13so120458687pdb.0 for ; Fri, 17 Apr 2015 00:59:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=oO23OOWmTBnBJISRV+jzV2q2m7vb72+mXlbPYy9uWJI=; b=i+kfzw15N01jyqfs6Kfw16WfMS/pY3w/Ez5j3Sbse+7acBzlyrSkRqK1d21VlYVRgQ FVJ1ACGZ1aTmQqvPr2LFNQAtKiJ8ErHXdESaNKTjlSGINuSHIq8yejVbP4esCw4ZSH5s 9Armp+lk9SZ+Mlbn6QSl6NSOif+063gPd7JS4ZJQdYBOQVC1WaR9gHDCqZ2OY3MsjueM y7fJt/gN1zSOmGHmnJu2kXoVLc2NOqXmZDY7WpTzsTC0UmPabRsMABArqtTWh2ESjYoX cgqMLqQP4UX3bIPyaBHNO8yYYH7nx9trsegAVNoQekGSHMr8p69HqKbNtWlx867l/b+s 3WBQ== X-Gm-Message-State: ALoCoQlKgARzZ3Go5SqKgWy261onHODzNsqqfQjlYWDwIzbZZCdqJY8YQKPUkKu0FElWvEitjopa X-Received: by 10.68.204.199 with SMTP id la7mr3244071pbc.147.1429257573184; Fri, 17 Apr 2015 00:59:33 -0700 (PDT) Received: from localhost.localdomain ([202.55.20.10]) by mx.google.com with ESMTPSA id q4sm9262804pdo.42.2015.04.17.00.59.26 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 17 Apr 2015 00:59:32 -0700 (PDT) From: Caspar Zhang X-Google-Original-From: Caspar Zhang To: "Michael S. Tsirkin" Cc: kvm@vger.kernel.org, virtualization@lists.linux-foundation.org, Caspar Zhang Subject: [PATCH RESEND] Revert "vhost: fix release path lockdep checks" Date: Fri, 17 Apr 2015 15:58:55 +0800 Message-Id: <433ea26d7655be7b12fb3f3a830acce16fd51f41.1429257475.git.jinli.zjl@alibaba-inc.com> X-Mailer: git-send-email 2.2.2 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This reverts commit ea5d404655ba ("vhost: fix release path lockdep checks") In commit 47283bef7ed3 ("vhost: move memory pointer to VQs"), RCU operations have been replaced by mutex, we need to remove the no longer used `locked' parameter by reverting original patch. Conflicts: drivers/vhost/net.c drivers/vhost/vhost.c drivers/vhost/vhost.h Signed-off-by: Caspar Zhang --- drivers/vhost/net.c | 2 +- drivers/vhost/vhost.c | 6 +++--- drivers/vhost/vhost.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c index 7d137a4..26c4837 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c @@ -793,7 +793,7 @@ static int vhost_net_release(struct inode *inode, struct file *f) vhost_net_stop(n, &tx_sock, &rx_sock); vhost_net_flush(n); vhost_dev_stop(&n->dev); - vhost_dev_cleanup(&n->dev, false); + vhost_dev_cleanup(&n->dev); vhost_net_vq_reset(n); if (tx_sock) sockfd_put(tx_sock); diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c index 2ee2826..c6640d3 100644 --- a/drivers/vhost/vhost.c +++ b/drivers/vhost/vhost.c @@ -418,7 +418,7 @@ void vhost_dev_reset_owner(struct vhost_dev *dev, struct vhost_memory *memory) { int i; - vhost_dev_cleanup(dev, true); + vhost_dev_cleanup(dev); /* Restore memory to default empty mapping. */ memory->nregions = 0; @@ -444,8 +444,8 @@ void vhost_dev_stop(struct vhost_dev *dev) } EXPORT_SYMBOL_GPL(vhost_dev_stop); -/* Caller should have device mutex if and only if locked is set */ -void vhost_dev_cleanup(struct vhost_dev *dev, bool locked) +/* Caller should have device mutex */ +void vhost_dev_cleanup(struct vhost_dev *dev) { int i; diff --git a/drivers/vhost/vhost.h b/drivers/vhost/vhost.h index 8c1c792..cc9a742 100644 --- a/drivers/vhost/vhost.h +++ b/drivers/vhost/vhost.h @@ -127,7 +127,7 @@ bool vhost_dev_has_owner(struct vhost_dev *dev); long vhost_dev_check_owner(struct vhost_dev *); struct vhost_memory *vhost_dev_reset_owner_prepare(void); void vhost_dev_reset_owner(struct vhost_dev *, struct vhost_memory *); -void vhost_dev_cleanup(struct vhost_dev *, bool locked); +void vhost_dev_cleanup(struct vhost_dev *); void vhost_dev_stop(struct vhost_dev *); long vhost_dev_ioctl(struct vhost_dev *, unsigned int ioctl, void __user *argp); long vhost_vring_ioctl(struct vhost_dev *d, int ioctl, void __user *argp);