From patchwork Sat Jan 13 06:52:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kasireddy, Vivek" X-Patchwork-Id: 13518886 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9146AC4707C for ; Sat, 13 Jan 2024 07:17:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AF78B94000B; Sat, 13 Jan 2024 02:16:48 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A802F94000A; Sat, 13 Jan 2024 02:16:48 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8866194000B; Sat, 13 Jan 2024 02:16:48 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 6D14D94000A for ; Sat, 13 Jan 2024 02:16:48 -0500 (EST) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 501A7A1E44 for ; Sat, 13 Jan 2024 07:16:48 +0000 (UTC) X-FDA: 81673430496.26.A683075 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) by imf30.hostedemail.com (Postfix) with ESMTP id 5B36680003 for ; Sat, 13 Jan 2024 07:16:46 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=Exc0YdPO; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf30.hostedemail.com: domain of vivek.kasireddy@intel.com designates 192.198.163.11 as permitted sender) smtp.mailfrom=vivek.kasireddy@intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1705130206; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=vsjLvb1MVElc3705OSeKS7FFWwBMLjZD4BZGoHyBC3Q=; b=OMH+JASkbNAHgUNX/hVlsMG5E8pquAMSHQNhIxXKhdfMlDbnwtOtbZNhDTwTOCjhZ9GYWh iosCvIPoAoyAypwbhc9pa0bRJSAohb6BAUeIWY+ydcBnfDKpvTWleiV2Os/N6HXViMF9Z9 2zClJTQVU7Pa55sPBaLB888vn98S9MA= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=Exc0YdPO; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf30.hostedemail.com: domain of vivek.kasireddy@intel.com designates 192.198.163.11 as permitted sender) smtp.mailfrom=vivek.kasireddy@intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1705130206; a=rsa-sha256; cv=none; b=4RaeLI6tOHjx4LMVOps64cSubY8hp7umU1fcQ3X5BeeAeB2dlphvHKeCzlE4NHYJK3dC84 zTNgpFx2Va3f2ObrNDpsH1r6vczv9PTt8dDSRWrxijs6GoJ1Jk/zNg+dhfldzfpufbc+HV V5Cu2w6tC5iW+ikhYOPoUw8Er+azVRs= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1705130206; x=1736666206; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=HkaJB5MACRgiA2p4lexf6azWCkfvx51m7Bj0EsrYLok=; b=Exc0YdPOoovc7EwBXip7sY7P1eBqqh88F4Qfd2MDbc2aIZxmmZY0DhZK 9J9nPSHHnHC9FcLGBS8sJlEW2eDd4kGljLz292ErnKKXKV4x4iONpmoB+ x3F/KcM5bTd1EAhmXHfFo8UiFtR4j5S3Ssq6WkjCv8/uYhwDRPQY/qsbH VbY9G9ryWr6raM5oFTcANA0GDVWXA7EVf1gabMkQTC3GlExIEV+t4BWZf 9e+G9DSYk+QGktyPLMWbUQk1IhzKlhYOIQpLwPT2rcJLkeYNz4sblSWGr DRiInSqLRQ0hMZqsZtJcx9IdgYsGPLeQkF8QIocMxQE3sUmPjRGORbHDh g==; X-IronPort-AV: E=McAfee;i="6600,9927,10951"; a="6078166" X-IronPort-AV: E=Sophos;i="6.04,191,1695711600"; d="scan'208";a="6078166" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jan 2024 23:16:42 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10951"; a="783269519" X-IronPort-AV: E=Sophos;i="6.04,191,1695711600"; d="scan'208";a="783269519" Received: from vkasired-desk2.fm.intel.com ([10.105.128.132]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jan 2024 23:16:41 -0800 From: Vivek Kasireddy To: dri-devel@lists.freedesktop.org, linux-mm@kvack.org Cc: Vivek Kasireddy , Shuah Khan , David Hildenbrand , Daniel Vetter , Mike Kravetz , Hugh Dickins , Peter Xu , Jason Gunthorpe , Gerd Hoffmann , Dongwon Kim , Junxiao Chang Subject: [PATCH v11 8/8] selftests/udmabuf: Add tests to verify data after page migration Date: Fri, 12 Jan 2024 22:52:23 -0800 Message-Id: <20240113065223.1532987-9-vivek.kasireddy@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240113065223.1532987-1-vivek.kasireddy@intel.com> References: <20240113065223.1532987-1-vivek.kasireddy@intel.com> MIME-Version: 1.0 X-Rspam-User: X-Stat-Signature: b5wz7byyif9fuchtg185578348qdfqr5 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 5B36680003 X-HE-Tag: 1705130206-474567 X-HE-Meta: U2FsdGVkX1+NAuPw7YAYQZi6V/9aHh/XxjdRnM/JPL8pD04Ley8rDqw+eIgqTTljJIGU84ExAwxfEzJ9QEznl1zqCZgXe3jag+Y9r+GEpuMJoKq9Izv/aJeEhABwomuYn3mQE/OSzh99odxGONBWmxBmKGsFfpelH1S5I14nJb2mhRh36W/dbuiu6AJ0xpSE4bEWEUDl8V4JJ11rEVpCwtHwJfMV3wG4A3g69wb0VrLIZcs7MJAL3UFvJ1tl01RdElQCkfYh14iktQHQcBSefoM5nYU4AQGeb2bOn5sXacaIPcz6IiC16MMM1VP3WgnDAWtBuH1R7jXVlBlOZtKNN9LFCKPef8jJU8E6LFkalOm/ayk9fIGtusIEfUJkliYmx11NcdEdxHxbWSueRbOTyLvR6rUWQRS0/R8rWGXNuWXfyHuOXxN+68PNjP3C/OtUwl0ljEwsPgXsopKtkK91RYkSsT9EocAO2wCj7jiBR2+U0S1N2TnmAFUhWjEC7M3p2hSTX86ha1IHi86n6uCgHQlNx4Zw5AyIq99wJ3+jO6VCC1f6eFmyT5NIlfeqjqVZARUKTq5RbB2cYwt+PcGLBw/NrKOlQsYZR9+m0DzqxPl5oNuRMxgoa/ljP4KIlo7JPglb7wmQLcRvbHnLV3DWCUDOvYo8wakGQkO8Ekk/QbBj6zqz9Xs7jyQFab9N576pPcDjtZxxPyERMVpI+FkjMO90ZJQOPaKT9TiVe2+u/mmfNcVe41rz4QwhLsyaB+PMrW67FwadUwieTAfeGg3DMT1C9IM/GESPNHkRf3BCLTjTjTu83sOC4chwSvCKqicsM5tPGeuceDI0sTp77puctkEkBiFNs4aZyZtumH4JEzBn4kVgH7sT44e7hAEcRZYeoCqyN68vSMdPGgh9YiDi+Ss9dQuv19rPuVhUj1+0VPI9ZZe3ujYdYW4WQlUvBaSyOZxunY8d9PaApkMXlAy 9V+jBwqu wabA8wFAAKpWItF2pfcjHsxX5/SW81AxSca7rExCl/Ix1Vnc6EUoiOvzgzm5A0INUmdLXKWuZjW126DGxY37QGe90VYiSSBBA5B+omp2LXPUd6Hjq7hgYcdW+Z1ozOfoAyKudpXS/+Vtp080hQT4UtiyChWhbGyLGNVUSy3ZJhOir22cPUwJaF6MgIeGPWAJZHMg78t+N4iO8WyLIM2brvArTNmsF62cj/996zUP23eSJjOiBE8wwRh1b8E04MlIyyKnc5qdM52PRcYLew22dwaXY8lwyRtUXLGTxKGDBwWqsK3IEPoFYMW/c5g== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Since the memfd pages associated with a udmabuf may be migrated as part of udmabuf create, we need to verify the data coherency after successful migration. The new tests added in this patch try to do just that using 4k sized pages and also 2 MB sized huge pages for the memfd. Successful completion of the tests would mean that there is no disconnect between the memfd pages and the ones associated with a udmabuf. And, these tests can also be augmented in the future to test newer udmabuf features (such as handling memfd hole punch). The idea for these tests comes from a patch by Mike Kravetz. Cc: Shuah Khan Cc: David Hildenbrand Cc: Daniel Vetter Cc: Mike Kravetz Cc: Hugh Dickins Cc: Peter Xu Cc: Jason Gunthorpe Cc: Gerd Hoffmann Cc: Dongwon Kim Cc: Junxiao Chang Signed-off-by: Vivek Kasireddy --- .../selftests/drivers/dma-buf/udmabuf.c | 151 +++++++++++++++++- 1 file changed, 147 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/drivers/dma-buf/udmabuf.c b/tools/testing/selftests/drivers/dma-buf/udmabuf.c index c812080e304e..d76c813fe652 100644 --- a/tools/testing/selftests/drivers/dma-buf/udmabuf.c +++ b/tools/testing/selftests/drivers/dma-buf/udmabuf.c @@ -9,26 +9,132 @@ #include #include #include +#include #include #include +#include #include #include #define TEST_PREFIX "drivers/dma-buf/udmabuf" #define NUM_PAGES 4 +#define NUM_ENTRIES 4 +#define MEMFD_SIZE 1024 /* in pages */ -static int memfd_create(const char *name, unsigned int flags) +static unsigned int page_size; + +static int create_memfd_with_seals(off64_t size, bool hpage) +{ + int memfd, ret; + unsigned int flags = MFD_ALLOW_SEALING; + + if (hpage) + flags |= MFD_HUGETLB; + + memfd = memfd_create("udmabuf-test", flags); + if (memfd < 0) { + printf("%s: [skip,no-memfd]\n", TEST_PREFIX); + exit(77); + } + + ret = fcntl(memfd, F_ADD_SEALS, F_SEAL_SHRINK); + if (ret < 0) { + printf("%s: [skip,fcntl-add-seals]\n", TEST_PREFIX); + exit(77); + } + + ret = ftruncate(memfd, size); + if (ret == -1) { + printf("%s: [FAIL,memfd-truncate]\n", TEST_PREFIX); + exit(1); + } + + return memfd; +} + +static int create_udmabuf_list(int devfd, int memfd, off64_t memfd_size) +{ + struct udmabuf_create_list *list; + int ubuf_fd, i; + + list = malloc(sizeof(struct udmabuf_create_list) + + sizeof(struct udmabuf_create_item) * NUM_ENTRIES); + if (!list) { + printf("%s: [FAIL, udmabuf-malloc]\n", TEST_PREFIX); + exit(1); + } + + for (i = 0; i < NUM_ENTRIES; i++) { + list->list[i].memfd = memfd; + list->list[i].offset = i * (memfd_size / NUM_ENTRIES); + list->list[i].size = getpagesize() * NUM_PAGES; + } + + list->count = NUM_ENTRIES; + list->flags = UDMABUF_FLAGS_CLOEXEC; + ubuf_fd = ioctl(devfd, UDMABUF_CREATE_LIST, list); + free(list); + if (ubuf_fd < 0) { + printf("%s: [FAIL, udmabuf-create]\n", TEST_PREFIX); + exit(1); + } + + return ubuf_fd; +} + +static void write_to_memfd(void *addr, off64_t size, char chr) +{ + int i; + + for (i = 0; i < size / page_size; i++) { + *((char *)addr + (i * page_size)) = chr; + } +} + +static void *mmap_fd(int fd, off64_t size) { - return syscall(__NR_memfd_create, name, flags); + void *addr; + + addr = mmap(NULL, size, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0); + if (addr == MAP_FAILED) { + printf("%s: ubuf_fd mmap fail\n", TEST_PREFIX); + exit(1); + } + + return addr; +} + +static int compare_chunks(void *addr1, void *addr2, off64_t memfd_size) +{ + off64_t off; + int i = 0, j, k = 0, ret = 0; + char char1, char2; + + while (i < NUM_ENTRIES) { + off = i * (memfd_size / NUM_ENTRIES); + for (j = 0; j < NUM_PAGES; j++, k++) { + char1 = *((char *)addr1 + off + (j * getpagesize())); + char2 = *((char *)addr2 + (k * getpagesize())); + if (char1 != char2) { + ret = -1; + goto err; + } + } + i++; + } +err: + munmap(addr1, memfd_size); + munmap(addr2, NUM_ENTRIES * NUM_PAGES * getpagesize()); + return ret; } int main(int argc, char *argv[]) { struct udmabuf_create create; int devfd, memfd, buf, ret; - off_t size; - void *mem; + off64_t size; + void *addr1, *addr2; devfd = open("/dev/udmabuf", O_RDWR); if (devfd < 0) { @@ -90,6 +196,9 @@ int main(int argc, char *argv[]) } /* should work */ + page_size = getpagesize(); + addr1 = mmap_fd(memfd, size); + write_to_memfd(addr1, size, 'a'); create.memfd = memfd; create.offset = 0; create.size = size; @@ -98,6 +207,40 @@ int main(int argc, char *argv[]) printf("%s: [FAIL,test-4]\n", TEST_PREFIX); exit(1); } + munmap(addr1, size); + close(buf); + close(memfd); + + /* should work (migration of 4k size pages)*/ + size = MEMFD_SIZE * page_size; + memfd = create_memfd_with_seals(size, false); + addr1 = mmap_fd(memfd, size); + write_to_memfd(addr1, size, 'a'); + buf = create_udmabuf_list(devfd, memfd, size); + addr2 = mmap_fd(buf, NUM_PAGES * NUM_ENTRIES * getpagesize()); + write_to_memfd(addr1, size, 'b'); + ret = compare_chunks(addr1, addr2, size); + if (ret < 0) { + printf("%s: [FAIL,test-5]\n", TEST_PREFIX); + exit(1); + } + close(buf); + close(memfd); + + /* should work (migration of 2MB size huge pages)*/ + page_size = getpagesize() * 512; /* 2 MB */ + size = MEMFD_SIZE * page_size; + memfd = create_memfd_with_seals(size, true); + addr1 = mmap_fd(memfd, size); + write_to_memfd(addr1, size, 'a'); + buf = create_udmabuf_list(devfd, memfd, size); + addr2 = mmap_fd(buf, NUM_PAGES * NUM_ENTRIES * getpagesize()); + write_to_memfd(addr1, size, 'b'); + ret = compare_chunks(addr1, addr2, size); + if (ret < 0) { + printf("%s: [FAIL,test-6]\n", TEST_PREFIX); + exit(1); + } fprintf(stderr, "%s: ok\n", TEST_PREFIX); close(buf);