From patchwork Thu Nov 23 06:44:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kasireddy, Vivek" X-Patchwork-Id: 13465861 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 7E213C5AD4C for ; Thu, 23 Nov 2023 07:08:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 19B686B0649; Thu, 23 Nov 2023 02:08:39 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 125B16B064E; Thu, 23 Nov 2023 02:08:39 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E91236B064F; Thu, 23 Nov 2023 02:08:38 -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 D5E9D6B0649 for ; Thu, 23 Nov 2023 02:08:38 -0500 (EST) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 9E7EF16068E for ; Thu, 23 Nov 2023 07:08:38 +0000 (UTC) X-FDA: 81488341116.14.695EECB Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by imf23.hostedemail.com (Postfix) with ESMTP id 884E314000A for ; Thu, 23 Nov 2023 07:08:35 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=itQl9LXn; spf=pass (imf23.hostedemail.com: domain of vivek.kasireddy@intel.com designates 134.134.136.20 as permitted sender) smtp.mailfrom=vivek.kasireddy@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1700723316; a=rsa-sha256; cv=none; b=Tb5O7pMFX1HpHoNIQQG7GwuUs2zT1vUlyjtwqRmJ+U2ZJRqdzzkYACqb6BLM9Y1QtnLnHN XqJTdnIAGbEutzISUJXYwM/7hxBXlOtjM5C+SvNfOANhr/a8t6XsqcadbwYwscqV3LomvO LKEzxNz1JxB6ig9BH8PM9MhI3PuC4EM= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=itQl9LXn; spf=pass (imf23.hostedemail.com: domain of vivek.kasireddy@intel.com designates 134.134.136.20 as permitted sender) smtp.mailfrom=vivek.kasireddy@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1700723316; 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=w/tAcsbDfY/GebeqRkuwtICF6qttG5C2gjiA3HQqd+r6HB0WD9ztcOKvxqggktky6wB1T9 y9muhQebN8ev1/qpJ5MEQlSFjs0epXzBIN01Tw+KcrEfGcnaQXs3m+64j57UriA1NvDsk+ 6AsYJSbb7tejVLLxfEaR3iP+a85sjoY= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1700723316; x=1732259316; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=r39C9fURv/tYjjTgfRvVfOiacLkGBXJF65fG2x4l+b0=; b=itQl9LXnzspaH/0MIvgVfvTKoKXFi0YGu/WAqpAylGaN5iEmMVevSo9g BlL8PeHoPRhcxcBhZt6rE4wA8Zo4AgMGUcm7O3987Tvt9SzItpfODUNXW JTYpC+3qGerxOkgp9iYUsy1W6mV4JJKPNNFCj+kEK5gNr7xJp88dh41LF wwUUhpfkqAQFLOpOaSg2f7G1/x5I+mrzqWFcCv0KQWln2joBqnfxOtCbN I72Z8Ci0EtCyPyXNbp4DWRS9tGj+CZG//eu0rlZAhr53vZlt9NDIAyiyx x7VCChnfYjnWISrsN9rVToi4EGlIGuoCxwHGyP7HrOxvZ6DvHkC+TnKbD A==; X-IronPort-AV: E=McAfee;i="6600,9927,10902"; a="382612341" X-IronPort-AV: E=Sophos;i="6.04,220,1695711600"; d="scan'208";a="382612341" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Nov 2023 23:08:24 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.04,220,1695711600"; d="scan'208";a="8757726" 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; 22 Nov 2023 23:08:24 -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 v5 5/5] selftests/dma-buf/udmabuf: Add tests to verify data after page migration Date: Wed, 22 Nov 2023 22:44:43 -0800 Message-Id: <20231123064443.1035709-6-vivek.kasireddy@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231123064443.1035709-1-vivek.kasireddy@intel.com> References: <20231123064443.1035709-1-vivek.kasireddy@intel.com> MIME-Version: 1.0 X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 884E314000A X-Stat-Signature: 85xt8863rfatcohfn5gq7fi3nudmcu8t X-Rspam-User: X-HE-Tag: 1700723315-767205 X-HE-Meta: U2FsdGVkX19jVKrCMkCTRJBXzaaVLiXaeTEPjLHD591lakygQ/E/ErX0VaCgceOn8LlbBjBt7Tzu3xHVbaHE/wFvmMzvPUXzwYIo2kn0AD+o6HnDdVpWDhtFzEI/y54a4kdlIUOUoytwHu/RuP2ICNwgKPJR+FUem0JWJCmsaUVvJbyRmkoNzJsazabKYrI2esQykV0v+cfNSZkpFDSWzrMZCwEuboN9NenbsyECVhdSkgJE65tV6Dm2SB4j50f5PRmN53LuZk070CKw2VFGtoNBYwfJg0/R7lcvb9mrzyN8anL6KkFenH394Ps+s5pHbWSqIUqhEsb8O2vul4bR8KsFJ4xQiVmv85w61BGQa+vFWlvK0cghQLuS8+MqPFwCq+VrEb5z6fwHQFBuYmd3fhgx+j1GH6PbmTpDE/S6Rx8fsR7ctR/QX6DlUteYefU45p0T4pygyUi6SKzIoWlCWNrcKyg6Qw/s5j2XgN6AopeDNCsKGBLMqWvQAZZvfto8QyERx2Ev9T4XHaqtJFZm3Bunn7JLlVGy9th7vvlA22t2nLra7DN7/J9d2njnH9qRHdmF+gRRgeMz4X51k2vJGC+OF4hXvpMKAAuJJ0ZHevDp8o5UGVJ8e/Z/gqEqFn0ZUsLljqP6h1aSli2hNGGCB5Sgbm/6lAEZ/C3mIQ0ZO/LhKnCnV0SuOfVXFxHg9nNA2qh0HL0wB0Dd5xgi2zLYN0okatcLGSK9P499wsBIzOuw4rLtiVey5RpInvq5kIQIGiiGvIP2nR+DxqeuLcjBT8mIxIL1x3D9HK0YJZTFJhAOMHJtAs2dwGPA4HmZfQI0SYuLOfQLk8JpMO0FNURkE1VnSJfuD18GMdDCeflo6m0cTk07rTE0pPj51hgmOJ1wSdwCbh6yz2PDNkwId/n/uFfcOwE9nSQ8y/T6L9uQkfhsJj7qqU4oynXjSRebKEENvLCHz+2rgMyopMBq7oy C9YuCasG dfLUAECnNhW1DmL4JeuQmG53foHZEBjDXoYQXjPrhSLCdIuImU6rIVhg2oSl055QU4Y+SACr0dwxIL4IzMwAEpNRlQzrc9Ap/mgXBZoSFExBIQxK9MNkYMxNXj56EvEW3JwhwIwoYr0bam5Mkz+iOq1vlWV58v6L/gaHU8f2HjulI5zgS796g5yli2hDkfnutrmYTNlcWQeH7cJvZgtE7nC1yf9X/TerF5yrBy3SKWv2BwiP+eyC8qF9ij1fyUFcZL/53NKmoefYbFfQQpqec02qdlhbB09MgN5dJHP6hPHIE+qGrHJc1bPoGog== 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);