Hi Julien, > On 24 Aug 2022, at 3:58 pm, Julien Grall <[email protected]> wrote: > > Hi Rahul, > > On 24/08/2022 14:53, Rahul Singh wrote: >> Backport Linux commit dc898eb84b25c39ea46f28c48a169bdbd0e2c7e0 >> iommu/arm-smmu-v3: Fix l1 stream table size in the error message > > We have a tag for this (see Origin). If you use it, then… Ok. > >> Original commit message: > > You don't need to add "original commit message" here and the content is > exactly the same. Ok. > >> iommu/arm-smmu-v3: Fix l1 stream table size in the error message >> The actual size of level-1 stream table is l1size. This looks like >> an oversight on commit d2e88e7c081ef ("iommu/arm-smmu: Fix LOG2SIZE >> setting for 2-level stream tables") which forgot to update the @size >> in error message as well. >> As memory allocation failure is already bad enough, nothing worse >> would happen. But let's be careful. >> Signed-off-by: Zenghui Yu <[email protected]> > > AFAICT, you didn't make any change to this patch. So the "From:" should still > be from Zenghui Yu. For an example how to do backport, see > 9c432b876bf518866d431bda73f2be1250f688eb "x86/mwait-idle: add SPR support".
Ok. > > Also, it would be good to clarify whether they are clean backport and > required some changes (other than context changes). I assume they are clean > backports? Yes all patches are clean back port. Here is the commit msg please have a look once. Once you confirmed I will modify other patches and send it for review. Author: Zenghui Yu <[email protected]> Date: Mon Aug 22 16:19:01 2022 +0100 xen/arm: smmuv3: Fix l1 stream table size in the error message Backport Linux commit dc898eb84b25. This is the clean backport without any changes. The actual size of level-1 stream table is l1size. This looks like an oversight on commit d2e88e7c081ef ("iommu/arm-smmu: Fix LOG2SIZE setting for 2-level stream tables") which forgot to update the @size in error message as well. As memory allocation failure is already bad enough, nothing worse would happen. But let's be careful. Signed-off-by: Zenghui Yu <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Will Deacon <[email protected]> Origin: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git dc898eb84b25 Signed-off-by: Rahul Singh <[email protected]> diff --git a/xen/drivers/passthrough/arm/smmu-v3.c b/xen/drivers/passthrough/arm/smmu-v3.c index f2562acc38..340609264d 100644 --- a/xen/drivers/passthrough/arm/smmu-v3.c +++ b/xen/drivers/passthrough/arm/smmu-v3.c @@ -2348,7 +2348,7 @@ static int arm_smmu_init_strtab_2lvl(struct arm_smmu_device *smmu) if (!strtab) { dev_err(smmu->dev, "failed to allocate l1 stream table (%u bytes)\n", - size); + l1size); return -ENOMEM; } cfg->strtab = strtab; Regards, Rahul
