[v2,bpf-next,04/10] bpf: convert temp arrays to kvcalloc

Message ID	20190402042749.3670015-5-ast@kernel.org
State	Accepted
Delegated to:	BPF Maintainers
Headers	show Return-Path: <bpf-owner@vger.kernel.org> Smtp-Origin-Hostprefix: devbig From: Alexei Starovoitov <ast@kernel.org> Smtp-Origin-Hostname: devbig007.ftw2.facebook.com To: <davem@davemloft.net> CC: <daniel@iogearbox.net>, <jakub.kicinski@netronome.com>, <jannh@google.com>, <netdev@vger.kernel.org>, <bpf@vger.kernel.org>, <kernel-team@fb.com> Smtp-Origin-Cluster: ftw2c04 Subject: [PATCH v2 bpf-next 04/10] bpf: convert temp arrays to kvcalloc Date: Mon, 1 Apr 2019 21:27:43 -0700 Message-ID: <20190402042749.3670015-5-ast@kernel.org> In-Reply-To: <20190402042749.3670015-1-ast@kernel.org> References: <20190402042749.3670015-1-ast@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8BIT Content-Type: text/plain Sender: bpf-owner@vger.kernel.org Precedence: bulk
Series	bpf: improve verifier scalability \| expand [v2,bpf-next,00/10] bpf: improve verifier scalability [v2,bpf-next,01/10] bpf: add verifier stats and log_level bit 2 [v2,bpf-next,02/10] bpf: improve verification speed by droping states [v2,bpf-next,03/10] bpf: improve verification speed by not remarking live_read [v2,bpf-next,04/10] bpf: convert temp arrays to kvcalloc [v2,bpf-next,05/10] bpf: verbose jump offset overflow check [v2,bpf-next,06/10] bpf: increase complexity limit and maximum program size [v2,bpf-next,07/10] bpf: increase verifier log limit [v2,bpf-next,08/10] libbpf: teach libbpf about log_level bit 2 [v2,bpf-next,09/10] selftests/bpf: add few verifier scale tests [v2,bpf-next,10/10] selftests/bpf: synthetic tests to push verifier limits

Message ID

20190402042749.3670015-5-ast@kernel.org

State

Accepted

Delegated to:

BPF Maintainers

Headers

Smtp-Origin-Hostprefix: devbig
From: Alexei Starovoitov <ast@kernel.org>
Smtp-Origin-Hostname: devbig007.ftw2.facebook.com
To: <davem@davemloft.net>
CC: <daniel@iogearbox.net>, <jakub.kicinski@netronome.com>,
	<jannh@google.com>, <netdev@vger.kernel.org>,
	<bpf@vger.kernel.org>, <kernel-team@fb.com>
Smtp-Origin-Cluster: ftw2c04
Subject: [PATCH v2 bpf-next 04/10] bpf: convert temp arrays to kvcalloc
Date: Mon, 1 Apr 2019 21:27:43 -0700
Message-ID: <20190402042749.3670015-5-ast@kernel.org>
In-Reply-To: <20190402042749.3670015-1-ast@kernel.org>
References: <20190402042749.3670015-1-ast@kernel.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8BIT
Content-Type: text/plain
Sender: bpf-owner@vger.kernel.org
Precedence: bulk

Series

bpf: improve verifier scalability | expand

Commit Message

Alexei Starovoitov April 2, 2019, 4:27 a.m. UTC

Temporary arrays used during program verification need to be vmalloc-ed
to support large bpf programs.

Signed-off-by: Alexei Starovoitov <ast@kernel.org>
---
 kernel/bpf/verifier.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
index 94cf6efc5df6..ad3494a881da 100644
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@ -5313,13 +5313,13 @@  static int check_cfg(struct bpf_verifier_env *env)
 	int ret = 0;
 	int i, t;
 
-	insn_state = kcalloc(insn_cnt, sizeof(int), GFP_KERNEL);
+	insn_state = kvcalloc(insn_cnt, sizeof(int), GFP_KERNEL);
 	if (!insn_state)
 		return -ENOMEM;
 
-	insn_stack = kcalloc(insn_cnt, sizeof(int), GFP_KERNEL);
+	insn_stack = kvcalloc(insn_cnt, sizeof(int), GFP_KERNEL);
 	if (!insn_stack) {
-		kfree(insn_state);
+		kvfree(insn_state);
 		return -ENOMEM;
 	}
 
@@ -5417,8 +5417,8 @@  static int check_cfg(struct bpf_verifier_env *env)
 	ret = 0; /* cfg looks good */
 
 err_free:
-	kfree(insn_state);
-	kfree(insn_stack);
+	kvfree(insn_state);
+	kvfree(insn_stack);
 	return ret;
 }
 
@@ -7898,7 +7898,7 @@  static void free_states(struct bpf_verifier_env *env)
 			}
 	}
 
-	kfree(env->explored_states);
+	kvfree(env->explored_states);
 }
 
 static void print_verification_stats(struct bpf_verifier_env *env)
@@ -7994,7 +7994,7 @@  int bpf_check(struct bpf_prog **prog, union bpf_attr *attr,
 			goto skip_full_check;
 	}
 
-	env->explored_states = kcalloc(env->prog->len,
+	env->explored_states = kvcalloc(env->prog->len,
 				       sizeof(struct bpf_verifier_state_list *),
 				       GFP_USER);
 	ret = -ENOMEM;

[v2,bpf-next,04/10] bpf: convert temp arrays to kvcalloc

Commit Message

Patch