From patchwork Tue Dec 12 07:38:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivek Kasireddy X-Patchwork-Id: 13488638 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 6165DC4332F for ; Tue, 12 Dec 2023 08:01:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DE4866B029E; Tue, 12 Dec 2023 03:01:37 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D92E96B02A1; Tue, 12 Dec 2023 03:01:37 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C0CFC6B02A2; Tue, 12 Dec 2023 03:01:37 -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 ABC876B029E for ; Tue, 12 Dec 2023 03:01:37 -0500 (EST) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 72D8EC0632 for ; Tue, 12 Dec 2023 08:01:37 +0000 (UTC) X-FDA: 81557421834.25.B52B41F Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.24]) by imf08.hostedemail.com (Postfix) with ESMTP id 43D5A160019 for ; Tue, 12 Dec 2023 08:01:35 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=JnID1DBm; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf08.hostedemail.com: domain of vivek.kasireddy@intel.com designates 134.134.136.24 as permitted sender) smtp.mailfrom=vivek.kasireddy@intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1702368095; a=rsa-sha256; cv=none; b=4z59VxNlkaG4XNpUiaWorbgZ/N80ykA30m0JFQE9KSm2EQmkQOiAzOpbBLs5BbqW7qxNp3 FMOXDChCGZAcZiYGzyVwT7aFQqcz0UPrceAD6MpjcugJRwXLgbBm9XNRIBTkFryQSJ8Sps BFlKWcTxt8HcCaXgGfQJWMMOx4vZ52Q= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=JnID1DBm; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf08.hostedemail.com: domain of vivek.kasireddy@intel.com designates 134.134.136.24 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=1702368095; 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=0D7+uQ+y6mXjseZODS65L7n51agJB38x37Dr7LteU2FCKpMWTxdvKh+NX25kRF8BKUqkzS 0gmfWy2iSQXZeEvcF+MwBknO1sRrFOR4LfG6C8UjNmydVf2i+PxOm2GxuuufCu6OdSAV8u yrqynm4yKg8oA2KlIW4KIlVK7wLTXV0= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1702368095; x=1733904095; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=r39C9fURv/tYjjTgfRvVfOiacLkGBXJF65fG2x4l+b0=; b=JnID1DBmQ4tO/0pwvPmKXRv7PqMm1MJfmKvkfJcWiBA23f0aIzyLsZJq KwwnIlzYfwzcGPozT3wDoXwKQLACk9lqcl3dkMt6OpsIdu+psLG9lLvHF KnqSaLBJ38+8aH3hW+njWMcLeh1HTbI/nbVu+wOCbBU9+m4r9EwF5/GNe jiVzRmQRlSVNXiNXrJbFJax458hXXUHP7BLcrZ+9t4e45EYbVc8dHxqFm 2Q8G5u7VaG8N6WXF5JeMiE4F9EfZWy4d0yLKMwQQxewq/N5OxtnVsz+GC vM34ySPY1ViyQop5TvYXvIMRQ9CeMLdGyLB6hWiytizktM2+B5eCYxeOy g==; X-IronPort-AV: E=McAfee;i="6600,9927,10921"; a="397553996" X-IronPort-AV: E=Sophos;i="6.04,269,1695711600"; d="scan'208";a="397553996" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Dec 2023 00:01:26 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10921"; a="802376338" X-IronPort-AV: E=Sophos;i="6.04,269,1695711600"; d="scan'208";a="802376338" Received: from vkasired-desk2.fm.intel.com ([10.105.128.132]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Dec 2023 00:01:26 -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 v7 6/6] selftests/dma-buf/udmabuf: Add tests to verify data after page migration Date: Mon, 11 Dec 2023 23:38:03 -0800 Message-Id: <20231212073803.3233055-7-vivek.kasireddy@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231212073803.3233055-1-vivek.kasireddy@intel.com> References: <20231212073803.3233055-1-vivek.kasireddy@intel.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 43D5A160019 X-Stat-Signature: pm4kpj1kjjrpbsz5437pniar5mu63faw X-HE-Tag: 1702368095-698139 X-HE-Meta: U2FsdGVkX19jkU/EN4epEokSAYy6hXjzvfYDEX9sc+9ET5HB+eoRDpDyIUJRIgtLyCjBCW4o2WY06d6EVVVhu3VtMaeOdzCOy/Vii3sU7InA2vZUPCkZNCLI9/n/D4gOl8ZOzVmbSBddd305tqpvwX//wgu4yFpSMwS5SitiM1mtB63cGc4xhUJKbouX9RFDSiEQMruR3aOz6E5gStuIOc1GpPpgeMgdW2bG1p/J7rre99iqFbcLwddRA6E+xYxcU60eRCwugIqRfJ+HKrE0lEF1xBOIRjTSvHW6viY4gy3jq1Pky0tBur86/gWshZ/Qse5FVeL+BovhXrATkEpe9GATpGa2lRidtdw9pEp8FzoNCU2KMaoX/uh4ccM8Qp9eNgnj/GguYffTcEDtZWx2A69cV4EnLO20BUYMSUE/1qManLBJt22QEtdn5jIqwpnCU81HpvGn399e5EpdvrUh1TWxz6yUDXxrXoj0NZmGaMr3eHiTMuF7bWEHEr3FeSUzdious+ttX6elxzZZffdSSKiAc0G2Mycylx/HWYOmKvdB+MmrFodoe7y+AfHF9rZnMsQg147tIPTybGN//FC18f6eNJi00kI+WYctpVo1yAV/XT50A2hyrvPDdmkBMAuJmf5sAVpGkAwjFg+XEMnML2mzHd6a6f4lTCdcmyfYSRcd2l8Y4sUujCq6rgfrNo6JO6TusedJ8pgaIJirUtWrRdPuj4MrCILoneqVUWtDmjBXS2cl7Au4BjevcC8KG9N6ZcxxG88n6jqUIBzN0/C/i4B+k3FLqoLPzcv+gIQh7cmKGH/HY1NRq3zYtykFyF9j2xL4j/k3TtnwqeAeUtoGz705+43tBR27jTFIBlOFG7qkk0OVJ/bqUZ874WHfXOH0j57bvvaouQo19/Glyv0HZMT/yPQrpdwvVOIgM56lL/4AEc2tMj6aBBMo/zaDrXBxMBX3KIEYJ84V2pd0Vu+ i0WOCL6o bra9cWT0ASggrzJkKKulndux7A8CVOhjEBOiQzxAMRbAVVvbvxDIs4E2LDGRcqtEwk5HspDkQwQIknQMPBXr2dWQGrBGYNjDD1JNcDNxz+LnnuPvtMz1Czu7xLFYfI0m+v+PmS1EMNNiuBJ6yXy0GPy9EWX7N2w5TQ4UxzgXddmrhhQZbPIGtC+r5mdXeWiVd3SFNRWuq8YsEAOkG1HGHhI88FWxpD43oJso2WbLHbwgFH6nteYIUpzDdEVgW99nmuWUvpwTLi/rMNrK3AmRQ6q4zriK3st98F5OG2kYvJdAq/sHCwudFx8EHFQ== 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);