From patchwork Fri Feb 21 22:13:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mykyta Yatsenko X-Patchwork-Id: 13986367 X-Patchwork-Delegate: bpf@iogearbox.net Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) (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 B907620127C for ; Fri, 21 Feb 2025 22:14:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740176051; cv=none; b=qxT6HlwBaomw4a5hW3AToG58n2Z+E7ycUmyrIHxXtnTUbJlYYWM9vvx9i01k2wYY4aIj6kt6a7m2JMpcSpkSo36K9s4SYojR24J07OKNE4Bm5b6s7S5A3xpBOjFcEtiAyKZuwn9w70Blb7+acIjMvo7tvcwJ0BALunqOjs4M1Fc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740176051; c=relaxed/simple; bh=ed/GGbgXRmxe2+M2D6XTAuZ8n26/pWnO/d07WuuViZI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VTzn4bgc85HrwskWxn7m67vpWiZS/06uR90w2CimMSmj6Q+LQxWhccRhRGXKomdcikeZ0D8hNcKuFhv77djCgYzJxnceVYKgU1qtl6d6dR4vUH/FNQVe0fO/Uxm/b96JXTrV6n02Q9ZCYnAG7GqVVYovaBkt6CbgXK4J3xOTAnQ= 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=gwKpQ9EC; arc=none smtp.client-ip=209.85.221.53 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="gwKpQ9EC" Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-38f22fe889aso2212150f8f.3 for ; Fri, 21 Feb 2025 14:14:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740176048; x=1740780848; 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=Bn1BX9y76DZhXdWo5I/TVE3tCtue0TCmEwlwjM7p7HM=; b=gwKpQ9ECwb5Mf6tbvTjU4iEP3GLLTHeTklFjjAAFylawciX7g6pgxc3/AUf/VonYX1 G1VO5AvLNsvPM7hMqXMIC23sGuzJln9FqAH9LfIj5Lgd2YRut5bqmCFN6Hc4MuKkJmQp frD3FjMfnGL4dDES3bdhmbRDR+XyPxCMgs/PTUM41uGHRGQzhekuPojFgtif+hKgIgAW Q24m3WMth3PdDXB5qfuA7CE3xAGomfR2Idi4luaCbMC8DnoP9Jt9uCD/HfW9N4MqS0S0 Y+geI8HOOJRcsjykjsPyvz5jj7QwwSTzbItbluj9NsB1hndV+8qfLjnohdanpgzISQJE Gx2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740176048; x=1740780848; 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=Bn1BX9y76DZhXdWo5I/TVE3tCtue0TCmEwlwjM7p7HM=; b=pfu/6gK+UQ8RuEaalQniijiOFOO3/mY4NnGn82e0U8+SOnnETxB1wgsGKu3mzV+v0v +pgZEGVJ7YK9bgvKFP1jU57InjFr8XOWMM6iJFQ2NuqiBXSuenh8hCeMOpgCyVFWIviq KcFsUwVTmSYUyp/v2HZBgMc2K8RD/IBFlLt9+UL4YRuEHAbsKNKh7l7pVvlksVma0xkk ry7RaDNEhG4NbVhKDYzveAEeInbAqYiUDtz9geF8LFVGqqMDoLWfdeQrNuPNUtiWGxMI yyAh289fXt1AWrEvX8eZALTfH6VlkE4lY/aN+0F7K2AwQju+yH35e29Cq380h9az7Bi9 enAg== X-Gm-Message-State: AOJu0Yy2KWko4OX+GqivJritwhwzkm1/d2cZgQJoil6BxxRM0GRoriKF lsMnvkrWDQEAVIDIZPGAqZ3h6orY63ClqkpzTTGsjij32mCVGrDyNSQPaA== X-Gm-Gg: ASbGnctd8UKAZAN5PHx/5CzMpw6V7VStuMmCnbRr5IWvC9LCuRohWX6qCbNBzEubclW uYBRpUMFFM3b8WSuhA15OsriptLIx0RmL+dwv7HG/nT39bv2BhBOZbPL2qy2c4XBF0Tm8UamijM xQHaYkuz0AckRhOBi4tOJe4HleApbEz65T6uMjvEy7pnSNpYpH0YO2PK474xVhaH0m0WQcgGEkS ZINwbpAnuG6MmDyj1HNXsP+o0AO3rfW6E8cOfNqAYRc0Wt+XhAzG3SX5cAKh8oUmodQDPfMjuNl L8G5HtFOEcPAiRBEvGyPDeQInoSssLczc/csdVfQh7rEQ6IM9xGVwrvYSHFUtsR40c4/BvvCGon uRqrr2CRHw2jzehgyTFNOejCPQOtyGM4= X-Google-Smtp-Source: AGHT+IGvlMRMFvZtG0kwmv2zjh0T8YEoQye3hkvL4aqcgZwtxWFXm9afnlWC9iLioDwyVDP4TNZHxw== X-Received: by 2002:a5d:4c81:0:b0:38e:48a6:280b with SMTP id ffacd0b85a97d-38f6f096a76mr3031950f8f.34.1740176047817; Fri, 21 Feb 2025 14:14:07 -0800 (PST) Received: from localhost.localdomain (cpc158789-hari22-2-0-cust468.20-2.cable.virginm.net. [86.26.115.213]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38f259f7fe6sm24070707f8f.86.2025.02.21.14.14.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Feb 2025 14:14:07 -0800 (PST) From: Mykyta Yatsenko To: bpf@vger.kernel.org, ast@kernel.org, andrii@kernel.org, daniel@iogearbox.net, kafai@meta.com, kernel-team@meta.com, eddyz87@gmail.com Cc: Mykyta Yatsenko Subject: [PATCH bpf-next v2 1/3] bpf/helpers: refactor bpf_dynptr_read and bpf_dynptr_write Date: Fri, 21 Feb 2025 22:13:58 +0000 Message-ID: <20250221221400.672980-2-mykyta.yatsenko5@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250221221400.672980-1-mykyta.yatsenko5@gmail.com> References: <20250221221400.672980-1-mykyta.yatsenko5@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: Mykyta Yatsenko Refactor bpf_dynptr_read and bpf_dynptr_write helpers: extract code into the static functions namely __bpf_dynptr_read and __bpf_dynptr_write, this allows calling these without compiler warnings. Signed-off-by: Mykyta Yatsenko --- kernel/bpf/helpers.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/kernel/bpf/helpers.c b/kernel/bpf/helpers.c index 183298fc11ba..6600aa4492ec 100644 --- a/kernel/bpf/helpers.c +++ b/kernel/bpf/helpers.c @@ -1759,8 +1759,8 @@ static const struct bpf_func_proto bpf_dynptr_from_mem_proto = { .arg4_type = ARG_PTR_TO_DYNPTR | DYNPTR_TYPE_LOCAL | MEM_UNINIT | MEM_WRITE, }; -BPF_CALL_5(bpf_dynptr_read, void *, dst, u32, len, const struct bpf_dynptr_kern *, src, - u32, offset, u64, flags) +static int __bpf_dynptr_read(void *dst, u32 len, const struct bpf_dynptr_kern *src, + u32 offset, u64 flags) { enum bpf_dynptr_type type; int err; @@ -1793,6 +1793,12 @@ BPF_CALL_5(bpf_dynptr_read, void *, dst, u32, len, const struct bpf_dynptr_kern } } +BPF_CALL_5(bpf_dynptr_read, void *, dst, u32, len, const struct bpf_dynptr_kern *, src, + u32, offset, u64, flags) +{ + return __bpf_dynptr_read(dst, len, src, offset, flags); +} + static const struct bpf_func_proto bpf_dynptr_read_proto = { .func = bpf_dynptr_read, .gpl_only = false, @@ -1804,8 +1810,8 @@ static const struct bpf_func_proto bpf_dynptr_read_proto = { .arg5_type = ARG_ANYTHING, }; -BPF_CALL_5(bpf_dynptr_write, const struct bpf_dynptr_kern *, dst, u32, offset, void *, src, - u32, len, u64, flags) +static int __bpf_dynptr_write(const struct bpf_dynptr_kern *dst, u32 offset, void *src, + u32 len, u64 flags) { enum bpf_dynptr_type type; int err; @@ -1843,6 +1849,12 @@ BPF_CALL_5(bpf_dynptr_write, const struct bpf_dynptr_kern *, dst, u32, offset, v } } +BPF_CALL_5(bpf_dynptr_write, const struct bpf_dynptr_kern *, dst, u32, offset, void *, src, + u32, len, u64, flags) +{ + return __bpf_dynptr_write(dst, offset, src, len, flags); +} + static const struct bpf_func_proto bpf_dynptr_write_proto = { .func = bpf_dynptr_write, .gpl_only = false, From patchwork Fri Feb 21 22:13:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mykyta Yatsenko X-Patchwork-Id: 13986368 X-Patchwork-Delegate: bpf@iogearbox.net Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (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 5C5EC253F1C for ; Fri, 21 Feb 2025 22:14:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740176053; cv=none; b=tbkw51/CD2rVaM7rjzcuR5ZKXyCPVorbXspDPFppJom3eGIVuTe0JbvWZ8x1xeXqAtrsG1Lf50rOYx0D0zJ+3BVySi9Njm22IE8nN3ybT4VZV8AI3vpMR6YCU6c6m+7XneavN0zSMYiy8ih2bRm18R72Ys21HEgugXHvxfdxP2M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740176053; c=relaxed/simple; bh=Ygwc2D41ymtMAAbVJXhc78CltmObejr+JTpgXxGtkOs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fRYzfG6H3pWGPR8bN4EpIWYporj9UziOmlM09ILp0KX7LVgMJhBndt6zICiaqbIyPiyvIXMX81cG4CtaFORIeT3oLpg5lLA8dIXc/S0VvA4Vll1+Ana/t0SlZtGVoVkShf+JuPv/tw/AJ1omErxLWgL8g/GIcIMdDncXB3WLBZ8= 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=aS+njBc9; arc=none smtp.client-ip=209.85.128.51 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="aS+njBc9" Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-4393dc02b78so18082475e9.3 for ; Fri, 21 Feb 2025 14:14:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740176049; x=1740780849; 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=Fw0wPlPb9YgMeKJoz/JvQyduRzfrBwTB0MVE63lyzHg=; b=aS+njBc9/Hur6yLGLn+0CtUTzw+XdI0d7oYxWhYg1DgBl11qCMwOk6r2o18fzSKaDZ bUti3mE9jktO/yMacuTxRgodskLx8N+k3uGn8/dd0qTDP3lyeIjbzn2Rla4LQxLgPDpJ QpNC+oYz7aAxRgXzGpL58BvwsY3yl0gH1OoJKzKlptoHnanWYlEIZ76gJU3id0iV+OX6 lAL8l0pHyLZdbCN5UidSC1jpQGLHCOhoSB6pwDPoloLF95jW9B63NBkuzqnm9g4SiGKd tg8SYdunhWxuAiE3Ba+UzVi8LNoi0Plb6qzRmzW0y8s4HsmMQRItLUOuevoeEeEorst0 nu9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740176049; x=1740780849; 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=Fw0wPlPb9YgMeKJoz/JvQyduRzfrBwTB0MVE63lyzHg=; b=FI/W2L8pG+GM+KNpVXQKNh1cmiGoqnaluGnFsm3M1ljbBROmOdZ4aNgDJVN/GqTGCT QXr4bfyRDNqZqv3xd75uiI1yPPfYgGGp1XwoHzQ9CsWf2euJMTo30D1Ngsbiy4+IqMqi p6sXkFOrb6J+vQhwlBlTSKjnYj7T4Zlz9NTwzM4L9bR1LsojX0guPmfWhhLG7yVTiWY8 UGMN0juLISaFizukAfXmCQ231TRtfr2DlUhQgSx+htainIn3Nwe49WYIOeCjUt2LImbM XtbI3VaMjVzjpwg1laVUgeTrSIMwEX5JGmTqWF2NofRlfsE/XYrrMj58ZXwVNPm1i7nb fnGQ== X-Gm-Message-State: AOJu0Yxvbn0JEzfafPkPa05FW1cfbd1lqmQ2u/aYI+V0rIn2W+JvXozp N2ZiLbNJL2zHkYMLE6wTuw22Lp8qERf6h4X1Dabf6Ney7XQeu3+biFtHHw== X-Gm-Gg: ASbGncv/MsRDQfR1lgG94BLAa2A+D3wWwj3kGLa4l1No9nORiilBI3m0/ZEA5dWN7l5 iBpOcKT0D46m0cGsW04UO39coOcX9vzKOOKlVRphVjIWTIlYiNWaUn235GLZ2a/ZTWgLaObd8jP cqIzGbNpgiqbKRjqsIEPOCY2L0OYwnxFOmQL1WZYL62p0gRtOXJkar6sVCO4cDvXrhAvuD4XzTK VHbYoBIHVMdHAH4vjlP7m2fRezfIC9jaUGaBCBda4xzBXcCF3Tb8LUUjFfnGSzsnXgSpEjimPPt SI1kd9I/pfVTOLdXJr+3YzHUW3DTjtHNvxH3VB3jdkG5UI9PAF1y0pRTW5NHp/L1Ppld525qCJF FWTRATpqnYazG/YcIhpO7VPCmB77eJdg= X-Google-Smtp-Source: AGHT+IFWBC0DI+AxdQZOaChE3aRZBmqnRWEOS4swjZnzYsP5awSldZq5BuhuVnw8LVIZWlrzrlCuFA== X-Received: by 2002:a5d:6d82:0:b0:38f:2b49:7bfe with SMTP id ffacd0b85a97d-38f6f0ae7eamr4861682f8f.47.1740176049465; Fri, 21 Feb 2025 14:14:09 -0800 (PST) Received: from localhost.localdomain (cpc158789-hari22-2-0-cust468.20-2.cable.virginm.net. [86.26.115.213]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38f259f7fe6sm24070707f8f.86.2025.02.21.14.14.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Feb 2025 14:14:09 -0800 (PST) From: Mykyta Yatsenko To: bpf@vger.kernel.org, ast@kernel.org, andrii@kernel.org, daniel@iogearbox.net, kafai@meta.com, kernel-team@meta.com, eddyz87@gmail.com Cc: Mykyta Yatsenko Subject: [PATCH bpf-next v2 2/3] bpf/helpers: introduce bpf_dynptr_copy kfunc Date: Fri, 21 Feb 2025 22:13:59 +0000 Message-ID: <20250221221400.672980-3-mykyta.yatsenko5@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250221221400.672980-1-mykyta.yatsenko5@gmail.com> References: <20250221221400.672980-1-mykyta.yatsenko5@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: Mykyta Yatsenko Introducing bpf_dynptr_copy kfunc allowing copying data from one dynptr to another. This functionality is useful in scenarios such as capturing XDP data to a ring buffer. The implementation consists of 4 branches: * A fast branch for contiguous buffer capacity in both source and destination dynptrs * 3 branches utilizing __bpf_dynptr_read and __bpf_dynptr_write to copy data to/from non-contiguous buffer Signed-off-by: Mykyta Yatsenko --- kernel/bpf/helpers.c | 55 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/kernel/bpf/helpers.c b/kernel/bpf/helpers.c index 6600aa4492ec..264afa0effb0 100644 --- a/kernel/bpf/helpers.c +++ b/kernel/bpf/helpers.c @@ -2770,6 +2770,60 @@ __bpf_kfunc int bpf_dynptr_clone(const struct bpf_dynptr *p, return 0; } +/** + * bpf_dynptr_copy() - Copy data from one dynptr to another. + * @dst_ptr: Destination dynptr - where data should be copied to + * @dst_off: Offset into the destination dynptr + * @src_ptr: Source dynptr - where data should be copied from + * @src_off: Offset into the source dynptr + * @size: Length of the data to copy from source to destination + * + * Copies data from source dynptr to destination dynptr + */ +__bpf_kfunc int bpf_dynptr_copy(struct bpf_dynptr *dst_ptr, u32 dst_off, + struct bpf_dynptr *src_ptr, u32 src_off, u32 size) +{ + struct bpf_dynptr_kern *dst = (struct bpf_dynptr_kern *)dst_ptr; + struct bpf_dynptr_kern *src = (struct bpf_dynptr_kern *)src_ptr; + void *src_slice, *dst_slice; + char buf[256]; + u32 off; + + src_slice = bpf_dynptr_slice(src_ptr, src_off, NULL, size); + dst_slice = bpf_dynptr_slice_rdwr(dst_ptr, dst_off, NULL, size); + + if (src_slice && dst_slice) { + memmove(dst_slice, src_slice, size); + return 0; + } + + if (src_slice) + return __bpf_dynptr_write(dst, dst_off, src_slice, size, 0); + + if (dst_slice) + return __bpf_dynptr_read(dst_slice, size, src, src_off, 0); + + if (bpf_dynptr_check_off_len(dst, dst_off, size) || + bpf_dynptr_check_off_len(src, src_off, size)) + return -E2BIG; + + off = 0; + while (off < size) { + u32 chunk_sz = min_t(u32, sizeof(buf), size - off); + int err = 0; + + err = __bpf_dynptr_read(buf, chunk_sz, src, src_off + off, 0); + if (err) + return err; + err = __bpf_dynptr_write(dst, dst_off + off, buf, chunk_sz, 0); + if (err) + return err; + + off += chunk_sz; + } + return 0; +} + __bpf_kfunc void *bpf_cast_to_kern_ctx(void *obj) { return obj; @@ -3218,6 +3272,7 @@ BTF_ID_FLAGS(func, bpf_dynptr_is_null) BTF_ID_FLAGS(func, bpf_dynptr_is_rdonly) BTF_ID_FLAGS(func, bpf_dynptr_size) BTF_ID_FLAGS(func, bpf_dynptr_clone) +BTF_ID_FLAGS(func, bpf_dynptr_copy) #ifdef CONFIG_NET BTF_ID_FLAGS(func, bpf_modify_return_test_tp) #endif From patchwork Fri Feb 21 22:14:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mykyta Yatsenko X-Patchwork-Id: 13986369 X-Patchwork-Delegate: bpf@iogearbox.net Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.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 13796253F3B for ; Fri, 21 Feb 2025 22:14:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740176054; cv=none; b=spCpMXTyC0XiJtIweW1Tigeoxa3zTM56Qi6gylJ+neEb813/TbS3TDNqADIYnkafOJ0AgMOXBdiflxNrnrQkpYDtKaAJgHiD5PoqZwLogdEHWc0NUIYgXk8IX7GePAtamWhDr20M5HRGili9sb8jssUCypDJWh4czf3dWYYr6Yk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740176054; c=relaxed/simple; bh=hkU94gsQL0oAgxYTfGzs7HNjfFoysGnBT8KjUdz4i2s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iU8hflG2rtrsOIXR2znb6IsaI4hLhSHWEpe/JCTGKarTaqwWkFSos0IbEGY2Ers5zBMb6lU0oj991qX6iRVC630F2NO/JSquHU9RbLYmfdXQQUkuQWlHLP2Xf/rn4xWhqcIAkLT0FyMZJQ1FfFkP1Rs1bOr0eKpnlRPQhv/gGAc= 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=LF85CbKM; arc=none smtp.client-ip=209.85.128.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="LF85CbKM" Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-4394a0c65fcso26401915e9.1 for ; Fri, 21 Feb 2025 14:14:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740176051; x=1740780851; 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=6FjE5DQWY/2WNS7aNEg53sV/Q9GrD/0CuPnveAlPfNo=; b=LF85CbKMVxSIgpPcqzXlWfPDO0EzKTF1PNxzhWxQ2P4TwQXsoLNh9zsmSVtIWY2trM rvFO2l9jzBMqpF1h4CeNTustxf8kur/Nqs49VVuxvTwmTDXlElGrx/YnFsR8ofxrwT0Z eYCcQ0/UiCQEB0Mvlm5z8X+8uKJliraSTMZXY9CuETY2oTBVd47ozcOB+woUOcaAINsi Ws/6WhvUl/ltcfIzKHrpnHLDG1P/IwZF4bNdROaT1FDf8nFj3qqh/vdVEuTR+at2G0u3 Nbnlm1SaPWbPJLj09XxFUP4o0Zt5C1jIA0ARvYzrwrifMvBgb7dJRV3CBQWSjTgSoHoE saog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740176051; x=1740780851; 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=6FjE5DQWY/2WNS7aNEg53sV/Q9GrD/0CuPnveAlPfNo=; b=ff5VhcuEa+RJwbQWSVI0JTnqlyBL0ilL4hj1K2/zLDwnOtnVTkUUQH2+lrkiK5D+8J BLkFekRg+psZ93mlpcOdTjUGnrz9jbyzlxPHunyjvFeQhCqFh5S/Ei1XVOiBLKgto8b9 r1HgDQRpcDnFhEaShOYlyuKB3Dxwb8ip8I36satYWqJsx2ktB3BaO0z8D1G7Z3jSRuh3 e0bL+dF/rl5XkKQtXjfHgmwOYdpZdMMojUQZJhpFuYrcJQqxOQW8dvNuyJONGnRnyGFy mGLX9DbeEIwlVRgAFZGIlc3r9seG/U5swPRhf8J+yOQuqyP/iR0EZlzgymYyVAtKZjT8 TPmA== X-Gm-Message-State: AOJu0YzBEVsJY6jLNzgvQNja7z0yYqRs1y+zUtO7BE2rDDEGqfDENSBb kqa+MTYw50swg5uBICc1wBzz84ZzPHcIDe+95v3aC07uXcc4Um9aKEOh2g== X-Gm-Gg: ASbGncvgANp9rGq6P7w+K5DBe3HxIqpNWhDelOeaGP9C5bpwCSzFPZ/lK81U8b0S1Wb bi90RWWV6KHALzdYankvXnmZetjazPbIAci7+VqiGDTB51MGtdnwZLx11VDyMxwUON78JKskXyL MxiQMh016EUqPFtgtbgxkDTKNFud7R9EO3nWd08241700AwwUspvtUaMa/Ovk6Z8Kt9NpeCwJgo An2a/CHswVwJBu3Vvy8Gk2DQidXhwmgdvyvXpcDct8YblVJUTgTfeWOgltWESybG6KkcyxJmmGE cFQ6MFPcVjkpWoHThbOFco9BfcDq4wezwPfAILD0KjSI/7rDsr3uYtnMQsU1ENPt4AmX9oBMylm gyRSU/S1GNc8T/mDKRT3fqf6RCQ/CdmY= X-Google-Smtp-Source: AGHT+IH+EzmaEK7VTJQYS5AM1X2VFsNqywHThc026sDcBDxzo/5tIcyOU1YLIjlC0Ke/R1pWAmCAOQ== X-Received: by 2002:a05:6000:885:b0:38c:3f12:64be with SMTP id ffacd0b85a97d-38f6f096fe5mr4552054f8f.35.1740176051104; Fri, 21 Feb 2025 14:14:11 -0800 (PST) Received: from localhost.localdomain (cpc158789-hari22-2-0-cust468.20-2.cable.virginm.net. [86.26.115.213]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38f259f7fe6sm24070707f8f.86.2025.02.21.14.14.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Feb 2025 14:14:10 -0800 (PST) From: Mykyta Yatsenko To: bpf@vger.kernel.org, ast@kernel.org, andrii@kernel.org, daniel@iogearbox.net, kafai@meta.com, kernel-team@meta.com, eddyz87@gmail.com Cc: Mykyta Yatsenko Subject: [PATCH bpf-next v2 3/3] selftests/bpf: add tests for bpf_dynptr_copy Date: Fri, 21 Feb 2025 22:14:00 +0000 Message-ID: <20250221221400.672980-4-mykyta.yatsenko5@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250221221400.672980-1-mykyta.yatsenko5@gmail.com> References: <20250221221400.672980-1-mykyta.yatsenko5@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: Mykyta Yatsenko Add XDP setup type for dynptr tests, enabling testing for non-contiguous buffer. Add 2 tests: - test_dynptr_copy - verify correctness for the fast (contiguous buffer) code path. - test_dynptr_copy_xdp - verifies code paths that handle non-contiguous buffer. Signed-off-by: Mykyta Yatsenko --- .../testing/selftests/bpf/prog_tests/dynptr.c | 21 ++++ .../selftests/bpf/progs/dynptr_success.c | 112 +++++++++++++++++- 2 files changed, 128 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/dynptr.c b/tools/testing/selftests/bpf/prog_tests/dynptr.c index b614a5272dfd..e29cc16124c2 100644 --- a/tools/testing/selftests/bpf/prog_tests/dynptr.c +++ b/tools/testing/selftests/bpf/prog_tests/dynptr.c @@ -10,6 +10,7 @@ enum test_setup_type { SETUP_SYSCALL_SLEEP, SETUP_SKB_PROG, SETUP_SKB_PROG_TP, + SETUP_XDP_PROG, }; static struct { @@ -18,6 +19,8 @@ static struct { } success_tests[] = { {"test_read_write", SETUP_SYSCALL_SLEEP}, {"test_dynptr_data", SETUP_SYSCALL_SLEEP}, + {"test_dynptr_copy", SETUP_SYSCALL_SLEEP}, + {"test_dynptr_copy_xdp", SETUP_XDP_PROG}, {"test_ringbuf", SETUP_SYSCALL_SLEEP}, {"test_skb_readonly", SETUP_SKB_PROG}, {"test_dynptr_skb_data", SETUP_SKB_PROG}, @@ -120,6 +123,24 @@ static void verify_success(const char *prog_name, enum test_setup_type setup_typ break; } + case SETUP_XDP_PROG: + { + char data[5000]; + int err, prog_fd; + LIBBPF_OPTS(bpf_test_run_opts, opts, + .data_in = &data, + .data_size_in = sizeof(data), + .repeat = 1, + ); + + prog_fd = bpf_program__fd(prog); + err = bpf_prog_test_run_opts(prog_fd, &opts); + + if (!ASSERT_OK(err, "test_run")) + goto cleanup; + + break; + } } ASSERT_EQ(skel->bss->err, 0, "err"); diff --git a/tools/testing/selftests/bpf/progs/dynptr_success.c b/tools/testing/selftests/bpf/progs/dynptr_success.c index bfcc85686cf0..dd10411d1c02 100644 --- a/tools/testing/selftests/bpf/progs/dynptr_success.c +++ b/tools/testing/selftests/bpf/progs/dynptr_success.c @@ -1,20 +1,19 @@ // SPDX-License-Identifier: GPL-2.0 /* Copyright (c) 2022 Facebook */ +#include #include #include -#include #include #include #include "bpf_misc.h" -#include "bpf_kfuncs.h" #include "errno.h" char _license[] SEC("license") = "GPL"; int pid, err, val; -struct sample { +struct ringbuf_sample { int pid; int seq; long value; @@ -121,7 +120,7 @@ int test_dynptr_data(void *ctx) static int ringbuf_callback(__u32 index, void *data) { - struct sample *sample; + struct ringbuf_sample *sample; struct bpf_dynptr *ptr = (struct bpf_dynptr *)data; @@ -138,7 +137,7 @@ SEC("?tp/syscalls/sys_enter_nanosleep") int test_ringbuf(void *ctx) { struct bpf_dynptr ptr; - struct sample *sample; + struct ringbuf_sample *sample; if (bpf_get_current_pid_tgid() >> 32 != pid) return 0; @@ -567,3 +566,106 @@ int BPF_PROG(test_dynptr_skb_tp_btf, void *skb, void *location) return 1; } + +SEC("?tp/syscalls/sys_enter_nanosleep") +int test_dynptr_copy(void *ctx) +{ + char data[] = "hello there, world!!"; + char buf[32] = {'\0'}; + __u32 sz = sizeof(data); + struct bpf_dynptr src, dst; + + bpf_ringbuf_reserve_dynptr(&ringbuf, sz, 0, &src); + bpf_ringbuf_reserve_dynptr(&ringbuf, sz, 0, &dst); + + /* Test basic case of copying contiguous memory backed dynptrs */ + err = bpf_dynptr_write(&src, 0, data, sz, 0); + err = err ?: bpf_dynptr_copy(&dst, 0, &src, 0, sz); + err = err ?: bpf_dynptr_read(buf, sz, &dst, 0, 0); + err = err ?: __builtin_memcmp(data, buf, sz); + + /* Test that offsets are handled correctly */ + err = err ?: bpf_dynptr_copy(&dst, 3, &src, 5, sz - 5); + err = err ?: bpf_dynptr_read(buf, sz - 5, &dst, 3, 0); + err = err ?: __builtin_memcmp(data + 5, buf, sz - 5); + + bpf_ringbuf_discard_dynptr(&src, 0); + bpf_ringbuf_discard_dynptr(&dst, 0); + return 0; +} + +SEC("xdp") +int test_dynptr_copy_xdp(struct xdp_md *xdp) +{ + struct bpf_dynptr ptr_buf, ptr_xdp; + char data[] = "qwertyuiopasdfghjkl"; + char buf[32] = {'\0'}; + __u32 len = sizeof(data); + int i, chunks = 200; + + /* ptr_xdp is backed by non-contiguous memory */ + bpf_dynptr_from_xdp(xdp, 0, &ptr_xdp); + bpf_ringbuf_reserve_dynptr(&ringbuf, len * chunks, 0, &ptr_buf); + + /* Destination dynptr is backed by non-contiguous memory */ + bpf_for(i, 0, chunks) { + err = bpf_dynptr_write(&ptr_buf, i * len, data, len, 0); + if (err) + goto out; + } + + err = bpf_dynptr_copy(&ptr_xdp, 0, &ptr_buf, 0, len * chunks); + if (err) + goto out; + + bpf_for(i, 0, chunks) { + __builtin_memset(buf, 0, sizeof(buf)); + err = bpf_dynptr_read(&buf, len, &ptr_xdp, i * len, 0); + if (err) + goto out; + if (__builtin_memcmp(data, buf, len) != 0) + goto out; + } + + /* Source dynptr is backed by non-contiguous memory */ + __builtin_memset(buf, 0, sizeof(buf)); + bpf_for(i, 0, chunks) { + err = bpf_dynptr_write(&ptr_buf, i * len, buf, len, 0); + if (err) + goto out; + } + + err = bpf_dynptr_copy(&ptr_buf, 0, &ptr_xdp, 0, len * chunks); + if (err) + goto out; + + bpf_for(i, 0, chunks) { + __builtin_memset(buf, 0, sizeof(buf)); + err = bpf_dynptr_read(&buf, len, &ptr_buf, i * len, 0); + if (err) + goto out; + if (__builtin_memcmp(data, buf, len) != 0) + goto out; + } + + /* Both source and destination dynptrs are backed by non-contiguous memory */ + err = bpf_dynptr_copy(&ptr_xdp, 2, &ptr_xdp, len, len * (chunks - 1)); + if (err) + goto out; + + bpf_for(i, 0, chunks - 1) { + __builtin_memset(buf, 0, sizeof(buf)); + err = bpf_dynptr_read(&buf, len, &ptr_xdp, 2 + i * len, 0); + if (err) + goto out; + if (__builtin_memcmp(data, buf, len) != 0) + goto out; + } + + if (bpf_dynptr_copy(&ptr_xdp, 2000, &ptr_xdp, 0, len * chunks) != -E2BIG) + err = 1; + +out: + bpf_ringbuf_discard_dynptr(&ptr_buf, 0); + return XDP_DROP; +}