[05/14] bpf: Allow no charge in bpf_map_area_alloc

Message ID	20220319173036.23352-6-laoar.shao@gmail.com (mailing list archive)
State	Rejected
Delegated to:	BPF
Headers	show Return-Path: <netdev-owner@kernel.org> From: Yafang Shao <laoar.shao@gmail.com> To: roman.gushchin@linux.dev, ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, kafai@fb.com, songliubraving@fb.com, yhs@fb.com, john.fastabend@gmail.com, kpsingh@kernel.org, shuah@kernel.org Cc: netdev@vger.kernel.org, bpf@vger.kernel.org, linux-kselftest@vger.kernel.org, Yafang Shao <laoar.shao@gmail.com> Subject: [PATCH 05/14] bpf: Allow no charge in bpf_map_area_alloc Date: Sat, 19 Mar 2022 17:30:27 +0000 Message-Id: <20220319173036.23352-6-laoar.shao@gmail.com> In-Reply-To: <20220319173036.23352-1-laoar.shao@gmail.com> References: <20220319173036.23352-1-laoar.shao@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	bpf: Allow not to charge bpf memory \| expand [00/14] bpf: Allow not to charge bpf memory [01/14] bpf: Introduce no charge flag for bpf map [02/14] bpf: Only sys admin can set no charge flag [03/14] bpf: Enable no charge in map _CREATE_FLAG_MASK [04/14] bpf: Introduce new parameter bpf_attr in bpf_map_area_alloc [05/14] bpf: Allow no charge in bpf_map_area_alloc [06/14] bpf: Allow no charge for allocation not at map creation time [07/14] bpf: Allow no charge in map specific allocation [08/14] bpf: Aggregate flags for BPF_PROG_LOAD command [09/14] bpf: Add no charge flag for bpf prog [10/14] bpf: Only sys admin can set no charge flag for bpf prog [11/14] bpf: Set __GFP_ACCOUNT at the callsite of bpf_prog_alloc [12/14] bpf: Allow no charge for bpf prog [13/14] bpf: selftests: Add test case for BPF_F_NO_CHARTE [14/14] bpf: selftests: Add test case for BPF_F_PROG_NO_CHARGE

Message ID

20220319173036.23352-6-laoar.shao@gmail.com (mailing list archive)

State

Rejected

Delegated to:

BPF

Headers

From: Yafang Shao <laoar.shao@gmail.com>
To: roman.gushchin@linux.dev, ast@kernel.org, daniel@iogearbox.net,
        andrii@kernel.org, kafai@fb.com, songliubraving@fb.com, yhs@fb.com,
        john.fastabend@gmail.com, kpsingh@kernel.org, shuah@kernel.org
Cc: netdev@vger.kernel.org, bpf@vger.kernel.org,
        linux-kselftest@vger.kernel.org, Yafang Shao <laoar.shao@gmail.com>
Subject: [PATCH 05/14] bpf: Allow no charge in bpf_map_area_alloc
Date: Sat, 19 Mar 2022 17:30:27 +0000
Message-Id: <20220319173036.23352-6-laoar.shao@gmail.com>
In-Reply-To: <20220319173036.23352-1-laoar.shao@gmail.com>
References: <20220319173036.23352-1-laoar.shao@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

bpf: Allow not to charge bpf memory | expand

Checks

Context	Check	Description
bpf/vmtest-bpf-next-PR	success	PR summary
netdev/tree_selection	success	Guessing tree name failed - patch did not apply, async

Context

Check

Description

bpf/vmtest-bpf-next-PR

success

PR summary

netdev/tree_selection

success

Guessing tree name failed - patch did not apply, async

Commit Message

Yafang Shao March 19, 2022, 5:30 p.m. UTC

Use the helper we introduced before to decide whether set the
__GFP_ACCOUNT or not.

Signed-off-by: Yafang Shao <laoar.shao@gmail.com>
---
 kernel/bpf/syscall.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index f70a7067ef4a..add3b4045b4d 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -307,7 +307,7 @@  static void *__bpf_map_area_alloc(u64 size, union bpf_attr *attr, bool mmapable)
 	 * __GFP_RETRY_MAYFAIL to avoid such situations.
 	 */
 
-	const gfp_t gfp = __GFP_NOWARN | __GFP_ZERO | __GFP_ACCOUNT;
+	const gfp_t gfp = map_flags_no_charge(__GFP_NOWARN | __GFP_ZERO, attr);
 	int numa_node = bpf_map_attr_numa_node(attr);
 	unsigned long align = 1;
 	unsigned int flags = 0;