From nobody Tue May 7 01:24:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598004921; cv=none; d=zohomail.com; s=zohoarc; b=Vp05zADN/mkdXVmTqSJNxSvbMjA6URvoniuNlMq8eiFuvV1hOYLnvHqQK+MAoxlguSpag2AEAkZOYY8HIK4iGPQTNvODUJbYwNWth/wSvhMvqujAzrdt1yRY+cyzos5ArSPVFBLxBr+9OdRw/oMz/GcabQrGwT+T0AYBKf3gUpU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598004921; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ATVb+MnLS/Fh5QTtjAWEwBNNwPpciuDGYmqtNMOZZDU=; b=QnuLx5SrkuOW6/k93tCMIqcoARpErsUZHiUYZTBCs7rrivHKHkqFXxCDzZBSXu3UEfhIVuQuvyu76lYgIeeNr/8lidf11qO8ONuKjmgbPiQp7aepoP1wwlNHGBG163OHFuMvMhWP+MJx/NdWrfOQyfLmphRJOOPEM3k08MilL08= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 159800492191223.415957497337672; Fri, 21 Aug 2020 03:15:21 -0700 (PDT) Received: from localhost ([::1]:37190 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k944t-00084n-4t for importer@patchew.org; Fri, 21 Aug 2020 06:15:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57198) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k942m-00053h-5t for qemu-devel@nongnu.org; Fri, 21 Aug 2020 06:13:08 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:59421 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k942k-0000In-Am for qemu-devel@nongnu.org; Fri, 21 Aug 2020 06:13:07 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-205-VOkyOVpAOJCieqQEjxYd_w-1; Fri, 21 Aug 2020 06:13:03 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A885D81F02C; Fri, 21 Aug 2020 10:13:02 +0000 (UTC) Received: from localhost (ovpn-113-166.ams2.redhat.com [10.36.113.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id 42FAB10098AE; Fri, 21 Aug 2020 10:12:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598004785; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ATVb+MnLS/Fh5QTtjAWEwBNNwPpciuDGYmqtNMOZZDU=; b=iTGYB14C1z/tgocbsQddUIrAiVEK+sCx51vMRb0QckBo5hL7YDC3kpJrreP6qBa6cRzcFs R2fQ7wXvROhQJEwi2DIcjkJTXbo+bdlAMdDKIlpaOcifCTUsR59PF/GimE6x8n2uT79T0e Eiy93BKAvnSm8vYV0OHeuGPTC5h4Gnw= X-MC-Unique: VOkyOVpAOJCieqQEjxYd_w-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PATCH 1/2] fdmon-poll: reset npfd when upgrading to fdmon-epoll Date: Fri, 21 Aug 2020 11:12:51 +0100 Message-Id: <20200821101252.203056-2-stefanha@redhat.com> In-Reply-To: <20200821101252.203056-1-stefanha@redhat.com> References: <20200821101252.203056-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=stefanha@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.120; envelope-from=stefanha@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/21 04:55:47 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MIME_BASE64_TEXT=1.741, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , qemu-block@nongnu.org, qemu-stable@nongnu.org, Stefan Hajnoczi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" npfd keeps track of how many pollfds are currently being monitored. It must be reset to 0 when fdmon_poll_wait() returns. When npfd reaches a treshold we switch to fdmon-epoll because it scales better. This patch resets npfd in the case where we switch to fdmon-epoll. Forgetting to do so results in the following assertion failure: util/fdmon-poll.c:65: fdmon_poll_wait: Assertion `npfd =3D=3D 0' failed. Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=3D1869952 Fixes: 1f050a4690f62a1e7dabc4f44141e9f762c3769f ("aio-posix: extract ppoll(= 2) and epoll(7) fd monitoring") Signed-off-by: Stefan Hajnoczi Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- util/fdmon-poll.c | 1 + 1 file changed, 1 insertion(+) diff --git a/util/fdmon-poll.c b/util/fdmon-poll.c index 488067b679..5fe3b47865 100644 --- a/util/fdmon-poll.c +++ b/util/fdmon-poll.c @@ -73,6 +73,7 @@ static int fdmon_poll_wait(AioContext *ctx, AioHandlerLis= t *ready_list, =20 /* epoll(7) is faster above a certain number of fds */ if (fdmon_epoll_try_upgrade(ctx, npfd)) { + npfd =3D 0; /* we won't need pollfds[], reset npfd */ return ctx->fdmon_ops->wait(ctx, ready_list, timeout); } =20 --=20 2.26.2 From nobody Tue May 7 01:24:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598004879; cv=none; d=zohomail.com; s=zohoarc; b=SFu8MMNZxf/IX0eH3UpZzIFnkXCqhoq5utigGBDiFp2tELCgXN/nbvIHyse7pQ+XS0OCfMzZSY5oaIJGbESz3Yebr6JU9lovISLgHclxAtwulEIu6kgZ/2AdyaiOQoFLUYOXwo6uRyNFNkCWk9JrqfjL0RZ8Sgab8LXcTHzF9i0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598004879; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=vWr0Zb/P5tn5lmfDrRNkAndUcbgT7XDOpIOik5d1buk=; b=XjQWkIHSZXPues8w9L38b0Bg36hl/Hgiky2u9BBw2a1caESQF8jKovxO78W9aCrvbEJFK56OAfAX8BNDCTeDxWgBfwRLgVSUfSP5aAzgceBSPiqE1nI4tiPvUrBmi8GVvaiAdB37cF2tFFV4nB7ZrD3hlpFa8ewAmtdWwZTYBZM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598004879627182.36392038131453; Fri, 21 Aug 2020 03:14:39 -0700 (PDT) Received: from localhost ([::1]:33404 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k944E-0006Zu-Cx for importer@patchew.org; Fri, 21 Aug 2020 06:14:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57314) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k942w-0005DP-PW for qemu-devel@nongnu.org; Fri, 21 Aug 2020 06:13:18 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:57389 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k942t-0000JT-8B for qemu-devel@nongnu.org; Fri, 21 Aug 2020 06:13:18 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-244-WygTYZrNOyWtC_gIuIo4IQ-1; Fri, 21 Aug 2020 06:13:08 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 97B8F107464F; Fri, 21 Aug 2020 10:13:07 +0000 (UTC) Received: from localhost (ovpn-113-166.ams2.redhat.com [10.36.113.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id 60EB37E318; Fri, 21 Aug 2020 10:13:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598004791; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vWr0Zb/P5tn5lmfDrRNkAndUcbgT7XDOpIOik5d1buk=; b=BqMhfkrVAZiWM1x0ka5lTPukC15qNqjAMuvaRbH94ZPLMvpx/pG0V1cFZYiPz+pcjBLpmd +/xianpfchgNqW1Jm5PoH7WOT0BsRlVsrkaVm7cutXeMyW/D0bXaVjIx7jiUPMV6P3D7lU 6jYfXk3oFOdztRL+VYnDyhFEQ+xi4Tg= X-MC-Unique: WygTYZrNOyWtC_gIuIo4IQ-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PATCH 2/2] tests: add test-fdmon-epoll Date: Fri, 21 Aug 2020 11:12:52 +0100 Message-Id: <20200821101252.203056-3-stefanha@redhat.com> In-Reply-To: <20200821101252.203056-1-stefanha@redhat.com> References: <20200821101252.203056-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=stefanha@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.120; envelope-from=stefanha@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/20 23:41:39 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MIME_BASE64_TEXT=1.741, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , qemu-block@nongnu.org, qemu-stable@nongnu.org, Stefan Hajnoczi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Test aio_disable_external(), which switches from fdmon-epoll back to fdmon-poll. This resulted in an assertion failure that was fixed in the previous patch. Signed-off-by: Stefan Hajnoczi --- MAINTAINERS | 1 + tests/Makefile.include | 4 +++ tests/test-fdmon-epoll.c | 73 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 78 insertions(+) create mode 100644 tests/test-fdmon-epoll.c diff --git a/MAINTAINERS b/MAINTAINERS index 0886eb3d2b..6d2e99b94f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2109,6 +2109,7 @@ F: migration/block* F: include/block/aio.h F: include/block/aio-wait.h F: scripts/qemugdb/aio.py +F: tests/test-fdmon-epoll.c T: git https://github.com/stefanha/qemu.git block =20 Block SCSI subsystem diff --git a/tests/Makefile.include b/tests/Makefile.include index c7e4646ded..b785e487b7 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -78,6 +78,9 @@ check-unit-$(CONFIG_SOFTMMU) +=3D tests/test-iov$(EXESUF) check-unit-y +=3D tests/test-bitmap$(EXESUF) check-unit-$(CONFIG_BLOCK) +=3D tests/test-aio$(EXESUF) check-unit-$(CONFIG_BLOCK) +=3D tests/test-aio-multithread$(EXESUF) +ifeq ($(CONFIG_EPOLL_CREATE1),y) +check-unit-$(CONFIG_BLOCK) +=3D tests/test-fdmon-epoll$(EXESUF) +endif check-unit-$(CONFIG_BLOCK) +=3D tests/test-throttle$(EXESUF) check-unit-$(CONFIG_BLOCK) +=3D tests/test-thread-pool$(EXESUF) check-unit-$(CONFIG_BLOCK) +=3D tests/test-hbitmap$(EXESUF) @@ -408,6 +411,7 @@ tests/test-char$(EXESUF): tests/test-char.o $(test-util= -obj-y) $(test-io-obj-y) tests/test-coroutine$(EXESUF): tests/test-coroutine.o $(test-block-obj-y) tests/test-aio$(EXESUF): tests/test-aio.o $(test-block-obj-y) tests/test-aio-multithread$(EXESUF): tests/test-aio-multithread.o $(test-b= lock-obj-y) +tests/test-fdmon-epoll$(EXESUF): tests/test-fdmon-epoll.o $(test-block-obj= -y) tests/test-throttle$(EXESUF): tests/test-throttle.o $(test-block-obj-y) tests/test-bdrv-drain$(EXESUF): tests/test-bdrv-drain.o $(test-block-obj-y= ) $(test-util-obj-y) tests/test-bdrv-graph-mod$(EXESUF): tests/test-bdrv-graph-mod.o $(test-blo= ck-obj-y) $(test-util-obj-y) diff --git a/tests/test-fdmon-epoll.c b/tests/test-fdmon-epoll.c new file mode 100644 index 0000000000..11fd8a2fa9 --- /dev/null +++ b/tests/test-fdmon-epoll.c @@ -0,0 +1,73 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * fdmon-epoll tests + * + * Copyright (c) 2020 Red Hat, Inc. + */ + +#include "qemu/osdep.h" +#include "block/aio.h" +#include "qapi/error.h" +#include "qemu/main-loop.h" + +static AioContext *ctx; + +static void dummy_fd_handler(EventNotifier *notifier) +{ + event_notifier_test_and_clear(notifier); +} + +static void add_event_notifiers(EventNotifier *notifiers, size_t n) +{ + for (size_t i =3D 0; i < n; i++) { + event_notifier_init(¬ifiers[i], false); + aio_set_event_notifier(ctx, ¬ifiers[i], false, + dummy_fd_handler, NULL); + } +} + +static void remove_event_notifiers(EventNotifier *notifiers, size_t n) +{ + for (size_t i =3D 0; i < n; i++) { + aio_set_event_notifier(ctx, ¬ifiers[i], false, NULL, NULL); + event_notifier_cleanup(¬ifiers[i]); + } +} + +/* Check that fd handlers work when external clients are disabled */ +static void test_external_disabled(void) +{ + EventNotifier notifiers[100]; + + /* fdmon-epoll is only enabled when many fd handlers are registered */ + add_event_notifiers(notifiers, G_N_ELEMENTS(notifiers)); + + event_notifier_set(¬ifiers[0]); + assert(aio_poll(ctx, true)); + + aio_disable_external(ctx); + event_notifier_set(¬ifiers[0]); + assert(aio_poll(ctx, true)); + aio_enable_external(ctx); + + remove_event_notifiers(notifiers, G_N_ELEMENTS(notifiers)); +} + +int main(int argc, char **argv) +{ + /* + * This code relies on the fact that fdmon-io_uring disables itself wh= en + * the glib main loop is in use. The main loop uses fdmon-poll and upg= rades + * to fdmon-epoll when the number of fds exceeds a threshold. + */ + qemu_init_main_loop(&error_fatal); + ctx =3D qemu_get_aio_context(); + + while (g_main_context_iteration(NULL, false)) { + /* Do nothing */ + } + + g_test_init(&argc, &argv, NULL); + g_test_add_func("/fdmon-epoll/external-disabled", test_external_disabl= ed); + return g_test_run(); +} --=20 2.26.2