bpf: switch to memcg-based memory accounting

[kernel-patches-bot]

Pull request for series with
subject: bpf: switch to memcg-based memory accounting
version: 5
url: https://patchwork.kernel.org/project/netdevbpf/list/?series=383159

[kernel-patches-bot]

Master branch: c365387
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=383159
version: 5

Pull request is NOT updated. Failed to apply https://patchwork.kernel.org/project/netdevbpf/list/?series=383159
error message:

Cmd('git') failed due to: exit code(128)
  cmdline: git am -3
  stdout: 'Applying: bpf: memcg-based memory accounting for bpf progs
Applying: bpf: prepare for memcg-based memory accounting for bpf maps
Applying: bpf: memcg-based memory accounting for bpf maps
Applying: bpf: refine memcg-based memory accounting for arraymap maps
Applying: bpf: refine memcg-based memory accounting for cpumap maps
Applying: bpf: memcg-based memory accounting for cgroup storage maps
Applying: bpf: eliminate rlimit-based memory accounting for bpf local storage maps
Patch failed at 0007 bpf: eliminate rlimit-based memory accounting for bpf local storage maps
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".'
  stderr: 'error: sha1 information is lacking or useless (kernel/bpf/bpf_local_storage.c).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch' to see the failed patch'

conflict:

[kernel-patches-bot]

Master branch: c365387
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=383159
version: 5

[kernel-patches-bot]

Master branch: 0a58a65
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=383159
version: 5

[kernel-patches-bot]

Master branch: 904709f
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=383159
version: 5

[kernel-patches-bot]

Master branch: c14d61f
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=383159
version: 5

[kernel-patches-bot]

Master branch: 024cd2c
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=383159
version: 5

Pull request is NOT updated. Failed to apply https://patchwork.kernel.org/project/netdevbpf/list/?series=383159
error message:

Cmd('git') failed due to: exit code(128)
  cmdline: git am -3
  stdout: 'Applying: bpf: memcg-based memory accounting for bpf progs
Applying: bpf: prepare for memcg-based memory accounting for bpf maps
Applying: bpf: memcg-based memory accounting for bpf maps
Applying: bpf: refine memcg-based memory accounting for arraymap maps
Applying: bpf: refine memcg-based memory accounting for cpumap maps
Applying: bpf: memcg-based memory accounting for cgroup storage maps
Applying: bpf: refine memcg-based memory accounting for devmap maps
Applying: bpf: refine memcg-based memory accounting for hashtab maps
Applying: bpf: memcg-based memory accounting for lpm_trie maps
Applying: bpf: memcg-based memory accounting for bpf ringbuffer
Applying: bpf: memcg-based memory accounting for bpf local storage maps
Applying: bpf: refine memcg-based memory accounting for sockmap and sockhash maps
Applying: bpf: refine memcg-based memory accounting for xskmap maps
Applying: bpf: eliminate rlimit-based memory accounting for arraymap maps
Applying: bpf: eliminate rlimit-based memory accounting for bpf_struct_ops maps
Applying: bpf: eliminate rlimit-based memory accounting for cpumap maps
Applying: bpf: eliminate rlimit-based memory accounting for cgroup storage maps
Applying: bpf: eliminate rlimit-based memory accounting for devmap maps
Applying: bpf: eliminate rlimit-based memory accounting for hashtab maps
Applying: bpf: eliminate rlimit-based memory accounting for lpm_trie maps
Applying: bpf: eliminate rlimit-based memory accounting for queue_stack_maps maps
Applying: bpf: eliminate rlimit-based memory accounting for reuseport_array maps
Applying: bpf: eliminate rlimit-based memory accounting for bpf ringbuffer
Applying: bpf: eliminate rlimit-based memory accounting for sockmap and sockhash maps
Applying: bpf: eliminate rlimit-based memory accounting for stackmap maps
Applying: bpf: eliminate rlimit-based memory accounting for xskmap maps
Applying: bpf: eliminate rlimit-based memory accounting for bpf local storage maps
Applying: bpf: eliminate rlimit-based memory accounting infra for bpf maps
Applying: bpf: eliminate rlimit-based memory accounting for bpf progs
Applying: bpf: samples: do not touch RLIMIT_MEMLOCK
Using index info to reconstruct a base tree...
M	samples/bpf/task_fd_query_user.c
M	samples/bpf/tracex2_user.c
M	samples/bpf/tracex3_user.c
M	samples/bpf/xdp_redirect_cpu_user.c
M	samples/bpf/xdp_rxq_info_user.c
Falling back to patching base and 3-way merge...
Auto-merging samples/bpf/xdp_rxq_info_user.c
CONFLICT (content): Merge conflict in samples/bpf/xdp_rxq_info_user.c
Auto-merging samples/bpf/xdp_redirect_cpu_user.c
CONFLICT (content): Merge conflict in samples/bpf/xdp_redirect_cpu_user.c
Auto-merging samples/bpf/tracex3_user.c
CONFLICT (content): Merge conflict in samples/bpf/tracex3_user.c
Auto-merging samples/bpf/tracex2_user.c
CONFLICT (content): Merge conflict in samples/bpf/tracex2_user.c
Auto-merging samples/bpf/task_fd_query_user.c
CONFLICT (content): Merge conflict in samples/bpf/task_fd_query_user.c
Patch failed at 0030 bpf: samples: do not touch RLIMIT_MEMLOCK
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".'
  stderr: 'error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch'

conflict:

diff --cc samples/bpf/task_fd_query_user.c
index b68bd2f8fdc9,0f2050ff54f9..000000000000
--- a/samples/bpf/task_fd_query_user.c
+++ b/samples/bpf/task_fd_query_user.c
@@@ -290,7 -290,6 +290,10 @@@ static int test_debug_fs_uprobe(char *b
  
  int main(int argc, char **argv)
  {
++<<<<<<< HEAD
 +	struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};
++=======
++>>>>>>> bpf: samples: do not touch RLIMIT_MEMLOCK
  	extern char __executable_start;
  	char filename[256], buf[256];
  	__u64 uprobe_file_offset;
diff --cc samples/bpf/tracex2_user.c
index 3d6eab711d23,1626d51dfffd..000000000000
--- a/samples/bpf/tracex2_user.c
+++ b/samples/bpf/tracex2_user.c
@@@ -116,7 -116,6 +116,10 @@@ static void int_exit(int sig
  
  int main(int ac, char **argv)
  {
++<<<<<<< HEAD
 +	struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};
++=======
++>>>>>>> bpf: samples: do not touch RLIMIT_MEMLOCK
  	long key, next_key, value;
  	struct bpf_link *links[2];
  	struct bpf_program *prog;
diff --cc samples/bpf/tracex3_user.c
index 83e0fecbb01a,33e16ba39f25..000000000000
--- a/samples/bpf/tracex3_user.c
+++ b/samples/bpf/tracex3_user.c
@@@ -107,7 -107,6 +107,10 @@@ static void print_hist(int fd
  
  int main(int ac, char **argv)
  {
++<<<<<<< HEAD
 +	struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};
++=======
++>>>>>>> bpf: samples: do not touch RLIMIT_MEMLOCK
  	struct bpf_link *links[2];
  	struct bpf_program *prog;
  	struct bpf_object *obj;
diff --cc samples/bpf/xdp_redirect_cpu_user.c
index f78cb18319aa,576411612523..000000000000
--- a/samples/bpf/xdp_redirect_cpu_user.c
+++ b/samples/bpf/xdp_redirect_cpu_user.c
@@@ -765,7 -765,6 +765,10 @@@ static int load_cpumap_prog(char *file_
  
  int main(int argc, char **argv)
  {
++<<<<<<< HEAD
 +	struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};
++=======
++>>>>>>> bpf: samples: do not touch RLIMIT_MEMLOCK
  	char *prog_name = "xdp_cpu_map5_lb_hash_ip_pairs";
  	char *mprog_filename = "xdp_redirect_kern.o";
  	char *redir_interface = NULL, *redir_map = NULL;
diff --cc samples/bpf/xdp_rxq_info_user.c
index 93fa1bc54f13,74a2926eba08..000000000000
--- a/samples/bpf/xdp_rxq_info_user.c
+++ b/samples/bpf/xdp_rxq_info_user.c
@@@ -450,7 -450,6 +450,10 @@@ static void stats_poll(int interval, in
  int main(int argc, char **argv)
  {
  	__u32 cfg_options= NO_TOUCH ; /* Default: Don't touch packet memory */
++<<<<<<< HEAD
 +	struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY};
++=======
++>>>>>>> bpf: samples: do not touch RLIMIT_MEMLOCK
  	struct bpf_prog_load_attr prog_load_attr = {
  		.prog_type	= BPF_PROG_TYPE_XDP,
  	};

[kernel-patches-bot]

At least one diff in series https://patchwork.kernel.org/project/linux-mm/list/?series=385629 irrelevant now for [{'archived': False, 'project': 399, 'delegate': 121173}]