linux-kernel - Re: [PATCH] perf: riscv: fix broken build due to struct redefinition

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <mhng-32b44fa5-288d-4186-bc79-6c5f2608aa36@palmer-ri-x1c9>
Date:   Fri, 12 Aug 2022 15:33:30 -0700 (PDT)
From:   Palmer Dabbelt <palmer@...osinc.com>
To:     Conor.Dooley@...rochip.com
CC:     jrtc27@...c27.com, atishp@...shpatra.org, anup@...infault.org,
        Will Deacon <will@...nel.org>, mark.rutland@....com,
        Paul Walmsley <paul.walmsley@...ive.com>,
        aou@...s.berkeley.edu, linux-riscv@...ts.infradead.org,
        linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org
Subject:     Re: [PATCH] perf: riscv: fix broken build due to struct redefinition

On Fri, 12 Aug 2022 07:19:54 PDT (-0700), Conor.Dooley@...rochip.com wrote:
> On 12/08/2022 15:13, Jessica Clarke wrote:
>> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
>> 
>> On 12 Aug 2022, at 14:51, Conor Dooley <conor.dooley@...rochip.com> wrote:
>>>
>>> Building riscv/for-next produces following error:
>>> drivers/perf/riscv_pmu_sbi.c:44:7: error: redefinition of 'sbi_pmu_ctr_info'
>>> union sbi_pmu_ctr_info {
>>>       ^
>>> arch/riscv/include/asm/sbi.h:125:7: note: previous definition is here
>>> union sbi_pmu_ctr_info {
>>>
>>> This appears to have been caused by a merge conflict resolution between
>>> riscv/for-next & riscv/fixes, causing the struct define not being
>> 
>> union, not struct
> 
> autopilot, thanks :)
> 
>> 
>> Jess
>> 
>>> properly moved to its header.
>>>
>>> Fixes: 9a7ccac63f9c ("perf: riscv_pmu{,_sbi}: Miscallenous improvement & fixes")
>>> Signed-off-by: Conor Dooley <conor.dooley@...rochip.com>
>>> ---
>>> drivers/perf/riscv_pmu_sbi.c | 14 --------------
>>> 1 file changed, 14 deletions(-)
>>>
>>> diff --git a/drivers/perf/riscv_pmu_sbi.c b/drivers/perf/riscv_pmu_sbi.c
>>> index e7c6fecbf061..6f6681bbfd36 100644
>>> --- a/drivers/perf/riscv_pmu_sbi.c
>>> +++ b/drivers/perf/riscv_pmu_sbi.c
>>> @@ -41,20 +41,6 @@ static const struct attribute_group *riscv_pmu_attr_groups[] = {
>>>        NULL,
>>> };
>>>
>>> -union sbi_pmu_ctr_info {
>>> -     unsigned long value;
>>> -     struct {
>>> -             unsigned long csr:12;
>>> -             unsigned long width:6;
>>> -#if __riscv_xlen == 32
>>> -             unsigned long reserved:13;
>>> -#else
>>> -             unsigned long reserved:45;
>>> -#endif
>>> -             unsigned long type:1;
>>> -     };
>>> -};
>>> -
>>> /*
>>>   * RISC-V doesn't have hetergenous harts yet. This need to be part of
>>>   * per_cpu in case of harts with different pmu counters

Atish just poked me about this as I was tagging my PR, I squashed it in.  
I don't see a message on lore, not sure if something went off the rails 
or if it's just in the outbox on my box at home.