linux-kernel - Re: mmotm 2021-04-11-20-47 uploaded (bpf: xsk.c)

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] [day] [month] [year] [list]

Message-ID: <034959c7-c70f-4d1b-0fe2-dcc00075807f@infradead.org>
Date:   Tue, 13 Apr 2021 15:44:26 -0700
From:   Randy Dunlap <rdunlap@...radead.org>
To:     Andrii Nakryiko <andrii.nakryiko@...il.com>
Cc:     Andrew Morton <akpm@...ux-foundation.org>, broonie@...nel.org,
        mhocko@...e.cz, Stephen Rothwell <sfr@...b.auug.org.au>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        linux-fsdevel@...r.kernel.org,
        Linux Memory Management List <linux-mm@...ck.org>,
        open list <linux-kernel@...r.kernel.org>,
        mm-commits@...r.kernel.org, bpf <bpf@...r.kernel.org>,
        "netdev@...r.kernel.org" <netdev@...r.kernel.org>,
        Alexei Starovoitov <ast@...nel.org>,
        Daniel Borkmann <daniel@...earbox.net>,
        Andrii Nakryiko <andrii@...nel.org>
Subject: Re: mmotm 2021-04-11-20-47 uploaded (bpf: xsk.c)

On 4/13/21 3:18 PM, Andrii Nakryiko wrote:
> On Mon, Apr 12, 2021 at 9:38 AM Randy Dunlap <rdunlap@...radead.org> wrote:
>>
>> On 4/11/21 8:48 PM, akpm@...ux-foundation.org wrote:
>>> The mm-of-the-moment snapshot 2021-04-11-20-47 has been uploaded to
>>>
>>>    https://www.ozlabs.org/~akpm/mmotm/
>>>
>>> mmotm-readme.txt says
>>>
>>> README for mm-of-the-moment:
>>>
>>> https://www.ozlabs.org/~akpm/mmotm/
>>>
>>> This is a snapshot of my -mm patch queue.  Uploaded at random hopefully
>>> more than once a week.
>>>
>>> You will need quilt to apply these patches to the latest Linus release (5.x
>>> or 5.x-rcY).  The series file is in broken-out.tar.gz and is duplicated in
>>> https://ozlabs.org/~akpm/mmotm/series
>>>
>>> The file broken-out.tar.gz contains two datestamp files: .DATE and
>>> .DATE-yyyy-mm-dd-hh-mm-ss.  Both contain the string yyyy-mm-dd-hh-mm-ss,
>>> followed by the base kernel version against which this patch series is to
>>> be applied.
>>>
>>> This tree is partially included in linux-next.  To see which patches are
>>> included in linux-next, consult the `series' file.  Only the patches
>>> within the #NEXT_PATCHES_START/#NEXT_PATCHES_END markers are included in
>>> linux-next.
>>>
>>>
>>> A full copy of the full kernel tree with the linux-next and mmotm patches
>>> already applied is available through git within an hour of the mmotm
>>> release.  Individual mmotm releases are tagged.  The master branch always
>>> points to the latest release, so it's constantly rebasing.
>>>
>>>       https://github.com/hnaz/linux-mm
>>>
>>> The directory https://www.ozlabs.org/~akpm/mmots/ (mm-of-the-second)
>>> contains daily snapshots of the -mm tree.  It is updated more frequently
>>> than mmotm, and is untested.
>>>
>>> A git copy of this tree is also available at
>>>
>>>       https://github.com/hnaz/linux-mm
>>
>> on x86_64:
>>
>> xsk.c: In function ‘xsk_socket__create_shared’:
>> xsk.c:1027:7: error: redeclaration of ‘unmap’ with no linkage
>>   bool unmap = umem->fill_save != fill;
>>        ^~~~~
>> xsk.c:1020:7: note: previous declaration of ‘unmap’ was here
>>   bool unmap, rx_setup_done = false, tx_setup_done = false;
>>        ^~~~~
>> xsk.c:1028:7: error: redefinition of ‘rx_setup_done’
>>   bool rx_setup_done = false, tx_setup_done = false;
>>        ^~~~~~~~~~~~~
>> xsk.c:1020:14: note: previous definition of ‘rx_setup_done’ was here
>>   bool unmap, rx_setup_done = false, tx_setup_done = false;
>>               ^~~~~~~~~~~~~
>> xsk.c:1028:30: error: redefinition of ‘tx_setup_done’
>>   bool rx_setup_done = false, tx_setup_done = false;
>>                               ^~~~~~~~~~~~~
>> xsk.c:1020:37: note: previous definition of ‘tx_setup_done’ was here
>>   bool unmap, rx_setup_done = false, tx_setup_done = false;
>>                                      ^~~~~~~~~~~~~
>>
>>
>> Full randconfig file is attached.
> 
> What SHA are you on? I checked that github tree, the source code there
> doesn't correspond to the errors here (i.e., there is no unmap
> redefinition on lines 1020 and 1027). Could it be some local merge
> conflict?

Yes, it seems to have been a merge problem in mmotm 2021-04-11.
It is fixed/OK in today's mmotm 2021-04013.

thanks.

-- 
~Randy