From patchwork Fri Feb 17 09:47:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolu Lu X-Patchwork-Id: 58461 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp799914wrn; Fri, 17 Feb 2023 02:02:21 -0800 (PST) X-Google-Smtp-Source: AK7set9AonJiaoPUoriZsf3G23oj1W+sTWQE2xjSJQQMLZwEJgquziZuxWzYVwxas5gUHlhifu6/ X-Received: by 2002:a05:6402:51a:b0:4ac:be53:178e with SMTP id m26-20020a056402051a00b004acbe53178emr8169246edv.6.1676628140832; Fri, 17 Feb 2023 02:02:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676628140; cv=none; d=google.com; s=arc-20160816; b=pQPuyqBdYQ7NXHHlp3sfzw5LscnPuqZll3WP9b8PtNNALgHuGyGUZ8mqQ8ThxeIT7K k6v7pLX+YtJoV7LJ5cgjLpqxpgiJ0rBrPXtXwjow8xXXT5BeizT2rRF0jDPtP6LaA6tV aLf7guRM54hxe9wc5hqV2Bw7r/Y0/YomUbMEQ89ApMpN8uDdJMIsAa4esnD0sF+KouzA mCmVQaXZei0PZ196tzNgUpqhxDAydeGqnn3o5vqg/6baI3BsQf1grtSGf8cUSi8wASRT IKyyWsC0kbVA4W1sdy/AkKdeD2Pkx8/5TbRJGOcKoiIv003F3VMnJQmL7Wovii3jJL/B VDOg== 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=oz24eG2khsYqTrcweZAVglb04cN02zYhjze+g7IDm28=; b=BDGrnVJw+o/qMPHxIPWNn4InjZywMRTeHPDq72n1AuZjs+TplfsoRn3f9hFkNXq5hs 7FeR5KspH5aiscUAyZgT76zWRfoAanpeRqyFnzEwzr7UNJz1tzZ+oPOtI8j+wJd8Rzlj RmVOjGEGitRRF4RGbP12pNwjHBBvMwmrw6IRSPt1JMDgJoWhXmJAYxMNFZjhjIZBJTst Df2hp51VeDQz8LKaXS0ZFTtMiy3QnXuTQCDzsnl/gLPQpqoJ6CaJY1vKzYNk0Lq7qFQr yHGHosNTAG3U66uYW1akoJ4xtJ7lKfjhfR4wLxHjoc9/8IPH+xJvjZea4XV2foDNj3tQ nyAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=lODVbbV8; 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 w20-20020aa7d294000000b004ab4c2ecd9csi4991562edq.310.2023.02.17.02.01.57; Fri, 17 Feb 2023 02:02:20 -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=lODVbbV8; 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 S230263AbjBQJ4d (ORCPT + 99 others); Fri, 17 Feb 2023 04:56:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49232 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230236AbjBQJ42 (ORCPT ); Fri, 17 Feb 2023 04:56:28 -0500 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 360A963BC5 for ; Fri, 17 Feb 2023 01:56:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1676627781; x=1708163781; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=I7zwcHhE0QciS3+BHxkcRCwFeb6U9lVqL1VaFiFdxu8=; b=lODVbbV86Eq4xmxpCfRYhX8gfMppxZYG+8M2uXP4sOyaaOZvn8rFXELX kNwKFfSwVYQGldFw3sBQbUMjAv+Xv6lCSSKoElinWHIN774f0ed7IlVKL Z+w1bqAhGlPcsV/00GRftlii3BYgbp6cveWFcMm5bbHuOVFyNf2IQdjBg U0pux6QPhg44ybPNdB0TCHikeNCuR0Sntxl5RckCehwosVhpyqY83r3DE MeyQYhw9bRZoX0sKJgOakvz8q0fdYzyWHZExREHRyELIHGSZykV4jNcR2 k98F+6SpY5j64gjOlRLH1qZbPR9bfkR8V0RFg6xmx+johxEO7Md5xJriS Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10623"; a="331955258" X-IronPort-AV: E=Sophos;i="5.97,304,1669104000"; d="scan'208";a="331955258" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Feb 2023 01:56:17 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10623"; a="999391230" X-IronPort-AV: E=Sophos;i="5.97,304,1669104000"; d="scan'208";a="999391230" Received: from allen-box.sh.intel.com ([10.239.159.48]) by fmsmga005.fm.intel.com with ESMTP; 17 Feb 2023 01:56:15 -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 v2 4/6] iommu: Move lock from iommu_change_dev_def_domain() to its caller Date: Fri, 17 Feb 2023 17:47:34 +0800 Message-Id: <20230217094736.159005-5-baolu.lu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230217094736.159005-1-baolu.lu@linux.intel.com> References: <20230217094736.159005-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,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?1758072029464980441?= X-GMAIL-MSGID: =?utf-8?q?1758072029464980441?= 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 --- 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 093692308b80..e1ae1eb4faf0 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -2892,7 +2892,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"); @@ -2980,28 +2980,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; } @@ -3089,7 +3076,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: