Hi,
On 2/21/25 4:17 AM, JianChunfu wrote:
> Uniform the removal judgement of g_hash_table_foreach_remove(), previous
> name seems to perform the actual action while it just returns a Boolean.
I had difficulties to understand the commit msg.
IIUC you meant smmuv3_invalidate_ste() name is not self explanatory and
you would prefer to use a similar terminology as the one being used for
other hash table matching functions, ie. "remove_by" and introduce a
helper that invokes the g_hash_table_foreach_remove with the renamed
function. + add "No functional change intended".
>
> Signed-off-by: JianChunfu <jansef.j...@hj-micro.com>
> ---
> v2: - move smmuv3_invalidate_ste() to smmu_hash_remove_by_sid_range()
> - add function smmu_configs_inv_sid_range()
> v1: - Rename smmuv3_invalidate_ste to smmuv3_hash_remove_by_sid_range
> ---
> hw/arm/smmu-common.c | 21 +++++++++++++++++++++
> hw/arm/smmu-internal.h | 5 -----
> hw/arm/smmuv3.c | 17 +----------------
> hw/arm/trace-events | 1 +
> include/hw/arm/smmu-common.h | 6 ++++++
> 5 files changed, 29 insertions(+), 21 deletions(-)
>
> diff --git a/hw/arm/smmu-common.c b/hw/arm/smmu-common.c
> index 3f8272875..69544392a 100644
> --- a/hw/arm/smmu-common.c
> +++ b/hw/arm/smmu-common.c
> @@ -225,6 +225,27 @@ static gboolean smmu_hash_remove_by_vmid_ipa(gpointer
> key, gpointer value,
> ((entry->iova & ~info->mask) == info->iova);
> }
>
> +static gboolean
> +smmu_hash_remove_by_sid_range(gpointer key, gpointer value, gpointer
> user_data)
> +{
> + SMMUDevice *sdev = (SMMUDevice *)key;
> + uint32_t sid = smmu_get_sid(sdev);
> + SMMUSIDRange *sid_range = (SMMUSIDRange *)user_data;
> +
> + if (sid < sid_range->start || sid > sid_range->end) {
> + return false;
> + }
> + trace_smmuv3_config_cache_inv(sid);
now the code has been moved to smmu-common, would be better to rename
the trace into
trace_smmu_config_cache_inv and move it into the
# smmu-common.c section in trace-events.
> + return true;
> +}
> +
> +void smmu_configs_inv_sid_range(SMMUState *s, SMMUSIDRange sid_range)
> +{
> + trace_smmu_configs_inv_sid_range(sid_range.start, sid_range.end);
> + g_hash_table_foreach_remove(s->configs, smmu_hash_remove_by_sid_range,
> + &sid_range);
> +}
> +
> void smmu_iotlb_inv_iova(SMMUState *s, int asid, int vmid, dma_addr_t iova,
> uint8_t tg, uint64_t num_pages, uint8_t ttl)
> {
> diff --git a/hw/arm/smmu-internal.h b/hw/arm/smmu-internal.h
> index 843bebb18..d143d296f 100644
> --- a/hw/arm/smmu-internal.h
> +++ b/hw/arm/smmu-internal.h
> @@ -141,9 +141,4 @@ typedef struct SMMUIOTLBPageInvInfo {
> uint64_t mask;
> } SMMUIOTLBPageInvInfo;
>
> -typedef struct SMMUSIDRange {
> - uint32_t start;
> - uint32_t end;
> -} SMMUSIDRange;
> -
> #endif
> diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c
> index 4c49b5a88..9da3b6df0 100644
> --- a/hw/arm/smmuv3.c
> +++ b/hw/arm/smmuv3.c
> @@ -1277,20 +1277,6 @@ static void smmuv3_range_inval(SMMUState *s, Cmd *cmd,
> SMMUStage stage)
> }
> }
>
> -static gboolean
> -smmuv3_invalidate_ste(gpointer key, gpointer value, gpointer user_data)
> -{
> - SMMUDevice *sdev = (SMMUDevice *)key;
> - uint32_t sid = smmu_get_sid(sdev);
> - SMMUSIDRange *sid_range = (SMMUSIDRange *)user_data;
> -
> - if (sid < sid_range->start || sid > sid_range->end) {
> - return false;
> - }
> - trace_smmuv3_config_cache_inv(sid);
> - return true;
> -}
> -
> static int smmuv3_cmdq_consume(SMMUv3State *s)
> {
> SMMUState *bs = ARM_SMMU(s);
> @@ -1373,8 +1359,7 @@ static int smmuv3_cmdq_consume(SMMUv3State *s)
> sid_range.end = sid_range.start + mask;
>
> trace_smmuv3_cmdq_cfgi_ste_range(sid_range.start, sid_range.end);
> - g_hash_table_foreach_remove(bs->configs, smmuv3_invalidate_ste,
> - &sid_range);
> + smmu_configs_inv_sid_range(bs, sid_range);
> break;
> }
> case SMMU_CMD_CFGI_CD:
> diff --git a/hw/arm/trace-events b/hw/arm/trace-events
> index c64ad344b..95f523361 100644
> --- a/hw/arm/trace-events
> +++ b/hw/arm/trace-events
> @@ -15,6 +15,7 @@ smmu_iotlb_inv_asid_vmid(int asid, int vmid) "IOTLB
> invalidate asid=%d vmid=%d"
> smmu_iotlb_inv_vmid(int vmid) "IOTLB invalidate vmid=%d"
> smmu_iotlb_inv_vmid_s1(int vmid) "IOTLB invalidate vmid=%d"
> smmu_iotlb_inv_iova(int asid, uint64_t addr) "IOTLB invalidate asid=%d
> addr=0x%"PRIx64
> +smmu_configs_inv_sid_range(uint32_t start, uint32_t end) "Config cache INV
> SID range from 0x%x to 0x%x"
> smmu_inv_notifiers_mr(const char *name) "iommu mr=%s"
> smmu_iotlb_lookup_hit(int asid, int vmid, uint64_t addr, uint32_t hit,
> uint32_t miss, uint32_t p) "IOTLB cache HIT asid=%d vmid=%d addr=0x%"PRIx64"
> hit=%d miss=%d hit rate=%d"
> smmu_iotlb_lookup_miss(int asid, int vmid, uint64_t addr, uint32_t hit,
> uint32_t miss, uint32_t p) "IOTLB cache MISS asid=%d vmid=%d addr=0x%"PRIx64"
> hit=%d miss=%d hit rate=%d"
> diff --git a/include/hw/arm/smmu-common.h b/include/hw/arm/smmu-common.h
> index e5ad55bba..e5e2d0929 100644
> --- a/include/hw/arm/smmu-common.h
> +++ b/include/hw/arm/smmu-common.h
> @@ -142,6 +142,11 @@ typedef struct SMMUIOTLBKey {
> uint8_t level;
> } SMMUIOTLBKey;
>
> +typedef struct SMMUSIDRange {
> + uint32_t start;
> + uint32_t end;
> +} SMMUSIDRange;
> +
> struct SMMUState {
> /* <private> */
> SysBusDevice dev;
> @@ -219,6 +224,7 @@ void smmu_iotlb_inv_iova(SMMUState *s, int asid, int
> vmid, dma_addr_t iova,
> uint8_t tg, uint64_t num_pages, uint8_t ttl);
> void smmu_iotlb_inv_ipa(SMMUState *s, int vmid, dma_addr_t ipa, uint8_t tg,
> uint64_t num_pages, uint8_t ttl);
> +void smmu_configs_inv_sid_range(SMMUState *s, SMMUSIDRange sid_range);
> /* Unmap the range of all the notifiers registered to any IOMMU mr */
> void smmu_inv_notifiers_all(SMMUState *s);
>
Otherwise it looks good.
Thanks
Eric
