forked from dynup/kpatch
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request dynup#1322 from joe-lawrence/v6.2-support
Upstream kernel v6.2 support
- Loading branch information
Showing
23 changed files
with
692 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
#!/bin/bash | ||
|
||
grep "kpatch: 5" /proc/meminfo |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
diff -Nupr src.orig/fs/proc/meminfo.c src/fs/proc/meminfo.c | ||
--- src.orig/fs/proc/meminfo.c 2023-01-12 11:20:07.184710563 -0500 | ||
+++ src/fs/proc/meminfo.c 2023-01-12 11:20:08.166716386 -0500 | ||
@@ -29,6 +29,8 @@ static void show_val_kb(struct seq_file | ||
seq_write(m, " kB\n", 4); | ||
} | ||
|
||
+static int foo = 5; | ||
+ | ||
static int meminfo_proc_show(struct seq_file *m, void *v) | ||
{ | ||
struct sysinfo i; | ||
@@ -154,6 +156,7 @@ static int meminfo_proc_show(struct seq_ | ||
show_val_kb(m, "CmaFree: ", | ||
global_zone_page_state(NR_FREE_CMA_PAGES)); | ||
#endif | ||
+ seq_printf(m, "kpatch: %d\n", foo); | ||
|
||
hugetlb_report_meminfo(m); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
diff -Nupr src.orig/net/ipv6/netfilter.c src/net/ipv6/netfilter.c | ||
--- src.orig/net/ipv6/netfilter.c 2023-01-12 11:20:07.630713207 -0500 | ||
+++ src/net/ipv6/netfilter.c 2023-01-12 11:20:29.874845095 -0500 | ||
@@ -96,6 +96,8 @@ static int nf_ip6_reroute(struct sk_buff | ||
return 0; | ||
} | ||
|
||
+#include "kpatch-macros.h" | ||
+ | ||
int __nf_ip6_route(struct net *net, struct dst_entry **dst, | ||
struct flowi *fl, bool strict) | ||
{ | ||
@@ -109,6 +111,9 @@ int __nf_ip6_route(struct net *net, stru | ||
struct dst_entry *result; | ||
int err; | ||
|
||
+ if (!jiffies) | ||
+ printk("kpatch nf_ip6_route foo\n"); | ||
+ | ||
result = ip6_route_output(net, sk, &fl->u.ip6); | ||
err = result->error; | ||
if (err) |
Oops, something went wrong.