From: Lu Baolu <baolu.lu@linux.intel.com>
To: Zhenzhong Duan <zhenzhong.duan@gmail.com>, linux-kernel@vger.kernel.org
Cc: dwmw2@infradead.org, iommu@lists.linux-foundation.org
Subject: Re: [PATCH] iommu/vt-d: remove redundant variable no_platform_optin
Date: Thu, 5 Nov 2020 09:40:37 +0800 [thread overview]
Message-ID: <67fd98a2-23a9-b69a-4d60-a0698e243a85@linux.intel.com> (raw)
In-Reply-To: <20201104081936.2128-1-zhenzhong.duan@gmail.com>
Hi Zhenzhong,
On 11/4/20 4:19 PM, Zhenzhong Duan wrote:
> no_platform_optin is redundant with dmar_disabled and it's only used in
> platform_optin_force_iommu(), remove it and use dmar_disabled instead.
It's actually not.
If CONFIG_INTEL_IOMMU_DEFAULT_ON is not set, we will get "dmar_disable =
1" and "no_platform_optin = 0". In this case, we must force the iommu on
and set dmar_disable = 0.
The real use case: if a kernel built with [CONFIG_INTEL_IOMMU_DEFAULT_ON
= n] running on a platform with thunderbolt ports, we must force IOMMU
on so that the system could be protected from possible malicious
peripherals.
Best regards,
baolu
>
> Meanwhile remove all the dead code in platform_optin_force_iommu().
>
> Signed-off-by: Zhenzhong Duan <zhenzhong.duan@gmail.com>
> ---
> drivers/iommu/intel/iommu.c | 14 ++------------
> 1 file changed, 2 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
> index 8651f6d4dfa0..a011d1ed63ef 100644
> --- a/drivers/iommu/intel/iommu.c
> +++ b/drivers/iommu/intel/iommu.c
> @@ -180,7 +180,6 @@ static int rwbf_quirk;
> */
> static int force_on = 0;
> int intel_iommu_tboot_noforce;
> -static int no_platform_optin;
>
> #define ROOT_ENTRY_NR (VTD_PAGE_SIZE/sizeof(struct root_entry))
>
> @@ -440,7 +439,6 @@ static int __init intel_iommu_setup(char *str)
> pr_info("IOMMU enabled\n");
> } else if (!strncmp(str, "off", 3)) {
> dmar_disabled = 1;
> - no_platform_optin = 1;
> pr_info("IOMMU disabled\n");
> } else if (!strncmp(str, "igfx_off", 8)) {
> dmar_map_gfx = 0;
> @@ -4810,20 +4808,12 @@ static inline bool has_external_pci(void)
>
> static int __init platform_optin_force_iommu(void)
> {
> - if (!dmar_platform_optin() || no_platform_optin || !has_external_pci())
> + if (!dmar_platform_optin() || dmar_disabled || !has_external_pci())
> return 0;
>
> - if (no_iommu || dmar_disabled)
> + if (no_iommu)
> pr_info("Intel-IOMMU force enabled due to platform opt in\n");
>
> - /*
> - * If Intel-IOMMU is disabled by default, we will apply identity
> - * map for all devices except those marked as being untrusted.
> - */
> - if (dmar_disabled)
> - iommu_set_default_passthrough(false);
> -
> - dmar_disabled = 0;
> no_iommu = 0;
>
> return 1;
>
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
next prev parent reply other threads:[~2020-11-05 1:47 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-04 8:19 [PATCH] iommu/vt-d: remove redundant variable no_platform_optin Zhenzhong Duan
2020-11-05 1:40 ` Lu Baolu [this message]
2020-11-05 2:19 ` Zhenzhong Duan
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=67fd98a2-23a9-b69a-4d60-a0698e243a85@linux.intel.com \
--to=baolu.lu@linux.intel.com \
--cc=dwmw2@infradead.org \
--cc=iommu@lists.linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=zhenzhong.duan@gmail.com \
/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).