From patchwork Thu Jun 13 08:42:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Leizhen \(ThunderTown\)" X-Patchwork-Id: 166711 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp949389ilk; Thu, 13 Jun 2019 09:12:39 -0700 (PDT) X-Google-Smtp-Source: APXvYqw+iDPCjq5vaRtim5cWs991qVaXwG12hVxQvNmxYXBxxlv7emDh06rBAmekyKnRm8VbpRRM X-Received: by 2002:a65:6116:: with SMTP id z22mr31216909pgu.50.1560442359156; Thu, 13 Jun 2019 09:12:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560442359; cv=none; d=google.com; s=arc-20160816; b=xpuTmNob0XLaEOiqNnl4tONlg4Ilz7RDMiQ2e1jVFq59nkr/UQjkt4cd5iCpbuKkoZ GZwNYUzIccpXlkg9AHmMyz1YaxgboumaFsZ2D6uGco5ERrsEWa6Lyh6C8Ijbs1kOiHJs IoXPWSpsCA592bhZvG8p3y+Kactx3B85LNwz73SjCKlUVelJHfdBwJTwmZy8VLbvSApE R0nqQHz7e1QnpXITlP9XuVfEcmiUozgW/6hIpiY3Acw59T6fuwI+tc1TLDf2ZcxfdTOj Xap8W5MTuvRDAjszCDr+v1p1e1s/WndGM0VjSizmsbqpooENH/P3Ig8PBCK3rG9ypd+Y mcBQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from; bh=2hMqB8wnd8JIsqUGiBkN01uB5MitCJPfunCisR9wa/w=; b=mo1ZeF/utS5GMYHo/z42giaF6xvxFkZZ9XcsKWTZqtteEGllzMKtqQe0yxeFSL90ev BOhBsDhBmsdDCVWS1RG3mRuuXQLQIvSJSGJWbAFMMS2sRuslYunu4AYmJbreX6t2k11B ryf/f9e7FTL7ZbWPxxBDicjrK7zrBa7xBFrgpZpyZ7SHRfODBvwLbyajJydesUSrxR1l nidRC7KFQcN7WBwu3i5UVFnZtVvzJnmJ0SFUhjpJdo6LhHVbJNPKm4jgKC0DTVtR2fEC cWyHfiH+zP83RnX1qYz07ePhrWLv/Oj6GQr3AF3XhgokTuzDEc6SR1TSxFxV8ARTVJU3 3U7A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o3si48958pld.102.2019.06.13.09.12.38; Thu, 13 Jun 2019 09:12:39 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391510AbfFMQMh (ORCPT + 24 others); Thu, 13 Jun 2019 12:12:37 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:18564 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1731222AbfFMInM (ORCPT ); Thu, 13 Jun 2019 04:43:12 -0400 Received: from DGGEMS403-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 7C2EF437288702CB4296; Thu, 13 Jun 2019 16:43:10 +0800 (CST) Received: from HGHY4L002753561.china.huawei.com (10.133.215.186) by DGGEMS403-HUB.china.huawei.com (10.3.19.203) with Microsoft SMTP Server id 14.3.439.0; Thu, 13 Jun 2019 16:42:59 +0800 From: Zhen Lei To: Jean-Philippe Brucker , John Garry , Robin Murphy , Will Deacon , Joerg Roedel , Jonathan Corbet , linux-doc , Sebastian Ott , Gerald Schaefer , "Martin Schwidefsky" , Heiko Carstens , Benjamin Herrenschmidt , Paul Mackerras , "Michael Ellerman" , Tony Luck , Fenghua Yu , Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H . Peter Anvin" , David Woodhouse , iommu , linux-kernel , linux-s390 , linuxppc-dev , x86 , linux-ia64 CC: Zhen Lei Subject: [PATCH v9 1/7] iommu: enhance IOMMU default DMA mode build options Date: Thu, 13 Jun 2019 16:42:34 +0800 Message-ID: <20190613084240.16768-2-thunder.leizhen@huawei.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20190613084240.16768-1-thunder.leizhen@huawei.com> References: <20190613084240.16768-1-thunder.leizhen@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.133.215.186] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org First, add build option IOMMU_DEFAULT_{LAZY|STRICT}, so that we have the opportunity to set {lazy|strict} mode as default at build time. Then put the three config options in an choice, make people can only choose one of the three at a time. Signed-off-by: Zhen Lei --- drivers/iommu/Kconfig | 44 ++++++++++++++++++++++++++++++++++++-------- drivers/iommu/iommu.c | 3 ++- 2 files changed, 38 insertions(+), 9 deletions(-) -- 1.8.3 diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig index 83664db5221df02..fe715fb295c6ed2 100644 --- a/drivers/iommu/Kconfig +++ b/drivers/iommu/Kconfig @@ -75,16 +75,44 @@ config IOMMU_DEBUGFS debug/iommu directory, and then populate a subdirectory with entries as required. -config IOMMU_DEFAULT_PASSTHROUGH - bool "IOMMU passthrough by default" +choice + prompt "IOMMU default DMA mode" depends on IOMMU_API - help - Enable passthrough by default, removing the need to pass in - iommu.passthrough=on or iommu=pt through command line. If this - is enabled, you can still disable with iommu.passthrough=off - or iommu=nopt depending on the architecture. + default IOMMU_DEFAULT_STRICT + help + This option allows an IOMMU DMA mode to be chosen at build time, to + override the default DMA mode of each ARCH, removing the need to + pass in kernel parameters through command line. You can still use + ARCH specific boot options to override this option again. - If unsure, say N here. + If unsure, keep the default. + +config IOMMU_DEFAULT_PASSTHROUGH + bool "passthrough" + help + In this mode, the DMA access through IOMMU without any addresses + translation. That means, the wrong or illegal DMA access can not + be caught, no error information will be reported. + +config IOMMU_DEFAULT_LAZY + bool "lazy" + help + Support lazy mode, where for every IOMMU DMA unmap operation, the + flush operation of IOTLB and the free operation of IOVA are deferred. + They are only guaranteed to be done before the related IOVA will be + reused. + +config IOMMU_DEFAULT_STRICT + bool "strict" + help + For every IOMMU DMA unmap operation, the flush operation of IOTLB and + the free operation of IOVA are guaranteed to be done in the unmap + function. + + This mode is safer than the two above, but it maybe slower in some + high performace scenarios. + +endchoice config OF_IOMMU def_bool y diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index f9cacce909d3ae9..05171dd0bd03aee 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -31,7 +31,8 @@ #else static unsigned int iommu_def_domain_type = IOMMU_DOMAIN_DMA; #endif -static bool iommu_dma_strict __read_mostly = true; +static bool iommu_dma_strict __read_mostly = + IS_ENABLED(CONFIG_IOMMU_DEFAULT_STRICT); struct iommu_group { struct kobject kobj;