From patchwork Thu Mar 7 03:12:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexei Starovoitov X-Patchwork-Id: 13585007 X-Patchwork-Delegate: bpf@iogearbox.net Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 38A93DDB8 for ; Thu, 7 Mar 2024 03:12:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709781159; cv=none; b=hdVOHUD+l2RsQN8zUN7tYl2v00Q0CS0itL0OyIAYqxbF7Cp8H3X9yhE3DjsBwM3DhThBFwuxh2I38H6sCwEM0YvZGYg8SwIoPwHLbqYDWlCmPCYDD5M5BC5Lcw0BVArXEy8af9OQcEiHrrzxiPMcL3bqTWWhEeGVbykuLWDnmIM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709781159; c=relaxed/simple; bh=BJ0IquS0vg1HErG7K8Oe9gg/mGzDJMqv3M4UBjKSkHI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=YOsS6G+Y4Oy/u9BA30c2a5aR2Lam9KJ0kXdyhfrjQsmNdNOxy9QNSn5smFVVc4fN4ni5bbqtqjXcmgiozBakEILVvvJhkMc138YNaYAZ5oGZRQJd/baGZBF/O3zfUTP8mVXFSA7htpPH2ZUWykpaSYXhm7M4u83Wx6lxODy3h9g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=avjCZLyd; arc=none smtp.client-ip=209.85.214.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="avjCZLyd" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-1dd1d9daf02so2628625ad.1 for ; Wed, 06 Mar 2024 19:12:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709781157; x=1710385957; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lClt+RKfEMg9EMmXAGqTAo5A/Mtjux5XjVv7JeOshxs=; b=avjCZLyd2h5SLBkcFCesx3q4rHpIYXId8CLpUnISOapM8NlQkTP+pLYs2v8/X0lXzZ p2QtiA4CiUINn9E95eV5PbahS9tvC4tg34HJcYN4myh+ZBEJ/fTPc0LpPcVgt0vNsKgP D+s3yWXIWCmLuiOVPAVT48TC/yXw+qYcP47vtVbjpn1emXlLw8Lxw2p8Hhx6TOkiK1ed 2dv9zb5yYmpdKxlEggK/3fsQyGlAxAVLn5mY32T8QN9vFEisaQkjVt8/dNmOvWRlT5FV Up8kZR89sJruC7rzkOynpANUXG4ephGLotywdJepYI5BhMeVXcz/XmrEX21i6e/u3rXD 31lQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709781157; x=1710385957; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lClt+RKfEMg9EMmXAGqTAo5A/Mtjux5XjVv7JeOshxs=; b=UUKhIZQVYFYDqntj+qB6jL+oXEeUPI8prendufkJNA0k697Ij2jIuqj/9uhBbbY00g IurzpHW5bOy3r/GvG8rel2yuLWectihEBjIIXwpA0Ap+jGPluc6Iq0VQ1u9bekGciZ6i 46YF1RuhQ+3G2dznnld+aVMPjLBx5olGdrX7ufIZbRLPh9OuStmcs2KfnY5aYeqlcq68 qinswkevmEcp6deG2JJ2oinEJsqtExwimpU81kFjn8nn+6mE+AMfS1H68ciJ0Y1i0gib 93jZXqVS0f/mPWQmaxQrDaQTeey8hm7O9CEykQzwqu4aBzC5K11nzZnIEpYmucRLE91N VKJw== X-Gm-Message-State: AOJu0YxPqh9hlUk64uGNRO8LnZqTePT2htLdJkGvesdE9Mz/+aLZNYAW bRy1lhHmB9x97p0IiEcbUc6Q4kZA92x8f8kMsT8KK8VajKSill/789WNIamZ X-Google-Smtp-Source: AGHT+IG6Wvw6mIXKrPcBpu4RZzBxZ4uELt1F+bm8X3C78H8o9Xcud6ZtjDP1saARS5H24a8+pJFO0A== X-Received: by 2002:a17:902:b48f:b0:1db:68d5:6281 with SMTP id y15-20020a170902b48f00b001db68d56281mr6590433plr.35.1709781156779; Wed, 06 Mar 2024 19:12:36 -0800 (PST) Received: from localhost.localdomain ([2620:10d:c090:400::5:dd40]) by smtp.gmail.com with ESMTPSA id k12-20020a170902c40c00b001db5ca97817sm13321129plk.68.2024.03.06.19.12.35 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 Mar 2024 19:12:36 -0800 (PST) From: Alexei Starovoitov To: bpf@vger.kernel.org Cc: daniel@iogearbox.net, andrii@kernel.org, martin.lau@kernel.org, memxor@gmail.com, eddyz87@gmail.com, kernel-team@fb.com Subject: [PATCH v4 bpf-next 1/6] bpf: Allow kfuncs return 'void *' Date: Wed, 6 Mar 2024 19:12:23 -0800 Message-Id: <20240307031228.42896-2-alexei.starovoitov@gmail.com> X-Mailer: git-send-email 2.39.3 (Apple Git-145) In-Reply-To: <20240307031228.42896-1-alexei.starovoitov@gmail.com> References: <20240307031228.42896-1-alexei.starovoitov@gmail.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: bpf@iogearbox.net From: Alexei Starovoitov Recognize return of 'void *' from kfunc as returning unknown scalar. Acked-by: Andrii Nakryiko Acked-by: Kumar Kartikeya Dwivedi Signed-off-by: Alexei Starovoitov --- kernel/bpf/verifier.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index ee86e4d7d5fc..9c2a36b1373b 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -12364,6 +12364,9 @@ static int check_kfunc_call(struct bpf_verifier_env *env, struct bpf_insn *insn, meta.func_name); return -EFAULT; } + } else if (btf_type_is_void(ptr_type)) { + /* kfunc returning 'void *' is equivalent to returning scalar */ + mark_reg_unknown(env, regs, BPF_REG_0); } else if (!__btf_type_is_struct(ptr_type)) { if (!meta.r0_size) { __u32 sz; From patchwork Thu Mar 7 03:12:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexei Starovoitov X-Patchwork-Id: 13585008 X-Patchwork-Delegate: bpf@iogearbox.net Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 30DD2E546 for ; Thu, 7 Mar 2024 03:12:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709781163; cv=none; b=EfzxLdTNeD34bTjXV4/rIRaTkhqRQrGP9xa2grtiTmDEw3vnRk3QhpnZ5QH8cUwdVBm2P92hkQ941fQ2pDqwLuJrGkUPe/4OI3N2uh0qA2O92WGiab2HVew+MzmTI0qQYPjqDv/ZT3ZmuSNuc/8caifUbnzi4zPOiO7FR4Mtn7c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709781163; c=relaxed/simple; bh=XnlsoQFXLM0Vve6a0zyaM47X1FEn0VJgXz3p8HUxRnE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=RN1DYFuPhGgY9QxWUL3BCWjRlMCXyl13SkdStxDkmLRdSLu3ByutpOsJKTcCMdmBi5KDf88NiVWTDQVmht7Zc4iR63lyyrZP5JpqnUOiUlBS1sV0JycbcwMqbCGSAKRrzjsZD4II/0HAawhBBH9rKBS4DiI+TwmC+ISCyNoB5OE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=LvuKv3Af; arc=none smtp.client-ip=209.85.210.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="LvuKv3Af" Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-6e46dcd8feaso339296b3a.2 for ; Wed, 06 Mar 2024 19:12:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709781161; x=1710385961; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9QXi2fGy0WO2Juk0nELFlUaJBHD5vu1E3qVS4jPD92Q=; b=LvuKv3Af6DO0uiwjBwy3QMil2kvhtcJo2oxmwl0OKM2X7w/n3zQqMi7ACvES+4eatG 6Mn1Ss5/SG6bbY0XWgQZjkBjjfI4av4ObxViAj0LR+Ik4B6VQBY8krEeLhrITgRbM2Tm YrI95FU2cfpaznTLAlowEJws2s4N7kzvj87ihlc6bltNsQ6Pl0fwbXkUU47Lnyc+WUic Be2WE90LNkXbI2xH6a3fBKuFdyLDPWA5ueWHtXn+fZi7VDvuV9CVLfpkcxURBsBs9ruW Zk8n7l32knbFxAd0iqjV2Ms7E/E+hcSkxE3yRkAASufGQGjIGwKbVU4EOdZlfAmiGPYo t15g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709781161; x=1710385961; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9QXi2fGy0WO2Juk0nELFlUaJBHD5vu1E3qVS4jPD92Q=; b=VlT4mIaxMNV4U2pnqdsJcVxMcBGJdVuTFnbH5v9kGkduXGmiYWWeR3ZjhN4OG+uj7X wysP3SsZVvaexitv4Vv9ydf53mXrR3BfBa03BuEFXFDKgNMPZOLjkDim0spmYhY/jCLZ uGPgkPWNYoCGANDJQJXzxFlpVdiZze9a+pLZg6/5Ot4vgM7Pz58N9pVyTLEe7i3b2BZB 6i0RxOiraadHghKeK2TldR5MDb/Jm/3beLNnsYkFDb0waWsKgiOW1N8lGj32pQASe32/ VD/fckXlW8/Ei6zoRCjdjXJ1tNsR4HhLX0jC+vIbZeyU4QL2J0X2pKlXQSb49iYxaVTt XskA== X-Gm-Message-State: AOJu0YyJjql1JTsfryGu+B3UYnaTI8kSiWsKSWR0sE336rlcfqS2LD6p 4HlBfj9blHaa3ge9wwUC5WX+770li56Cxc5dfvaDpN6cNm1NDuUFD2Ov+JT2 X-Google-Smtp-Source: AGHT+IHMGOhk1GfbygH0Qr3N0moMlk1VqsYYl2kuzPDD4e1aETSEADSJHw+dFZ452WQMtUUScu57YA== X-Received: by 2002:a05:6a00:4f96:b0:6e5:3b8e:bb6b with SMTP id ld22-20020a056a004f9600b006e53b8ebb6bmr18698706pfb.7.1709781160775; Wed, 06 Mar 2024 19:12:40 -0800 (PST) Received: from localhost.localdomain ([2620:10d:c090:400::5:dd40]) by smtp.gmail.com with ESMTPSA id c9-20020aa78c09000000b006e56da42e24sm11464986pfd.158.2024.03.06.19.12.39 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 Mar 2024 19:12:40 -0800 (PST) From: Alexei Starovoitov To: bpf@vger.kernel.org Cc: daniel@iogearbox.net, andrii@kernel.org, martin.lau@kernel.org, memxor@gmail.com, eddyz87@gmail.com, kernel-team@fb.com Subject: [PATCH v4 bpf-next 2/6] bpf: Recognize '__map' suffix in kfunc arguments Date: Wed, 6 Mar 2024 19:12:24 -0800 Message-Id: <20240307031228.42896-3-alexei.starovoitov@gmail.com> X-Mailer: git-send-email 2.39.3 (Apple Git-145) In-Reply-To: <20240307031228.42896-1-alexei.starovoitov@gmail.com> References: <20240307031228.42896-1-alexei.starovoitov@gmail.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: bpf@iogearbox.net From: Alexei Starovoitov Recognize 'void *p__map' kfunc argument as 'struct bpf_map *p__map'. It allows kfunc to have 'void *' argument for maps, since bpf progs will call them as: struct { __uint(type, BPF_MAP_TYPE_ARENA); ... } arena SEC(".maps"); bpf_kfunc_with_map(... &arena ...); Underneath libbpf will load CONST_PTR_TO_MAP into the register via ld_imm64 insn. If kfunc was defined with 'struct bpf_map *' it would pass the verifier as well, but bpf prog would need to type cast the argument (void *)&arena, which is not clean. Acked-by: Kumar Kartikeya Dwivedi Signed-off-by: Alexei Starovoitov --- kernel/bpf/verifier.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index 9c2a36b1373b..bf084c693507 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -10752,6 +10752,11 @@ static bool is_kfunc_arg_ignore(const struct btf *btf, const struct btf_param *a return btf_param_match_suffix(btf, arg, "__ign"); } +static bool is_kfunc_arg_map(const struct btf *btf, const struct btf_param *arg) +{ + return btf_param_match_suffix(btf, arg, "__map"); +} + static bool is_kfunc_arg_alloc_obj(const struct btf *btf, const struct btf_param *arg) { return btf_param_match_suffix(btf, arg, "__alloc"); @@ -10921,6 +10926,7 @@ enum kfunc_ptr_arg_type { KF_ARG_PTR_TO_RB_NODE, KF_ARG_PTR_TO_NULL, KF_ARG_PTR_TO_CONST_STR, + KF_ARG_PTR_TO_MAP, }; enum special_kfunc_type { @@ -11074,6 +11080,9 @@ get_kfunc_ptr_arg_type(struct bpf_verifier_env *env, if (is_kfunc_arg_const_str(meta->btf, &args[argno])) return KF_ARG_PTR_TO_CONST_STR; + if (is_kfunc_arg_map(meta->btf, &args[argno])) + return KF_ARG_PTR_TO_MAP; + if ((base_type(reg->type) == PTR_TO_BTF_ID || reg2btf_ids[base_type(reg->type)])) { if (!btf_type_is_struct(ref_t)) { verbose(env, "kernel function %s args#%d pointer type %s %s is not supported\n", @@ -11674,6 +11683,7 @@ static int check_kfunc_args(struct bpf_verifier_env *env, struct bpf_kfunc_call_ switch (kf_arg_type) { case KF_ARG_PTR_TO_NULL: continue; + case KF_ARG_PTR_TO_MAP: case KF_ARG_PTR_TO_ALLOC_BTF_ID: case KF_ARG_PTR_TO_BTF_ID: if (!is_kfunc_trusted_args(meta) && !is_kfunc_rcu(meta)) @@ -11890,6 +11900,12 @@ static int check_kfunc_args(struct bpf_verifier_env *env, struct bpf_kfunc_call_ if (ret < 0) return ret; break; + case KF_ARG_PTR_TO_MAP: + /* If argument has '__map' suffix expect 'struct bpf_map *' */ + ref_id = *reg2btf_ids[CONST_PTR_TO_MAP]; + ref_t = btf_type_by_id(btf_vmlinux, ref_id); + ref_tname = btf_name_by_offset(btf, ref_t->name_off); + fallthrough; case KF_ARG_PTR_TO_BTF_ID: /* Only base_type is checked, further checks are done here */ if ((base_type(reg->type) != PTR_TO_BTF_ID || From patchwork Thu Mar 7 03:12:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexei Starovoitov X-Patchwork-Id: 13585009 X-Patchwork-Delegate: bpf@iogearbox.net Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AAE2BE554 for ; Thu, 7 Mar 2024 03:12:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709781167; cv=none; b=OPF3MvE+Vg/dMIGcfdOcbNiCuRT1/QUIbWxoldzOz79KbSLqHji8NOrm2DkNzBIrDcP0HLvDWzKEZ1pCWd3mmqImSu2coC67BWQNP6waotK3zbUUUrKNj5HOcaLWlSuy8zMKxsIpz5oW/L7Mwbab/i9pH8EzhFsMzD4WmnY5UFo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709781167; c=relaxed/simple; bh=8u5FwGZOQvGWs13SGw8hCJZUOeF4oULonqwyw5IBvts=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=evlK2KfxW3kDlRn8xkcDVxDsbKhe+Nlc4Fqr1GNBZPLjhBQHRwagLE/3GOMzuQfofqgPfMOVXJuKsTjq+NCydZbXLcoyO4KGG6UkOI2x1djes4KSCJ7t0WAe0J3/2pqR/bx6h9PZRNvMV4d/0atpOcht12oPG+VwEBaRRVbLi7M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=KlbDHL8P; arc=none smtp.client-ip=209.85.215.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="KlbDHL8P" Received: by mail-pg1-f179.google.com with SMTP id 41be03b00d2f7-5d8b276979aso315274a12.2 for ; Wed, 06 Mar 2024 19:12:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709781165; x=1710385965; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6f6GYPJ364QpWqK3mIvywnvJQ658PEM/p0C7UMLLVdE=; b=KlbDHL8P4aq7fpZbLmGoaf93+E/wnBHp7LgdCBTu6lHt8fjVfjPjvoGbBGZhGFjnea sN43n0keRtcgZr4+6EWIc9nRov5XY2qYJ1raHZgLxbG/+RTkYPEDGHSHZhekQPuy7BNP Fm84TBKEcERwZFb/oBS0GV4N4wAp0e8bOsirnVfkU95M/Irq+JrXfjZ/X9I6l+Ha1YHn HZHgJBt4cydHVznUO+4LcKgSorS50nRUKEBbijHnp89iFqge7bXMNT5NC5ormTmmoPOS zbikMsPFhJxVEEFrkB4pXvzg+vKzvuHAxivhpd8RZjms8OEbeEtJT6hf+Xd3VmqL9EBb 2RzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709781165; x=1710385965; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6f6GYPJ364QpWqK3mIvywnvJQ658PEM/p0C7UMLLVdE=; b=APiunSeVhsl/ARffxwHJc0ViLzCyi2U1ie3qLAKPfgQgUOvkUbIcqqC82Jeqskb84s drsyvroM/Q3ZOKxFJsC3byMOlsyuj7xhsL3/E5m4S5ZLsqMtLwY12UP0Lr46rZPq7//y XzfqcsyRydKNJSIWK0dpY9JHCijCDp87/ojUB85fEl5RqY56ZdM+bXWupnz/05Q/BYpB AnAfDcHVl3dueCgT74qMEBg3dPRswuGrY/SRKUv3nMTTerR6UA4v+Pyi8FqJSr14dy8y deaXuk0VE2CMZPzY8k1YPhNDeV9hRS9M+GjJhX08OXm7+pvcsB3V0fcUdhn6a6onZLsa 2nsg== X-Gm-Message-State: AOJu0Yw6AO90H6BmK0b+eeLCkJuXXRlhf0eRFIVtXRmAu0NszI5jkyPS trNPMvqfbNc7b/6w4nujy7bFHefg+MYp0oFX3fhHc1HNS3myXHfAS6stlglJ X-Google-Smtp-Source: AGHT+IGEdQLU7AekXaYHt/M4zx4G9I9NyuyA+kUeaRbBsIixDI2dAELIbyrcKtfsrQiv5EjR7PbEjg== X-Received: by 2002:a05:6a20:e10e:b0:1a1:6a75:1442 with SMTP id kr14-20020a056a20e10e00b001a16a751442mr3048769pzb.11.1709781164771; Wed, 06 Mar 2024 19:12:44 -0800 (PST) Received: from localhost.localdomain ([2620:10d:c090:400::5:dd40]) by smtp.gmail.com with ESMTPSA id q10-20020a170902daca00b001dd3ea391f4sm2001199plx.177.2024.03.06.19.12.43 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 Mar 2024 19:12:44 -0800 (PST) From: Alexei Starovoitov To: bpf@vger.kernel.org Cc: daniel@iogearbox.net, andrii@kernel.org, martin.lau@kernel.org, memxor@gmail.com, eddyz87@gmail.com, kernel-team@fb.com Subject: [PATCH v4 bpf-next 3/6] bpf: Plumb get_unmapped_area() callback into bpf_map_ops Date: Wed, 6 Mar 2024 19:12:25 -0800 Message-Id: <20240307031228.42896-4-alexei.starovoitov@gmail.com> X-Mailer: git-send-email 2.39.3 (Apple Git-145) In-Reply-To: <20240307031228.42896-1-alexei.starovoitov@gmail.com> References: <20240307031228.42896-1-alexei.starovoitov@gmail.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: bpf@iogearbox.net From: Alexei Starovoitov Subsequent patches introduce bpf_arena that imposes special alignment requirements on address selection. Acked-by: Kumar Kartikeya Dwivedi Signed-off-by: Alexei Starovoitov --- include/linux/bpf.h | 3 +++ kernel/bpf/syscall.c | 16 ++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/include/linux/bpf.h b/include/linux/bpf.h index 785660810e6a..95e07673cdc1 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@ -139,6 +139,9 @@ struct bpf_map_ops { int (*map_mmap)(struct bpf_map *map, struct vm_area_struct *vma); __poll_t (*map_poll)(struct bpf_map *map, struct file *filp, struct poll_table_struct *pts); + unsigned long (*map_get_unmapped_area)(struct file *filep, unsigned long addr, + unsigned long len, unsigned long pgoff, + unsigned long flags); /* Functions called by bpf_local_storage maps */ int (*map_local_storage_charge)(struct bpf_local_storage_map *smap, diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c index b2750b79ac80..f63f4da4db5e 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -937,6 +937,21 @@ static __poll_t bpf_map_poll(struct file *filp, struct poll_table_struct *pts) return EPOLLERR; } +static unsigned long bpf_get_unmapped_area(struct file *filp, unsigned long addr, + unsigned long len, unsigned long pgoff, + unsigned long flags) +{ + struct bpf_map *map = filp->private_data; + + if (map->ops->map_get_unmapped_area) + return map->ops->map_get_unmapped_area(filp, addr, len, pgoff, flags); +#ifdef CONFIG_MMU + return current->mm->get_unmapped_area(filp, addr, len, pgoff, flags); +#else + return addr; +#endif +} + const struct file_operations bpf_map_fops = { #ifdef CONFIG_PROC_FS .show_fdinfo = bpf_map_show_fdinfo, @@ -946,6 +961,7 @@ const struct file_operations bpf_map_fops = { .write = bpf_dummy_write, .mmap = bpf_map_mmap, .poll = bpf_map_poll, + .get_unmapped_area = bpf_get_unmapped_area, }; int bpf_map_new_fd(struct bpf_map *map, int flags) From patchwork Thu Mar 7 03:12:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexei Starovoitov X-Patchwork-Id: 13585010 X-Patchwork-Delegate: bpf@iogearbox.net Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 25A7363C7 for ; Thu, 7 Mar 2024 03:12:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709781171; cv=none; b=CJer4esxqmAiNIby0F63rAE/LOdasjyBQrDrcnzlMXxH0SufwZvKDctpJ+8moPaCBn/tPCa73tUuKQEJQY9WvPrlaXWS5NkN4vqIHHpPF2Ri8y+p8kCdeunpQw/vN3nUPhZKr2vmHUJPfF2FZgQl/RbkYfUS/SX2Dw90eJGJjAs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709781171; c=relaxed/simple; bh=3Vo7RtddkovaUNsfGME8tOTBMZHDqvOqepWoD6kN7E4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=J+kfOVXAcAP4G1fRvPhx3N67sSDyzOhndHDkGFfCVsbaC8wuj1j6Glkey9l9TGqBV3IcSs5EkCrXA9JexMBJ36k6RNZbszFyYKsIKq5d4SVIjFN+Cls/uwDCKxcBhnguYIQlW69SXtCzmlTyrO3JTI3KyTRYgW/m/OETuZN3FhI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Hcc9YQuo; arc=none smtp.client-ip=209.85.210.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Hcc9YQuo" Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-6e617b39877so347781b3a.3 for ; Wed, 06 Mar 2024 19:12:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709781169; x=1710385969; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=m020q1Q9X28dNr+XufqionpS1OXGz7hwSYjHovEffwo=; b=Hcc9YQuowPz0pss6LAjrzjlnMgSt0fMfu0d+WbZiR6wU9jQcOEpXjoKcNCvnp4LtTb iHMGxz09aEw9I7jYOEuileUCvdlf7pqknyRg+U5GCgwsdG29PUeiAX+l+MuGVJ/wNI2M H831Zf5fQXkpo7fEEiOMr+GJYHqBzJ1Byt461ItYt+ku5FPE1Oi+XLU5gJ6UjMoTbmTE TDgGqzK4fxmSBzbit6r0Yk1/YEfFwCa3zU3QWkwnDiQeT787ZmiaaBjcthF9ZeOjr1V5 6Eg8M76MsCwYftxMQxH46PseAq05DRFSzJhzQiWLdUUd93diUknajjY8gwgaHIy6arE1 A6Kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709781169; x=1710385969; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=m020q1Q9X28dNr+XufqionpS1OXGz7hwSYjHovEffwo=; b=RVIBY2ZwDAioUX8W+7m4oerFZeOFlc4jIL6GyVJ2RptE4vl+JiFbU567T4SAzZm0is q4hAyL0EV9GV8u8KWx5WQOACw/QOCNGZIX0H2U4RLUZDlOeUHJT69x5l1cV1WgtG0J/G rVMylgvC89l/WcaJW8rCmN1bheM1JKnOcLUZEb+0lIKcQVLFa20Z3VwCI9pM7ubwPUzm o+PDLhUKLTTZJxr9AuJreM5yl9Wh5tAaH9LpmKgAzKvYEVwS4Za47ddwUH+huAhKmmA1 foPRUiZxPRmMX87plqrnmyxm4FAVSU/F/3xBfq9QlybS87coNI2uxBiMQYSaam1w18dS 5n8A== X-Gm-Message-State: AOJu0YwWtvtw3R0QtNhFjYxP76nfQzPVliNnS9nHoTbdzd+Uc0I/dJEU Rz2V1YG3vY2f/xSlAvQrxIC7fIqj16yrKTjEPisfnaMS6FrdcJ3z8y+TthrJ X-Google-Smtp-Source: AGHT+IFOgF8VAZmNjlmcLDJ8CsRLseZfZcPuVBXkDztlWPpO+lXh4JziHztmdWMianpPYahMuEOSVQ== X-Received: by 2002:a05:6a00:22c4:b0:6e4:e7dc:25a4 with SMTP id f4-20020a056a0022c400b006e4e7dc25a4mr22261771pfj.23.1709781168726; Wed, 06 Mar 2024 19:12:48 -0800 (PST) Received: from localhost.localdomain ([2620:10d:c090:400::5:dd40]) by smtp.gmail.com with ESMTPSA id s18-20020a056a0008d200b006e5af565b1dsm3615615pfu.201.2024.03.06.19.12.47 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 Mar 2024 19:12:48 -0800 (PST) From: Alexei Starovoitov To: bpf@vger.kernel.org Cc: daniel@iogearbox.net, andrii@kernel.org, martin.lau@kernel.org, memxor@gmail.com, eddyz87@gmail.com, kernel-team@fb.com Subject: [PATCH v4 bpf-next 4/6] libbpf: Allow specifying 64-bit integers in map BTF. Date: Wed, 6 Mar 2024 19:12:26 -0800 Message-Id: <20240307031228.42896-5-alexei.starovoitov@gmail.com> X-Mailer: git-send-email 2.39.3 (Apple Git-145) In-Reply-To: <20240307031228.42896-1-alexei.starovoitov@gmail.com> References: <20240307031228.42896-1-alexei.starovoitov@gmail.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: bpf@iogearbox.net From: Alexei Starovoitov __uint() macro that is used to specify map attributes like: __uint(type, BPF_MAP_TYPE_ARRAY); __uint(map_flags, BPF_F_MMAPABLE); It is limited to 32-bit, since BTF_KIND_ARRAY has u32 "number of elements" field in "struct btf_array". Introduce __ulong() macro that allows specifying values bigger than 32-bit. In map definition "map_extra" is the only u64 field, so far. Signed-off-by: Alexei Starovoitov --- tools/lib/bpf/bpf_helpers.h | 1 + tools/lib/bpf/libbpf.c | 44 +++++++++++++++++++++++++++++++++++-- 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/tools/lib/bpf/bpf_helpers.h b/tools/lib/bpf/bpf_helpers.h index 79eaa581be98..112b1504e072 100644 --- a/tools/lib/bpf/bpf_helpers.h +++ b/tools/lib/bpf/bpf_helpers.h @@ -13,6 +13,7 @@ #define __uint(name, val) int (*name)[val] #define __type(name, val) typeof(val) *name #define __array(name, val) typeof(val) *name[] +#define __ulong(name, val) enum { ___bpf_concat(__unique_value, __COUNTER__) = val } name /* * Helper macro to place programs, maps, license in diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index 672fca94ff53..567ad367e7aa 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -2335,6 +2335,46 @@ static bool get_map_field_int(const char *map_name, const struct btf *btf, return true; } +static bool get_map_field_long(const char *map_name, const struct btf *btf, + const struct btf_member *m, __u64 *res) +{ + const struct btf_type *t = skip_mods_and_typedefs(btf, m->type, NULL); + const char *name = btf__name_by_offset(btf, m->name_off); + + if (btf_is_ptr(t)) { + __u32 res32; + bool ret; + + ret = get_map_field_int(map_name, btf, m, &res32); + if (ret) + *res = (__u64)res32; + return ret; + } + + if (!btf_is_enum(t) && !btf_is_enum64(t)) { + pr_warn("map '%s': attr '%s': expected ENUM or ENUM64, got %s.\n", + map_name, name, btf_kind_str(t)); + return false; + } + + if (btf_vlen(t) != 1) { + pr_warn("map '%s': attr '%s': invalid __ulong\n", + map_name, name); + return false; + } + + if (btf_is_enum(t)) { + const struct btf_enum *e = btf_enum(t); + + *res = e->val; + } else { + const struct btf_enum64 *e = btf_enum64(t); + + *res = btf_enum64_value(e); + } + return true; +} + static int pathname_concat(char *buf, size_t buf_sz, const char *path, const char *name) { int len; @@ -2568,9 +2608,9 @@ int parse_btf_map_def(const char *map_name, struct btf *btf, map_def->pinning = val; map_def->parts |= MAP_DEF_PINNING; } else if (strcmp(name, "map_extra") == 0) { - __u32 map_extra; + __u64 map_extra; - if (!get_map_field_int(map_name, btf, m, &map_extra)) + if (!get_map_field_long(map_name, btf, m, &map_extra)) return -EINVAL; map_def->map_extra = map_extra; map_def->parts |= MAP_DEF_MAP_EXTRA; From patchwork Thu Mar 7 03:12:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexei Starovoitov X-Patchwork-Id: 13585011 X-Patchwork-Delegate: bpf@iogearbox.net Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2FD48DDA0 for ; Thu, 7 Mar 2024 03:12:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709781175; cv=none; b=Jo02TMoo3F9HVP8TNVnzK+3JsRcnqzbzlf5+86fsY8vRP9mWzo7pe1NnMqV+XLShAV0jqpGcvfuDJznlmMb4ABYG+2SAY2qs5/r8/CbjaHfP50AIklkZSlLY/u2N5bOb5wpWBBNLhVMlcD9eXHjvFGwB43GvTtF3vdUF7o6wXhc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709781175; c=relaxed/simple; bh=+L0EdhG1lJzIEcfLN+nHMAtbDjoCh7/CUD68fD8ZDVY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Id0q6LCvKxceWXkEfE9YnMagAWsZUqt2gqMc6aWKdKxlGj6mHT8SCvXpUW+rbwjGdWgtXnA+opI/0zunNMXgn4YzmgXUlMXRKVU3guMw2+jzoMxsPdO28/yQO9AdHAzHjAS9tYJQgKaQL9XdWfumjt6wMkhSLZUBeeGjvuW0uSk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=MAs1gO5f; arc=none smtp.client-ip=209.85.210.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="MAs1gO5f" Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-6e5a232fe80so369227b3a.0 for ; Wed, 06 Mar 2024 19:12:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709781173; x=1710385973; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Ou+etYFnc3ibpiL/LdevwQV7NT8tdYOvHQaDmdXfzqc=; b=MAs1gO5f8NM+2eUHOgzYuk7C/aC7ZLDjjeLPvOlJosDKdlXTVLIzItUlaah93ezEcI dmOJ98Os//z55cSG+cBME6xfczHLHbuYvbyGKPuhzZ6AZY3cOQbQY5O+HZyP3YqhRB7V m4mqMOMK8eqfAHrW/aW3eevQoo28mzPQPBzWOioy5Du7xDG1DCEAGuaweIHw8/GVbWfL xPI8bK9UrJ0n6g3lTHWECyQ4clVAC1w5qMidv4gC57hCiuM1Sy6bB2kJ1VszFPoKkJRd XUd0ixUFuB2CJOdwNQngOO0x7TVwMuviHi5oEqh6QgTwSFkl625m6zQH47HGWc8+9/J/ kuJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709781173; x=1710385973; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ou+etYFnc3ibpiL/LdevwQV7NT8tdYOvHQaDmdXfzqc=; b=wNfZSu2krkNZkvsP3SQXcp5juNcbuhldv13WMssBe3l8StTJU7+GFjftHKQXYWuXan 6QjFt7IEdYbduZ7VkCj796gaN3sGER1OC2fpyX0EaMTplcfgICo640BGr0MdNqO4SVpi aL2yPQyhrKJdPvtwOpK/MG/JTHCR1c+cgHxprVAvdpFEZhFRWR6tdAGHT9au+qJl813B xBwTPrq63MrLx7GPuK+BJLgs6zxPNkUgdtOi6H6b+l7TGCak3L2V8zWUzFIThc+3hTrP KJcCNeUsHUnLFKayU6yEheZP5rYxDKGY8LZOAIsLp87IeubEWUvV7/o7kGvMZzv3vUhJ IyoQ== X-Gm-Message-State: AOJu0YzNV/V9Eo31dfR5tIqfh0qIecfeFyIBfZ2BvqQDNrnYmglW7+EY oBq9069F3xzseMZb2mYR86g8MXpSyGi3RYICZh/9s7fXcBYlMfDFXPFWm7qt X-Google-Smtp-Source: AGHT+IHudPQ+6CUhy8HuBd97Wv4oqSap1uW5ljEhI/NAoi2h+awHqfEh63q0wSAnuQU/OnzswV1XWQ== X-Received: by 2002:a05:6a00:2315:b0:6e6:5291:1779 with SMTP id h21-20020a056a00231500b006e652911779mr396850pfh.6.1709781172733; Wed, 06 Mar 2024 19:12:52 -0800 (PST) Received: from localhost.localdomain ([2620:10d:c090:400::5:dd40]) by smtp.gmail.com with ESMTPSA id n39-20020a056a000d6700b006e57defe737sm11575038pfv.76.2024.03.06.19.12.51 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 Mar 2024 19:12:52 -0800 (PST) From: Alexei Starovoitov To: bpf@vger.kernel.org Cc: daniel@iogearbox.net, andrii@kernel.org, martin.lau@kernel.org, memxor@gmail.com, eddyz87@gmail.com, kernel-team@fb.com Subject: [PATCH v4 bpf-next 5/6] bpftool: rename is_internal_mmapable_map into is_mmapable_map Date: Wed, 6 Mar 2024 19:12:27 -0800 Message-Id: <20240307031228.42896-6-alexei.starovoitov@gmail.com> X-Mailer: git-send-email 2.39.3 (Apple Git-145) In-Reply-To: <20240307031228.42896-1-alexei.starovoitov@gmail.com> References: <20240307031228.42896-1-alexei.starovoitov@gmail.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: bpf@iogearbox.net From: Andrii Nakryiko It's not restricted to working with "internal" maps, it cares about any map that can be mmap'ed. Reflect that in more succinct and generic name. Signed-off-by: Andrii Nakryiko Signed-off-by: Alexei Starovoitov Acked-by: Quentin Monnet --- tools/bpf/bpftool/gen.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/bpf/bpftool/gen.c b/tools/bpf/bpftool/gen.c index 1f579eacd9d4..a3d72be347b0 100644 --- a/tools/bpf/bpftool/gen.c +++ b/tools/bpf/bpftool/gen.c @@ -248,7 +248,7 @@ static const struct btf_type *find_type_for_map(struct btf *btf, const char *map return NULL; } -static bool is_internal_mmapable_map(const struct bpf_map *map, char *buf, size_t sz) +static bool is_mmapable_map(const struct bpf_map *map, char *buf, size_t sz) { if (!bpf_map__is_internal(map) || !(bpf_map__map_flags(map) & BPF_F_MMAPABLE)) return false; @@ -274,7 +274,7 @@ static int codegen_datasecs(struct bpf_object *obj, const char *obj_name) bpf_object__for_each_map(map, obj) { /* only generate definitions for memory-mapped internal maps */ - if (!is_internal_mmapable_map(map, map_ident, sizeof(map_ident))) + if (!is_mmapable_map(map, map_ident, sizeof(map_ident))) continue; sec = find_type_for_map(btf, map_ident); @@ -327,7 +327,7 @@ static int codegen_subskel_datasecs(struct bpf_object *obj, const char *obj_name bpf_object__for_each_map(map, obj) { /* only generate definitions for memory-mapped internal maps */ - if (!is_internal_mmapable_map(map, map_ident, sizeof(map_ident))) + if (!is_mmapable_map(map, map_ident, sizeof(map_ident))) continue; sec = find_type_for_map(btf, map_ident); @@ -504,7 +504,7 @@ static void codegen_asserts(struct bpf_object *obj, const char *obj_name) ", obj_name); bpf_object__for_each_map(map, obj) { - if (!is_internal_mmapable_map(map, map_ident, sizeof(map_ident))) + if (!is_mmapable_map(map, map_ident, sizeof(map_ident))) continue; sec = find_type_for_map(btf, map_ident); @@ -720,7 +720,7 @@ static int gen_trace(struct bpf_object *obj, const char *obj_name, const char *h const void *mmap_data = NULL; size_t mmap_size = 0; - if (!is_internal_mmapable_map(map, ident, sizeof(ident))) + if (!is_mmapable_map(map, ident, sizeof(ident))) continue; codegen("\ @@ -782,7 +782,7 @@ static int gen_trace(struct bpf_object *obj, const char *obj_name, const char *h bpf_object__for_each_map(map, obj) { const char *mmap_flags; - if (!is_internal_mmapable_map(map, ident, sizeof(ident))) + if (!is_mmapable_map(map, ident, sizeof(ident))) continue; if (bpf_map__map_flags(map) & BPF_F_RDONLY_PROG) @@ -871,7 +871,7 @@ codegen_maps_skeleton(struct bpf_object *obj, size_t map_cnt, bool mmaped) ", i, bpf_map__name(map), i, ident); /* memory-mapped internal maps */ - if (mmaped && is_internal_mmapable_map(map, ident, sizeof(ident))) { + if (mmaped && is_mmapable_map(map, ident, sizeof(ident))) { printf("\ts->maps[%zu].mmaped = (void **)&obj->%s;\n", i, ident); } @@ -1617,7 +1617,7 @@ static int do_subskeleton(int argc, char **argv) /* Also count all maps that have a name */ map_cnt++; - if (!is_internal_mmapable_map(map, ident, sizeof(ident))) + if (!is_mmapable_map(map, ident, sizeof(ident))) continue; map_type_id = bpf_map__btf_value_type_id(map); @@ -1739,7 +1739,7 @@ static int do_subskeleton(int argc, char **argv) /* walk through each symbol and emit the runtime representation */ bpf_object__for_each_map(map, obj) { - if (!is_internal_mmapable_map(map, ident, sizeof(ident))) + if (!is_mmapable_map(map, ident, sizeof(ident))) continue; map_type_id = bpf_map__btf_value_type_id(map); From patchwork Thu Mar 7 03:12:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexei Starovoitov X-Patchwork-Id: 13585012 X-Patchwork-Delegate: bpf@iogearbox.net Received: from mail-oi1-f176.google.com (mail-oi1-f176.google.com [209.85.167.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 465241C27 for ; Thu, 7 Mar 2024 03:12:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709781179; cv=none; b=idfXcDx3cVucZ5QOpb0DjIezj3L128biiso4m2aJWFpuc751Uut6XZHwb1I0j8R7YHHRdjGBhYqSvG0rTUS9GnXiwCxAImF7tVFEStUqqoM9mOKKlVc8WbL+FbNWuJ4WEHlLz09YiciHh8SqTsgIEptrDsYt6JtS8rWWoelf47g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709781179; c=relaxed/simple; bh=D3qO1GMlOnd5cfKg57eDj48b+xlJK9DwlonYdfJjqMo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=NO0HvHtZagkTyMwKgLuzCo2buO3uFThWgOaccGv2aM5gxnhtIZ3jQVWpYD0903jQPhZCjh7V47tP8eIE1R5AN7h4wa8K6zSvdmZ6hGmv9WVRZsMt12vK4y4/1mf5btbIyLeLzN2A2jRlquS/4ahP2XduiTw7qJkUtldNgpCwhAg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=WQIwfeL3; arc=none smtp.client-ip=209.85.167.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="WQIwfeL3" Received: by mail-oi1-f176.google.com with SMTP id 5614622812f47-3c19dd9ade5so172243b6e.3 for ; Wed, 06 Mar 2024 19:12:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709781177; x=1710385977; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=adxbi6QDcay2Ge9X2I0DlgAOdU2KFX2PZB04faHlqxY=; b=WQIwfeL3pMb51HNddf69HhlsIaFuNUtvEa0AUROd4/KejzpEHUD85783vPCMAZiwXZ 94Kbg5zTfcc3YLpB+JWyrD4dAvSnDHT3lDjXsspo/30qnmqIqabxkxsX9QnekEx47TG7 pW99Xm1lm6eri2r+e9O8yXWDyH3zHiQ2A8c2nH5s/S8tMKSgkpvU0lWe2FQet6dVyMBd xIRhAwdOUjsiFDRpiTILFZTBDrNv36PpsUF+Sp3INUtTqVyaHL9QzwDAipO4Z+ygT1E9 Z39higknCozuW09BIxm+8TzfdbCHSD5XPSVp16QlocFmn7ubQZgCyz+CZYpObGea7jfX wHAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709781177; x=1710385977; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=adxbi6QDcay2Ge9X2I0DlgAOdU2KFX2PZB04faHlqxY=; b=Ukk/YPLf1ZVLgcq2JZ0zk0GJsPBBEK/xCXIctirevJ2hTIAf9ERcamytBAawJOg91M yX8py2gDSLl5ycdAfGz6k2m3MQ4xzPm5xHQHCGHcuSteDiY0RtiLDliZ2bH0u9svltta f55l113wEZBlcV4fdSk78FaXHq1BSjXAFCo5JDEAwnEjov81qPdKhiuW+LcBHoTd5zl2 WNXLMD3CBR8tw1FMXJj9z+57x1mdeSEOCH40oCdx/4/Uxww3tXHMTJrY8y5oOX/bx+zP Odalnk9PoueWM4V9JFLuAnPRWfg1d9YQ/lrHpT18rJoy1K1cnXATtxRajjQiJjC6Rj+1 UkdQ== X-Gm-Message-State: AOJu0YwmgRwjndNnPZlhbwMya+IZ1uXRcYIFkf7qDHlNqULh7mOEGIx0 IPqW09+GS+BzS76V4tdy8VTgaOgex2lFcd6NRv4AGSKJscccXI5NiYrdAbJj X-Google-Smtp-Source: AGHT+IHjAzfNiwCy0xPG0KicdsKWxhw/26oqi+gOT7athTrrKabx5To6xxuwAbGWUPIybLoRZmT68A== X-Received: by 2002:a05:6808:1494:b0:3c2:f88:664c with SMTP id e20-20020a056808149400b003c20f88664cmr8516179oiw.22.1709781177003; Wed, 06 Mar 2024 19:12:57 -0800 (PST) Received: from localhost.localdomain ([2620:10d:c090:400::5:dd40]) by smtp.gmail.com with ESMTPSA id fh8-20020a056a00390800b006e4e600d15esm11501241pfb.160.2024.03.06.19.12.55 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 06 Mar 2024 19:12:56 -0800 (PST) From: Alexei Starovoitov To: bpf@vger.kernel.org Cc: daniel@iogearbox.net, andrii@kernel.org, martin.lau@kernel.org, memxor@gmail.com, eddyz87@gmail.com, kernel-team@fb.com Subject: [PATCH v4 bpf-next 6/6] bpf: Tell bpf programs kernel's PAGE_SIZE Date: Wed, 6 Mar 2024 19:12:28 -0800 Message-Id: <20240307031228.42896-7-alexei.starovoitov@gmail.com> X-Mailer: git-send-email 2.39.3 (Apple Git-145) In-Reply-To: <20240307031228.42896-1-alexei.starovoitov@gmail.com> References: <20240307031228.42896-1-alexei.starovoitov@gmail.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: bpf@iogearbox.net From: Alexei Starovoitov vmlinux BTF includes all kernel enums. Add __PAGE_SIZE = PAGE_SIZE enum, so that bpf programs that include vmlinux.h can easily access it. Acked-by: Kumar Kartikeya Dwivedi Signed-off-by: Alexei Starovoitov --- kernel/bpf/core.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c index 9ee4536d0a09..134b7979f537 100644 --- a/kernel/bpf/core.c +++ b/kernel/bpf/core.c @@ -88,13 +88,18 @@ void *bpf_internal_load_pointer_neg_helper(const struct sk_buff *skb, int k, uns return NULL; } +/* tell bpf programs that include vmlinux.h kernel's PAGE_SIZE */ +enum page_size_enum { + __PAGE_SIZE = PAGE_SIZE +}; + struct bpf_prog *bpf_prog_alloc_no_stats(unsigned int size, gfp_t gfp_extra_flags) { gfp_t gfp_flags = bpf_memcg_flags(GFP_KERNEL | __GFP_ZERO | gfp_extra_flags); struct bpf_prog_aux *aux; struct bpf_prog *fp; - size = round_up(size, PAGE_SIZE); + size = round_up(size, __PAGE_SIZE); fp = __vmalloc(size, gfp_flags); if (fp == NULL) return NULL;