From patchwork Tue Aug 13 13:28:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matteo Croce X-Patchwork-Id: 13762034 X-Patchwork-Delegate: bpf@iogearbox.net Received: from mail-lf1-f41.google.com (mail-lf1-f41.google.com [209.85.167.41]) (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 183B619B3C5; Tue, 13 Aug 2024 13:28:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723555730; cv=none; b=uGMzPWt1JHKie4HBQcOTdNCtf1z/B9wK13AnQI8P7tpMC0n7ccAevLoxMSxb/vwB5Z2Mzt1ahxssrWwJP92AHp/Ev8M4jqXM19Ir9EtSZzfMoSoGapNcQO/CvcWuIMv4RJzP2AKOMVpz4HoEsoitw0S+TVRHGrPknJAnI4b5ClU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723555730; c=relaxed/simple; bh=lSxUx8QJC4EPhMBsEVy0vDjpMEg1x5VyoHxhEZZ5+ZQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=s7+dIFxPQrbnmQXVbktpRs+146YFgb22EhdxOm9DGRU/GPE2XDYpKlZ1zEF1VZrvQZrJk9m5E+91D0BXG1SY6NQiCx9BrNtPVLrpwcWi46llxJArHJH05mP6qwkpr71Ao6r3UL0twy/fikU7mu8rQwLFJkFeFITI83MTdMq6l2M= 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=gHrN3hBl; arc=none smtp.client-ip=209.85.167.41 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="gHrN3hBl" Received: by mail-lf1-f41.google.com with SMTP id 2adb3069b0e04-52efdf02d13so9029269e87.2; Tue, 13 Aug 2024 06:28:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723555727; x=1724160527; 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=L3qivM8JDv5nFGvOqtv1aQ6yzpE06yGKDeScqPR2KII=; b=gHrN3hBlwInHlLHwQXftLE7DQ50Iqq0tHEwMd/zh407sObxggq5t8qnxkdoK3Y3I4x bfqEIyn1Hz2+/klFk+zark3Jryhqyb6oz5CnKeUjbzg+UYY0tVYSzLfy8uXCh+kNgbM4 2DZx2zGRVn4jaNm+tk9xw6FL2AwQMqqzp2bbjgH1pJJSd7UoNgtnL3lE5Cy/XWzAc1mB DiqG+IwIR65NRKGDDu1fRPi8pB5Kv8a+wozSTI42aHPXV6nyKfn25McUyw8uhsMPAPEI smnK8yPe6GQJULk7S7Yo4gIeCi9hUMQN4vM25CQ0kPxDOCjB0LOy6z6pVczWq3X60nbK KrwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723555727; x=1724160527; 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=L3qivM8JDv5nFGvOqtv1aQ6yzpE06yGKDeScqPR2KII=; b=cHgb2P84OG7fwG1AqfwvfGkGnjJDZYUKRQxCDYT+PIQfrFN0YChxztfNl4+76D9uD9 5wzIYwppP6nRBL0cS5gCNp+mX7WpFN9t4iN41YbhEIWLitlQQ7krNf0PGxd9ZyWWAwAl l1ox7CH7Lf+e7jnaWK+JCUo0LhH9A06kzfKOiU47S75L9hWUzFGKbg70aqYY8IYr+fxs Yqlerue4QZW1l4+Q40Q5MW6q84HtWJyfDPWdMWww+xcCiZtr2UTXO/IkWMISQzHx5Gy9 9LGnrTPr4aKCOIXnuyVmESy6pLVWQQNkT+X1IMzY4rpawyVmmY0PJvadok097ekft76o qTAg== X-Forwarded-Encrypted: i=1; AJvYcCV/PDfFzjqV/u/Q8i+/6+XqLSVEXKV88yD1OeEogGxvNIzmeEHizD3NwaF70MlD4iWjkyuP4rW6rfKovPgr1KqnamPQxKj4m1rlqJ9XoCUcN1vY4STtsh8+HpvFGb2R65tPIFIfB91/ X-Gm-Message-State: AOJu0Yz0fHz6/c3jVdKdvcSCo9EtKF0/opu2O41dYdtTJo0XkCP5hzhW Jk7zY7z60pRlX7cj91bCxAZkn8g/f3C8Te9h1GMUQ94FwAK+VQxw X-Google-Smtp-Source: AGHT+IGixZb4iQ8MItRX4SkJeF2nVC4Y4UlA589p4iD9NqyABs/rB1o1Sg/PVpC2mrSTjIN8nEuF7w== X-Received: by 2002:ac2:4e14:0:b0:530:e0fd:4a97 with SMTP id 2adb3069b0e04-532135a5d5fmr3170162e87.0.1723555726827; Tue, 13 Aug 2024 06:28:46 -0700 (PDT) Received: from lenovo.homenet.telecomitalia.it (host-79-17-17-86.retail.telecomitalia.it. [79.17.17.86]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a80f414afe2sm70426766b.144.2024.08.13.06.28.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Aug 2024 06:28:46 -0700 (PDT) From: Matteo Croce To: Andrii Nakryiko , Alexei Starovoitov , Daniel Borkmann , Steven Rostedt , Masami Hiramatsu , bpf@vger.kernel.org, linux-trace-kernel@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Matteo Croce Subject: [PATCH bpf-next v5 1/2] bpf: enable generic kfuncs for BPF_CGROUP_* programs Date: Tue, 13 Aug 2024 15:28:30 +0200 Message-ID: <20240813132831.184362-2-technoboy85@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240813132831.184362-1-technoboy85@gmail.com> References: <20240813132831.184362-1-technoboy85@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: Matteo Croce These kfuncs are enabled even in BPF_PROG_TYPE_TRACING, so they should be safe also in BPF_CGROUP_* programs. In enum btf_kfunc_hook, rename BTF_KFUNC_HOOK_CGROUP_SKB to a more generic BTF_KFUNC_HOOK_CGROUP, since it's used for all the cgroup related program types. Signed-off-by: Matteo Croce --- kernel/bpf/btf.c | 8 ++++++-- kernel/bpf/helpers.c | 6 ++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c index 95426d5b634e..08d094875f00 100644 --- a/kernel/bpf/btf.c +++ b/kernel/bpf/btf.c @@ -212,7 +212,7 @@ enum btf_kfunc_hook { BTF_KFUNC_HOOK_TRACING, BTF_KFUNC_HOOK_SYSCALL, BTF_KFUNC_HOOK_FMODRET, - BTF_KFUNC_HOOK_CGROUP_SKB, + BTF_KFUNC_HOOK_CGROUP, BTF_KFUNC_HOOK_SCHED_ACT, BTF_KFUNC_HOOK_SK_SKB, BTF_KFUNC_HOOK_SOCKET_FILTER, @@ -8312,8 +8312,12 @@ static int bpf_prog_type_to_kfunc_hook(enum bpf_prog_type prog_type) case BPF_PROG_TYPE_SYSCALL: return BTF_KFUNC_HOOK_SYSCALL; case BPF_PROG_TYPE_CGROUP_SKB: + case BPF_PROG_TYPE_CGROUP_SOCK: + case BPF_PROG_TYPE_CGROUP_DEVICE: case BPF_PROG_TYPE_CGROUP_SOCK_ADDR: - return BTF_KFUNC_HOOK_CGROUP_SKB; + case BPF_PROG_TYPE_CGROUP_SOCKOPT: + case BPF_PROG_TYPE_CGROUP_SYSCTL: + return BTF_KFUNC_HOOK_CGROUP; case BPF_PROG_TYPE_SCHED_ACT: return BTF_KFUNC_HOOK_SCHED_ACT; case BPF_PROG_TYPE_SK_SKB: diff --git a/kernel/bpf/helpers.c b/kernel/bpf/helpers.c index d02ae323996b..0d1d97d968b0 100644 --- a/kernel/bpf/helpers.c +++ b/kernel/bpf/helpers.c @@ -3052,6 +3052,12 @@ static int __init kfunc_init(void) ret = ret ?: register_btf_kfunc_id_set(BPF_PROG_TYPE_XDP, &generic_kfunc_set); ret = ret ?: register_btf_kfunc_id_set(BPF_PROG_TYPE_STRUCT_OPS, &generic_kfunc_set); ret = ret ?: register_btf_kfunc_id_set(BPF_PROG_TYPE_SYSCALL, &generic_kfunc_set); + ret = ret ?: register_btf_kfunc_id_set(BPF_PROG_TYPE_CGROUP_SKB, &generic_kfunc_set); + ret = ret ?: register_btf_kfunc_id_set(BPF_PROG_TYPE_CGROUP_SOCK, &generic_kfunc_set); + ret = ret ?: register_btf_kfunc_id_set(BPF_PROG_TYPE_CGROUP_DEVICE, &generic_kfunc_set); + ret = ret ?: register_btf_kfunc_id_set(BPF_PROG_TYPE_CGROUP_SOCK_ADDR, &generic_kfunc_set); + ret = ret ?: register_btf_kfunc_id_set(BPF_PROG_TYPE_CGROUP_SYSCTL, &generic_kfunc_set); + ret = ret ?: register_btf_kfunc_id_set(BPF_PROG_TYPE_CGROUP_SOCKOPT, &generic_kfunc_set); ret = ret ?: register_btf_id_dtor_kfuncs(generic_dtors, ARRAY_SIZE(generic_dtors), THIS_MODULE); From patchwork Tue Aug 13 13:28:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matteo Croce X-Patchwork-Id: 13762035 X-Patchwork-Delegate: bpf@iogearbox.net Received: from mail-ed1-f49.google.com (mail-ed1-f49.google.com [209.85.208.49]) (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 74B0419B5A7; Tue, 13 Aug 2024 13:28:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723555739; cv=none; b=vEpkLQYBHfSAUYMIO9fqX913/Z0ousVKf7bInLmD8wpsaggf7Vat2vqLCHdX2w4cHUCOcGjISBF5CpfuvL6KnaGTT3ab9E6LaaeBsUNpAAJiqWeNC/UdD6Vlwx6RrkK8+oNvpcHbtSP7nnv6c93KLFDl53ZtqXT02MQzqZQqm+8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723555739; c=relaxed/simple; bh=nul9oNFo5MlT8L54l8FRJ+VtGDNyl0aThkFSBNHbOKU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=R6Bs5qA0rO+LO/YRGjVeoeCJ3kAE0GJgNah1s+jOdHGSapqPYI3p6go+pefNIhBMSFqmQt7bPTeB6a3ZEy6cKa/RV+xEEFOk8PbWv2vfbLJUuJs2jAeYQvLmSliCsczOTfctidMhd/kbrehNg6nAr7S2atmprBvCykq5mvkpOoI= 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=O/CZjGCT; arc=none smtp.client-ip=209.85.208.49 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="O/CZjGCT" Received: by mail-ed1-f49.google.com with SMTP id 4fb4d7f45d1cf-5a1337cfbb5so7214734a12.3; Tue, 13 Aug 2024 06:28:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723555736; x=1724160536; 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=YKwcvjI1BwRV/PUGETAH1O0LycydQJQiwQrCJX2yD5s=; b=O/CZjGCTxHen70dB28pgnIkDSMhLkjIzz4wbF8m1NqmEvMZTCwWzmROt51nyo+qI50 JiJd4PCQU87GODHPBY4u9QYSfiMUQceuHma+gxZAMqh+qK9BXR+JBF2W+GouqZSf4EqV cfJSm8zEoOAvI5NLcrcGk9RHHxZ4ZuD/8OxYfhd+PBOZbbtoeVfWvM7N1HJH1wSrKLJx H8CzrZpws7jo7zahjirDEZsn7a2OAFKcsXx9u/mhN+WPyr3rk8aKqkYRCmUxxSYVC3mC PH8F1GAUajWB4SgSRUI2Er/dW+oskjX1j+5wocvw4naXBbOY8VsnNY/CK0OQKdmqV/2R SAZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723555736; x=1724160536; 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=YKwcvjI1BwRV/PUGETAH1O0LycydQJQiwQrCJX2yD5s=; b=DXCW0CY4vbKZM9AtC9BAbJx5VExHBFFxiW3t4zva1Y4aF/R1YorGMXhaQGIEC/alTp LiH7maGAjgoUTPOVy+YRubz20Iml8HTzMgj7201Pk04Le0zNiyYSw+SIEBLjr5k3FmjG sr0XP4eoX3i5jtOpsVqiruKsDd08rVHI7hsESjH9v1cwygqYLvuBrmQ2NDupZb1EwvRx 8/qJHnflbam012IXaZ7rTlsM4/T9BEI93yfGYaVe3VEimjw9bOmv9qebJh2b8U/yxTGi yJdR6lYKvSJCAAw4yxe3kKZUHj/U2S2Isbsjj6GQC/VPS9GUtWrRxmQ1Rvd9OCP1JRFP lFJw== X-Forwarded-Encrypted: i=1; AJvYcCXYoWxJDkwsAeDrE1VH40qucA2GIE4UHViMYH+rPOSrPb/+xVlm7XkeAzPc4vNuYkV27sGy9i5eLczQAxxzsRcVcYZO7uW0UgDCIlN3i8Y/mlnJGa/CGLVsfEIdAV2SSIJtwheyTLC+ X-Gm-Message-State: AOJu0YxVDXII/fdaTSwFauqED3EtUSZA8JP1iUV1yyCITsALwE8UX4OT QWUWOz7jMfhgQa1j1irbOeIM9514fzwKYCIE9n3M5sfj6WNO/yBa X-Google-Smtp-Source: AGHT+IEqoEDOsqu63OSRHDTK19w80a+3vW/zllREoHYe+sC7y4RPTXw2fRGg0bBLMzql2oo+nm3Zfg== X-Received: by 2002:a17:907:3e14:b0:a77:c080:11fa with SMTP id a640c23a62f3a-a80ed2c5360mr278671866b.48.1723555735619; Tue, 13 Aug 2024 06:28:55 -0700 (PDT) Received: from lenovo.homenet.telecomitalia.it (host-79-17-17-86.retail.telecomitalia.it. [79.17.17.86]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a80f414afe2sm70426766b.144.2024.08.13.06.28.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Aug 2024 06:28:55 -0700 (PDT) From: Matteo Croce To: Andrii Nakryiko , Alexei Starovoitov , Daniel Borkmann , Steven Rostedt , Masami Hiramatsu , bpf@vger.kernel.org, linux-trace-kernel@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Matteo Croce Subject: [PATCH bpf-next v5 2/2] bpf: allow bpf_current_task_under_cgroup() with BPF_CGROUP_* Date: Tue, 13 Aug 2024 15:28:31 +0200 Message-ID: <20240813132831.184362-3-technoboy85@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240813132831.184362-1-technoboy85@gmail.com> References: <20240813132831.184362-1-technoboy85@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: Matteo Croce The helper bpf_current_task_under_cgroup() currently is only allowed for tracing programs, allow its usage also in the BPF_CGROUP_* program types. Move the code from kernel/trace/bpf_trace.c to kernel/bpf/helpers.c, so it compiles also without CONFIG_BPF_EVENTS. This will be used in systemd-networkd to monitor the sysctl writes, and filter it's own writes from others: https://github.com/systemd/systemd/pull/32212 Signed-off-by: Matteo Croce --- include/linux/bpf.h | 1 + kernel/bpf/cgroup.c | 2 ++ kernel/bpf/helpers.c | 23 +++++++++++++++++++++++ kernel/trace/bpf_trace.c | 23 ----------------------- 4 files changed, 26 insertions(+), 23 deletions(-) diff --git a/include/linux/bpf.h b/include/linux/bpf.h index b9425e410bcb..f0192c173ed8 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@ -3206,6 +3206,7 @@ extern const struct bpf_func_proto bpf_sock_hash_update_proto; extern const struct bpf_func_proto bpf_get_current_cgroup_id_proto; extern const struct bpf_func_proto bpf_get_current_ancestor_cgroup_id_proto; extern const struct bpf_func_proto bpf_get_cgroup_classid_curr_proto; +extern const struct bpf_func_proto bpf_current_task_under_cgroup_proto; extern const struct bpf_func_proto bpf_msg_redirect_hash_proto; extern const struct bpf_func_proto bpf_msg_redirect_map_proto; extern const struct bpf_func_proto bpf_sk_redirect_hash_proto; diff --git a/kernel/bpf/cgroup.c b/kernel/bpf/cgroup.c index 8ba73042a239..e7113d700b87 100644 --- a/kernel/bpf/cgroup.c +++ b/kernel/bpf/cgroup.c @@ -2581,6 +2581,8 @@ cgroup_current_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog) case BPF_FUNC_get_cgroup_classid: return &bpf_get_cgroup_classid_curr_proto; #endif + case BPF_FUNC_current_task_under_cgroup: + return &bpf_current_task_under_cgroup_proto; default: return NULL; } diff --git a/kernel/bpf/helpers.c b/kernel/bpf/helpers.c index 0d1d97d968b0..8502cfed2926 100644 --- a/kernel/bpf/helpers.c +++ b/kernel/bpf/helpers.c @@ -2458,6 +2458,29 @@ __bpf_kfunc long bpf_task_under_cgroup(struct task_struct *task, return ret; } +BPF_CALL_2(bpf_current_task_under_cgroup, struct bpf_map *, map, u32, idx) +{ + struct bpf_array *array = container_of(map, struct bpf_array, map); + struct cgroup *cgrp; + + if (unlikely(idx >= array->map.max_entries)) + return -E2BIG; + + cgrp = READ_ONCE(array->ptrs[idx]); + if (unlikely(!cgrp)) + return -EAGAIN; + + return task_under_cgroup_hierarchy(current, cgrp); +} + +const struct bpf_func_proto bpf_current_task_under_cgroup_proto = { + .func = bpf_current_task_under_cgroup, + .gpl_only = false, + .ret_type = RET_INTEGER, + .arg1_type = ARG_CONST_MAP_PTR, + .arg2_type = ARG_ANYTHING, +}; + /** * bpf_task_get_cgroup1 - Acquires the associated cgroup of a task within a * specific cgroup1 hierarchy. The cgroup1 hierarchy is identified by its diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c index d557bb11e0ff..e4e1f5d8b2a6 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -797,29 +797,6 @@ const struct bpf_func_proto bpf_task_pt_regs_proto = { .ret_btf_id = &bpf_task_pt_regs_ids[0], }; -BPF_CALL_2(bpf_current_task_under_cgroup, struct bpf_map *, map, u32, idx) -{ - struct bpf_array *array = container_of(map, struct bpf_array, map); - struct cgroup *cgrp; - - if (unlikely(idx >= array->map.max_entries)) - return -E2BIG; - - cgrp = READ_ONCE(array->ptrs[idx]); - if (unlikely(!cgrp)) - return -EAGAIN; - - return task_under_cgroup_hierarchy(current, cgrp); -} - -static const struct bpf_func_proto bpf_current_task_under_cgroup_proto = { - .func = bpf_current_task_under_cgroup, - .gpl_only = false, - .ret_type = RET_INTEGER, - .arg1_type = ARG_CONST_MAP_PTR, - .arg2_type = ARG_ANYTHING, -}; - struct send_signal_irq_work { struct irq_work irq_work; struct task_struct *task;