Received: by 2002:a05:6358:4e97:b0:b3:742d:4702 with SMTP id ce23csp2718192rwb; Mon, 15 Aug 2022 10:08:05 -0700 (PDT) X-Google-Smtp-Source: AA6agR5NffxxzyCWFDyG/qaxijezvsq1Ip10O7+nvfZsc1zjkatr84hXZUBh9jEa6BpduNZkDwFW X-Received: by 2002:a17:907:60c7:b0:731:2be4:f72d with SMTP id hv7-20020a17090760c700b007312be4f72dmr10990696ejc.639.1660583285384; Mon, 15 Aug 2022 10:08:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660583285; cv=none; d=google.com; s=arc-20160816; b=oQULEYd0tiUXEZiJPFcFh4ehQlB2MspPu3KQx1i+iShktQnU4ntbDiUzl52zHiDRvJ AFYivfNSt+aYZI/ONS7OTqlaZt+G+sX9ymhJp3gy7l8anUa4emu/VIIteUYie0BoY3Pa 67JCShG6Xc2MNeSRMjcJIEoEKIgU3ND98znM5V3DlPvqhGhPlkJvOhYDDdY933mO57YR SBnVdZduqkN0MFqh78dAaEYMjoJzsnIYn5+Ky635H65h34ey3ECnOOZwkYMsB7EW3Kv7 qmXlqhZjj9yIpfDlxMV3DO1GXptBu97XIYRTdgIkwJc48P+X4182NIiFyYTUoSMtYo6B LxBg== 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; bh=lKBsluGQJ6g6IM9/NCeQlaIBD16LhXMMYbjpYrG0t+4=; b=yfEbKT+38kqWdgyvVK9vVCWqJDWF1LR88KsaHLhVPsgzCi4YA3nLgE8hpz7cd2I7HP yTgxtnwb733xMvEspTsiGWg4kcK9maQ0mrhpqsz9B/0fr/oyvUrDtKDRJxmDsL1uRQ/N Cy1yTwnv3bq49pdacQyPEwA5LGnoD06/LyftwZ0m1Scf9QzweItoaXmQt4y9VSilZu2i rNgTf5lsFj9Bh7iDOVGPiqI6iTCQsqSHR3Q/qV2o23jAR1Qc0TKwnzW3HwBIDcjM/lb7 8MB+fqFohyLznVj+t5d77Kr2IObGEHv9JJK9B+jjiewj3Y8bQDEgUKDOZDg0MMo5u2WE 2gmA== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f25-20020a170906561900b00730a1a86524si6489096ejq.112.2022.08.15.10.07.33; Mon, 15 Aug 2022 10:08:05 -0700 (PDT) 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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231310AbiHOQUd (ORCPT + 99 others); Mon, 15 Aug 2022 12:20:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39034 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230022AbiHOQU1 (ORCPT ); Mon, 15 Aug 2022 12:20:27 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 83FFADF01 for ; Mon, 15 Aug 2022 09:20:26 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 2194B1480; Mon, 15 Aug 2022 09:20:27 -0700 (PDT) Received: from e121345-lin.cambridge.arm.com (e121345-lin.cambridge.arm.com [10.1.196.40]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id D406A3F70D; Mon, 15 Aug 2022 09:20:24 -0700 (PDT) From: Robin Murphy To: joro@8bytes.org Cc: will@kernel.org, iommu@lists.linux.dev, linux-arm-kernel@lists.infradead.org, baolu.lu@linux.intel.com, kevin.tian@intel.com, suravee.suthikulpanit@amd.com, vasant.hegde@amd.com, mjrosato@linux.ibm.com, schnelle@linux.ibm.com, linux-kernel@vger.kernel.org Subject: [PATCH v4 02/16] iommu/amd: Handle race between registration and device probe Date: Mon, 15 Aug 2022 17:20:03 +0100 Message-Id: X-Mailer: git-send-email 2.36.1.dirty In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE 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 As for the Intel driver, make sure the AMD driver can cope with seeing .probe_device calls without having to wait for all known instances to register first. Signed-off-by: Robin Murphy --- v4: No change drivers/iommu/amd/iommu.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c index 65b8e4fd8217..5ed9fd40d2a7 100644 --- a/drivers/iommu/amd/iommu.c +++ b/drivers/iommu/amd/iommu.c @@ -1851,6 +1851,10 @@ static struct iommu_device *amd_iommu_probe_device(struct device *dev) if (!iommu) return ERR_PTR(-ENODEV); + /* Not registered yet? */ + if (!iommu->iommu.ops) + return ERR_PTR(-ENODEV); + if (dev_iommu_priv_get(dev)) return &iommu->iommu; -- 2.36.1.dirty