From patchwork Sat Nov 18 06:32:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivek Kasireddy X-Patchwork-Id: 13459890 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 8E8C9C54FB9 for ; Sat, 18 Nov 2023 06:56:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 61CDA6B053E; Sat, 18 Nov 2023 01:56:16 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5A3F26B0541; Sat, 18 Nov 2023 01:56:16 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4516E6B0542; Sat, 18 Nov 2023 01:56:16 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 26CF56B053E for ; Sat, 18 Nov 2023 01:56:16 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 01B8E80E80 for ; Sat, 18 Nov 2023 06:56:16 +0000 (UTC) X-FDA: 81470165952.13.2DE7BDC Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.100]) by imf19.hostedemail.com (Postfix) with ESMTP id 018AC1A000C for ; Sat, 18 Nov 2023 06:56:13 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=aPQcbzo8; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf19.hostedemail.com: domain of vivek.kasireddy@intel.com designates 134.134.136.100 as permitted sender) smtp.mailfrom=vivek.kasireddy@intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1700290574; a=rsa-sha256; cv=none; b=fhzJAtpuZlm6an+VNleaVr5wmDtZF/VeuYKvvP2QU176xQJe48MLiOcDPRRgQwgchAfHTs FoDHOdW54CwAKHSj6DmDGn+Ttkpk9R3qxaFrHV0OzwMPoGBHLDk6Rxun5tfIfbBrVwUQe6 vUwY3/lryT9vH4DgrexD+Uo+cXqxjZk= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=aPQcbzo8; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf19.hostedemail.com: domain of vivek.kasireddy@intel.com designates 134.134.136.100 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=1700290574; 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=igTmXvJtsI3F9NgPjx77PJt38nNKVQ2QS9dKlfS3ESuDN5qBa9c/dwHQztEiQaWS1ix0xW BPq9dUZFurgUQ0yNA3C8pV1RFEfkiJd3aP7XgwnigwJ3IE2iAKk+go+wRu7MKLqi3GWq7L 4H+Pb1bs/IxWiG6mMrjsZQPJzfepwag= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1700290574; x=1731826574; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=r39C9fURv/tYjjTgfRvVfOiacLkGBXJF65fG2x4l+b0=; b=aPQcbzo8qAKEBMuZ1saO6yXisJ2FO4oos5XBiS6IhPfSGiZHSuWwp8Bo srVRYTlUjBxJVcFYndfcFCcbzS+D0PoUhMWUGz1weUjh+ZnWPURU3nAK/ aPRAv4yjfM/zzGLr4zCk0mAaVuzs/YushmNEEoY+9uQgGz97ikRH9tDnI nS5jgE1OZNL33X+8rC1tBjb9CWz+khHKPjM9blMW7YVuOtfFABvaUyMqS yxg6SZPNOb6VaNeg3HfActLdKhRNPMbr9XtTOyLUjVZD6ACc76xsm5738 fmvEU4Ni2cRJw1A4mWAnlA9W7g+MK3kRAxxGMrYN3yNAE115fdAtPOTT7 g==; X-IronPort-AV: E=McAfee;i="6600,9927,10897"; a="457912385" X-IronPort-AV: E=Sophos;i="6.04,207,1695711600"; d="scan'208";a="457912385" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Nov 2023 22:56:09 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10897"; a="800686587" X-IronPort-AV: E=Sophos;i="6.04,207,1695711600"; d="scan'208";a="800686587" Received: from vkasired-desk2.fm.intel.com ([10.105.128.132]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Nov 2023 22:56:08 -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 v4 5/5] selftests/dma-buf/udmabuf: Add tests to verify data after page migration Date: Fri, 17 Nov 2023 22:32:33 -0800 Message-Id: <20231118063233.733523-6-vivek.kasireddy@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231118063233.733523-1-vivek.kasireddy@intel.com> References: <20231118063233.733523-1-vivek.kasireddy@intel.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 018AC1A000C X-Stat-Signature: zayuqkchf9ote5p89mzf5akti4i77kgt X-HE-Tag: 1700290573-671090 X-HE-Meta: U2FsdGVkX1/NLmzfYACP/RDLhMhAO4BckiJeb8eDtaNSdIZvLejzZcCXFefjjErFtgw055i1DaGQtHBLfB8ikcwXbZx8DThIcuteqPxaveYlt3tWDRaLUOhpDxJqddx6E9pbTn/aa6p6GVeM5+1Wfph5m9ic2FNPpruecgtJseHczGewIO5hAK11DBTCSiNbOctKoZWGjZ0ZAhD+sgVQpppdPkd1PHalFytE8+uQFaohZTtFQuHH4EJVP4v/hbCS5fCdAr9oHcHPylaO7Wc5rplVKJYdn8CRB4+9ogqMpwhIAyprjvOW09drdRpEkOgHhLO2mPWLRhwwY1e5CHy/c1Z96pUN7HyWbY26dKAPYnj9pR3PnxdfnXJpIDygJ9cSNIO1Zi9UWvE943j3C6OTkjvuxZqJ1lb3ULy3b8BxcEL73otR+RGNCRhm2ot9tWhSyoBO/cM3QMm7lhANPxJ/HXc6Lh0uMzEzWQD+MoXczY2KI/xFpvTXefuIO9lfqjWRO8DAuwY+y3fmc47WRKyr5ORRrkou4lXoVgEfOQjstTUeBhX7riahCrHcIXrmi3W2HCAsYN1R/Zaf8ETTKf0QeCjebhE29vJ2UKJkZQg4fCv6wPv4fMNwYlfB/zsKvfFzz/vOltUNUmMT0ZUBfcwIyTF0kWzeBVPqvtUE+kBRJHxk0fFnZhjYPnSr2TCtVxkablWOcJ/iV2S289LseBIcAu9pCcdAXoW+lFobVqCTWGGHjBvkgk0nDcr0aACBC4c3o9eZeu8bzZbZ9/AB8kcC7U35OrOiJmHCPZ7sYMzXSwDyZMDxTh4pscvUa67vfrBlffvWqHx9XZ6ijntG7lOLLc8TmHmy6MwZanWqotsgrthSh3YJECf4m8kB57Q2A6Codxnix94mAxY1Uks7aHE+xHfh1KUC4muYPvzZ7JuIg6rKUMtSOlH7SygbvytYBB9I76Ra5KT2AM/bblcoqvb A+jVn758 d2QDI6W30FP50i4D4Z+ThT5Nn+OYkb8/fe0UlV913zE+GgFDZP4/SW7iGK+8vcPT6TiHhzBUdmDv/VlBrMyYum3dMhNWuOM/D3r25RJbRUm3UN6hdUxuyM0IWiGO2V4XbGhHz/wmuwTO/ZFq8wwESSvMVRVJFdD/sQeg1ayFGbSzC78La7uf1VwruJnS3vlFF6pstdT13Wdnu86kxEyYiyHrpTN1ZXWycg152vQdHTOKNjVSf6js6FaKspgx6D76mGKy0K22sgmjnSUViIlaXgypATt1TP+vmYKXkZFo7tmRjzBHreoH70tNa+YpCmeaPUpMC 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);