From patchwork Thu Jan 4 07:25:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivek Kasireddy X-Patchwork-Id: 13510852 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 2F7C8C4707B for ; Thu, 4 Jan 2024 07:49:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2B0016B03B4; Thu, 4 Jan 2024 02:49:03 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 239256B03B5; Thu, 4 Jan 2024 02:49:03 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E9B626B03B7; Thu, 4 Jan 2024 02:49:02 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id C961D6B03B5 for ; Thu, 4 Jan 2024 02:49:02 -0500 (EST) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 9F63940367 for ; Thu, 4 Jan 2024 07:49:02 +0000 (UTC) X-FDA: 81640852524.21.34E4031 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.43]) by imf20.hostedemail.com (Postfix) with ESMTP id B1BFC1C0010 for ; Thu, 4 Jan 2024 07:48:58 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=FZaL59Yq; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf20.hostedemail.com: domain of vivek.kasireddy@intel.com designates 192.55.52.43 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=1704354538; 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=h3emmYlObQz4YBWvxea89j9SxvY/uMNOIgA3BV8wvNU=; b=M5YTJ7L8n/KP+mWn/DZRPNPh8cDEepNcYWWX3RNWwPgr/HkAnGbNibMsLkyQSYbUjjWXZ+ 2lUvj8UgJvkAQWpuF72NrlYU7VIBEJr+SWX0W8N9oObQE8ss49CaRFBvZD7fPx8u7U0x3s NVA/gX2UQrRuXiUok7fl6dHsTv0lUdc= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=FZaL59Yq; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf20.hostedemail.com: domain of vivek.kasireddy@intel.com designates 192.55.52.43 as permitted sender) smtp.mailfrom=vivek.kasireddy@intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1704354538; a=rsa-sha256; cv=none; b=gKK+Bo19RepS3aYoWiNXArtv0WNxuN5d+N+QDUAqv3t2kfZfPtms5hRahzuwWrGG4b60PB kenN71TtB5xMXY7/wbJete96E8iTAhktfVCWbmlk19J8l+ryL98P2Towf/hviAL9+6KhN3 626bjWQ6XiX/eQhitkMy823tDyg2pbg= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1704354538; x=1735890538; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=r39C9fURv/tYjjTgfRvVfOiacLkGBXJF65fG2x4l+b0=; b=FZaL59Yqau0/OsOAmrNCNcR739iZndOMTjJDnzXR1hLTLUqygL5fNOs7 ewWVU0uqj49QzSE1HKxa4swdd/gjslqUkjmpjyU5ID50J5HBIAKEGWUJ5 YBAHyUnwJcJ7vbtQuLsuZOl6snxML6WAjLuxRVizCIgG4WBGylqkZWQUF L4pn2Peb8aeYzRefOyQA0LKWhoLeGPIDUhfqP0gLdH+wheRlX+CErBQvK a/zHLb8ahs/NDn2QgAT4UJALoFumGERTCFoODLVBWCt/Geavq2cKjjECR 6MBRssfS5Q/Lj0WgxCuVSDNCXqEfrDfEvd/7F5vwyzsL0bYcO9/yxH4Ca Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10942"; a="483331144" X-IronPort-AV: E=Sophos;i="6.04,330,1695711600"; d="scan'208";a="483331144" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jan 2024 23:48:50 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.04,330,1695711600"; d="scan'208";a="14776743" Received: from vkasired-desk2.fm.intel.com ([10.105.128.132]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jan 2024 23:48:47 -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 v10 8/8] selftests/dma-buf/udmabuf: Add tests to verify data after page migration Date: Wed, 3 Jan 2024 23:25:18 -0800 Message-Id: <20240104072518.807950-9-vivek.kasireddy@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240104072518.807950-1-vivek.kasireddy@intel.com> References: <20240104072518.807950-1-vivek.kasireddy@intel.com> MIME-Version: 1.0 X-Rspam-User: X-Stat-Signature: rmkgknqafzhufgf7moec9p7wm6run9mr X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: B1BFC1C0010 X-HE-Tag: 1704354538-136359 X-HE-Meta: U2FsdGVkX19MWjFoKeB6Smd7llPJKJdOblt7AXBqInRr5vJgnXzdhuLkChnTQF5HDQhsF6xl84g+r4QkKHUU5DnjV/ALsmhW5IGb6kkB0Yy06IIgDfyUY/lTAADk4yAK86GMd8KFPZF9bVNLopSy7YeNneHf2Ewc14iZg2NvdHRbdEG4QRxcTpx7APBaRJLyOgjBa58UDEy9Kq9Kxc9uGWecdVMMynuTnX9f+ZQLooq+gCrMcDPwpcA3f2E2cA5MNbd6/YS8F5ah7JzLvU8FhS4fPvMU9m407SwZQOs/FaOy3MKzNYbxcGcvZFORoUkPISEVp3vdA+uOVPD0wpj+Vrp0cLsDd3PGUCHVqPac1CcQyEveQYlEiv5mlFplugRtm0stnD/JdEYPJPfWEkNn8JoP4cqRdCGv/ILACxPAQO1T8prDoU3NPIf6tAG5DbwP9MvC4vX/ZL73QHQ5pmSoFG+aD34SpYtFKp1qE0gv8eutuLowGP/YWV6ZSFDc+XPgARCQsqjiR81yAGLaS3gbiRvM9FYqzAG3Z7mOaV6TbWD/Wjt7c0775JBkUyj2B34RdzWtgwOIiLrLLmuXMGYTzWt9OeDLe3oci2oEkjp1iB7c0yYnFTf2PGRSC2DnyDAtsn3GFCmLYZLpRFOMuoNfVEvWJIMSZO/ZX3vEnhVYxCvQicqEmrdHo+jKI5B38ysVInNQ+svtE2tcGg1dZmtKRvWkuAELdu1hCIPqYUixmRitxxNsnIb54tYawt5e2BPuB/a9FqwStIIUfzPdSrkEBbBmbEF0YcHgW39kQ7YaLPrKpjpZgm0iGSwa8cMVJ2HG1wcYakw5+76a1Ro6MOjEh3vzPb/NovxMgnJ3FoIpVn4bBHIivl9U2ePW6ZOAWmfwcZaZmRCP4QTA5UZU88c2IxWqpU784Z4bfeSmPWUOnpwmnCYUQF4Mkeo2uCLFnbxJz1vY6UPudSwdG54ZX4F V3MgsUpi 6N5A+x4XATLLLMF7DOW+h3lCdX8/QcRI+BtdtBxtF1UgJkc9gwEQf6oyf2qIGkAUtCWo/8CrEzmwuayKuJLqalUrVybwZO+V3vthlm3JmJhmHSLBp2y1fn+V2vBP9a+8+NOMvpHY07faYNOJ0QokjWv3ZWxtX6qQv9kH8zZd4286zRSjmWjFMoqP9e1ICOc1/AYVVeIgfkLZBNIJ2eRj8Oe+cMGse54fxxtTYXOo0zGUdhqETTmzA1h4YBrGRNwHd+8RpoyKrLu0Gd+RlS7cEKLGtiH8pbps+a7bYXWaZaZqJfSYzr39XtKhHxg== 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). 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 Based-on-patch-by: Mike Kravetz 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);