From patchwork Tue Feb 18 19:00:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mykyta Yatsenko X-Patchwork-Id: 13980588 X-Patchwork-Delegate: bpf@iogearbox.net Received: from mail-ed1-f52.google.com (mail-ed1-f52.google.com [209.85.208.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 DD4D71E520E for ; Tue, 18 Feb 2025 19:01:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739905278; cv=none; b=onA/3EOtDIsN6eHKYpZ4llt6aYoOyZYFjya0o8Qw/1uEUx5MvACqsOINgxpQjKpQN6/l9BbRjHQd9u0DUzpjR+xgzBP8GBzL7dT3fm+avuXCVOCpzQ+hmKFukZNIJA91vYOpu3bLubBKipz5Vh8AHnCHp4zhllrFIyFhYxTOXbQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739905278; c=relaxed/simple; bh=vcmw7BJhR0EK7XQdyJqnA3pMQ25ghMQT9FGn3OgyPhc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=D1CIx7ToyQ9TLYb7QZiDoT/DH+KtmKM/EdYTb+KNVXzfwsZgWWZkIl7Cc08Q+Ueq8uRd2uAAlaPlhya0f3Dv790KUX435Ek2s0hFuIG1OKyQmYBRlGKDAZLspWspU6Rf91KiQLATF2Z4T6FYlx8RA1ZeBM6kB3FvbWXP8eIEg1o= 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=C2EVm3XO; arc=none smtp.client-ip=209.85.208.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="C2EVm3XO" Received: by mail-ed1-f52.google.com with SMTP id 4fb4d7f45d1cf-5ded69e6134so8843943a12.0 for ; Tue, 18 Feb 2025 11:01:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739905275; x=1740510075; 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=pI8rZPxx4nO29zDE1a8YQQ1c9/ltOEZ6Oc7nBm5GmjQ=; b=C2EVm3XOmZ1klITnEobhqkWCqRv7RUjQz1aKfHPiSFGY0eLWRvn1c0j6sFxscAANqA O7O98jyiy0BHXqHXuBl9eO41CbxxJoL+bozZB2eaMPv2Vhy+nRZqrcP3tZKoMygwMRzX c/kRIYi6fxcETkwR6d/unDlMalSJtTphQ5qegmYqu+4SYg3tKVt2wwWbe2BZ23P2ea8X kPAKHUWY3pgqfAsnkG09p8KMY0AS8im9l5ujht7CpoctvOpBpD0X9/57vW6XWD9K0Tl2 cWP1LgxjCSZg5MSXcNi4oeAtHnhleqb1lPM+2/tH57ct7D9Ufzdz8LX6Va84ATk/MOs9 RvSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739905275; x=1740510075; 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=pI8rZPxx4nO29zDE1a8YQQ1c9/ltOEZ6Oc7nBm5GmjQ=; b=VO2HSdHAqfVNL4msZHvjW6G7jdbw9ACJYwDBlMw5d/deGfTtX5vtbNfWmoRF4XPO0j BSeEgAD6rakLKCwxH4JW0nYXTyW8ETVYDekGumixBPcH4u5q4TolbBroxyvLwAdnW0KB ZYkgWxVeEDr0E21agGc1tITAN6Xl+Y6NjDt7qIedVbjzwlZ40W0BIYPD9aMP7279m5JA H+3fJIOJRTvqz/I1dnLok9zfMas+og/too/HrR/hgAP9KUzNlTaGhhosvxnLV5Vay1Iu 90P81m4EEAh62J4PVeQx7wsgzU8KLBC4bfeQby8c8Yy+5cCgBanltmXnrPyq5aAxdrCc Mnzg== X-Gm-Message-State: AOJu0Yxtw5A3G3w+RRlBXffKFr5q3hMgzYA6im+cFVDWrlsDD0QafNe9 VdgLBnNEKFDIcX+wyvZ9y8Ttmi4NOy+gFXRdPcj/K6X8er87G3ImIwgr+A== X-Gm-Gg: ASbGncseOTxIYMiSu2xNPJUdfpeN1uD0ybIrWkbxRMc18VJBwULVW9g+XvXSRsbh/OQ CSe6RaqFO/xI9vQw1oQLp9ddJmEW4QXVTI80cNTEEYoEbVn5aKFUe9mcn2Dy7veWxusIxw65xE4 NW0sKQ+FvW1D4rHQGcJOjCM2Jsac+v89Pb/dns4otTyMM34oavXWXN9Moh1hPIp98kZT69IAc32 9U+gMA4nfc/grNgRskUoFG/Sf6Dt0GFXaedHp5v+i87v0vMvkrQHqV2u7QOwj/D9bndxBtYEkoN UablfMAFOVYjo/5iRy1JzU1TqclnEg== X-Google-Smtp-Source: AGHT+IE0FRDguW9BKbb1u1OpWOIDla1OvQGp7Dg+KxGZAalNOfNukZ81YZcLQsZCZIXjF3wNj8i1kQ== X-Received: by 2002:a05:6402:528b:b0:5de:bc13:6c65 with SMTP id 4fb4d7f45d1cf-5e08950c103mr468494a12.14.1739905274932; Tue, 18 Feb 2025 11:01:14 -0800 (PST) Received: from msi-laptop.thefacebook.com ([2620:10d:c092:500::4:4cdf]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5e02ebeaaa1sm6248540a12.5.2025.02.18.11.01.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Feb 2025 11:01: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 1/3] bpf/helpers: refactor bpf_dynptr_read and bpf_dynptr_write Date: Tue, 18 Feb 2025 19:00:25 +0000 Message-ID: <20250218190027.135888-2-mykyta.yatsenko5@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250218190027.135888-1-mykyta.yatsenko5@gmail.com> References: <20250218190027.135888-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 f27ce162427a..2833558c3009 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 Tue Feb 18 19:00:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mykyta Yatsenko X-Patchwork-Id: 13980589 X-Patchwork-Delegate: bpf@iogearbox.net Received: from mail-ed1-f47.google.com (mail-ed1-f47.google.com [209.85.208.47]) (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 827251E51FA for ; Tue, 18 Feb 2025 19:01:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739905282; cv=none; b=MMmik3dd0TLDeY8Ndqcr+hivFRaRb43ijFLyhI1XVDWE2SZUnsEVYZR41rcKORseT/DG0kkXA3rpmRhXFqnqhzFBeffmvbNBLOSWcF+GVuFk1fDgKehyBwJE3WqIrsTUd/x+plECu+4lW7xeH47NcRvOZ/nYDbBGUKUfycRoFJU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739905282; c=relaxed/simple; bh=/KO58R/FvOp9YExYAtt6OPYUWEo6tpHei1LCLwXioVA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=X6Q2Fdy8n9inrGD5BAUn0AkTFKFzlljP+zzRN/cV3hcCnYCs6xvhxLvWT31sExQXVtcn1vxCfK0YNd6tH0RTMoCjqhTyj4OQgsDkfr/DzbCMFAD3J5xfJzDUo3ows0y1iWkBYVdGvPmm21fKSQokjZWmNZ/oxlqEsTxa5XkUS6w= 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=CfnhE322; arc=none smtp.client-ip=209.85.208.47 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="CfnhE322" Received: by mail-ed1-f47.google.com with SMTP id 4fb4d7f45d1cf-5dc89df7eccso10803489a12.3 for ; Tue, 18 Feb 2025 11:01:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739905279; x=1740510079; 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=80pbILOgzGHV0Da0sUpN8NRJXtYU0fPH3X9MdbtcP8w=; b=CfnhE322dASjp10tnuvHLlHv8u5DqzOX3R9NQ6iNYh9O/Zk7unHgsIBOX7KGPK9e3V lkodbD5BrihhVk8yVO6cZANYqyKkdaIDU8eH5avyiOZ/kB8PakLs48Is9pjNjbTShCMn EeebLo2VGV6UUN14tKhRXpsR8BsLOa0Kepu1uhKhtzLoXyPxuYHJN5paChFsR80l8tGg a8N789LppYQknvqApRey/Hk7rDIbDfmZClT2egQs085YzUOH3VtN9E1WkfDWkbouWbTa X4wqRBsYXcj+zinIACdJt/ZXNmEDVWeHblYcp/ixar2CVR+ljbYQRWaKsdkYzcCmAp+/ +2sQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739905279; x=1740510079; 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=80pbILOgzGHV0Da0sUpN8NRJXtYU0fPH3X9MdbtcP8w=; b=IbdEuLv3xfFpkH4R0wZCi+IQB07PkeHd0WacwdLOOzY611qvjR3c65VkHL9j8SRQXd Xk2o2AH1zbRkbXt9BehCrXG2g5QrwdM/C3P/fhQfPBFpHdC5T8k9/1dnWMrx/O4kk7SP gNNEtoa/PL2EHEU8BPnXnZgXlY3WNxYFnMgM9kmJTvGK64cxJGZwuDW0/D6ENaYSaQV2 +g+3lB/FcUguNJrt7bX1JNGGiZn+bvbnCJQSjMSG2GzcKtr3TikwMDEXXOZvYRYLPiUk HcDeZLXkCSCY3W9VFvGCPqMdj8/D3SUbtxdiofWV+PdBxAfcXDmQFgOFA2MGh0DzQzBS zZKw== X-Gm-Message-State: AOJu0YwoBB7LNtIbuGm3h8gO5EtT5vB1SyJmKVBCEzULqbkomL6XifYM LQy4V4HuBnARWeU8HrpNliTld4hsM20plnvpOVAmhBl5MV2NO9zkU+x1Yg== X-Gm-Gg: ASbGncsng+G9QjRWmRsZw05LSXO9/iFbB1nXmsfPGykYaHBUexw4jmZtAPTTnJwdaqS cCPTD3tDMmYt0KgXEbbFeGQ9HwX9RYFBSjgHBiQlQFAqx+dp1nS5nUkzH2CpSpTCTHRt/IjEGI9 nCH2zNwKcUtwL7K0IIFqt0uloFJTy7OPbg7VXpkZE1rsqd2p0KqlYP3u1MlAuTHfMDkSUAJzxwR fRcop2DnosAXHuHG4Vee/GTitlj0pJuGikt1DXB1G67yr/rW3ESN9aRXfiLQCFlQRftssTClW3v +k4xDilZ7N9BXpHCKSPtwX1ZBt9FYw== X-Google-Smtp-Source: AGHT+IExHUCJyVzfct4PFKkWp6VB5P7e7PmKmTROmp7T2iKYeZqClC6ZVW6NlmLkaSESCwqn4R0p3A== X-Received: by 2002:a05:6402:3589:b0:5e0:82a0:50d9 with SMTP id 4fb4d7f45d1cf-5e082a0580dmr1527858a12.25.1739905278477; Tue, 18 Feb 2025 11:01:18 -0800 (PST) Received: from msi-laptop.thefacebook.com ([2620:10d:c092:500::4:4cdf]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5e02ebeaaa1sm6248540a12.5.2025.02.18.11.01.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Feb 2025 11:01:17 -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 2/3] bpf/helpers: introduce bpf_dynptr_copy kfunc Date: Tue, 18 Feb 2025 19:00:26 +0000 Message-ID: <20250218190027.135888-3-mykyta.yatsenko5@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250218190027.135888-1-mykyta.yatsenko5@gmail.com> References: <20250218190027.135888-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 Acked-by: Eduard Zingerman --- kernel/bpf/helpers.c | 37 +++++++++++++++++++++++++++++++++++++ kernel/bpf/verifier.c | 3 +++ 2 files changed, 40 insertions(+) diff --git a/kernel/bpf/helpers.c b/kernel/bpf/helpers.c index 2833558c3009..ac5fbdfc504d 100644 --- a/kernel/bpf/helpers.c +++ b/kernel/bpf/helpers.c @@ -2770,6 +2770,42 @@ __bpf_kfunc int bpf_dynptr_clone(const struct bpf_dynptr *p, return 0; } +__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; + __u8 *src_slice, *dst_slice; + int err = 0; + + 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); + } else if (src_slice) { + err = __bpf_dynptr_write(dst, dst_off, src_slice, size, 0); + } else if (dst_slice) { + err = __bpf_dynptr_read(dst_slice, size, src, src_off, 0); + } else { + u32 off = 0; + char buf[256]; + + if (bpf_dynptr_check_off_len(dst, dst_off, size) || + bpf_dynptr_check_off_len(src, src_off, size)) + return -E2BIG; + + while (err == 0 && off < size) { + u32 chunk_sz = min(sizeof(buf), size - off); + + err = err ?: __bpf_dynptr_read(buf, chunk_sz, src, src_off + off, 0); + err = err ?: __bpf_dynptr_write(dst, dst_off + off, buf, chunk_sz, 0); + off += chunk_sz; + } + } + return err; +} + __bpf_kfunc void *bpf_cast_to_kern_ctx(void *obj) { return obj; @@ -3174,6 +3210,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 diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index e7bc74171c99..3c567bfcc582 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -11781,6 +11781,7 @@ enum special_kfunc_type { KF_bpf_dynptr_slice, KF_bpf_dynptr_slice_rdwr, KF_bpf_dynptr_clone, + KF_bpf_dynptr_copy, KF_bpf_percpu_obj_new_impl, KF_bpf_percpu_obj_drop_impl, KF_bpf_throw, @@ -11819,6 +11820,7 @@ BTF_ID(func, bpf_dynptr_from_xdp) BTF_ID(func, bpf_dynptr_slice) BTF_ID(func, bpf_dynptr_slice_rdwr) BTF_ID(func, bpf_dynptr_clone) +BTF_ID(func, bpf_dynptr_copy) BTF_ID(func, bpf_percpu_obj_new_impl) BTF_ID(func, bpf_percpu_obj_drop_impl) BTF_ID(func, bpf_throw) @@ -11857,6 +11859,7 @@ BTF_ID_UNUSED BTF_ID(func, bpf_dynptr_slice) BTF_ID(func, bpf_dynptr_slice_rdwr) BTF_ID(func, bpf_dynptr_clone) +BTF_ID(func, bpf_dynptr_copy) BTF_ID(func, bpf_percpu_obj_new_impl) BTF_ID(func, bpf_percpu_obj_drop_impl) BTF_ID(func, bpf_throw) From patchwork Tue Feb 18 19:00:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mykyta Yatsenko X-Patchwork-Id: 13980590 X-Patchwork-Delegate: bpf@iogearbox.net Received: from mail-ed1-f47.google.com (mail-ed1-f47.google.com [209.85.208.47]) (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 7B4B91E521F for ; Tue, 18 Feb 2025 19:01:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739905285; cv=none; b=X7rkAOpeYZj4rZIt6o9MOv0r8LsyddqXUg4Ji1UZyHGQl72T8jc63CuB7n6k6DjJrxM9ByEhIF3NDXnBNE4hxUGImOulWfclHCphwSrhcTvA1jtWwsc+bpEDUyUo48p5QkTBS8cPC1s0bMibxaK2cW2SW4ULjOnD5Dqg5Sk9Ew8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739905285; c=relaxed/simple; bh=Kt3mH95b5H9nc1coou7hewl0NkP5AmQbREHN2zbVopA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kVl4/5EqbN5K5d0jwnyDfrMyOCSplwsUzx8RMVHMNmRrLFhrNN6kK0zLm7jaWjmO2IEhbSI0JBxwLwvNhMpzLrlgljpupa/TRlXCHaqsOrWsNVXNbEw2QzMG/oBjYokVWanobtgDhBvpZl/iKjEY9FMVN8R+eLCnrg1QEOELKO4= 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=edGjNkYo; arc=none smtp.client-ip=209.85.208.47 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="edGjNkYo" Received: by mail-ed1-f47.google.com with SMTP id 4fb4d7f45d1cf-5df07041c24so6097480a12.0 for ; Tue, 18 Feb 2025 11:01:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739905282; x=1740510082; 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=hYvKg89FXx57N3Mi662936PgeqbMmX7HDtH6IYMmr0o=; b=edGjNkYoPT2r5mho3cvBqE0qu6K/DBgjlaU4EXbpgFO724lx7RQ//8cYnqN7EAGEip Z6OVWja+pWeMCXBSC/hD88WMOBXOSC2IrHV2vmyGuM6tuVep8lSHs8wm0084ABwjpwfi kn2bD/Eonpbfrc74mLh6h9HzBDE3Er0H4NAUP7yexcEY5Uukvjqp4aPVwc8zesfLyETB 8nEfmkiKK6cBWxl8RA3cc2bxspcRJIJAoVyzc+gmGb6QcMYbw+ANRGxhRtSHSWobiscd 65agrtT4jsw9daTe+QwqNjV5oxrgcxuNAol3ud7TDMT32d+paQuuzGgGu7UEPSUf5FKs z2yQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739905282; x=1740510082; 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=hYvKg89FXx57N3Mi662936PgeqbMmX7HDtH6IYMmr0o=; b=Fo6DsRwdrqlkFWEa8rAZrNmzzfmJBdIXWGgN7ggjs88nnuVOpm0JWWAjeisT5nhUoI WR+iA1A4JfHdrqSslSJc3VbCDWjzpATPlqxva2BO0BZXkTNoyFw8fztvTEs0+ThPjlZl nAYD3kmW+ofCtMYOxfxSEBOD7gF/K9eWuBQxCTco9CttimBReKO6rdR+ClMV/RiJcUHm n87UMd4WQiihC/yX/xKZW/TWWA5zV6+GGTbvjJNq2l2NggmtixiLEb4Gy//s5pBOMFLb jOYc4QGJZGqHKtAbrw+6LAavyDBoSzZevdrUsssivlX1vPJfLQLYolAxNRBHOu8+fwJp GSdg== X-Gm-Message-State: AOJu0YwTkJmrxYSKePi9zzbIcp0pI6cKNlbbZq+wmT60U0zjHMHjqrvR gAQE0nHV0ngiDp7kNicSrvawyos3NwjxM2R0nb5Y1JXNnmv2OJYr4aOQTg== X-Gm-Gg: ASbGnculBh7AWrB5r7nWYsnP+JaxTuT6J0AsoBWQ6A/bciy0TFOCZTcqRSG1Sfr7guA k5B4BQGvdkoWwcjBiDG4Vvq0au1MgBRMb2gMYHLR4qmM3BypIPLtKCCIzHwgrFCD18+uOV07YqP YtrcUEXDGi7PiCrn5CY3+EsL/FW9zwHSAwyC+QF2jwYQK5njnHNL5k3aCyHbFACl/fZTGA65HK/ Wk5RXWHmOhp25CAKj2pKUskR/xbjjio6rucUoUAWNCgkEDbBZ0Dg+/gM15NGsqUm7ntxCmHsHgT j/J1dtR/1CLSqX5t5tSlJeRz0ifqzA== X-Google-Smtp-Source: AGHT+IFTwMAKpL59mEL31Pd1VlKOzd9zqznvt5aMoEEBrzM4Oqj5q8TpXFCkwDXKuDtA3T/ISiXEpg== X-Received: by 2002:a05:6402:440d:b0:5d9:b84:a01f with SMTP id 4fb4d7f45d1cf-5e0360a6974mr13840289a12.18.1739905281554; Tue, 18 Feb 2025 11:01:21 -0800 (PST) Received: from msi-laptop.thefacebook.com ([2620:10d:c092:500::4:4cdf]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5e02ebeaaa1sm6248540a12.5.2025.02.18.11.01.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Feb 2025 11:01:20 -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 3/3] selftests/bpf: add tests for bpf_dynptr_copy Date: Tue, 18 Feb 2025 19:00:27 +0000 Message-ID: <20250218190027.135888-4-mykyta.yatsenko5@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250218190027.135888-1-mykyta.yatsenko5@gmail.com> References: <20250218190027.135888-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 Acked-by: Eduard Zingerman --- tools/testing/selftests/bpf/bpf_kfuncs.h | 8 ++ .../testing/selftests/bpf/prog_tests/dynptr.c | 25 ++++++ .../selftests/bpf/progs/dynptr_success.c | 77 +++++++++++++++++++ 3 files changed, 110 insertions(+) diff --git a/tools/testing/selftests/bpf/bpf_kfuncs.h b/tools/testing/selftests/bpf/bpf_kfuncs.h index 8215c9b3115e..e9c193036c82 100644 --- a/tools/testing/selftests/bpf/bpf_kfuncs.h +++ b/tools/testing/selftests/bpf/bpf_kfuncs.h @@ -43,6 +43,14 @@ extern bool bpf_dynptr_is_rdonly(const struct bpf_dynptr *ptr) __ksym __weak; extern __u32 bpf_dynptr_size(const struct bpf_dynptr *ptr) __ksym __weak; extern int bpf_dynptr_clone(const struct bpf_dynptr *ptr, struct bpf_dynptr *clone__init) __ksym __weak; +/* Description + * Copy data from one dynptr to another + * Returns + * Error code + */ +extern int bpf_dynptr_copy(struct bpf_dynptr *dst, __u32 dst_off, + struct bpf_dynptr *src, __u32 src_off, __u32 size) __ksym __weak; + /* Description * Modify the address of a AF_UNIX sockaddr. * Returns diff --git a/tools/testing/selftests/bpf/prog_tests/dynptr.c b/tools/testing/selftests/bpf/prog_tests/dynptr.c index b614a5272dfd..247618958155 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,28 @@ 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); + if (!ASSERT_GE(prog_fd, 0, "prog_fd")) + goto cleanup; + + 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..8a6b35418e39 100644 --- a/tools/testing/selftests/bpf/progs/dynptr_success.c +++ b/tools/testing/selftests/bpf/progs/dynptr_success.c @@ -567,3 +567,80 @@ 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 = strlen(data); + struct bpf_dynptr src, dst; + + bpf_ringbuf_reserve_dynptr(&ringbuf, sz, 0, &src); + bpf_ringbuf_reserve_dynptr(&ringbuf, sz, 0, &dst); + + 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); + + 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 = strlen(data); + int i, chunks = 200; + + bpf_dynptr_from_xdp(xdp, 0, &ptr_xdp); + bpf_ringbuf_reserve_dynptr(&ringbuf, len * chunks, 0, &ptr_buf); + + bpf_for(i, 0, chunks) { + err = err ?: bpf_dynptr_write(&ptr_buf, i * len, data, len, 0); + } + + err = err ?: bpf_dynptr_copy(&ptr_xdp, 0, &ptr_buf, 0, len * chunks); + + bpf_for(i, 0, chunks) { + memset(buf, 0, sizeof(buf)); + err = err ?: bpf_dynptr_read(&buf, len, &ptr_xdp, i * len, 0); + err = err ?: memcmp(data, buf, len); + } + + memset(buf, 0, sizeof(buf)); + bpf_for(i, 0, chunks) { + err = err ?: bpf_dynptr_write(&ptr_buf, i * len, buf, len, 0); + } + + err = err ?: bpf_dynptr_copy(&ptr_buf, 0, &ptr_xdp, 0, len * chunks); + + bpf_for(i, 0, chunks) { + memset(buf, 0, sizeof(buf)); + err = err ?: bpf_dynptr_read(&buf, len, &ptr_buf, i * len, 0); + err = err ?: memcmp(data, buf, len); + } + + bpf_ringbuf_discard_dynptr(&ptr_buf, 0); + + err = err ?: bpf_dynptr_copy(&ptr_xdp, 2, &ptr_xdp, len, len * (chunks - 1)); + + bpf_for(i, 0, chunks - 1) { + memset(buf, 0, sizeof(buf)); + err = err ?: bpf_dynptr_read(&buf, len, &ptr_xdp, 2 + i * len, 0); + err = err ?: memcmp(data, buf, len); + } + + err = err ?: (bpf_dynptr_copy(&ptr_xdp, 2000, &ptr_xdp, 0, len * chunks) == -E2BIG ? 0 : 1); + + return XDP_DROP; +}