From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f201.google.com (mail-pf1-f201.google.com [209.85.210.201]) (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 8663F34CDD for ; Thu, 4 Dec 2025 00:05:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764806729; cv=none; b=sxOxoVE3K949vNHOC7Jd2rCPceqGWHQqBUSEAL/KvAk5ozXlj8kswzhLRvaNMf6bLdNhgQ12CembDvwUxMGLdJcl6lBhsbFqAMyrVt1GfdtJS2OQLDD+9bdTHu1GH4xMhi5rgeLIufaWUEznVVIjHEMVn3+Xygx5zqtqNuc6Ppc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764806729; c=relaxed/simple; bh=/5/SUf84x79x0zxuYBMGAtCjge8lcuDz6hz4jtqQGQ4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=CcnQdY2PkrSTdDyIU4GPmzZ0iaR4YNmtPrkgn2rCgfp7D+LxR8i64M5/7YlgAunwkC+Ac21oECnV6sGPMRstAoffRieFeJI3YiN+MeyUk/awmyed8BJw5NYjjKQi//kYOPoGX7cDlD9SIxVYRvHsq50L0lUfnxJKfklDzfbRlOE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--tjmercier.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=wHdH588s; arc=none smtp.client-ip=209.85.210.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--tjmercier.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="wHdH588s" Received: by mail-pf1-f201.google.com with SMTP id d2e1a72fcca58-7d24bbb9278so639264b3a.0 for ; Wed, 03 Dec 2025 16:05:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1764806727; x=1765411527; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=ntEJ7gGn1a+C6xdaOK38Dw1hgtUSvuAfJEVchxv0EQk=; b=wHdH588sUB3ALxFMf+UHldiRgFA4+P223jZj4mLPo6xC5UidV5nHUibVgkoW5LAlV6 0vS6InmlF/ZchuY3aF2yQFGIVZKImWdljrDH642QCvPSbteI4/4v9+UEb9tbwuki3OtZ EOcpkVKlksOVUL2zjjSlRR+3oSY2bM1uxAjz4cvdm9uAl18+ycuU4PmVV83k/6S1JsjE UmDBOuor+F3E1czaLE7g6qKIro6XcQiYFqht3TedMQL48a71oPphPXghyCttWaXDdAsM zLCXSMtPRZOhMHc8ZFdV3IafjpnxLAL5K3JeVLvA6NpZ67wVGnk7vAo/H8VQjr+dkVMS eWMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764806727; x=1765411527; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ntEJ7gGn1a+C6xdaOK38Dw1hgtUSvuAfJEVchxv0EQk=; b=R7a4yXHfWIBoUyoCe0SwY4Ka0tib2CRhYu0edt9wbUIEXQurkbapSZ2SZwIzNmxr4A tPM1+mjTUF7UQ+1veEfelnp+yhs0K/aTBus3xU4kHTSuGwmJD34CNomT3G1CAwpNYmgd j2lIfApr3b9aPuEtYB1KPbOp0dojVkWnu4lBgzxgQ3u8yV57gp5/sZgqNmEmlRPbvyZJ //7qsDCDcmF46gdn8Oguk6yOj4GhWL1sv09NVkNqcY/0fkkpDlwvuPMD+DomFcHqRJcc oJjxlUh9N8zNwa/xizsUQj17R+iBBivsKSDiapFQTz5jgKZ7JBxGYXZhMBQglAoZXHJz arGQ== X-Forwarded-Encrypted: i=1; AJvYcCU2JXt98+JfbqWHqxxos71Ul6Npk+OwOnC2aADhdMAGIfdhPuYM/NsKcYoYNosPrVRSOElwJ2Yo5rydh68=@vger.kernel.org X-Gm-Message-State: AOJu0YyL8UZrE+Ismp/VV3s3I1LtXwp8TR/0PIyCqjjdFlTbMbqWKkCn 4fmqxMq0P8IVt35AZeRMGJ6mmq/cmdxpBnbAYOPk3GMSCRXzqhq2MNTJQqjiAwuYqCsytVfQJOP uA1xgWayxNdJ9zqRzcg== X-Google-Smtp-Source: AGHT+IGanVIDs+7Y69ywHMHsNbcI0LEOaWi2CkaERYx1M22ypSftKd5oK/BkZTdgl+fJSBjubibGBoyAYRxfcc8= X-Received: from pffa10.prod.google.com ([2002:a62:bd0a:0:b0:7dd:8bba:63ab]) (user=tjmercier job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:4615:b0:7aa:4f1d:c458 with SMTP id d2e1a72fcca58-7e00d236c39mr4941316b3a.19.1764806726792; Wed, 03 Dec 2025 16:05:26 -0800 (PST) Date: Wed, 3 Dec 2025 16:03:48 -0800 In-Reply-To: <20251204000348.1413593-1-tjmercier@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20251204000348.1413593-1-tjmercier@google.com> X-Mailer: git-send-email 2.52.0.177.g9f829587af-goog Message-ID: <20251204000348.1413593-2-tjmercier@google.com> Subject: [PATCH bpf 2/2] selftests/bpf: Add test for truncated dmabuf_iter reads From: "T.J. Mercier" To: yonghong.song@linux.dev, ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, martin.lau@linux.dev, eddyz87@gmail.com, song@kernel.org, john.fastabend@gmail.com, kpsingh@kernel.org, sdf@fomichev.me, haoluo@google.com, jolsa@kernel.org, shuah@kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, android-mm@google.com Cc: christian.koenig@amd.com, sumit.semwal@linaro.org, linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org, "T.J. Mercier" Content-Type: text/plain; charset="UTF-8" If many dmabufs are present, reads of the dmabuf iterator can be truncated at PAGE_SIZE or user buffer size boundaries before the fix in "selftests/bpf: Add test for open coded dmabuf_iter". Add a test to confirm truncation does not occur. Signed-off-by: T.J. Mercier --- .../selftests/bpf/prog_tests/dmabuf_iter.c | 47 +++++++++++++++++-- 1 file changed, 42 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/dmabuf_iter.c b/tools/testing/selftests/bpf/prog_tests/dmabuf_iter.c index 6c2b0c3dbcd8..e442be9dde7e 100644 --- a/tools/testing/selftests/bpf/prog_tests/dmabuf_iter.c +++ b/tools/testing/selftests/bpf/prog_tests/dmabuf_iter.c @@ -73,12 +73,10 @@ static int create_udmabuf(void) return -1; } -static int create_sys_heap_dmabuf(void) +static int create_sys_heap_dmabuf(size_t bytes) { - sysheap_test_buffer_size = 20 * getpagesize(); - struct dma_heap_allocation_data data = { - .len = sysheap_test_buffer_size, + .len = bytes, .fd = 0, .fd_flags = O_RDWR | O_CLOEXEC, .heap_flags = 0, @@ -110,7 +108,9 @@ static int create_sys_heap_dmabuf(void) static int create_test_buffers(void) { udmabuf = create_udmabuf(); - sysheap_dmabuf = create_sys_heap_dmabuf(); + + sysheap_test_buffer_size = 20 * getpagesize(); + sysheap_dmabuf = create_sys_heap_dmabuf(sysheap_test_buffer_size); if (udmabuf < 0 || sysheap_dmabuf < 0) return -1; @@ -219,6 +219,26 @@ static void subtest_dmabuf_iter_check_default_iter(struct dmabuf_iter *skel) close(iter_fd); } +static void subtest_dmabuf_iter_check_lots_of_buffers(struct dmabuf_iter *skel) +{ + int iter_fd; + char buf[1024]; + size_t total_bytes_read = 0; + ssize_t bytes_read; + + iter_fd = bpf_iter_create(bpf_link__fd(skel->links.dmabuf_collector)); + if (!ASSERT_OK_FD(iter_fd, "iter_create")) + return; + + while ((bytes_read = read(iter_fd, buf, sizeof(buf))) > 0) + total_bytes_read += bytes_read; + + ASSERT_GT(total_bytes_read, getpagesize(), "total_bytes_read"); + + close(iter_fd); +} + + static void subtest_dmabuf_iter_check_open_coded(struct dmabuf_iter *skel, int map_fd) { LIBBPF_OPTS(bpf_test_run_opts, topts); @@ -275,6 +295,23 @@ void test_dmabuf_iter(void) subtest_dmabuf_iter_check_no_infinite_reads(skel); if (test__start_subtest("default_iter")) subtest_dmabuf_iter_check_default_iter(skel); + if (test__start_subtest("lots_of_buffers")) { + size_t NUM_BUFS = 100; + int buffers[NUM_BUFS]; + int i; + + for (i = 0; i < NUM_BUFS; ++i) { + buffers[i] = create_sys_heap_dmabuf(getpagesize()); + if (!ASSERT_OK_FD(buffers[i], "dmabuf_fd")) + goto cleanup_bufs; + } + + subtest_dmabuf_iter_check_lots_of_buffers(skel); + +cleanup_bufs: + for (--i; i >= 0; --i) + close(buffers[i]); + } if (test__start_subtest("open_coded")) subtest_dmabuf_iter_check_open_coded(skel, map_fd); -- 2.52.0.177.g9f829587af-goog