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 wrote: >> >> On 4/11/21 8:48 PM, a...@linux-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--mm-dd-hh-mm-ss. Both contain the string -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
Re: mmotm 2021-04-11-20-47 uploaded (bpf: xsk.c)
On Mon, Apr 12, 2021 at 9:38 AM Randy Dunlap wrote: > > On 4/11/21 8:48 PM, a...@linux-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--mm-dd-hh-mm-ss. Both contain the string -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? > > -- > ~Randy > Reported-by: Randy Dunlap
Re: mmotm 2021-04-11-20-47 uploaded (ni_routes_test.c)
On 12/04/2021 18:27, Randy Dunlap wrote: On 4/11/21 8:48 PM, a...@linux-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--mm-dd-hh-mm-ss. Both contain the string -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: ld: drivers/staging/comedi/drivers/tests/ni_routes_test.o: in function `test_ni_route_to_register': ni_routes_test.c:(.text+0x103): undefined reference to `ni_route_to_register' ld: ni_routes_test.c:(.text+0x13a): undefined reference to `ni_route_to_register' ld: ni_routes_test.c:(.text+0x171): undefined reference to `ni_route_to_register' ld: ni_routes_test.c:(.text+0x1a8): undefined reference to `ni_route_to_register' ld: ni_routes_test.c:(.text+0x1df): undefined reference to `ni_route_to_register' ld: drivers/staging/comedi/drivers/tests/ni_routes_test.o:ni_routes_test.c:(.text+0x216): more undefined references to `ni_route_to_register' follow ld: drivers/staging/comedi/drivers/tests/ni_routes_test.o: in function `test_ni_find_route_source': ni_routes_test.c:(.text+0x47d): undefined reference to `ni_find_route_source' ld: ni_routes_test.c:(.text+0x4b2): undefined reference to `ni_find_route_source' ld: ni_routes_test.c:(.text+0x4ec): undefined reference to `ni_find_route_source' ld: ni_routes_test.c:(.text+0x526): undefined reference to `ni_find_route_source' ld: ni_routes_test.c:(.text+0x560): undefined reference to `ni_find_route_source' ld: drivers/staging/comedi/drivers/tests/ni_routes_test.o: in function `test_ni_get_valid_routes': ni_routes_test.c:(.text+0x59f): undefined reference to `ni_get_valid_routes' ld: ni_routes_test.c:(.text+0x5d5): undefined reference to `ni_get_valid_routes' ld: drivers/staging/comedi/drivers/tests/ni_routes_test.o: in function `test_ni_is_cmd_dest': ni_routes_test.c:(.text+0x659): undefined reference to `ni_is_cmd_dest' ld: ni_routes_test.c:(.text+0x684): undefined reference to `ni_is_cmd_dest' ld: ni_routes_test.c:(.text+0x6af): undefined reference to `ni_is_cmd_dest' ld: ni_routes_test.c:(.text+0x6da): undefined reference to `ni_is_cmd_dest' ld: ni_routes_test.c:(.text+0x705): undefined reference to `ni_is_cmd_dest' ld: drivers/staging/comedi/drivers/tests/ni_routes_test.o:ni_routes_test.c:(.text+0x730): more undefined references to `ni_is_cmd_dest' follow ld: drivers/staging/comedi/drivers/tests/ni_routes_test.o: in function `test_ni_lookup_route_register': ni_routes_test.c:(.text+0x771): undefined reference to `ni_lookup_route_register' ld: ni_routes_test.c:(.text+0x7a8): undefined reference to `ni_lookup_route_register' ld: ni_routes_test.c:(.text+0x7df): undefined reference to `ni_lookup_route_register' ld: ni_routes_test.c:(.text+0x816): undefined reference to `ni_lookup_route_register' ld: ni_routes_test.c:(.text+0x84d): undefined reference to `ni_lookup_route_register' ld: drivers/staging/comedi/drivers/tests/ni_routes_test.o:ni_routes_test.c:(.text+0x884): more undefined references to `ni_lookup_route_register' follow ld: drivers/staging/comedi/drivers/tests/ni_routes_test.o: in function `test_ni_route_set_has_source': ni_routes_test.c:(.text+0xa3c): undefined reference to `ni_route_set_has_source' ld: ni_routes_test.c:(.text+0xa6e): undefined reference to `ni_route_set_has_source' ld: ni_routes_test.c:(.text+0xaa0): undefined reference to `ni_route_set_has_source' ld: ni_routes_test.c:(.text+0xad2): undefined reference to `ni_route_set_has_source' ld: drivers/staging/comedi/drivers/tests/ni_routes_test.o: in function `test_ni_find_route_set': ni_routes_test.c:(.text+0xb0a): undefined reference to `ni_find_route_set' ld:
Re: mmotm 2021-04-11-20-47 uploaded (ni_routes_test.c)
On 4/11/21 8:48 PM, a...@linux-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--mm-dd-hh-mm-ss. Both contain the string -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: ld: drivers/staging/comedi/drivers/tests/ni_routes_test.o: in function `test_ni_route_to_register': ni_routes_test.c:(.text+0x103): undefined reference to `ni_route_to_register' ld: ni_routes_test.c:(.text+0x13a): undefined reference to `ni_route_to_register' ld: ni_routes_test.c:(.text+0x171): undefined reference to `ni_route_to_register' ld: ni_routes_test.c:(.text+0x1a8): undefined reference to `ni_route_to_register' ld: ni_routes_test.c:(.text+0x1df): undefined reference to `ni_route_to_register' ld: drivers/staging/comedi/drivers/tests/ni_routes_test.o:ni_routes_test.c:(.text+0x216): more undefined references to `ni_route_to_register' follow ld: drivers/staging/comedi/drivers/tests/ni_routes_test.o: in function `test_ni_find_route_source': ni_routes_test.c:(.text+0x47d): undefined reference to `ni_find_route_source' ld: ni_routes_test.c:(.text+0x4b2): undefined reference to `ni_find_route_source' ld: ni_routes_test.c:(.text+0x4ec): undefined reference to `ni_find_route_source' ld: ni_routes_test.c:(.text+0x526): undefined reference to `ni_find_route_source' ld: ni_routes_test.c:(.text+0x560): undefined reference to `ni_find_route_source' ld: drivers/staging/comedi/drivers/tests/ni_routes_test.o: in function `test_ni_get_valid_routes': ni_routes_test.c:(.text+0x59f): undefined reference to `ni_get_valid_routes' ld: ni_routes_test.c:(.text+0x5d5): undefined reference to `ni_get_valid_routes' ld: drivers/staging/comedi/drivers/tests/ni_routes_test.o: in function `test_ni_is_cmd_dest': ni_routes_test.c:(.text+0x659): undefined reference to `ni_is_cmd_dest' ld: ni_routes_test.c:(.text+0x684): undefined reference to `ni_is_cmd_dest' ld: ni_routes_test.c:(.text+0x6af): undefined reference to `ni_is_cmd_dest' ld: ni_routes_test.c:(.text+0x6da): undefined reference to `ni_is_cmd_dest' ld: ni_routes_test.c:(.text+0x705): undefined reference to `ni_is_cmd_dest' ld: drivers/staging/comedi/drivers/tests/ni_routes_test.o:ni_routes_test.c:(.text+0x730): more undefined references to `ni_is_cmd_dest' follow ld: drivers/staging/comedi/drivers/tests/ni_routes_test.o: in function `test_ni_lookup_route_register': ni_routes_test.c:(.text+0x771): undefined reference to `ni_lookup_route_register' ld: ni_routes_test.c:(.text+0x7a8): undefined reference to `ni_lookup_route_register' ld: ni_routes_test.c:(.text+0x7df): undefined reference to `ni_lookup_route_register' ld: ni_routes_test.c:(.text+0x816): undefined reference to `ni_lookup_route_register' ld: ni_routes_test.c:(.text+0x84d): undefined reference to `ni_lookup_route_register' ld: drivers/staging/comedi/drivers/tests/ni_routes_test.o:ni_routes_test.c:(.text+0x884): more undefined references to `ni_lookup_route_register' follow ld: drivers/staging/comedi/drivers/tests/ni_routes_test.o: in function `test_ni_route_set_has_source': ni_routes_test.c:(.text+0xa3c): undefined reference to `ni_route_set_has_source' ld: ni_routes_test.c:(.text+0xa6e): undefined reference to `ni_route_set_has_source' ld: ni_routes_test.c:(.text+0xaa0): undefined reference to `ni_route_set_has_source' ld: ni_routes_test.c:(.text+0xad2): undefined reference to `ni_route_set_has_source' ld: drivers/staging/comedi/drivers/tests/ni_routes_test.o: in function `test_ni_find_route_set': ni_routes_test.c:(.text+0xb0a): undefined reference to
Re: mmotm 2021-04-11-20-47 uploaded (bpf: xsk.c)
On 4/11/21 8:48 PM, a...@linux-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--mm-dd-hh-mm-ss. Both contain the string -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. -- ~Randy Reported-by: Randy Dunlap config-r8702.gz Description: application/gzip
Re: mmotm 2021-04-11-20-47 uploaded (fs/io_uring.c)
On 4/12/21 5:39 AM, Jens Axboe wrote:
> On 4/12/21 1:21 AM, Randy Dunlap wrote:
>> On 4/11/21 8:48 PM, a...@linux-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--mm-dd-hh-mm-ss. Both contain the string -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.
>>
>> on i386:
>> # CONFIG_BLOCK is not set
>>
>> ../fs/io_uring.c: In function ‘kiocb_done’:
>> ../fs/io_uring.c:2766:7: error: implicit declaration of function
>> ‘io_resubmit_prep’; did you mean ‘io_put_req’?
>> [-Werror=implicit-function-declaration]
>>if (io_resubmit_prep(req)) {
>
> I'll apply the below to take care of that.
>
Acked-by: Randy Dunlap # build-tested
Thanks.
>
> diff --git a/fs/io_uring.c b/fs/io_uring.c
> index 3a837d2b8331..aa29918944f6 100644
> --- a/fs/io_uring.c
> +++ b/fs/io_uring.c
> @@ -2464,6 +2464,10 @@ static bool io_rw_should_reissue(struct io_kiocb *req)
> return true;
> }
> #else
> +static bool io_resubmit_prep(struct io_kiocb *req)
> +{
> + return false;
> +}
> static bool io_rw_should_reissue(struct io_kiocb *req)
> {
> return false;
> @@ -2504,14 +2508,8 @@ static void io_complete_rw_iopoll(struct kiocb *kiocb,
> long res, long res2)
> if (kiocb->ki_flags & IOCB_WRITE)
> kiocb_end_write(req);
> if (unlikely(res != req->result)) {
> - bool fail = true;
> -
> -#ifdef CONFIG_BLOCK
> - if (res == -EAGAIN && io_rw_should_reissue(req) &&
> - io_resubmit_prep(req))
> - fail = false;
> -#endif
> - if (fail) {
> + if (!(res == -EAGAIN && io_rw_should_reissue(req) &&
> + io_resubmit_prep(req))) {
> req_set_fail_links(req);
> req->flags |= REQ_F_DONT_REISSUE;
> }
>
--
~Randy
Re: mmotm 2021-04-11-20-47 uploaded (fs/io_uring.c)
On 4/12/21 1:21 AM, Randy Dunlap wrote:
> On 4/11/21 8:48 PM, a...@linux-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--mm-dd-hh-mm-ss. Both contain the string -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.
>
> on i386:
> # CONFIG_BLOCK is not set
>
> ../fs/io_uring.c: In function ‘kiocb_done’:
> ../fs/io_uring.c:2766:7: error: implicit declaration of function
> ‘io_resubmit_prep’; did you mean ‘io_put_req’?
> [-Werror=implicit-function-declaration]
>if (io_resubmit_prep(req)) {
I'll apply the below to take care of that.
diff --git a/fs/io_uring.c b/fs/io_uring.c
index 3a837d2b8331..aa29918944f6 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -2464,6 +2464,10 @@ static bool io_rw_should_reissue(struct io_kiocb *req)
return true;
}
#else
+static bool io_resubmit_prep(struct io_kiocb *req)
+{
+ return false;
+}
static bool io_rw_should_reissue(struct io_kiocb *req)
{
return false;
@@ -2504,14 +2508,8 @@ static void io_complete_rw_iopoll(struct kiocb *kiocb,
long res, long res2)
if (kiocb->ki_flags & IOCB_WRITE)
kiocb_end_write(req);
if (unlikely(res != req->result)) {
- bool fail = true;
-
-#ifdef CONFIG_BLOCK
- if (res == -EAGAIN && io_rw_should_reissue(req) &&
- io_resubmit_prep(req))
- fail = false;
-#endif
- if (fail) {
+ if (!(res == -EAGAIN && io_rw_should_reissue(req) &&
+ io_resubmit_prep(req))) {
req_set_fail_links(req);
req->flags |= REQ_F_DONT_REISSUE;
}
--
Jens Axboe
Re: mmotm 2021-04-11-20-47 uploaded (fs/io_uring.c)
On 4/11/21 8:48 PM, a...@linux-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--mm-dd-hh-mm-ss. Both contain the string -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.
on i386:
# CONFIG_BLOCK is not set
../fs/io_uring.c: In function ‘kiocb_done’:
../fs/io_uring.c:2766:7: error: implicit declaration of function
‘io_resubmit_prep’; did you mean ‘io_put_req’?
[-Werror=implicit-function-declaration]
if (io_resubmit_prep(req)) {
--
~Randy
Reported-by: Randy Dunlap
mmotm 2021-04-11-20-47 uploaded
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--mm-dd-hh-mm-ss. Both contain the string -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 This mmotm tree contains the following patches against 5.12-rc7: (patches marked "*" will be included in linux-next) * mm-eliminate-expecting-prototype-kernel-doc-warnings.patch * kasan-fix-hwasan-build-for-gcc.patch * kasan-remove-redundant-config-option.patch * csky-change-a-kconfig-symbol-name-to-fix-e1000-build-error.patch * ia64-remove-duplicate-entries-in-generic_defconfig.patch * ia64-fix-discontigc-section-mismatches.patch * ia64-tools-remove-inclusion-of-ia64-specific-version-of-errnoh-header.patch * ia64-tools-remove-duplicate-definition-of-ia64_mf-on-ia64.patch * mm-mapping_dirty_helpers-guard-hugepage-puds-usage.patch * proc-kpageflags-prevent-an-integer-overflow-in-stable_page_flags.patch * proc-kpageflags-do-not-use-uninitialized-struct-pages.patch * module-remove-duplicate-include-in-arch-ia64-kernel-heads.patch * ia64-kernel-few-typos-fixed-in-the-file-fsyss.patch * ia64-include-asm-minor-typo-fixes-in-the-file-pgtableh.patch * ia64-ensure-proper-numa-distance-and-possible-map-initialization.patch * ia64-drop-unused-ia64_fw_emu-ifdef.patch * ia64-simplify-code-flow-around-swiotlb-init.patch * ia64-trivial-spelling-fixes.patch * ia64-fix-efi_debug-build.patch * ia64-mca-always-make-ia64_mca_debug-an-expression.patch * ia64-drop-marked-broken-discontigmem-and-virtual_mem_map.patch * ia64-module-fix-symbolizer-crash-on-fdescr.patch * sparse-can-do-constant-folding-of-__builtin_bswap.patch * scripts-spellingtxt-add-entries-for-recent-discoveries.patch * scripts-a-new-script-for-checking-duplicate-struct-declaration.patch * scripts-a-new-script-for-checking-duplicate-struct-declaration-fix.patch * sh-remove-duplicate-include-in-tlbh.patch * ocfs2-replace-define_simple_attribute-with-define_debugfs_attribute.patch * ocfs2-map-flags-directly-in-flags_to_o2dlm.patch * ocfs2-fix-a-typo.patch * ocfs2-clear-links-count-in-ocfs2_mknod-if-an-error-occurs.patch * ocfs2-fix-ocfs2-corrupt-when-iputting-an-inode.patch * vfs-fs_parser-clean-up-kernel-doc-warnings.patch * watchdog-rename-__touch_watchdog-to-a-better-descriptive-name.patch * watchdog-explicitly-update-timestamp-when-reporting-softlockup.patch * watchdog-softlockup-report-the-overall-time-of-softlockups.patch * watchdog-softlockup-remove-logic-that-tried-to-prevent-repeated-reports.patch * watchdog-fix-barriers-when-printing-backtraces-from-all-cpus.patch * watchdog-fix-barriers-when-printing-backtraces-from-all-cpus-fix.patch * watchdog-cleanup-handling-of-false-positives.patch mm.patch * mm-slab_common-provide-slab_merge-option-for-is_enabledconfig_slab_merge_default-builds.patch * mm-slub-enable-slub_debug-static-key-when-creating-cache-with-explicit-debug-flags.patch * kunit-add-a-kunit-test-for-slub-debugging-functionality.patch * slub-remove-resiliency_test-function.patch * mm-slubc-trivial-typo-fixes.patch * mm-kmemleak-fix-a-typo.patch * mm-page_owner-record-the-timestamp-of-all-pages-during-free.patch * mm-page_owner-remove-unused-parameter-in-__set_page_owner_handle.patch * mm-page_owner-fetch-backtrace-only-for-tracked-pages.patch * mm-page_owner-use-kstrtobool-to-parse-bool-option.patch * mm-page_owner-detect-page_owner-recursion-via-task_struct.patch * mm-page_poison-print-page-owner-info-when-corruption-is-caught.patch * mm-page_poison-print-page-info-when-corruption-is-caught-v2.patch * mm-memtest-add-arch_use_memtest.patch * mm-provide-filemap_range_needs_writeback-helper.patch *
