From patchwork Thu Apr 11 06:59:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kasireddy, Vivek" X-Patchwork-Id: 13625515 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 BE73ACD128A for ; Thu, 11 Apr 2024 07:26:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DF99A6B009A; Thu, 11 Apr 2024 03:26:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CE3456B009B; Thu, 11 Apr 2024 03:26:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B11EB6B009C; Thu, 11 Apr 2024 03:26:30 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 885F26B009A for ; Thu, 11 Apr 2024 03:26:30 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 5F3F7A15A2 for ; Thu, 11 Apr 2024 07:26:30 +0000 (UTC) X-FDA: 81996418140.18.170BAA9 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) by imf14.hostedemail.com (Postfix) with ESMTP id 2F8BE100002 for ; Thu, 11 Apr 2024 07:26:28 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=iDDDhT1Z; spf=pass (imf14.hostedemail.com: domain of vivek.kasireddy@intel.com designates 192.198.163.18 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=1712820388; a=rsa-sha256; cv=none; b=fLKgPbTtx6fOvC1uHpqbNLO2h8VAW7fyxwPejkQbBRlphgqUcTSfs2uyzPWlM6p9v5aBtO hmBtpO/5xbTslvs4cFMkMNEnP6Tys5W/ThTfmg7CGBMBYaE+etv2QJh17q5YlcBVacGvHS dtk34L/3+ApVIrMjZBsr8YpLz7WiQsw= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=iDDDhT1Z; spf=pass (imf14.hostedemail.com: domain of vivek.kasireddy@intel.com designates 192.198.163.18 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=1712820388; 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=Z6+wvDrkutSDOw22Ejx1fEgvkMhl6byMwiuW888CkvU=; b=8oTmuhBC4ovzCUBtZbbb2SNbCOmnjIOLIYUIYL0tYVAQgnkAUj79NeKGp64+0gCIrcf1rH X9+YgXz1d20KzOetJrX2m1Iev+DO8vmwCevUjFacDS8oA8/MCI7+XFf2AFvIK4bfYvUOmC UEY8imjeUxeQv+PEEE8D+UlTSkOz2EY= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1712820388; x=1744356388; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=u4Zt6ncn47IgJB14JDZFwjyqGxYcviEbMnt3l0dVYJg=; b=iDDDhT1ZMa4GwEhfk1QAop5uoyZDZKYO6uG2XcVNMO24UzmODEpzAqde h9ecVjOlBvoMe56tqHNjNgip1ncXv04qbcrnpi22l+v7cetP8pVU9R5R5 erKm77pGwoi2svWUAOKoRBR4WEcd3WpoCS2c5APUL7dZ+vqrcS1ldUFMU XzIhuKFdXWBk4mcerBsySdyGf15XQ5+7xyEnySSB/1OhQfhwDuvgdrt2z Z37qSjHLq59wEl4NEwFOmZgsTIsFD9cM8pLkA+CSndxo6BzQJGNqzqXZG 6ZYLllFrvr55DpHiIfHEX4xyUN/9fYPNW/EeUL3hJNQi7sz9z6feHmvjA w==; X-CSE-ConnectionGUID: YaBva0GCS3yMXCwsX7+0Ug== X-CSE-MsgGUID: j/21UGpFRBK9/uyDVpYatg== X-IronPort-AV: E=McAfee;i="6600,9927,11039"; a="8074392" X-IronPort-AV: E=Sophos;i="6.07,192,1708416000"; d="scan'208";a="8074392" Received: from fmviesa009.fm.intel.com ([10.60.135.149]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Apr 2024 00:26:04 -0700 X-CSE-ConnectionGUID: lJ3/DrzzRJORhGhCD+Jd/A== X-CSE-MsgGUID: PvvaWwV2Qnyx++zeZKMVHA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,192,1708416000"; d="scan'208";a="20848555" Received: from vkasired-desk2.fm.intel.com ([10.105.128.132]) by fmviesa009-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Apr 2024 00:26:04 -0700 From: Vivek Kasireddy To: dri-devel@lists.freedesktop.org, linux-mm@kvack.org Cc: Vivek Kasireddy , Shuah Khan , David Hildenbrand , Daniel Vetter , Hugh Dickins , Peter Xu , Jason Gunthorpe , Gerd Hoffmann , Dongwon Kim , Junxiao Chang , linux-kselftest@vger.kernel.org, Mike Kravetz Subject: [PATCH v14 8/8] selftests/udmabuf: Add tests to verify data after page migration Date: Wed, 10 Apr 2024 23:59:44 -0700 Message-ID: <20240411070157.3318425-9-vivek.kasireddy@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240411070157.3318425-1-vivek.kasireddy@intel.com> References: <20240411070157.3318425-1-vivek.kasireddy@intel.com> MIME-Version: 1.0 X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 2F8BE100002 X-Stat-Signature: ofber1wh4ao4sedcegswt877ffgz4q9u X-Rspam-User: X-HE-Tag: 1712820388-342864 X-HE-Meta: U2FsdGVkX19JXHNsFlrO5bOSpCi72cxw5AXMvAmWrQ2OS7TRA1uiODRSGscdLQjXwp+R+D11i/dQK/2Tuud/HzZkxaxaqA7Nh5YoONCVpnhOAC88m2M2Jnt8GK9T1N6h12zB6EcDnaPde+UFdwMvfswDjtSxrOe68XvJHzU0GML22W0RS+5dvgN+1ZR9RRocMRBvdx1zs66pA8iVM/oZX/48FKeGOBKuK3Tq6z8a3RNUScW8uQTyNV2bwsSqmLeYJckNgmTI2pTKzcuKGPpCz2Z07aSssbWev8x0rVnM0Vhm7UFvj4U0kjlYSJlvW39gQSUBj2Wd+0xwX5WppKCK5JxGJQXudaUfgryXMiknzDXkv0/uyB/EcIm93W6B3K2hc3zRYcmlTscAebyhJ6zCSN+EaIQZC92J8exTVx4el2Nfei5TwMNs/WU/jNd/5yWi+DEJ0xZEp2HrsUjYc41TSVey6JbjTCJ7aTGV0UpE4Z4O03A5vFLLttCt2mJS+0q3g4YpoWs0gkjr12MeIYAQnd96+sm7cdWgT3+WwORXv/nlwim7Gh2lU+j6IFXajIh8+lUQUpDCedrNFcYeWnW1gFEBSfvxRoYwx7i2+KkPY0O4/O/9l5scmnOZISV9APbYgdkEDmFDMIAXwrbOa//hoh66fUiPM+vNcia+fy++vs6l/VWwxW7C9gQTJbsKJury4qNShXHwE1FeIRKAmoZncp4foQtj7jhUs2ZoyJKiTo76kTQQz60wCjSsx1di8nBtOtAKNDEZnoLogPoZCz+vXCtB1zlM6zwvd22oAF3K0gdUsMfuZegTmPTNFvv7Xs5yXBVt/IxjQj4lr6gkpC6DoO2t7wQzzjo/+mPqRircXD1oAkDcxTUUcVpyOa10EN7jNnvsbnmSgNKGpRiA3ASLCDEh16fGuYVYNyBW4tQVgS+eyGuMPwRWr7PtYKExOL85myoYydo42Ebww6Lff88 oV99GkZX Toe84vmZriqD3McZqjfGmkN8X3uDFqYnqM+jtlMa74juTvHeAxTKjpMdIzh9yxmANH6mO1YA0No6kYQyztEhEhqZsktxw7OY7g8EWIrtZQfyA2/7aXxgmy8cxhh0Y5JE95iV/u37SWguOIY7akUL/JCE72GHByh51cnKxBr3Hp1M9e+LwK5UWfMF01rf/0gcDB1nL/6QRlsE3ohbt+q4UbajxKhwaBeocOzFkmguHahOrW+O0F/aN760tz9Ws+9d88D3dpEdI9Jfh/MMGq7P9ClGCeaqSssvrVR8C2WBcTTddb258taa2zi0L8FLClXKnvFdZ7tyIMccNvq/Jy2xFz498A8vyTQXa/bgDFB7/w+wfpD5cPjkkU57U9wGFRlBVyuYDKY8H3tjdlGs= 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 here: https://lists.freedesktop.org/archives/dri-devel/2023-June/410623.html v1->v2: (suggestions from Shuah) - Use ksft_* functions to print and capture results of tests - Use appropriate KSFT_* status codes for exit() - Add Mike Kravetz's suggested-by tag Cc: Shuah Khan Cc: David Hildenbrand Cc: Daniel Vetter Cc: Hugh Dickins Cc: Peter Xu Cc: Jason Gunthorpe Cc: Gerd Hoffmann Cc: Dongwon Kim Cc: Junxiao Chang Cc: linux-kselftest@vger.kernel.org Suggested-by: Mike Kravetz Signed-off-by: Vivek Kasireddy --- .../selftests/drivers/dma-buf/udmabuf.c | 214 +++++++++++++++--- 1 file changed, 183 insertions(+), 31 deletions(-) diff --git a/tools/testing/selftests/drivers/dma-buf/udmabuf.c b/tools/testing/selftests/drivers/dma-buf/udmabuf.c index c812080e304e..6062723a172e 100644 --- a/tools/testing/selftests/drivers/dma-buf/udmabuf.c +++ b/tools/testing/selftests/drivers/dma-buf/udmabuf.c @@ -9,52 +9,162 @@ #include #include #include +#include #include #include +#include #include #include +#include "../../kselftest.h" #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) { + ksft_print_msg("%s: [skip,no-memfd]\n", TEST_PREFIX); + exit(KSFT_SKIP); + } + + ret = fcntl(memfd, F_ADD_SEALS, F_SEAL_SHRINK); + if (ret < 0) { + ksft_print_msg("%s: [skip,fcntl-add-seals]\n", TEST_PREFIX); + exit(KSFT_SKIP); + } + + ret = ftruncate(memfd, size); + if (ret == -1) { + ksft_print_msg("%s: [FAIL,memfd-truncate]\n", TEST_PREFIX); + exit(KSFT_FAIL); + } + + 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) { + ksft_print_msg("%s: [FAIL, udmabuf-malloc]\n", TEST_PREFIX); + exit(KSFT_FAIL); + } + + 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) { + ksft_print_msg("%s: [FAIL, udmabuf-create]\n", TEST_PREFIX); + exit(KSFT_FAIL); + } + + 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) { + ksft_print_msg("%s: ubuf_fd mmap fail\n", TEST_PREFIX); + exit(KSFT_FAIL); + } + + 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; + + ksft_print_header(); + ksft_set_plan(6); devfd = open("/dev/udmabuf", O_RDWR); if (devfd < 0) { - printf("%s: [skip,no-udmabuf: Unable to access DMA buffer device file]\n", - TEST_PREFIX); - exit(77); + ksft_print_msg( + "%s: [skip,no-udmabuf: Unable to access DMA buffer device file]\n", + TEST_PREFIX); + exit(KSFT_SKIP); } memfd = memfd_create("udmabuf-test", MFD_ALLOW_SEALING); if (memfd < 0) { - printf("%s: [skip,no-memfd]\n", TEST_PREFIX); - exit(77); + ksft_print_msg("%s: [skip,no-memfd]\n", TEST_PREFIX); + exit(KSFT_SKIP); } ret = fcntl(memfd, F_ADD_SEALS, F_SEAL_SHRINK); if (ret < 0) { - printf("%s: [skip,fcntl-add-seals]\n", TEST_PREFIX); - exit(77); + ksft_print_msg("%s: [skip,fcntl-add-seals]\n", TEST_PREFIX); + exit(KSFT_SKIP); } - size = getpagesize() * NUM_PAGES; ret = ftruncate(memfd, size); if (ret == -1) { - printf("%s: [FAIL,memfd-truncate]\n", TEST_PREFIX); - exit(1); + ksft_print_msg("%s: [FAIL,memfd-truncate]\n", TEST_PREFIX); + exit(KSFT_FAIL); } memset(&create, 0, sizeof(create)); @@ -64,44 +174,86 @@ int main(int argc, char *argv[]) create.offset = getpagesize()/2; create.size = getpagesize(); buf = ioctl(devfd, UDMABUF_CREATE, &create); - if (buf >= 0) { - printf("%s: [FAIL,test-1]\n", TEST_PREFIX); - exit(1); - } + if (buf >= 0) + ksft_test_result_fail("%s: [FAIL,test-1]\n", TEST_PREFIX); + else + ksft_test_result_pass("%s: [PASS,test-1]\n", TEST_PREFIX); /* should fail (size not multiple of page) */ create.memfd = memfd; create.offset = 0; create.size = getpagesize()/2; buf = ioctl(devfd, UDMABUF_CREATE, &create); - if (buf >= 0) { - printf("%s: [FAIL,test-2]\n", TEST_PREFIX); - exit(1); - } + if (buf >= 0) + ksft_test_result_fail("%s: [FAIL,test-2]\n", TEST_PREFIX); + else + ksft_test_result_pass("%s: [PASS,test-2]\n", TEST_PREFIX); /* should fail (not memfd) */ create.memfd = 0; /* stdin */ create.offset = 0; create.size = size; buf = ioctl(devfd, UDMABUF_CREATE, &create); - if (buf >= 0) { - printf("%s: [FAIL,test-3]\n", TEST_PREFIX); - exit(1); - } + if (buf >= 0) + ksft_test_result_fail("%s: [FAIL,test-3]\n", TEST_PREFIX); + else + ksft_test_result_pass("%s: [PASS,test-3]\n", TEST_PREFIX); /* 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; buf = ioctl(devfd, UDMABUF_CREATE, &create); - if (buf < 0) { - printf("%s: [FAIL,test-4]\n", TEST_PREFIX); - exit(1); - } + if (buf < 0) + ksft_test_result_fail("%s: [FAIL,test-4]\n", TEST_PREFIX); + else + ksft_test_result_pass("%s: [PASS,test-4]\n", TEST_PREFIX); + + 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) + ksft_test_result_fail("%s: [FAIL,test-5]\n", TEST_PREFIX); + else + ksft_test_result_pass("%s: [PASS,test-5]\n", TEST_PREFIX); + + 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) + ksft_test_result_fail("%s: [FAIL,test-6]\n", TEST_PREFIX); + else + ksft_test_result_pass("%s: [PASS,test-6]\n", TEST_PREFIX); - fprintf(stderr, "%s: ok\n", TEST_PREFIX); close(buf); close(memfd); close(devfd); + + ksft_print_msg("%s: ok\n", TEST_PREFIX); + ksft_print_cnts(); + return 0; }