From: Lu Baolu <baolu.lu@linux.intel.com>
To: Joerg Roedel <joro@8bytes.org>
Cc: fenghua.yu@intel.com, tony.luck@intel.com,
linux-ia64@vger.kernel.org, corbet@lwn.net,
Joerg Roedel <jroedel@suse.de>,
x86@kernel.org, linux-doc@vger.kernel.org,
linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org,
mingo@redhat.com, bp@alien8.de, Thomas.Lendacky@amd.com,
hpa@zytor.com, tglx@linutronix.de
Subject: Re: [PATCH 08/10] iommu: Set default domain type at runtime
Date: Thu, 15 Aug 2019 14:55:39 +0800 [thread overview]
Message-ID: <a8e804dd-a8ae-2e0d-6b3c-698fbc96bf75@linux.intel.com> (raw)
In-Reply-To: <20190814133841.7095-9-joro@8bytes.org>
Hi,
On 8/14/19 9:38 PM, Joerg Roedel wrote:
> From: Joerg Roedel <jroedel@suse.de>
>
> Set the default domain-type at runtime, not at compile-time.
> This keeps default domain type setting in one place when we
> have to change it at runtime.
>
> Signed-off-by: Joerg Roedel <jroedel@suse.de>
> ---
> drivers/iommu/iommu.c | 23 +++++++++++++++--------
> 1 file changed, 15 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
> index 233bc22b487e..96cc7cc8ab21 100644
> --- a/drivers/iommu/iommu.c
> +++ b/drivers/iommu/iommu.c
> @@ -26,11 +26,8 @@
>
> static struct kset *iommu_group_kset;
> static DEFINE_IDA(iommu_group_ida);
> -#ifdef CONFIG_IOMMU_DEFAULT_PASSTHROUGH
> -static unsigned int iommu_def_domain_type = IOMMU_DOMAIN_IDENTITY;
> -#else
> -static unsigned int iommu_def_domain_type = IOMMU_DOMAIN_DMA;
> -#endif
> +
> +static unsigned int iommu_def_domain_type __read_mostly;
> static bool iommu_dma_strict __read_mostly = true;
> static u32 iommu_cmd_line __read_mostly;
>
> @@ -76,7 +73,7 @@ static void iommu_set_cmd_line_dma_api(void)
> iommu_cmd_line |= IOMMU_CMD_LINE_DMA_API;
> }
>
> -static bool __maybe_unused iommu_cmd_line_dma_api(void)
> +static bool iommu_cmd_line_dma_api(void)
> {
> return !!(iommu_cmd_line & IOMMU_CMD_LINE_DMA_API);
> }
> @@ -115,8 +112,18 @@ static const char *iommu_domain_type_str(unsigned int t)
>
> static int __init iommu_subsys_init(void)
> {
> - pr_info("Default domain type: %s\n",
> - iommu_domain_type_str(iommu_def_domain_type));
> + bool cmd_line = iommu_cmd_line_dma_api();
> +
> + if (!cmd_line) {
> + if (IS_ENABLED(CONFIG_IOMMU_DEFAULT_PASSTHROUGH))
> + iommu_set_default_passthrough();
> + else
> + iommu_set_default_translated();
This overrides kernel parameters parsed in iommu_setup(), for example,
iommu=pt won't work anymore.
Best regards,
Lu Baolu
> + }
> +
> + pr_info("Default domain type: %s %s\n",
> + iommu_domain_type_str(iommu_def_domain_type),
> + cmd_line ? "(set via kernel command line)" : "");
>
> return 0;
> }
>
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
next prev parent reply other threads:[~2019-08-15 6:56 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-14 13:38 [PATCH 00/10 v2] Cleanup IOMMU passthrough setting (and disable IOMMU Passthrough when SME is active) Joerg Roedel
2019-08-14 13:38 ` [PATCH 01/10] iommu: Add helpers to set/get default domain type Joerg Roedel
2019-08-14 13:38 ` [PATCH 02/10] iommu/amd: Request passthrough mode from IOMMU core Joerg Roedel
2019-08-14 13:38 ` [PATCH 03/10] iommu/vt-d: " Joerg Roedel
2019-08-15 4:46 ` Lu Baolu
2019-08-14 13:38 ` [PATCH 04/10] x86/dma: Get rid of iommu_pass_through Joerg Roedel
2019-08-15 4:53 ` Lu Baolu
2019-08-14 13:38 ` [PATCH 05/10] ia64: " Joerg Roedel
2019-08-14 13:38 ` [PATCH 06/10] iommu: Remember when default domain type was set on kernel command line Joerg Roedel
2019-08-15 5:01 ` Lu Baolu
2019-08-15 7:19 ` Joerg Roedel
2019-08-14 13:38 ` [PATCH 07/10] iommu: Print default domain type on boot Joerg Roedel
2019-08-15 5:04 ` Lu Baolu
2019-08-14 13:38 ` [PATCH 08/10] iommu: Set default domain type at runtime Joerg Roedel
2019-08-15 6:55 ` Lu Baolu [this message]
2019-08-14 13:38 ` [PATCH 09/10] iommu: Disable passthrough mode when SME is active Joerg Roedel
2019-08-14 13:38 ` [PATCH 10/10] Documentation: Update Documentation for iommu.passthrough Joerg Roedel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a8e804dd-a8ae-2e0d-6b3c-698fbc96bf75@linux.intel.com \
--to=baolu.lu@linux.intel.com \
--cc=Thomas.Lendacky@amd.com \
--cc=bp@alien8.de \
--cc=corbet@lwn.net \
--cc=fenghua.yu@intel.com \
--cc=hpa@zytor.com \
--cc=iommu@lists.linux-foundation.org \
--cc=joro@8bytes.org \
--cc=jroedel@suse.de \
--cc=linux-doc@vger.kernel.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).