Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp1412827pxk; Thu, 10 Sep 2020 14:54:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxcRkB79acCCNqt/skJeNg5IsLIzvIcsFZGnEA5OeV0/QWxlhT/Bb2NLrw7JsiIs1rspY0n X-Received: by 2002:a17:906:95d1:: with SMTP id n17mr11485270ejy.324.1599774868718; Thu, 10 Sep 2020 14:54:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599774868; cv=none; d=google.com; s=arc-20160816; b=SX/SqWeOV3vLyLfZZ/qF1YqHcJQDQzp72QLXAzm8nHOgkT9rTF1fm4H0tuEFNX06dR HlmaarRBH/UUs1DDO9Q6ZQv/f6MlMR9n9mWdUj0XWk3m47CqC5HatYmAAHAVpmGOV6eo PUVCrazq5avuSwqv9cuZ09JlpJnZ4jZ3RsNrCWPKf7l3zc60Sx4NBM8pQx4m05BbIrvd 8tGbZBQvfpxFnWRVEHkhXfBQdchBzkK0ABG0PC+YxI63Zgwtb/vAuIzXArfxlFEUB0O0 rxLw0UYMg/GH4us2mVxkQ6bIoPRcjc3Wyg1lMkISeAxrpkwIELDFVDwOTE6940a7J+iG mqKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=hJMQ3l7D9c1jHa3lkbxsVQsPn/mQ9PWhdKwZ9KNTL6I=; b=a+hqcCBQGo71ZVDHSjBfOmLc2JRN2cVJZUN3Hew2mlVcQwM+8SISqV1R9q6S8NeN+y wGjJOJCPXckcVAJEeKVoOIIjJ5jXoSPlc2ubY4zJdjnUZzczQZhr2+tUrm1wPTr8Uzeo CsJCbf2y6sRUMjIN3eG3eWrq1rC7Ine83BYANUdyXW0M61zWQZKIQbyJjpdrfDbv3y9x yQzSA4BdKU09qSrUM6PXp5mV7vnSY8DN3yvz6EeOgED3G9tnAMGov9EsXoviC4wWKyPf Ytorv/oLIRk9KYvEQ8wzhQUvh37ofDUOTW66qNuf5fpiuvPiS7tF2JPvlVw5MMz+HTNX qI5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@tcd-ie.20150623.gappssmtp.com header.s=20150623 header.b=m1sx4C55; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id o21si4309206ejg.255.2020.09.10.14.53.36; Thu, 10 Sep 2020 14:54:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@tcd-ie.20150623.gappssmtp.com header.s=20150623 header.b=m1sx4C55; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725770AbgIJVt7 (ORCPT + 99 others); Thu, 10 Sep 2020 17:49:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36652 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730257AbgIJMZt (ORCPT ); Thu, 10 Sep 2020 08:25:49 -0400 Received: from mail-pj1-x1042.google.com (mail-pj1-x1042.google.com [IPv6:2607:f8b0:4864:20::1042]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2A4AFC061573 for ; Thu, 10 Sep 2020 05:25:49 -0700 (PDT) Received: by mail-pj1-x1042.google.com with SMTP id u3so2955643pjr.3 for ; Thu, 10 Sep 2020 05:25:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tcd-ie.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=hJMQ3l7D9c1jHa3lkbxsVQsPn/mQ9PWhdKwZ9KNTL6I=; b=m1sx4C55eJpUl/NnpzeEMYTsIQfCoVNwoG8sK1YYCwSWbS6ebtldCBKjzYquGLJjNb QIkcdQuSa6qC23sA76PmOxA0DkhHCbwLrOhCEHp1G0PBy1xjZp/tUNmksgcasW7GOT0j E9LXqk9iqt+2QCWGibI/eDous4DmVn8USIg9HEQU3Kay7RmqvtCf+q4GWnMism4PPEgM SQymKP32ZUnheFlxQNdm9dPFNFQZjZDRu8ZIHOuCFTwW7TGer0Ztk/FbzPMimjfA9q1J izcM2lTlMcR61ypwwE6qfjLhQC7PrBL/SE/MpsfAFJXSHemJijDGeKQ7xQIGqWaTMYcG t7mg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=hJMQ3l7D9c1jHa3lkbxsVQsPn/mQ9PWhdKwZ9KNTL6I=; b=IrI13oFehvUqp7a/a7MGWtxwmq0oAdbjrkeyjgdqFbMZFg1aw2MkqX1zYa/nAUnBbz ItFGpddvyv8XgFgymkDbtxC+HO/91Sqf0W426YLKmCQyKnMWJFLVnQDNKzfYOeAs8mnb n5TrQTxhzZikBFig2xqZNzLbB/IB9uC/jH2ljLR6Uwbd72dv+5q1ugFlaAH/lI9/1Heo fM5f0zvNvBY/qNFs7r0jRjExZxFzH3OmIs6Fn7cLDJ2Sbhoy8gTkk2zTfwoxY8wgCSSc wlyViy62en+Cz35sVKLkhq5JcDpUSXgCxNlxjETIEZJKSpZggPBjVjmmtN6hd+pj0n8Q ouPg== X-Gm-Message-State: AOAM53205x9B+LMR2ltZDsK0XVnCplVssoVfpBHUNjPz1jEq4cgSX/xu 3LRDryvZA5y7rG8Z1PQvTydj6QrWxNKwcA== X-Received: by 2002:a17:90b:1046:: with SMTP id gq6mr4966136pjb.231.1599740748465; Thu, 10 Sep 2020 05:25:48 -0700 (PDT) Received: from tom-ThinkPad-X1-Carbon-5th.teksavvy.com ([69.172.145.184]) by smtp.googlemail.com with ESMTPSA id z18sm5884124pfn.186.2020.09.10.05.25.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Sep 2020 05:25:47 -0700 (PDT) From: Tom Murphy To: iommu@lists.linux-foundation.org Cc: Tom Murphy , Joerg Roedel , linux-kernel@vger.kernel.org Subject: [PATCH] Handle init_iova_flush_queue failure in dma-iommu path Date: Thu, 10 Sep 2020 13:25:38 +0100 Message-Id: <20200910122539.3662-1-murphyt7@tcd.ie> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org init_iova_flush_queue can fail if we run out of memory. Fall back to noflush queue if it fails. Signed-off-by: Tom Murphy --- drivers/iommu/dma-iommu.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c index 4959f5df21bd..5f69126f3e91 100644 --- a/drivers/iommu/dma-iommu.c +++ b/drivers/iommu/dma-iommu.c @@ -343,8 +343,11 @@ static int iommu_dma_init_domain(struct iommu_domain *domain, dma_addr_t base, if (!cookie->fq_domain && !iommu_domain_get_attr(domain, DOMAIN_ATTR_DMA_USE_FLUSH_QUEUE, &attr) && attr) { - cookie->fq_domain = domain; - init_iova_flush_queue(iovad, iommu_dma_flush_iotlb_all, NULL); + if (init_iova_flush_queue(iovad, iommu_dma_flush_iotlb_all, + NULL)) + pr_warn("iova flush queue initialization failed\n"); + else + cookie->fq_domain = domain; } if (!dev) -- 2.20.1