From patchwork Wed Feb 26 18:31: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: 13992971 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 632DE224896 for ; Wed, 26 Feb 2025 18:32:14 +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=1740594736; cv=none; b=FhUetRTnM7LGhvVJ57AaiiJgCoohV3+1GvWqA+OhHFxVpYFnL4fgp2Lg8dnBmUmbs25Ib4qGVmH2xhPE8L6nITMNudqoBDgMDHm2xF4UIfeB6xUTtjYMWCIsZnyUjv1Okr8FoOUUbs/TdHrOshqcgl0QcJFwQltYaAqxG/Q9gQ4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740594736; c=relaxed/simple; bh=ed/GGbgXRmxe2+M2D6XTAuZ8n26/pWnO/d07WuuViZI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aBH2Dc5wo59Diq40qud/Mejf/RuMonyN29keeLB3mDL5w/y1W4qOOfu/erNa6fYTL6L2lx2+AJ7y794VubgzLWhUI/4KIma5ukeBrgNvzepjMZHyrsnv1q7EsQNwUTz7nULszo57wn5EZZgASrA0uGSjFq4WASd+goH6wk8Md3Y= 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=S5owLp4V; 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="S5owLp4V" Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-38f6287649eso32381f8f.3 for ; Wed, 26 Feb 2025 10:32:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740594733; x=1741199533; 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=S5owLp4VRej+Sn3g2kK/OWx1pyCCZnZtGXc9yjMXL297yRjVXooz2GVzX4nBn8rG/t nrLmwZgMReiOagSX/Q1eHFhRdIjvftPwvkn0EJramkyQEzRZGDsbUi2hOTpUYATc5T6N DOerBuvvF4C5M5XGH+tAHeQJuBMmMrh7f6yJJ4J+WzdR6W+m/6jtbP/px7ypiXBAaPMC BmMmd6CZL5UeqQsBmnU24hw/D4+WP0YsV7DEowm0ZSr+NU5Yk0IUd8g7tYBLvEBH+IQ2 dV+hyL9qYHQcEnjZGoHLcFWFq24dShOXOOsfiNuQSzBxjh+EXbsEqlJMOhULWWQ69Ohe x8Dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740594733; x=1741199533; 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=Dy9VHJCUOa0A9SZxMLbsKJwQuJnloBLXUigtotJUh7CP9hXjfrRxMOtPE6wVvao3oK BBEnSHPrshpli0A38TNFn6m8Lvh0mr/bY6zsG1r9n6hO0dsdaDt+np9Q8Pom23h1gY1t 3x74Xkfd802ukpI4r72Vq7HzFilakq0VuGuFmcTQZpk1KHOfgizn28aXGQjfavNUKu+J HdEJaav7ydGrKdNtoqkpHs3rN8jBblRqrsolBfg6nYg461XMBLs9WfY99tS8E3Y5Dy0T Ga8iTLs9GCwX3Akk5Mgx0/jFvujRqYc6OTV89KXe1/juwtobvDG0Xw/XHgkfnXwkw9O4 4fBg== X-Gm-Message-State: AOJu0Yyv9/jzG5jCfOZbCiHSSAx0p+vQYSutEPC54faz6/3Rk0xLNenf eBvlnUP6qYT/o9gqRQGnPQSZtbHp4CpcDVhDwGj2shvYeB/2aJpuBBy9aA== X-Gm-Gg: ASbGncvaA5Nf1NoGlk3RN8Cdt/qPpUkjXejbHebf16m1+glNPZsnTV7pV5PWebExtF0 fS0hDf8e4LNbZhQMNgZIpwv9sC8y2C94RJxtn/DhgoZZAymAAXeB9BMLSCgZpoubBMa7wrSRU6d WlkHdIBFQI4qPHCnrlCBKtUZ42b3NSVWQKF9XyjiTdLmJc+8hT+6iTJ4kFfHBwNr1/q5N1350Js klZVzo24Z/yV0EFzEiewgqYH+AJdZ2x8SeZzHG5sfLp8VxF8Ofcqt9i0c+/0WLfRZHn1aAjLxKz ndUnZOnsSGQ+X7JlvYdP/T+D010YLNwUfgzo88BTZACPfpiLG+XaY9k8I2Q7uiwA6pPAoCbo6fF 4XKHy2T4Ek5i5qHgpKzGr5O1K0OOTA58= X-Google-Smtp-Source: AGHT+IFbn/yEBgNc4AFyHQd+AqbqvEvbN7eWjvO5YEiMtPin5rURbVRggJOroj7rS5+e/QnbztyS2w== X-Received: by 2002:a5d:6da5:0:b0:38d:cf33:31a1 with SMTP id ffacd0b85a97d-38f707afc79mr20708522f8f.23.1740594732578; Wed, 26 Feb 2025 10:32:12 -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-390cd866afesm6520531f8f.18.2025.02.26.10.32.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2025 10:32:12 -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 v3 1/3] bpf/helpers: refactor bpf_dynptr_read and bpf_dynptr_write Date: Wed, 26 Feb 2025 18:31:59 +0000 Message-ID: <20250226183201.332713-2-mykyta.yatsenko5@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250226183201.332713-1-mykyta.yatsenko5@gmail.com> References: <20250226183201.332713-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 Wed Feb 26 18:32: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: 13992972 X-Patchwork-Delegate: bpf@iogearbox.net Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (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 1F42719597F for ; Wed, 26 Feb 2025 18:32:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740594738; cv=none; b=jEcViOVDEIfOlPi5645Csn/+L7xGTBOhluJ5FxjILXl38jAjJxqLY83O9JBlv7m6A0JTtUTDQapT/ZwVzn/dnwgs1RLDTzyGq3o2vMCQX1An/fCIOkLDIGin+gzPpv5QTBiODOveSaIX5moNmtTU7fQUbQPGz6tlzmGl2vyIokE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740594738; c=relaxed/simple; bh=Ygwc2D41ymtMAAbVJXhc78CltmObejr+JTpgXxGtkOs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GQ62s3H+YUSvh/zTxII675OLn+kG5WflDuV3b+lfdb4/3zn4mtSCyjOPC61pgRFzztt688RGw2z7YFpG+CxQQN7EKfB5STBtNueezMiL6FmklbEPy6rXIDF5qHRvqoAJMVNmu8onuKUH1UZcANTa3IHl6CnfvGmz9sPpKP6yaLM= 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=UH70IvTQ; arc=none smtp.client-ip=209.85.128.52 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="UH70IvTQ" Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-439a1e8ba83so1325935e9.3 for ; Wed, 26 Feb 2025 10:32:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740594734; x=1741199534; 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=UH70IvTQLUErAQqV2bwMn3gB7n+Jv5VAGow84Fw7oThR+TACExIzSUQCn7auNW9rf/ k3NOsFdPvF7XGQoYtzFQkanjBNfqgWJdA6ibxZvAN47a99+onG8qOsSLhACt8dBTsvU3 W1iqXhU2LVqyVXVTftSG96mq44+Wl7OS8k/EZbD4M0njLvRjl+zBlipdSKNHyHNw0JOv hj8bvsmVKkR1vmPTT9CHq/auerSX3R33JNvaKDQUUnF8w9M2/8KeIIj/Eq2WRJ+ThyE9 kqO50cxX4msOeoHfZ4v+xfzQ/GgJfFNg4lHjJ1zCZcx72Z+4rm8eJ2yBjD8bJFNKu5OD 5u7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740594734; x=1741199534; 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=ubH5Rd/48INiWUCnaw8LFiIDNbpowRTU3uZQ29iAGBCkdbqJxxfnPnZo38QQSOX1uT ANTlD7SLPHB9V0EsqzZDPfd3LT+fc4AiDlT6yO4OuyfauZBALwLBea3pjoVpTdhoX3Fr 3YvXbPWvZDGr5ZtpiElA0OnNleb4+azxSnyWgR9MXMmhH5DCyB++bq7bLDZ4dGMHtJk+ jKR+W7UJtFNFhGCceREqrUobyxz3Tq+oRat9f+FR2V6Tg3617Do/aHD0WbFm3nW75Gty dz8o4w2ZQyNhQLHT8AwOhrmUTvouEOrkB3U1sIniU/TqSd2KST+Kc/9BT4gKL94mwXDn 7pOg== X-Gm-Message-State: AOJu0YyZSUDFo966x1ig0M009tl+JJ4QlB2yv2kSkLvbwUgOciCbbWAy HxQ6idDSfKXfpZmPKRbQ4qQOIXLXn8c3R1Cka5WwcL/qVYjhs40+OvnPZw== X-Gm-Gg: ASbGnct1MuKefSac7Z3JOypU51luaztgjLsBrD9+YgXyJMwYovkgXqC+/aOu66hmxVw 6+9lkwePJgXLte2CnLZBnRE7VAbZFF+mgZKl0T47xUpwwDnzG9GvyffKEBd3/CCbC2yQFvS0o0Q YyKOnNyAyePcYMLM07tNFTxyoxJZI2OA3+LNJBnZCgI7jPpg1a/Luzu05VCkcjtqe9PJUwiOWoi nPyrzJx20fqGo3rQq65AU40zXM7+u7in4k7TkoRwHh79kC4mp1E7EL90mROv3XYV86XfS0VWm3s s7Aqqr+poh0smUJ+iOsEHYbXloMNC2HyZWxLEQVDVnfv2CIIuP9Tm6RWFNtP2tePBvXYhke4q/0 jBG7Di70PbTgS9XNDYbkQSSbWUMHa4oQ= X-Google-Smtp-Source: AGHT+IHlijb0igdVazZOx8QL12EkMTyNu2BE5UrClU2exuHsJYa7mSZHaaaLWzyqZmeNdODYTSqDaA== X-Received: by 2002:a05:600c:4687:b0:439:9aca:3285 with SMTP id 5b1f17b1804b1-439b6ad5cbfmr166466115e9.6.1740594734077; Wed, 26 Feb 2025 10:32:14 -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-390cd866afesm6520531f8f.18.2025.02.26.10.32.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2025 10:32:13 -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 v3 2/3] bpf/helpers: introduce bpf_dynptr_copy kfunc Date: Wed, 26 Feb 2025 18:32:00 +0000 Message-ID: <20250226183201.332713-3-mykyta.yatsenko5@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250226183201.332713-1-mykyta.yatsenko5@gmail.com> References: <20250226183201.332713-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 Wed Feb 26 18:32:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mykyta Yatsenko X-Patchwork-Id: 13992973 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 58E7F23496B for ; Wed, 26 Feb 2025 18:32:17 +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=1740594740; cv=none; b=FMGyiInQL29I7GpQ5reyTKNHT59+GbsOH/1Da/Lf+/9v3HSg11lxYu2YhhTZMWEA7igJFMK7LD3S//GK8qwmT26UcEbaSM84pt6z9eNeN2ZM2+HgdmuhSuAvwwdKzulI/lHpbmVKp+bYuH7X5tqdiW+TZWIyqYMe+SkPpT5TjEE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740594740; c=relaxed/simple; bh=HzEUYH7qb1iWXRnDyo68KhiI31qeyT99Mz7m3Iyjw5w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=M2491s02hT0VYMY/YLBQJE0+cFomNptlkvbmv4hmQDXck+ZlKOy000emweZyuDP5E64LvpgpIU9ypgumc4DskZzlZ234Bt2SmqVv9lpSfoYGxpxVX5J1qlFkOTWb9Z6stf2AMCcCuT82J7CuDUvoHYR+zOxQDsVdS5FaxXucAx4= 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=khTMT7w/; 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="khTMT7w/" Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-4394345e4d5so1088725e9.0 for ; Wed, 26 Feb 2025 10:32:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740594735; x=1741199535; 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=EofGUMdmxWitNR/1EFa3t6bpHugE1KAAwnzD29BQtG4=; b=khTMT7w//+ZqYglYBpfV6zp7oLO3+7LegPTq02U7La6m8o8UwtcEOZ8lJ/tX9c/3/a bWvwXIrQXKTKCTxVMxt19DE/JWY3aiTAuKDxSmxR4GiB4xusphLKiZSk6AbTjH4VS9xr TvBGwFMB+w23zKodsMhnhL7uS6HWLux0m6Gm/QdWLL9vXv4Wcheah2pPN6KHzgZGhwCN tJxYh8PRBN+HTvX2pk330HzNQHzavrC4fFvPwhAX1i8qeKZXDiXYL82LfKg6K2vEwXal 7smn8LpIdgh0Jf+ZOAqlxSW0ax5Qoh94FKm/MDyk2T4Wd/FbexWY5pxxSC6pzNG0iH+t OeqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740594735; x=1741199535; 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=EofGUMdmxWitNR/1EFa3t6bpHugE1KAAwnzD29BQtG4=; b=bxe22ssQKOYOAspTpftfHtGoJHsesMV6zXdnc+3LgOTqD+VauOxBeaC+UPcrxlI35q jvL2G7prE3NSLX51ANM7CtlignKtjwuZxt06QX70UwYGBq+t3rMO7ssXGkISwY459OwH l2j6nnvX/Ghllr/RM08G6On9BCLw6HkeGV4cuoyyhzAkW1b9IB1w6Lb4SdSZ7uguZVRZ nuYOMiMwLnh1qWvnghaPkFKy8Tu525VCuurDJrU4B6y6WtRJCooU13u8PCFDcoDeUVX8 OKMVLEhjtgiAtKwbyAgPsSawnBX6apHAIHxyQqETwClY36pk3xjto4gCdrjnFZt4HvcQ 80Iw== X-Gm-Message-State: AOJu0Yx6efW0Cj+IbB0ajB2q4sQGD0WHVpfOzJicRO1hZJ8pUm+DaZCV QjaqGtcmBEs3UOJg16ItjHdvL2Efbrqf9UHlDllMgBNGmy6ezer6uDugOg== X-Gm-Gg: ASbGnct7Cd1+vxxoGstS5wtZSwQTcammdKAWbPx7BnZZD58NJ8tF6fndFLteJZ/D72g q72h959l+7W8MzV+93t9IhS/puIIWq3tB14zXZXIKAo2VPBotCO2sSaHcFfFx6F0NGq1TorW1v5 LJNUdhGrYeIXgkZjvKFOYvMpdddN0w6Qg2zttb7UtEhqAj6EBh8aFgpioixFZ3P0jMNnqR1iIuv C5dw8N7/00mI0juFdeDRcDkkmSpap1mSqbYmCyCKISUunkD8h2mAM52a1ylE7X27vdZ2svzQmAz 5rhCoba+RrNtiUZvN1YOWBSA6lCCUvNkbYftqdpO/cpqjkB/1hB5TS3YrHxO7hIfFY/XZs4A6ON C6Mz51iHIhAYwGI1S6irNtWMKlvaMyk0= X-Google-Smtp-Source: AGHT+IF5bHtAtR0nSrNNlQn7nlN55v/RWnyp96JBTG9S5k3vznqRUzmDlJLSG6HggG8oUcvL447upA== X-Received: by 2002:a5d:59a7:0:b0:38d:e304:7478 with SMTP id ffacd0b85a97d-38f7082b185mr23949448f8f.38.1740594735539; Wed, 26 Feb 2025 10:32:15 -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-390cd866afesm6520531f8f.18.2025.02.26.10.32.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2025 10:32:15 -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 v3 3/3] selftests/bpf: add tests for bpf_dynptr_copy Date: Wed, 26 Feb 2025 18:32:01 +0000 Message-ID: <20250226183201.332713-4-mykyta.yatsenko5@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250226183201.332713-1-mykyta.yatsenko5@gmail.com> References: <20250226183201.332713-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 | 123 +++++++++++++++++- 2 files changed, 139 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..e1fba28e4a86 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,117 @@ int BPF_PROG(test_dynptr_skb_tp_btf, void *skb, void *location) return 1; } + +static inline int bpf_memcmp(const char *a, const char *b, u32 size) +{ + int i; + + bpf_for(i, 0, size) { + if (a[i] != b[i]) + return a[i] < b[i] ? -1 : 1; + } + return 0; +} + +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 ?: bpf_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 ?: bpf_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 (bpf_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 (bpf_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 (bpf_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; +}