Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 625330 - sys-kernel/gentoo-sources-4.1.42 Failed to dry-run patch 1800_fix-lru-cache-add-oom-regression.patch
Summary: sys-kernel/gentoo-sources-4.1.42 Failed to dry-run patch 1800_fix-lru-cache-a...
Status: RESOLVED NEEDINFO
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal
Assignee: Gentoo Kernel Bug Wranglers and Kernel Maintainers
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2017-07-17 00:05 UTC by Michael 'veremitz' Everitt
Modified: 2017-08-23 18:06 UTC (History)
1 user (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
build.log (build.log,7.50 KB, text/x-log)
2017-07-17 00:05 UTC, Michael 'veremitz' Everitt
Details
Malformed 1800_fix-lru-cache-add-oom-regression.patch (1800_fix-lru-cache-add-oom-regression.err,1.16 KB, text/plain)
2017-07-17 00:07 UTC, Michael 'veremitz' Everitt
Details
Malformed 1800_fix-lru-cache-add-oom-regression.patch (file_625330.txt,625 bytes, text/plain)
2017-07-17 00:09 UTC, Michael 'veremitz' Everitt
Details

Note You need to log in before you can comment on or make changes to this bug.
Description Michael 'veremitz' Everitt 2017-07-17 00:05:25 UTC
Created attachment 485166 [details]
build.log

Patch 1800_fix-lru-cache-add-oom-regression.patch appears to have been munged and the @'s in the line references have become <at>s. See attachments.
Comment 1 Michael 'veremitz' Everitt 2017-07-17 00:07:40 UTC
Created attachment 485168 [details]
Malformed 1800_fix-lru-cache-add-oom-regression.patch

Revert commit 8f182270dfec mm/swap.c: flush lru pvecs on compound page arrival to fix OOM error.

Signed-off-by: Steven Rostedt <rostedt <at> goodmis.org>
---
diff --git a/mm/swap.c b/mm/swap.c
index b523f0a4cbfb..ab3b9c2dd783 100644
--- a/mm/swap.c
+++ b/mm/swap.c
 <at>  <at>  -631,7 +631,7  <at>  <at>  static void __lru_cache_add(struct page *page)
    struct pagevec *pvec = &get_cpu_var(lru_add_pvec);

    page_cache_get(page);
-   if (!pagevec_space(pvec) || PageCompound(page))
+   if (!pagevec_add(pvec, page) || PageCompound(page))
        __pagevec_lru_add(pvec);
    put_cpu_var(lru_add_pvec);
 }
Comment 2 Michael 'veremitz' Everitt 2017-07-17 00:09:28 UTC
Created attachment 485170 [details]
Malformed 1800_fix-lru-cache-add-oom-regression.patch

The issue is hopefully quite easy to spot!
Comment 3 Michael 'veremitz' Everitt 2017-07-17 05:58:13 UTC
For extra comedy:-

Closer examination shows this patch actually isn't necessary ...
Comment 4 Mike Pagano gentoo-dev 2017-07-17 10:30:51 UTC
no problems here, and I don't think you mean 4.1.12..

Applying 1036_linux-4.1.37.patch (-p1) ...                                                                                                  [ ok ]
 * Applying 1037_linux-4.1.38.patch (-p1) ...                                                                                                  [ ok ]
 * Applying 1038_linux-4.1.39.patch (-p1) ...                                                                                                  [ ok ]
 * Applying 1039_linux-4.1.40.patch (-p1) ...                                                                                                  [ ok ]
 * Applying 1040_linux-4.1.41.patch (-p1) ...                                                                                                  [ ok ]
 * Applying 1041_linux-4.1.42.patch (-p1) ...                                                                                                  [ ok ]
 * Applying 1500_XATTR_USER_PREFIX.patch (-p1) ...                                                                                             [ ok ]
 * Applying 1510_fs-enable-link-security-restrictions-by-default.patch (-p1) ...                                                               [ ok ]
 * Applying 1800_fix-lru-cache-add-oom-regression.patch (-p1) ...                                                                              [ ok ]
 * Applying 2700_ThinkPad-30-brightness-control-fix.patch (-p1) ...                                                                            [ ok ]
 * Applying 2900_dev-root-proc-mount-fix.patch (-p1) ...                                                                                       [ ok ]
 * Applying 2905_2disk-resume-image-fix.patch (-p1) ...                                                                                        [ ok ]
 * Applying 2910_lz4-compression-fix.patch (-p1) ...                                                                                           [ ok ]
 * Applying 4200_fbcondecor-3.19.patch (-p1) ...                                                                                               [ ok ]
 * Applying 4567_distro-Gentoo-Kconfig.patch (-p1) ...                                                                                         [ ok ]
 * Applying 5001_block-cgroups-kconfig-build-bits-for-BFQ-v7r8-4.1.patch (-p1) ...                                                             [ ok ]
 * Applying 5002_block-introduce-the-BFQ-v7r8-I-O-sched-for-4.1.patch1 (-p1) ...                                                               [ ok ]
 * Applying 5003_block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r8-for-4.1.0.patch (-p1) ...                                                     [ ok ]
 * Applying 5010_enable-additional-cpu-optimizations-for-gcc-4.9.patch (-p1) ...                                                               [ ok ]
debug: Doing premake
debug: Doing unpack_set_extraversion
>>> Source unpacked in /tmp/portage/sys-kernel/gentoo-sources-4.1.42/work
Comment 5 Michael 'veremitz' Everitt 2017-07-17 10:38:28 UTC
Is that with +experimental set?

You're right I'm on 4.1.42 ;)

Definitely failed for me .. are you sure you're using the upstream (ie. distfiles) versions of things and the in-tree manifests?!
Comment 6 Mike Pagano gentoo-dev 2017-07-17 10:50:41 UTC
Could you fix the title of this bug. You know, for less comedy.

Notice the experimental patches being applied. It should not matter anyways as they are applied afterwards.


 * Applying 1800_fix-lru-cache-add-oom-regression.patch (-p1) ...                                                                              [ ok ]
 * Applying 2700_ThinkPad-30-brightness-control-fix.patch (-p1) ...                                                                            [ ok ]
 * Applying 2900_dev-root-proc-mount-fix.patch (-p1) ...                                                                                       [ ok ]
 * Applying 2905_2disk-resume-image-fix.patch (-p1) ...                                                                                        [ ok ]
 * Applying 2910_lz4-compression-fix.patch (-p1) ...                                                                                           [ ok ]
 * Applying 4200_fbcondecor-3.19.patch (-p1) ...                                                                                               [ ok ]
 * Applying 4567_distro-Gentoo-Kconfig.patch (-p1) ...                                                                                         [ ok ]
 * Applying 5001_block-cgroups-kconfig-build-bits-for-BFQ-v7r8-4.1.patch (-p1) ...                                                             [ ok ]
 * Applying 5002_block-introduce-the-BFQ-v7r8-I-O-sched-for-4.1.patch1 (-p1) ...                                                               [ ok ]
 * Applying 5003_block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r8-for-4.1.0.patch (-p1) ...                                                     [ ok ]
 * Applying 5010_enable-additional-cpu-optimizations-for-gcc-4.9.patch (-p1) ..
Comment 7 Michael 'veremitz' Everitt 2017-07-17 10:55:15 UTC
Guess I'll have to try again with --debug .. most strange ..
Comment 8 Mike Pagano gentoo-dev 2017-08-23 18:06:00 UTC
Please check your system and setup