From patchwork Mon Mar 6 02:58:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolu Lu X-Patchwork-Id: 64404 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1635374wrd; Sun, 5 Mar 2023 19:16:33 -0800 (PST) X-Google-Smtp-Source: AK7set+liW2l/5dx5rvh8rVG9wS0/eeIauQK0KXFFKSbRomrilLY5mp3UELj2Uy22nM/davDBvzp X-Received: by 2002:a62:4e06:0:b0:5a8:aca5:817d with SMTP id c6-20020a624e06000000b005a8aca5817dmr8855581pfb.5.1678072593012; Sun, 05 Mar 2023 19:16:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678072592; cv=none; d=google.com; s=arc-20160816; b=iqL5peeEj2f9ZD5w1XqscnsovwuPpvqPiQdtArUO/TNRYY6901Io8b+LfUzwhysuZ2 URePiawIyRAU+8Bq+fb4ps3PatcEcNhA3biYGdtpyfxSwtb9RKIqbDMBc0X8VFfm8IOj iP1xzoeJ42eigPC77YpxzNUuEOsJkcjvdtY16p7iYsf56655Z1VevfqW/CVXB/FF/vEh 6J7ivRuKHQ9c0+H6SG6K4wQmTZlPq+YkI7urda1A4+XyIEw9vHqSFO+EPBm4YkoD2J2B XYTU83VXHqo3LT+Yg0lawzZChtxjSZCBd9c2U1ZAl5izJzmDBvTxRbnVW8yYZid2UGr0 pdqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=HCksJop8pcHSLTajudJpz6wThpWXMZn1RUUw5XVz04A=; b=ORCJ+uqlW4TxBfG5SnkyOIs6pLinGSqXGt3vmDMluVSppj8W5pS2n06O0SlSEw0OIy ZSNfTTccWqHUOhLAX8ZzWgEZJo73TuejiGSWYmLq9uogECwptswPnBC+DAdGgx+oy0NQ WgQYpOGc9/HjaEWl50RogQF5zbUV/uj7SOJadwNNvih5GNAjO10FU5dX91e2TL5HXHhk vK5pVU5eheMFhs8xIKkY124HQ046Nuw7Mp6givimku1Ss8wJ2Y06a2Qn8rQ7FPiFn8WH V2KpHUi83Sfb5MujTZVHTYLAv142+XKnGcz3CiKuJGgNjz+mAZzBE+gByCkkqNa08LhD S4Ag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=JFVSLHH5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a21-20020a631a55000000b0050318fe2b1bsi7928717pgm.147.2023.03.05.19.16.20; Sun, 05 Mar 2023 19:16:32 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=JFVSLHH5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229695AbjCFC7d (ORCPT + 99 others); Sun, 5 Mar 2023 21:59:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49282 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229676AbjCFC71 (ORCPT ); Sun, 5 Mar 2023 21:59:27 -0500 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4548A11668 for ; Sun, 5 Mar 2023 18:59:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1678071565; x=1709607565; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=MdWuluD3W8nfCHmXoPEsni78ipVq2xDF2ne8PYskGyM=; b=JFVSLHH5v9MCBzXy40dN2rMYzu/Po924qnmOkJOUJmXpGxL/K/3otyVN EIM7f3bMDZzicpjwbAtb1VJaS8NhA+Op6ZAP5lEh5/TVQuCv/HJRFScYv IM6NK+SYMk9uujPtksR652+MSMZbI/AnaNHELWqAodHE5eeLhD8bD3gha KBqHxtgrtyXhv+OPO6OlA45aqyfE+HBL9M+2Dma9JdzUE845toBd1sp33 23b0VGQ2U+ku+w7nEfIv3+hxWNLJw778Pm0YPHqRh92MZBw8BCI86Xvfj 9uXixdOK3ba0pcnUBBgSu2iToKgtVpZzIOYH18w6L0FEpNKX/7hj6pDaB Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10640"; a="363071524" X-IronPort-AV: E=Sophos;i="5.98,236,1673942400"; d="scan'208";a="363071524" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Mar 2023 18:59:25 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10640"; a="765072484" X-IronPort-AV: E=Sophos;i="5.98,236,1673942400"; d="scan'208";a="765072484" Received: from allen-box.sh.intel.com ([10.239.159.48]) by FMSMGA003.fm.intel.com with ESMTP; 05 Mar 2023 18:59:22 -0800 From: Lu Baolu To: iommu@lists.linux.dev Cc: Joerg Roedel , Jason Gunthorpe , Christoph Hellwig , Kevin Tian , Will Deacon , Robin Murphy , linux-kernel@vger.kernel.org, Lu Baolu Subject: [PATCH v3 4/6] iommu: Move lock from iommu_change_dev_def_domain() to its caller Date: Mon, 6 Mar 2023 10:58:02 +0800 Message-Id: <20230306025804.13912-5-baolu.lu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230306025804.13912-1-baolu.lu@linux.intel.com> References: <20230306025804.13912-1-baolu.lu@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759586647374441766?= X-GMAIL-MSGID: =?utf-8?q?1759586647374441766?= The intention is to make it possible to put group ownership check and default domain change in a same critical region protected by the group's mutex lock. No intentional functional change. Signed-off-by: Lu Baolu Reviewed-by: Jason Gunthorpe --- drivers/iommu/iommu.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index 0bcd9625090d..f8f400548a10 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -2945,7 +2945,7 @@ static int iommu_change_dev_def_domain(struct iommu_group *group, int ret, dev_def_dom; struct device *dev; - mutex_lock(&group->mutex); + lockdep_assert_held(&group->mutex); if (group->default_domain != group->domain) { dev_err_ratelimited(prev_dev, "Group not assigned to default domain\n"); @@ -3033,28 +3033,15 @@ static int iommu_change_dev_def_domain(struct iommu_group *group, goto free_new_domain; group->domain = group->default_domain; - - /* - * Release the mutex here because ops->probe_finalize() call-back of - * some vendor IOMMU drivers calls arm_iommu_attach_device() which - * in-turn might call back into IOMMU core code, where it tries to take - * group->mutex, resulting in a deadlock. - */ - mutex_unlock(&group->mutex); - - /* Make sure dma_ops is appropriatley set */ - iommu_group_do_probe_finalize(dev, group->default_domain); iommu_domain_free(prev_dom); + return 0; free_new_domain: iommu_domain_free(group->default_domain); group->default_domain = prev_dom; group->domain = prev_dom; - out: - mutex_unlock(&group->mutex); - return ret; } @@ -3142,7 +3129,19 @@ static ssize_t iommu_group_store_type(struct iommu_group *group, goto out; } + mutex_lock(&group->mutex); ret = iommu_change_dev_def_domain(group, dev, req_type); + /* + * Release the mutex here because ops->probe_finalize() call-back of + * some vendor IOMMU drivers calls arm_iommu_attach_device() which + * in-turn might call back into IOMMU core code, where it tries to take + * group->mutex, resulting in a deadlock. + */ + mutex_unlock(&group->mutex); + + /* Make sure dma_ops is appropriatley set */ + if (!ret) + iommu_group_do_probe_finalize(dev, group->default_domain); ret = ret ?: count; out: