From: Robin Murphy <robin.murphy@arm.com>
To: John Garry <john.garry@huawei.com>,
joro@8bytes.org, will@kernel.org, dwmw2@infradead.org,
baolu.lu@linux.intel.com, corbet@lwn.net
Cc: linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org,
linuxarm@huawei.com, thunder.leizhen@huawei.com,
chenxiang66@hisilicon.com, linux-doc@vger.kernel.org
Subject: Re: [PATCH v13 1/6] iommu: Deprecate Intel and AMD cmdline methods to enable strict mode
Date: Thu, 17 Jun 2021 20:01:58 +0100 [thread overview]
Message-ID: <f95252ce-f834-103b-f96d-7e35fa59d5ec@arm.com> (raw)
In-Reply-To: <1623841437-211832-2-git-send-email-john.garry@huawei.com>
On 2021-06-16 12:03, John Garry wrote:
> Now that the x86 drivers support iommu.strict, deprecate the custom
> methods.
>
> Signed-off-by: John Garry <john.garry@huawei.com>
> ---
> Documentation/admin-guide/kernel-parameters.txt | 5 +++--
> drivers/iommu/amd/init.c | 4 +++-
> drivers/iommu/intel/iommu.c | 1 +
> 3 files changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
> index 30e9dd52464e..fcbb36d6eea7 100644
> --- a/Documentation/admin-guide/kernel-parameters.txt
> +++ b/Documentation/admin-guide/kernel-parameters.txt
> @@ -290,7 +290,8 @@
> amd_iommu= [HW,X86-64]
> Pass parameters to the AMD IOMMU driver in the system.
> Possible values are:
> - fullflush - enable flushing of IO/TLB entries when
> + fullflush [Deprecated, use iommu.strict instead]
> + - enable flushing of IO/TLB entries when
> they are unmapped. Otherwise they are
> flushed before they will be reused, which
> is a lot of faster
> @@ -1947,7 +1948,7 @@
> bypassed by not enabling DMAR with this option. In
> this case, gfx device will use physical address for
> DMA.
> - strict [Default Off]
> + strict [Default Off] [Deprecated, use iommu.strict instead]
> With this option on every unmap_single operation will
> result in a hardware IOTLB flush operation as opposed
> to batching them for performance.
FWIW I'd be inclined to replace both whole descriptions with just
something like "Deprecated, equivalent to iommu.strict=1".
> diff --git a/drivers/iommu/amd/init.c b/drivers/iommu/amd/init.c
> index 46280e6e1535..9f3096d650aa 100644
> --- a/drivers/iommu/amd/init.c
> +++ b/drivers/iommu/amd/init.c
> @@ -3098,8 +3098,10 @@ static int __init parse_amd_iommu_intr(char *str)
> static int __init parse_amd_iommu_options(char *str)
> {
> for (; *str; ++str) {
> - if (strncmp(str, "fullflush", 9) == 0)
> + if (strncmp(str, "fullflush", 9) == 0) {
> + pr_warn("amd_iommu=fullflush deprecated; use iommu.strict instead\n");
Nit: maybe we should spell out "...use <option>=1 instead" in all of
these messages just in case anyone takes them literally? (I'm not sure
the options parse correctly with no argument)
Either way,
Acked-by: Robin Murphy <robin.murphy@arm.com>
Thanks,
Robin.
> amd_iommu_unmap_flush = true;
> + }
> if (strncmp(str, "force_enable", 12) == 0)
> amd_iommu_force_enable = true;
> if (strncmp(str, "off", 3) == 0)
> diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
> index bd93c7ec879e..821d8227a4e6 100644
> --- a/drivers/iommu/intel/iommu.c
> +++ b/drivers/iommu/intel/iommu.c
> @@ -454,6 +454,7 @@ static int __init intel_iommu_setup(char *str)
> pr_warn("intel_iommu=forcedac deprecated; use iommu.forcedac instead\n");
> iommu_dma_forcedac = true;
> } else if (!strncmp(str, "strict", 6)) {
> + pr_warn("intel_iommu=strict deprecated; use iommu.strict instead\n");
> pr_info("Disable batched IOTLB flush\n");
> intel_iommu_strict = 1;
> } else if (!strncmp(str, "sp_off", 6)) {
>
next prev parent reply other threads:[~2021-06-17 19:02 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-16 11:03 [PATCH v13 0/6] iommu: Enhance IOMMU default DMA mode build options John Garry
2021-06-16 11:03 ` [PATCH v13 1/6] iommu: Deprecate Intel and AMD cmdline methods to enable strict mode John Garry
2021-06-17 19:01 ` Robin Murphy [this message]
2021-06-18 7:43 ` John Garry
2021-06-16 11:03 ` [PATCH v13 2/6] iommu: Print strict or lazy mode at init time John Garry
2021-06-16 11:03 ` [PATCH v13 3/6] iommu: Enhance IOMMU default DMA mode build options John Garry
2021-06-16 11:03 ` [PATCH v13 4/6] iommu/vt-d: Add support for " John Garry
2021-06-17 7:32 ` Lu Baolu
2021-06-17 8:00 ` John Garry
2021-06-17 19:03 ` Robin Murphy
2021-06-18 1:46 ` Lu Baolu
2021-06-18 7:31 ` John Garry
2021-06-16 11:03 ` [PATCH v13 5/6] iommu/amd: " John Garry
2021-06-16 11:03 ` [PATCH v13 6/6] iommu: Remove mode argument from iommu_set_dma_strict() John Garry
2021-06-17 7:36 ` Lu Baolu
2021-06-17 7:41 ` John Garry
2021-06-18 1:52 ` Lu Baolu
2021-06-17 18:56 ` Robin Murphy
2021-06-18 1:51 ` Lu Baolu
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=f95252ce-f834-103b-f96d-7e35fa59d5ec@arm.com \
--to=robin.murphy@arm.com \
--cc=baolu.lu@linux.intel.com \
--cc=chenxiang66@hisilicon.com \
--cc=corbet@lwn.net \
--cc=dwmw2@infradead.org \
--cc=iommu@lists.linux-foundation.org \
--cc=john.garry@huawei.com \
--cc=joro@8bytes.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxarm@huawei.com \
--cc=thunder.leizhen@huawei.com \
--cc=will@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).