From patchwork Thu Apr 27 20:11:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 13225730 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4A4CBC77B61 for ; Thu, 27 Apr 2023 20:12:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344150AbjD0UMi (ORCPT ); Thu, 27 Apr 2023 16:12:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48088 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344052AbjD0UMf (ORCPT ); Thu, 27 Apr 2023 16:12:35 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BF6842D74 for ; Thu, 27 Apr 2023 13:11:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682626306; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6LCJpqufoYvIBJBVywTzcH9xoKv2yJbkOGxjs6oW1og=; b=heXvVbB+yArRfrr0TukChmLK6FWe/WmJWtA72saSENNJ2ydmqoyg1Xx56kh8RoDXSuwnug NGH9Uzwnrh+VJojDwFcG6pGQUl7S/N+/O5B9sfFMH5M3OKisdk5my+DtD2O1r0FjX0Fygq ahHvWNvjNUkte3Z+zyus5cpXnz5Yfwc= Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-111-G7wXAIVgNtytfX2-vNVvBA-1; Thu, 27 Apr 2023 16:11:22 -0400 X-MC-Unique: G7wXAIVgNtytfX2-vNVvBA-1 Received: by mail-qt1-f200.google.com with SMTP id d75a77b69052e-3ef2cb3bfbfso24878071cf.0 for ; Thu, 27 Apr 2023 13:11:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682626277; x=1685218277; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6LCJpqufoYvIBJBVywTzcH9xoKv2yJbkOGxjs6oW1og=; b=KeU/mghurLsvsBnnGrvVKBP/IbdwfSLpD0liaI//wwf1DOekYnRvzTK/CaezOiV28k 5vT6525jVg1ZGs9cncHukyEVfg9Un6e7Lk+E5DzT2YXrIFnEQFJXs2rkP3eRS3to+4hP 8/2rPXjjjHXKn4rx8g/70ex2QvJPAlFiXWYStZwWAehmhFDSXfeS88fsnOOm8jtkH5uP rbjY8Qc8886Jjf+FEAw4NBWpGFig6wou88coJfntOBQ6itOxh0ZtDMuDHQsB3qO0IXTp yJHmt9l2J3dByAOqNhaG8LezBjHmawNVWTPPEZyLPpqthHmI3spuBzmqFD+1YvZGYRoC n2zA== X-Gm-Message-State: AC+VfDwaYBVdG6lj0Ydn+1Jn1t2L3Au2GPxJ0KqF3UdFtob50p9e+DQS Up5cYwv1UJQmUgZuR6vh5Loo6SGHxGa4sfCz3f0+Agk7rLf+W+NoZu8wkBxYLNalQv+/Cv4Mk2o Qez7AwaySSHNS X-Received: by 2002:a05:622a:1443:b0:3ef:5587:723b with SMTP id v3-20020a05622a144300b003ef5587723bmr135295qtx.3.1682626277099; Thu, 27 Apr 2023 13:11:17 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4g0ZcRZj3rzs9wGbSgr4+c+5fTEoqjr/5FCJ6CLpr8UpBSKLjqTwP4eEwGJ6qVDiS0YbA3PQ== X-Received: by 2002:a05:622a:1443:b0:3ef:5587:723b with SMTP id v3-20020a05622a144300b003ef5587723bmr135257qtx.3.1682626276859; Thu, 27 Apr 2023 13:11:16 -0700 (PDT) Received: from x1n.redhat.com (bras-base-aurron9127w-grc-40-70-52-229-124.dsl.bell.ca. [70.52.229.124]) by smtp.gmail.com with ESMTPSA id d19-20020a05620a241300b0074fb065bde4sm3444283qkn.18.2023.04.27.13.11.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Apr 2023 13:11:16 -0700 (PDT) From: Peter Xu To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: Sean Christopherson , Paolo Bonzini , James Houghton , peterx@redhat.com, Anish Moorthy Subject: [PATCH 1/2] selftests/kvm: Setup vcpu_alias only for minor mode test Date: Thu, 27 Apr 2023 16:11:11 -0400 Message-Id: <20230427201112.2164776-2-peterx@redhat.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230427201112.2164776-1-peterx@redhat.com> References: <20230427201112.2164776-1-peterx@redhat.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org This fixes two things: - Unbreaks MISSING mode test on anonymous memory type - Prefault alias mem before uffd thread creations, otherwise the uffd thread timing will be inaccurate when guest mem size is large, because it'll take prefault time into total time. Signed-off-by: Peter Xu Reviewed-by: James Houghton --- .../testing/selftests/kvm/demand_paging_test.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/tools/testing/selftests/kvm/demand_paging_test.c b/tools/testing/selftests/kvm/demand_paging_test.c index 2439c4043fed..9c18686b4f63 100644 --- a/tools/testing/selftests/kvm/demand_paging_test.c +++ b/tools/testing/selftests/kvm/demand_paging_test.c @@ -128,6 +128,7 @@ static void prefault_mem(void *alias, uint64_t len) static void run_test(enum vm_guest_mode mode, void *arg) { + struct memstress_vcpu_args *vcpu_args; struct test_params *p = arg; struct uffd_desc **uffd_descs = NULL; struct timespec start; @@ -145,24 +146,24 @@ static void run_test(enum vm_guest_mode mode, void *arg) "Failed to allocate buffer for guest data pattern"); memset(guest_data_prototype, 0xAB, demand_paging_size); + if (p->uffd_mode == UFFDIO_REGISTER_MODE_MINOR) { + for (i = 0; i < nr_vcpus; i++) { + vcpu_args = &memstress_args.vcpu_args[i]; + prefault_mem(addr_gpa2alias(vm, vcpu_args->gpa), + vcpu_args->pages * memstress_args.guest_page_size); + } + } + if (p->uffd_mode) { uffd_descs = malloc(nr_vcpus * sizeof(struct uffd_desc *)); TEST_ASSERT(uffd_descs, "Memory allocation failed"); - for (i = 0; i < nr_vcpus; i++) { - struct memstress_vcpu_args *vcpu_args; void *vcpu_hva; - void *vcpu_alias; vcpu_args = &memstress_args.vcpu_args[i]; /* Cache the host addresses of the region */ vcpu_hva = addr_gpa2hva(vm, vcpu_args->gpa); - vcpu_alias = addr_gpa2alias(vm, vcpu_args->gpa); - - prefault_mem(vcpu_alias, - vcpu_args->pages * memstress_args.guest_page_size); - /* * Set up user fault fd to handle demand paging * requests. From patchwork Thu Apr 27 20:11:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 13225729 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 12488C77B61 for ; Thu, 27 Apr 2023 20:12:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344154AbjD0UMG (ORCPT ); Thu, 27 Apr 2023 16:12:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48044 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244338AbjD0UMF (ORCPT ); Thu, 27 Apr 2023 16:12:05 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 12EDC359B for ; Thu, 27 Apr 2023 13:11:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682626284; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MVxEyT6YPQv9FpKzpmnFDZ3linRqP6xqGLLw8EoheGs=; b=GDMoeeJleANbP9moaA0mW/zH2rDHdWqH4yJJkkKNIqmeQEVlFaTM8tgyLSj8VnqSccZgxd 2zdGgBDNVyAWUcDMf6ZF6ZOIQXJ4e6QU8ykngpT4ikkm0stQOsZW84iYmdEK99gcbwEUJn C/5/6oFP7XOD4iyjq41skUcou0+dcTk= Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-425-4i5mTtWxPQ2NfuBJvdHYfw-1; Thu, 27 Apr 2023 16:11:23 -0400 X-MC-Unique: 4i5mTtWxPQ2NfuBJvdHYfw-1 Received: by mail-qt1-f200.google.com with SMTP id d75a77b69052e-3ef32210cabso19397451cf.0 for ; Thu, 27 Apr 2023 13:11:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682626279; x=1685218279; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MVxEyT6YPQv9FpKzpmnFDZ3linRqP6xqGLLw8EoheGs=; b=lz7rPjVd3W4k8ubdnNfgI7jY067NcIMuG5/o6tx0Ot7Dl4WUPMusIw95ycNoLgd8nK 0fIxwawxsgCsxjx18ROaLUI9BGs886iwEbnYuenwYJ90nPLwAEdTIbdJ9PlCRU5CFLnz 3dbxaNVjjPTYxWUb4qu1HS7PHI29sAaVY6FfJCxlyXR3TWsayn93bD3HljrKlkERtr99 j0BaPGC3vPIiranuI7XN/LoQ5OaDVK+Wi7L0/Tpt6ue2apmoEzd53G6Noi/e4Vqa2qKp 4ghDQyCBx930LRffL6DLuN6n4JAwj+FsmOeH9l9EvPlW2Y+qM8sooiAVEo9KPwYEfGfB iI7w== X-Gm-Message-State: AC+VfDzlWk5Qo6Bx7yxScs/z++g+ms/ThR//Qvvkr+5SyRSgwOt2sohF 5W8vF01t3oI1US11rMw8k5zeAYydGg2cvanNjNcKYchu+LwDurPcv0msYXqlXrqWNwqKxqbL1kj WiKWewKiOFYCM X-Received: by 2002:a05:622a:1a96:b0:3e6:8da4:427 with SMTP id s22-20020a05622a1a9600b003e68da40427mr4968040qtc.6.1682626279432; Thu, 27 Apr 2023 13:11:19 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5KE3lCDUjGNayup5e1EtQDHBZuAYaJD+lDZp2gHW+Y3izIr/NFp0H2THH7zdu1g2qOvrSQgA== X-Received: by 2002:a05:622a:1a96:b0:3e6:8da4:427 with SMTP id s22-20020a05622a1a9600b003e68da40427mr4968005qtc.6.1682626279102; Thu, 27 Apr 2023 13:11:19 -0700 (PDT) Received: from x1n.redhat.com (bras-base-aurron9127w-grc-40-70-52-229-124.dsl.bell.ca. [70.52.229.124]) by smtp.gmail.com with ESMTPSA id d19-20020a05620a241300b0074fb065bde4sm3444283qkn.18.2023.04.27.13.11.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Apr 2023 13:11:18 -0700 (PDT) From: Peter Xu To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: Sean Christopherson , Paolo Bonzini , James Houghton , peterx@redhat.com, Anish Moorthy Subject: [PATCH 2/2] selftests/kvm: Allow dump per-vcpu info for uffd threads Date: Thu, 27 Apr 2023 16:11:12 -0400 Message-Id: <20230427201112.2164776-3-peterx@redhat.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230427201112.2164776-1-peterx@redhat.com> References: <20230427201112.2164776-1-peterx@redhat.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org There's one PER_VCPU_DEBUG in per-vcpu uffd threads but it's never hit. Trigger that when quit in normal ways (kick pollfd[1]), meanwhile fix the number of nanosec calculation. Signed-off-by: Peter Xu Reviewed-by: James Houghton --- tools/testing/selftests/kvm/lib/userfaultfd_util.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/kvm/lib/userfaultfd_util.c b/tools/testing/selftests/kvm/lib/userfaultfd_util.c index 92cef20902f1..271f63891581 100644 --- a/tools/testing/selftests/kvm/lib/userfaultfd_util.c +++ b/tools/testing/selftests/kvm/lib/userfaultfd_util.c @@ -70,7 +70,7 @@ static void *uffd_handler_thread_fn(void *arg) r = read(pollfd[1].fd, &tmp_chr, 1); TEST_ASSERT(r == 1, "Error reading pipefd in UFFD thread\n"); - return NULL; + break; } if (!(pollfd[0].revents & POLLIN)) @@ -103,7 +103,7 @@ static void *uffd_handler_thread_fn(void *arg) ts_diff = timespec_elapsed(start); PER_VCPU_DEBUG("userfaulted %ld pages over %ld.%.9lds. (%f/sec)\n", pages, ts_diff.tv_sec, ts_diff.tv_nsec, - pages / ((double)ts_diff.tv_sec + (double)ts_diff.tv_nsec / 100000000.0)); + pages / ((double)ts_diff.tv_sec + (double)ts_diff.tv_nsec / NSEC_PER_SEC)); return NULL; }