From: "Leizhen (ThunderTown)" <thunder.leizhen@huawei.com>
To: John Garry <john.garry@huawei.com>, Will Deacon <will.deacon@arm.com>
Cc: Joerg Roedel <joro@8bytes.org>, LinuxArm <linuxarm@huawei.com>,
linux-kernel <linux-kernel@vger.kernel.org>,
iommu <iommu@lists.linux-foundation.org>,
Robin Murphy <robin.murphy@arm.com>,
linux-arm-kernel <linux-arm-kernel@lists.infradead.org>
Subject: Re: [PATCH v2 1/1] iommu/arm-smmu-v3: eliminate a potential memory corruption on Hi16xx soc
Date: Tue, 30 Oct 2018 22:02:51 +0800 [thread overview]
Message-ID: <5BD8648B.8050001@huawei.com> (raw)
In-Reply-To: <5f8866ef-41f4-424b-7fc3-240a4ae7b9f2@huawei.com>
On 2018/10/30 17:26, John Garry wrote:
> On 30/10/2018 01:52, Leizhen (ThunderTown) wrote:
>>
>>
>> On 2018/10/30 1:59, Will Deacon wrote:
>>> On Sat, Oct 20, 2018 at 03:36:54PM +0800, Zhen Lei wrote:
>>>> The standard GITS_TRANSLATER register in ITS is only 4 bytes, but
>>>> Hisilicon expands the next 4 bytes to carry some IMPDEF information. That
>>>> means, total 8 bytes data will be written to MSIAddress each time.
>>>>
>>>> MSIAddr: |----4bytes----|----4bytes----|
>>>> | MSIData | IMPDEF |
>>>>
>>>> There is no problem for ITS, because the next 4 bytes space is reserved
>>>> in ITS. But it will overwrite the 4 bytes memory following "sync_count".
>>>> It's very fortunately that the previous and the next neighbour of the
>>>> "sync_count" are both aligned by 8 bytes, so no problem is met now.
>>>>
>>>> It's good to explicitly add a workaround:
>>>> 1. Add gcc __attribute__((aligned(8))) to make sure that "sync_count" is
>>>> always aligned by 8 bytes.
>>>> 2. Add a "int" struct member to make sure the 4 bytes padding is always
>>>> exist.
>>>>
>>>> There is no functional change.
>>>>
>>>> Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
>>>> ---
>>>> drivers/iommu/arm-smmu-v3.c | 15 ++++++++++++++-
>>>> 1 file changed, 14 insertions(+), 1 deletion(-)
>>>>
>>>> diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c
>>>> index 5059d09..624fdd0 100644
>>>> --- a/drivers/iommu/arm-smmu-v3.c
>>>> +++ b/drivers/iommu/arm-smmu-v3.c
>>>> @@ -586,7 +586,20 @@ struct arm_smmu_device {
>>>>
>>>> struct arm_smmu_strtab_cfg strtab_cfg;
>>>>
>>>> - u32 sync_count;
>>>> + /*
>>>> + * The alignment and padding is required by Hi16xx of Hisilicon.
>
> Nit: I know that there is no functional change related to this bug which depends on the chip version, but how about "hi1620 and earlier"? hi16xx is very broad.
OK, I will update it.
>
> Thanks
>
>>>> + * Because the ITS hardware on Hi16xx will truncate the MSIAddress(Here
>>>> + * it's the address of "sync_count") to 8 bytes boundary first, then
>>>> + * write 32 bits MSIdata at offset 0, and 32 bits IMPDEF data at offset
>>>> + * 4. Without this workaround, the adjacent member maybe overwritten.
>>>> + *
>>>> + * |---4bytes---|---4bytes---|
>>>> + * MSIAddress & (~0x7): MSIdata | IMPDEF data|
>>>> + */
>>>> + struct {
>>>> + u32 sync_count;
>>>> + int padding;
>>>> + } __attribute__((aligned(8)));
>>>
>>> I thought the conclusion after reviewing your original patch was to maintain
>>> the union and drop the alignment directive? e.g.
>>>
>>> union {
>>> u32 sync_count;
>>> u64 padding; /* Hi16xx writes an extra 32 bits of goodness */
>>> };
>> OK, I will sent v3.
>>
>>>
>>> Will
>>>
>>> .
>>>
>>
>
>
>
> .
>
--
Thanks!
BestRegards
WARNING: multiple messages have this Message-ID (diff)
From: thunder.leizhen@huawei.com (Leizhen (ThunderTown))
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 1/1] iommu/arm-smmu-v3: eliminate a potential memory corruption on Hi16xx soc
Date: Tue, 30 Oct 2018 22:02:51 +0800 [thread overview]
Message-ID: <5BD8648B.8050001@huawei.com> (raw)
In-Reply-To: <5f8866ef-41f4-424b-7fc3-240a4ae7b9f2@huawei.com>
On 2018/10/30 17:26, John Garry wrote:
> On 30/10/2018 01:52, Leizhen (ThunderTown) wrote:
>>
>>
>> On 2018/10/30 1:59, Will Deacon wrote:
>>> On Sat, Oct 20, 2018 at 03:36:54PM +0800, Zhen Lei wrote:
>>>> The standard GITS_TRANSLATER register in ITS is only 4 bytes, but
>>>> Hisilicon expands the next 4 bytes to carry some IMPDEF information. That
>>>> means, total 8 bytes data will be written to MSIAddress each time.
>>>>
>>>> MSIAddr: |----4bytes----|----4bytes----|
>>>> | MSIData | IMPDEF |
>>>>
>>>> There is no problem for ITS, because the next 4 bytes space is reserved
>>>> in ITS. But it will overwrite the 4 bytes memory following "sync_count".
>>>> It's very fortunately that the previous and the next neighbour of the
>>>> "sync_count" are both aligned by 8 bytes, so no problem is met now.
>>>>
>>>> It's good to explicitly add a workaround:
>>>> 1. Add gcc __attribute__((aligned(8))) to make sure that "sync_count" is
>>>> always aligned by 8 bytes.
>>>> 2. Add a "int" struct member to make sure the 4 bytes padding is always
>>>> exist.
>>>>
>>>> There is no functional change.
>>>>
>>>> Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
>>>> ---
>>>> drivers/iommu/arm-smmu-v3.c | 15 ++++++++++++++-
>>>> 1 file changed, 14 insertions(+), 1 deletion(-)
>>>>
>>>> diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c
>>>> index 5059d09..624fdd0 100644
>>>> --- a/drivers/iommu/arm-smmu-v3.c
>>>> +++ b/drivers/iommu/arm-smmu-v3.c
>>>> @@ -586,7 +586,20 @@ struct arm_smmu_device {
>>>>
>>>> struct arm_smmu_strtab_cfg strtab_cfg;
>>>>
>>>> - u32 sync_count;
>>>> + /*
>>>> + * The alignment and padding is required by Hi16xx of Hisilicon.
>
> Nit: I know that there is no functional change related to this bug which depends on the chip version, but how about "hi1620 and earlier"? hi16xx is very broad.
OK, I will update it.
>
> Thanks
>
>>>> + * Because the ITS hardware on Hi16xx will truncate the MSIAddress(Here
>>>> + * it's the address of "sync_count") to 8 bytes boundary first, then
>>>> + * write 32 bits MSIdata at offset 0, and 32 bits IMPDEF data at offset
>>>> + * 4. Without this workaround, the adjacent member maybe overwritten.
>>>> + *
>>>> + * |---4bytes---|---4bytes---|
>>>> + * MSIAddress & (~0x7): MSIdata | IMPDEF data|
>>>> + */
>>>> + struct {
>>>> + u32 sync_count;
>>>> + int padding;
>>>> + } __attribute__((aligned(8)));
>>>
>>> I thought the conclusion after reviewing your original patch was to maintain
>>> the union and drop the alignment directive? e.g.
>>>
>>> union {
>>> u32 sync_count;
>>> u64 padding; /* Hi16xx writes an extra 32 bits of goodness */
>>> };
>> OK, I will sent v3.
>>
>>>
>>> Will
>>>
>>> .
>>>
>>
>
>
>
> .
>
--
Thanks!
BestRegards
next prev parent reply other threads:[~2018-10-30 14:02 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-20 7:36 [PATCH v2 1/1] iommu/arm-smmu-v3: eliminate a potential memory corruption on Hi16xx soc Zhen Lei
2018-10-20 7:36 ` Zhen Lei
2018-10-20 7:36 ` Zhen Lei
2018-10-29 17:59 ` Will Deacon
2018-10-29 17:59 ` Will Deacon
2018-10-30 1:52 ` Leizhen (ThunderTown)
2018-10-30 1:52 ` Leizhen (ThunderTown)
2018-10-30 9:26 ` John Garry
2018-10-30 9:26 ` John Garry
2018-10-30 14:02 ` Leizhen (ThunderTown) [this message]
2018-10-30 14:02 ` Leizhen (ThunderTown)
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=5BD8648B.8050001@huawei.com \
--to=thunder.leizhen@huawei.com \
--cc=iommu@lists.linux-foundation.org \
--cc=john.garry@huawei.com \
--cc=joro@8bytes.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxarm@huawei.com \
--cc=robin.murphy@arm.com \
--cc=will.deacon@arm.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.