| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20170111172352.rsi6n6aarvti7oox@pd.tnic>
Date: Wed, 11 Jan 2017 18:23:52 +0100
From: Borislav Petkov <bp@...en8.de>
To: Suravee Suthikulpanit <Suravee.Suthikulpanit@....com>
Cc: linux-kernel@...r.kernel.org, iommu@...ts.linux-foundation.org,
joro@...tes.org, peterz@...radead.org, mingo@...hat.com
Subject: Re: [PATCH v7 3/7] perf/amd/iommu: Modify IOMMU API to allow
specifying IOMMU index
On Mon, Jan 09, 2017 at 09:33:43PM -0600, Suravee Suthikulpanit wrote:
> The current amd_iommu_pc_get_set_reg_val() cannot support multi-IOMMU.
multiple IOMMUs.
> It is also confusing since it is trying to support set and get in
> one function.
>
> So, this patch breaks it down to amd_iommu_pc_[get|set]_counter(),
"So break it down to..."
> and modifies them to allow callers to specify IOMMU index. This prepares
> the driver for supporting multi-IOMMU in subsequent patch.
>
> This patch also removes unnecessary function declarations in
"Also, remove unnecessary ..."
> amd_iommu_proto.h.
>
> Cc: Peter Zijlstra <peterz@...radead.org>
> Cc: Borislav Petkov <bp@...en8.de>
> Cc: Joerg Roedel <joro@...tes.org>
> Signed-off-by: Suravee Suthikulpanit <Suravee.Suthikulpanit@....com>
> ---
> arch/x86/events/amd/iommu.c | 45 +++++++++++-------------
> arch/x86/events/amd/iommu.h | 8 +++--
> drivers/iommu/amd_iommu_init.c | 77 +++++++++++++++++++++++++++++++----------
> drivers/iommu/amd_iommu_proto.h | 7 ++--
> 4 files changed, 88 insertions(+), 49 deletions(-)
>
> diff --git a/arch/x86/events/amd/iommu.c b/arch/x86/events/amd/iommu.c
> index cf94f48..9744dc8 100644
> --- a/arch/x86/events/amd/iommu.c
> +++ b/arch/x86/events/amd/iommu.c
> @@ -248,46 +248,44 @@ static void perf_iommu_enable_event(struct perf_event *ev)
> {
> u8 csource = _GET_CSOURCE(ev);
> u16 devid = _GET_DEVID(ev);
> + u8 bank = _GET_BANK(ev);
> + u8 cntr = _GET_CNTR(ev);
> u64 reg = 0ULL;
>
> reg = csource;
> - amd_iommu_pc_get_set_reg_val(devid,
> - _GET_BANK(ev), _GET_CNTR(ev) ,
> - IOMMU_PC_COUNTER_SRC_REG, ®, true);
> + amd_iommu_pc_set_reg(0, devid, bank, cntr,
> + IOMMU_PC_COUNTER_SRC_REG, ®);
>
> reg = 0ULL | devid | (_GET_DEVID_MASK(ev) << 32);
What are those 0ULL being ORed in? This is to do what exactly?
> if (reg)
> reg |= (1UL << 31);
reg |= BIT(31);
You can do conversion in a prepatch though.
> - amd_iommu_pc_get_set_reg_val(devid,
> - _GET_BANK(ev), _GET_CNTR(ev) ,
> - IOMMU_PC_DEVID_MATCH_REG, ®, true);
> + amd_iommu_pc_set_reg(0, devid, bank, cntr,
> + IOMMU_PC_DEVID_MATCH_REG, ®);
>
> reg = 0ULL | _GET_PASID(ev) | (_GET_PASID_MASK(ev) << 32);
> if (reg)
> reg |= (1UL << 31);
> - amd_iommu_pc_get_set_reg_val(devid,
> - _GET_BANK(ev), _GET_CNTR(ev) ,
> - IOMMU_PC_PASID_MATCH_REG, ®, true);
> + amd_iommu_pc_set_reg(0, devid, bank, cntr,
> + IOMMU_PC_PASID_MATCH_REG, ®);
>
> reg = 0ULL | _GET_DOMID(ev) | (_GET_DOMID_MASK(ev) << 32);
> if (reg)
> reg |= (1UL << 31);
> - amd_iommu_pc_get_set_reg_val(devid,
> - _GET_BANK(ev), _GET_CNTR(ev) ,
> - IOMMU_PC_DOMID_MATCH_REG, ®, true);
> + amd_iommu_pc_set_reg(0, devid, bank, cntr,
> + IOMMU_PC_DOMID_MATCH_REG, ®);
> }
...
> diff --git a/arch/x86/events/amd/iommu.h b/arch/x86/events/amd/iommu.h
> index 432d867..342716e 100644
> --- a/arch/x86/events/amd/iommu.h
> +++ b/arch/x86/events/amd/iommu.h
> @@ -31,7 +31,11 @@
>
> extern u8 amd_iommu_pc_get_max_counters(uint idx);
>
> -extern int amd_iommu_pc_get_set_reg_val(u16 devid, u8 bank, u8 cntr,
> - u8 fxn, u64 *value, bool is_write);
> +extern int amd_iommu_pc_set_reg(uint idx, u16 devid, u8 bank, u8 cntr,
> + u8 fxn, u64 *value);
Align args at opening brace.
> +
> +extern int amd_iommu_pc_set_counter(uint idx, u8 bank, u8 cntr, u64 *value);
> +
> +extern int amd_iommu_pc_get_counter(uint idx, u8 bank, u8 cntr, u64 *value);
>
> #endif /*_PERF_EVENT_AMD_IOMMU_H_*/
> diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c
> index a7e756b..c993c77 100644
> --- a/drivers/iommu/amd_iommu_init.c
> +++ b/drivers/iommu/amd_iommu_init.c
> @@ -251,10 +251,6 @@ enum iommu_init_state {
> static int __init iommu_go_to_state(enum iommu_init_state state);
> static void init_device_table_dma(void);
>
> -static int iommu_pc_get_set_reg_val(struct amd_iommu *iommu,
> - u8 bank, u8 cntr, u8 fxn,
> - u64 *value, bool is_write);
> -
> static inline void update_last_devid(u16 devid)
> {
> if (devid > amd_iommu_last_bdf)
> @@ -1474,6 +1470,8 @@ static int __init init_iommu_all(struct acpi_table_header *table)
> return 0;
> }
>
> +static int iommu_pc_get_set_reg(struct amd_iommu *iommu, u8 bank, u8 cntr,
> + u8 fxn, u64 *value, bool is_write);
Can you break that one too pls? In a separate patch.
>
> static void init_iommu_perf_ctr(struct amd_iommu *iommu)
> {
> @@ -1485,8 +1483,8 @@ static void init_iommu_perf_ctr(struct amd_iommu *iommu)
> amd_iommu_pc_present = true;
>
> /* Check if the performance counters can be written to */
> - if ((0 != iommu_pc_get_set_reg_val(iommu, 0, 0, 0, &val, true)) ||
> - (0 != iommu_pc_get_set_reg_val(iommu, 0, 0, 0, &val2, false)) ||
> + if ((iommu_pc_get_set_reg(iommu, 0, 0, 0, &val, true) != 0) ||
> + (iommu_pc_get_set_reg(iommu, 0, 0, 0, &val2, false) != 0) ||
if (iommu_pc_get_set_reg(iommu, 0, 0, 0, &val, true) ||
iommu_pc_get_set_reg(iommu, 0, 0, 0, &val2, false))
is more readable.
> (val != val2)) {
> pr_err("AMD-Vi: Unable to write to IOMMU perf counter.\n");
> amd_iommu_pc_present = false;
> @@ -2754,15 +2752,18 @@ u8 amd_iommu_pc_get_max_counters(uint idx)
> }
> EXPORT_SYMBOL(amd_iommu_pc_get_max_counters);
>
> -static int iommu_pc_get_set_reg_val(struct amd_iommu *iommu,
> - u8 bank, u8 cntr, u8 fxn,
> - u64 *value, bool is_write)
> +static int iommu_pc_get_set_reg(struct amd_iommu *iommu, u8 bank, u8 cntr,
> + u8 fxn, u64 *value, bool is_write)
> {
> u32 offset;
> u32 max_offset_lim;
>
> + /* Make sure the IOMMU PC resource is available */
> + if (!amd_iommu_pc_present)
> + return -ENODEV;
> +
> /* Check for valid iommu and pc register indexing */
> - if (WARN_ON((fxn > 0x28) || (fxn & 7)))
> + if (WARN_ON((iommu == NULL) || (fxn > 0x28) || (fxn & 7)))
WARN_ON(!iommu || ...
> return -ENODEV;
>
> offset = (u32)(((0x40|bank) << 12) | (cntr << 8) | fxn);
> @@ -2785,17 +2786,55 @@ static int iommu_pc_get_set_reg_val(struct amd_iommu *iommu,
>
> return 0;
> }
> -EXPORT_SYMBOL(amd_iommu_pc_get_set_reg_val);
>
> -int amd_iommu_pc_get_set_reg_val(u16 devid, u8 bank, u8 cntr, u8 fxn,
> - u64 *value, bool is_write)
> +int amd_iommu_pc_set_reg(uint idx, u16 devid, u8 bank, u8 cntr,
> + u8 fxn, u64 *value)
> {
> - struct amd_iommu *iommu = amd_iommu_rlookup_table[devid];
> + struct amd_iommu *iommu = get_amd_iommu(idx);
>
> - /* Make sure the IOMMU PC resource is available */
> - if (!amd_iommu_pc_present || iommu == NULL)
> - return -ENODEV;
> + if (!iommu)
> + return -EINVAL;
> +
> + return iommu_pc_get_set_reg(iommu, bank, cntr, fxn, value, true);
> +}
> +EXPORT_SYMBOL(amd_iommu_pc_set_reg);
> +
> +int amd_iommu_pc_set_counter(uint idx, u8 bank, u8 cntr, u64 *value)
> +{
> + struct amd_iommu *iommu = get_amd_iommu(idx);
> +
> + if (!iommu)
> + return -EINVAL;
>
> - return iommu_pc_get_set_reg_val(iommu, bank, cntr, fxn,
> - value, is_write);
> + return iommu_pc_get_set_reg(iommu, bank, cntr,
> + IOMMU_PC_COUNTER_REG,
> + value, true);
Why isn't this masking out [63:49] like below?
> +}
> +EXPORT_SYMBOL(amd_iommu_pc_set_counter);
> +
> +int amd_iommu_pc_get_counter(uint idx, u8 bank, u8 cntr, u64 *value)
> +{
> + struct amd_iommu *iommu = get_amd_iommu(idx);
> + int ret;
> + u64 tmp;
> +
> + if (!value || !iommu)
> + return -EINVAL;
> + /*
> + * Here, we read the specified counters on all IOMMUs,
> + * which should have been programmed the same way and
> + * aggregate the counter values.
> + */
> +
> + ret = iommu_pc_get_set_reg(iommu, bank, cntr,
> + IOMMU_PC_COUNTER_REG,
> + &tmp, false);
> + if (ret)
> + return ret;
> +
> + /* IOMMU pc counter register is only 48 bits */
> + *value = tmp & GENMASK_ULL(48, 0);
> +
> + return 0;
> }
> +EXPORT_SYMBOL(amd_iommu_pc_get_counter);
> diff --git a/drivers/iommu/amd_iommu_proto.h b/drivers/iommu/amd_iommu_proto.h
> index 60f2eef..7186c63 100644
> --- a/drivers/iommu/amd_iommu_proto.h
> +++ b/drivers/iommu/amd_iommu_proto.h
> @@ -56,10 +56,9 @@ extern int amd_iommu_domain_set_gcr3(struct iommu_domain *dom, int pasid,
> extern int amd_iommu_domain_clear_gcr3(struct iommu_domain *dom, int pasid);
> extern struct iommu_domain *amd_iommu_get_v2_domain(struct pci_dev *pdev);
>
> -/* IOMMU Performance Counter functions */
> -extern bool amd_iommu_pc_supported(void);
> -extern int amd_iommu_pc_get_set_reg_val(u16 devid, u8 bank, u8 cntr, u8 fxn,
> - u64 *value, bool is_write);
> +#ifndef IOMMU_PC_COUNTER_REG
What's that for?
> +#define IOMMU_PC_COUNTER_REG 0x00
> +#endif
>
> #ifdef CONFIG_IRQ_REMAP
> extern int amd_iommu_create_irq_domain(struct amd_iommu *iommu);
> --
> 1.8.3.1
>
>
--
Regards/Gruss,
Boris.
Good mailing practices for 400: avoid top-posting and trim the reply.
Powered by blists - more mailing lists