Received: by 2002:a05:6358:16cc:b0:ea:6187:17c9 with SMTP id r12csp421025rwl; Wed, 4 Jan 2023 22:18:21 -0800 (PST) X-Google-Smtp-Source: AMrXdXsRoa3tPUUoc2+AhFSOVdrHaq/z7PBocd/x0yCtXYTuIS6EsRU9ClyU9rJMF0GcLEw9Pmwx X-Received: by 2002:a17:906:11d9:b0:7ae:7c4e:195b with SMTP id o25-20020a17090611d900b007ae7c4e195bmr42643690eja.22.1672899501139; Wed, 04 Jan 2023 22:18:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672899501; cv=none; d=google.com; s=arc-20160816; b=KQZXyaj9H02+ZyoEqlr2T/WPU90eHXXQmIx4hY8SPNkpb6pUFIvBHBWjc2DzbY7T8s gKzLwJ8j/v/D0ahRmB0pUvAsWZWLMl2shAPml9f9VrwBh3qFmIMLvooWDMTqUfkW29r1 FlJUwU323obz4nwgnqJirIDNpj2jgeas+LsR0adFdWF8hqM/eDpJw3ia7c8IFzjoWKNN 9JtOqwoNyZ9jmvehe2RDzGBQMRfHBDv1D4/LQ/nLZ9jinNTO+EkOUFebK6DHW2/M3/Xj oVq1ma68tKxfYMxsUSsMHgWoSm3Xtg2q42euz/Odc4FVlMeZDmNzCEgNXYz/iAXYvH5w tfug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:in-reply-to:subject :from:content-language:references:to:cc:user-agent:mime-version:date :message-id:dkim-signature; bh=BFp2Q2aVUJUgwmANe0TQeHYR0Hj5LelcXYt4GccLQZg=; b=QqjR5U8y36xvw4ChwvxLKoUA2iPDUTw0OUriVC5fZ2oEnEdYiy1n3QPnXZWcmLofrG +PlZobbIAWcFLCtu8aL1iBCMEIdC4XHW1tmS0ciTWMnK79YaaABBQNJIEHQxH9Fn7ukz V2nWQQkeN84rJizISuDKpQ8IN2W2BXZPdD50QKxI9XQBFHkJTvFPEPUCFi6B8QZ2W5Iu Z7AZudggyOHornhT7F/Bb/6Akgr4B+EZeTLOob0cecVmBCpz6OznsqoWHG3K35pxSUiH +p2RBHnUc6Md9GHf7Ev4zpcHoxibV0xgDqHBFfSHiCov17YdohF0P+uTc/UxUc5Yc+YC La/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=MmC34wgx; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id un2-20020a170907cb8200b007c19a717e6fsi27077368ejc.946.2023.01.04.22.18.07; Wed, 04 Jan 2023 22:18:21 -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=MmC34wgx; 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 S230195AbjAEF65 (ORCPT + 55 others); Thu, 5 Jan 2023 00:58:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38230 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229750AbjAEF6x (ORCPT ); Thu, 5 Jan 2023 00:58:53 -0500 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D034C4F122 for ; Wed, 4 Jan 2023 21:58:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1672898332; x=1704434332; h=message-id:date:mime-version:cc:to:references:from: subject:in-reply-to:content-transfer-encoding; bh=s5aaIEbbbKip1vwzbtKy2QwcpBFkECPTXwB0EP8j7fA=; b=MmC34wgxBubCI/Q7MGMgW9PjjMTSimZfw9T2cHIjSXuRhacuwB5Mus3o +FIF9+B00WE2YGKylpgiWeknWkQifkr/SjlOlDYZ97mocCuTQ+HuM2zyz YoRRmBmicjsKtj/8QCu5cPCLH146P1IAY0LIViYgHoIoQgdNdvYb/qeGc bBOZe94MF7YtXHGkYGMbdbSddJhJe1j/qolk2jTAZkxmJBdvL2KL8Sfhh sdk402aKhcDmfKHdC0ff8yY20fPhjx20QvQw3V7Xwyg52adqq6k99RV8O wXSEr8mBfKc7q/CbiR3JCW5wD5PA1X8Bi2ACJ+1m+S+ZTvqA1+bCUbPHs w==; X-IronPort-AV: E=McAfee;i="6500,9779,10580"; a="305624764" X-IronPort-AV: E=Sophos;i="5.96,302,1665471600"; d="scan'208";a="305624764" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Jan 2023 21:58:52 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10580"; a="648810306" X-IronPort-AV: E=Sophos;i="5.96,302,1665471600"; d="scan'208";a="648810306" Received: from blu2-mobl3.ccr.corp.intel.com (HELO [10.254.211.114]) ([10.254.211.114]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Jan 2023 21:58:44 -0800 Message-ID: <1ef288af-885a-f724-ea37-199f181e4937@linux.intel.com> Date: Thu, 5 Jan 2023 13:58:42 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.6.1 Cc: baolu.lu@linux.intel.com, Joerg Roedel , Christoph Hellwig , Kevin Tian , Will Deacon , Robin Murphy , Jean-Philippe Brucker , Suravee Suthikulpanit , Hector Martin , Sven Peter , Rob Clark , Marek Szyprowski , Krzysztof Kozlowski , Andy Gross , Bjorn Andersson , Yong Wu , Matthias Brugger , Heiko Stuebner , Matthew Rosato , Orson Zhai , Baolin Wang , Chunyan Zhang , Chen-Yu Tsai , Thierry Reding , iommu@lists.linux.dev, linux-kernel@vger.kernel.org To: Jason Gunthorpe References: <20230104125725.271850-1-baolu.lu@linux.intel.com> <20230104125725.271850-11-baolu.lu@linux.intel.com> Content-Language: en-US From: Baolu Lu Subject: Re: [PATCH v4 10/19] iommu: Add set_platform_dma_ops iommu ops In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,NICE_REPLY_A,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 Hi Jason, On 2023/1/4 21:17, Jason Gunthorpe wrote: > On Wed, Jan 04, 2023 at 08:57:16PM +0800, Lu Baolu wrote: > >> diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c >> index de91dd88705b..4e35a9f94873 100644 >> --- a/drivers/iommu/iommu.c >> +++ b/drivers/iommu/iommu.c >> @@ -2163,6 +2163,17 @@ static int iommu_group_do_detach_device(struct device *dev, void *data) >> return 0; >> } >> >> +static int iommu_group_do_set_platform_dma(struct device *dev, void *data) >> +{ >> + const struct iommu_ops *ops = dev_iommu_ops(dev); >> + >> + if (!ops->set_platform_dma_ops) >> + return -EINVAL; >> + >> + ops->set_platform_dma_ops(dev); >> + return 0; >> +} >> + >> static int __iommu_group_set_domain(struct iommu_group *group, >> struct iommu_domain *new_domain) >> { >> @@ -2177,10 +2188,14 @@ static int __iommu_group_set_domain(struct iommu_group *group, >> * platform specific behavior. >> */ >> if (!new_domain) { >> - if (WARN_ON(!group->domain->ops->detach_dev)) >> - return -EINVAL; > This should still have the WARN_ON.. > > if (WARN_ON(!group->domain->ops->detach_dev && !dev_iommu_ops(dev)->set_platform_dma_ops) This has been implicitly included in the code. iommu_group_do_set_platform_dma() returns -EINVAL if the iommu driver doesn't support set_platform_dma_ops (otherwise always return success). Then, the domain->ops->detach_dev is required and a WARN_ON was there. if (!new_domain) { ret = __iommu_group_for_each_dev(group, NULL, iommu_group_do_set_platform_dma); if (ret) { if (WARN_ON(!group->domain->ops->detach_dev)) return -EINVAL; __iommu_group_for_each_dev(group, group->domain, iommu_group_do_detach_device); } group->domain = NULL; return 0; } Perhaps I should add a comment to explain this? -- Best regards, baolu