Skip to content

Commit

Permalink
kernel: bump 6.1 to 6.1.103
Browse files Browse the repository at this point in the history 
https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.1.103

Removed upstreamed:
generic/backport-6.1/412-v6.3-01-spidev-Add-Silicon-Labs-EM3581-device-compatible.patch

See: See: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.103&id=c6c419ed94788ca13334b4acd50167b7f6d00a06

All other patches automatically rebased.

Build system: bcm4908 bcm53xx

Signed-off-by: Zxl hhyccc <[email protected]>
Link: openwrt/openwrt#16093
Signed-off-by: Robert Marko <[email protected]>
  • Loading branch information
@zxlhhyccc @robimarko
zxlhhyccc authored and robimarko committed Aug 7, 2024
1 parent e5dc16e commit 88068dd
Show file tree
Hide file tree
Showing 27 changed files with 73 additions and 105 deletions.
4 changes: 2 additions & 2 deletions include/kernel-6.1
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
LINUX_VERSION-6.1 = .102
LINUX_KERNEL_HASH-6.1.102 = 1ba5f93b411ead7587fe48b2eec6c656f6796d31f5e406d236913c77512497ec
LINUX_VERSION-6.1 = .103
LINUX_KERNEL_HASH-6.1.103 = 5eb4706f898f50881552ff5146d892132d3ffc5298033bffe27087d3a44c4573
8 changes: 4 additions & 4 deletions ...neric/backport-6.1/020-v6.3-01-UPSTREAM-mm-multi-gen-LRU-rename-lru_gen_struct-to-l.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ Signed-off-by: T.J. Mercier <[email protected]>
struct mem_cgroup *memcg = lruvec_memcg(lruvec);

VM_WARN_ON_ONCE(!list_empty(list));
@@ -5249,7 +5249,7 @@ done:
@@ -5248,7 +5248,7 @@ done:

static bool __maybe_unused state_is_valid(struct lruvec *lruvec)
{
Expand All @@ -303,7 +303,7 @@ Signed-off-by: T.J. Mercier <[email protected]>

if (lrugen->enabled) {
enum lru_list lru;
@@ -5531,7 +5531,7 @@ static void lru_gen_seq_show_full(struct
@@ -5530,7 +5530,7 @@ static void lru_gen_seq_show_full(struct
int i;
int type, tier;
int hist = lru_hist_from_seq(seq);
Expand All @@ -312,7 +312,7 @@ Signed-off-by: T.J. Mercier <[email protected]>

for (tier = 0; tier < MAX_NR_TIERS; tier++) {
seq_printf(m, " %10d", tier);
@@ -5581,7 +5581,7 @@ static int lru_gen_seq_show(struct seq_f
@@ -5580,7 +5580,7 @@ static int lru_gen_seq_show(struct seq_f
unsigned long seq;
bool full = !debugfs_real_fops(m->file)->write;
struct lruvec *lruvec = v;
Expand All @@ -321,7 +321,7 @@ Signed-off-by: T.J. Mercier <[email protected]>
int nid = lruvec_pgdat(lruvec)->node_id;
struct mem_cgroup *memcg = lruvec_memcg(lruvec);
DEFINE_MAX_SEQ(lruvec);
@@ -5835,7 +5835,7 @@ void lru_gen_init_lruvec(struct lruvec *
@@ -5834,7 +5834,7 @@ void lru_gen_init_lruvec(struct lruvec *
{
int i;
int gen, type, zone;
Expand Down
10 changes: 5 additions & 5 deletions ...neric/backport-6.1/020-v6.3-03-UPSTREAM-mm-multi-gen-LRU-remove-eviction-fairness-s.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ Signed-off-by: T.J. Mercier <[email protected]>
{
int type;
int scanned;
@@ -5095,9 +5104,6 @@ retry:
@@ -5094,9 +5103,6 @@ retry:
goto retry;
}

Expand All @@ -86,7 +86,7 @@ Signed-off-by: T.J. Mercier <[email protected]>
return scanned;
}

@@ -5136,67 +5142,26 @@ done:
@@ -5135,67 +5141,26 @@ done:
return min_seq[!can_swap] + MIN_NR_GENS <= max_seq ? nr_to_scan : 0;
}

Expand Down Expand Up @@ -163,7 +163,7 @@ Signed-off-by: T.J. Mercier <[email protected]>

lru_add_drain();

@@ -5220,7 +5185,7 @@ static void lru_gen_shrink_lruvec(struct
@@ -5219,7 +5184,7 @@ static void lru_gen_shrink_lruvec(struct
if (!nr_to_scan)
goto done;

Expand All @@ -172,7 +172,7 @@ Signed-off-by: T.J. Mercier <[email protected]>
if (!delta)
goto done;

@@ -5228,7 +5193,7 @@ static void lru_gen_shrink_lruvec(struct
@@ -5227,7 +5192,7 @@ static void lru_gen_shrink_lruvec(struct
if (scanned >= nr_to_scan)
break;

Expand All @@ -181,7 +181,7 @@ Signed-off-by: T.J. Mercier <[email protected]>
break;

cond_resched();
@@ -5678,7 +5643,7 @@ static int run_eviction(struct lruvec *l
@@ -5677,7 +5642,7 @@ static int run_eviction(struct lruvec *l
if (sc->nr_reclaimed >= nr_to_reclaim)
return 0;

Expand Down
8 changes: 4 additions & 4 deletions ...neric/backport-6.1/020-v6.3-04-BACKPORT-mm-multi-gen-LRU-remove-aging-fairness-safe.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ Signed-off-by: T.J. Mercier <[email protected]>
*/
if (mutex_trylock(&oom_lock)) {
struct oom_control oc = {
@@ -5113,33 +5117,27 @@ retry:
@@ -5112,33 +5116,27 @@ retry:
* reclaim.
*/
static unsigned long get_nr_to_scan(struct lruvec *lruvec, struct scan_control *sc,
Expand Down Expand Up @@ -254,7 +254,7 @@ Signed-off-by: T.J. Mercier <[email protected]>
}

static unsigned long get_nr_to_reclaim(struct scan_control *sc)
@@ -5158,9 +5156,7 @@ static unsigned long get_nr_to_reclaim(s
@@ -5157,9 +5155,7 @@ static unsigned long get_nr_to_reclaim(s
static void lru_gen_shrink_lruvec(struct lruvec *lruvec, struct scan_control *sc)
{
struct blk_plug plug;
Expand All @@ -264,7 +264,7 @@ Signed-off-by: T.J. Mercier <[email protected]>
unsigned long nr_to_reclaim = get_nr_to_reclaim(sc);

lru_add_drain();
@@ -5181,13 +5177,13 @@ static void lru_gen_shrink_lruvec(struct
@@ -5180,13 +5176,13 @@ static void lru_gen_shrink_lruvec(struct
else
swappiness = 0;

Expand All @@ -281,7 +281,7 @@ Signed-off-by: T.J. Mercier <[email protected]>

scanned += delta;
if (scanned >= nr_to_scan)
@@ -5199,10 +5195,6 @@ static void lru_gen_shrink_lruvec(struct
@@ -5198,10 +5194,6 @@ static void lru_gen_shrink_lruvec(struct
cond_resched();
}

Expand Down
2 changes: 1 addition & 1 deletion ...generic/backport-6.1/020-v6.3-05-UPSTREAM-mm-multi-gen-LRU-shuffle-should_run_aging.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ Signed-off-by: T.J. Mercier <[email protected]>
static bool lruvec_is_sizable(struct lruvec *lruvec, struct scan_control *sc)
{
int gen, type, zone;
@@ -5111,6 +5049,68 @@ retry:
@@ -5110,6 +5048,68 @@ retry:
return scanned;
}

Expand Down
22 changes: 11 additions & 11 deletions ...neric/backport-6.1/020-v6.3-06-BACKPORT-mm-multi-gen-LRU-per-node-lru_gen_folio-lis.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ Signed-off-by: T.J. Mercier <[email protected]>
/* check the order to exclude compaction-induced reclaim */
if (!min_ttl || sc->order || sc->priority == DEF_PRIORITY)
return;
@@ -5116,8 +5113,7 @@ static bool should_run_aging(struct lruv
@@ -5115,8 +5112,7 @@ static bool should_run_aging(struct lruv
* 1. Defer try_to_inc_max_seq() to workqueues to reduce latency for memcg
* reclaim.
*/
Expand All @@ -431,7 +431,7 @@ Signed-off-by: T.J. Mercier <[email protected]>
{
unsigned long nr_to_scan;
struct mem_cgroup *memcg = lruvec_memcg(lruvec);
@@ -5134,10 +5130,8 @@ static unsigned long get_nr_to_scan(stru
@@ -5133,10 +5129,8 @@ static unsigned long get_nr_to_scan(stru
if (sc->priority == DEF_PRIORITY)
return nr_to_scan;

Expand All @@ -443,7 +443,7 @@ Signed-off-by: T.J. Mercier <[email protected]>
}

static unsigned long get_nr_to_reclaim(struct scan_control *sc)
@@ -5146,29 +5140,18 @@ static unsigned long get_nr_to_reclaim(s
@@ -5145,29 +5139,18 @@ static unsigned long get_nr_to_reclaim(s
if (!global_reclaim(sc))
return -1;

Expand Down Expand Up @@ -475,7 +475,7 @@ Signed-off-by: T.J. Mercier <[email protected]>

if (sc->may_swap)
swappiness = get_swappiness(lruvec, sc);
@@ -5178,7 +5161,7 @@ static void lru_gen_shrink_lruvec(struct
@@ -5177,7 +5160,7 @@ static void lru_gen_shrink_lruvec(struct
swappiness = 0;

nr_to_scan = get_nr_to_scan(lruvec, sc, swappiness);
Expand All @@ -484,7 +484,7 @@ Signed-off-by: T.J. Mercier <[email protected]>
break;

delta = evict_folios(lruvec, sc, swappiness);
@@ -5195,10 +5178,251 @@ static void lru_gen_shrink_lruvec(struct
@@ -5194,10 +5177,251 @@ static void lru_gen_shrink_lruvec(struct
cond_resched();
}

Expand Down Expand Up @@ -736,7 +736,7 @@ Signed-off-by: T.J. Mercier <[email protected]>

/******************************************************************************
* state change
@@ -5656,11 +5880,11 @@ static int run_cmd(char cmd, int memcg_i
@@ -5655,11 +5879,11 @@ static int run_cmd(char cmd, int memcg_i

if (!mem_cgroup_disabled()) {
rcu_read_lock();
Expand All @@ -751,7 +751,7 @@ Signed-off-by: T.J. Mercier <[email protected]>
rcu_read_unlock();

if (!memcg)
@@ -5808,6 +6032,19 @@ void lru_gen_init_lruvec(struct lruvec *
@@ -5807,6 +6031,19 @@ void lru_gen_init_lruvec(struct lruvec *
}

#ifdef CONFIG_MEMCG
Expand All @@ -771,7 +771,7 @@ Signed-off-by: T.J. Mercier <[email protected]>
void lru_gen_init_memcg(struct mem_cgroup *memcg)
{
INIT_LIST_HEAD(&memcg->mm_list.fifo);
@@ -5831,7 +6068,69 @@ void lru_gen_exit_memcg(struct mem_cgrou
@@ -5830,7 +6067,69 @@ void lru_gen_exit_memcg(struct mem_cgrou
}
}
}
Expand Down Expand Up @@ -842,7 +842,7 @@ Signed-off-by: T.J. Mercier <[email protected]>

static int __init init_lru_gen(void)
{
@@ -5858,6 +6157,10 @@ static void lru_gen_shrink_lruvec(struct
@@ -5857,6 +6156,10 @@ static void lru_gen_shrink_lruvec(struct
{
}

Expand All @@ -853,7 +853,7 @@ Signed-off-by: T.J. Mercier <[email protected]>
#endif /* CONFIG_LRU_GEN */

static void shrink_lruvec(struct lruvec *lruvec, struct scan_control *sc)
@@ -5871,7 +6174,7 @@ static void shrink_lruvec(struct lruvec
@@ -5870,7 +6173,7 @@ static void shrink_lruvec(struct lruvec
bool proportional_reclaim;
struct blk_plug plug;

Expand All @@ -862,7 +862,7 @@ Signed-off-by: T.J. Mercier <[email protected]>
lru_gen_shrink_lruvec(lruvec, sc);
return;
}
@@ -6114,6 +6417,11 @@ static void shrink_node(pg_data_t *pgdat
@@ -6113,6 +6416,11 @@ static void shrink_node(pg_data_t *pgdat
struct lruvec *target_lruvec;
bool reclaimable = false;

Expand Down
12 changes: 6 additions & 6 deletions ...neric/backport-6.1/020-v6.3-07-BACKPORT-mm-multi-gen-LRU-clarify-scan_control-flags.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ Signed-off-by: T.J. Mercier <[email protected]>
*/
return isolated || !remaining ? scanned : 0;
}
@@ -5119,8 +5115,7 @@ static long get_nr_to_scan(struct lruvec
@@ -5118,8 +5114,7 @@ static long get_nr_to_scan(struct lruvec
struct mem_cgroup *memcg = lruvec_memcg(lruvec);
DEFINE_MAX_SEQ(lruvec);

Expand All @@ -123,7 +123,7 @@ Signed-off-by: T.J. Mercier <[email protected]>
return 0;

if (!should_run_aging(lruvec, max_seq, sc, can_swap, &nr_to_scan))
@@ -5148,17 +5143,14 @@ static bool try_to_shrink_lruvec(struct
@@ -5147,17 +5142,14 @@ static bool try_to_shrink_lruvec(struct
long nr_to_scan;
unsigned long scanned = 0;
unsigned long nr_to_reclaim = get_nr_to_reclaim(sc);
Expand All @@ -146,7 +146,7 @@ Signed-off-by: T.J. Mercier <[email protected]>

nr_to_scan = get_nr_to_scan(lruvec, sc, swappiness);
if (nr_to_scan <= 0)
@@ -5289,12 +5281,13 @@ static void lru_gen_shrink_lruvec(struct
@@ -5288,12 +5280,13 @@ static void lru_gen_shrink_lruvec(struct
struct blk_plug plug;

VM_WARN_ON_ONCE(global_reclaim(sc));
Expand All @@ -161,7 +161,7 @@ Signed-off-by: T.J. Mercier <[email protected]>

if (try_to_shrink_lruvec(lruvec, sc))
lru_gen_rotate_memcg(lruvec, MEMCG_LRU_YOUNG);
@@ -5350,11 +5343,19 @@ static void lru_gen_shrink_node(struct p
@@ -5349,11 +5342,19 @@ static void lru_gen_shrink_node(struct p

VM_WARN_ON_ONCE(!global_reclaim(sc));

Expand All @@ -182,7 +182,7 @@ Signed-off-by: T.J. Mercier <[email protected]>

set_initial_priority(pgdat, sc);

@@ -5372,7 +5373,7 @@ static void lru_gen_shrink_node(struct p
@@ -5371,7 +5372,7 @@ static void lru_gen_shrink_node(struct p
clear_mm_walk();

blk_finish_plug(&plug);
Expand All @@ -191,7 +191,7 @@ Signed-off-by: T.J. Mercier <[email protected]>
/* kswapd should never fail */
pgdat->kswapd_failures = 0;
}
@@ -5944,7 +5945,7 @@ static ssize_t lru_gen_seq_write(struct
@@ -5943,7 +5944,7 @@ static ssize_t lru_gen_seq_write(struct
set_task_reclaim_state(current, &sc.reclaim_state);
flags = memalloc_noreclaim_save();
blk_start_plug(&plug);
Expand Down
6 changes: 3 additions & 3 deletions ...nux/generic/backport-6.1/020-v6.3-09-UPSTREAM-mm-multi-gen-LRU-avoid-futile-retries.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Signed-off-by: T.J. Mercier <[email protected]>

--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -5218,18 +5218,20 @@ static int shrink_one(struct lruvec *lru
@@ -5217,18 +5217,20 @@ static int shrink_one(struct lruvec *lru

static void shrink_many(struct pglist_data *pgdat, struct scan_control *sc)
{
Expand All @@ -52,7 +52,7 @@ Signed-off-by: T.J. Mercier <[email protected]>
gen = get_memcg_gen(READ_ONCE(pgdat->memcg_lru.seq));

rcu_read_lock();
@@ -5253,14 +5255,22 @@ restart:
@@ -5252,14 +5254,22 @@ restart:

op = shrink_one(lruvec, sc);

Expand All @@ -78,7 +78,7 @@ Signed-off-by: T.J. Mercier <[email protected]>
/* restart if raced with lru_gen_rotate_memcg() */
if (gen != get_nulls_value(pos))
goto restart;
@@ -5269,11 +5279,6 @@ restart:
@@ -5268,11 +5278,6 @@ restart:
bin = get_memcg_bin(bin + 1);
if (bin != first_bin)
goto restart;
Expand Down
4 changes: 2 additions & 2 deletions ...ux/generic/backport-6.1/020-v6.3-15-UPSTREAM-mm-multi-gen-LRU-section-for-memcg-LRU.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ Signed-off-by: T.J. Mercier <[email protected]>
* the eviction
******************************************************************************/

@@ -5398,53 +5540,6 @@ done:
@@ -5397,53 +5539,6 @@ done:
pgdat->kswapd_failures = 0;
}

Expand Down Expand Up @@ -357,7 +357,7 @@ Signed-off-by: T.J. Mercier <[email protected]>
/******************************************************************************
* state change
******************************************************************************/
@@ -6090,67 +6185,6 @@ void lru_gen_exit_memcg(struct mem_cgrou
@@ -6089,67 +6184,6 @@ void lru_gen_exit_memcg(struct mem_cgrou
}
}

Expand Down
2 changes: 1 addition & 1 deletion ...neric/backport-6.1/020-v6.3-16-UPSTREAM-mm-multi-gen-LRU-improve-lru_gen_exit_memcg.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Signed-off-by: T.J. Mercier <[email protected]>

--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -6172,12 +6172,17 @@ void lru_gen_exit_memcg(struct mem_cgrou
@@ -6171,12 +6171,17 @@ void lru_gen_exit_memcg(struct mem_cgrou
int i;
int nid;

Expand Down
4 changes: 2 additions & 2 deletions .../linux/generic/backport-6.1/020-v6.4-19-mm-Multi-gen-LRU-remove-wait_event_killable.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -255,15 +255,15 @@ Signed-off-by: Andrew Morton <[email protected]>
}

/******************************************************************************
@@ -6117,7 +6087,6 @@ void lru_gen_init_lruvec(struct lruvec *
@@ -6116,7 +6086,6 @@ void lru_gen_init_lruvec(struct lruvec *
INIT_LIST_HEAD(&lrugen->folios[gen][type][zone]);

lruvec->mm_state.seq = MIN_NR_GENS;
- init_waitqueue_head(&lruvec->mm_state.wait);
}

#ifdef CONFIG_MEMCG
@@ -6150,7 +6119,6 @@ void lru_gen_exit_memcg(struct mem_cgrou
@@ -6149,7 +6118,6 @@ void lru_gen_exit_memcg(struct mem_cgrou
for_each_node(nid) {
struct lruvec *lruvec = get_lruvec(memcg, nid);

Expand Down
32 changes: 0 additions & 32 deletions ...x/generic/backport-6.1/412-v6.3-01-spidev-Add-Silicon-Labs-EM3581-device-compatible.patch
View file

This file was deleted.

Loading

0 comments on commit 88068dd

Please sign in to comment.