From nobody Thu May 9 13:53:50 2024 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 170794049231227.149580624179066; Wed, 14 Feb 2024 11:54:52 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 09F421BFC; Wed, 14 Feb 2024 14:54:51 -0500 (EST) Received: from lists.libvirt.org.85.43.8.in-addr.arpa (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 5F5CB1A84; Wed, 14 Feb 2024 14:53:33 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 55E8F1AF8; Wed, 14 Feb 2024 14:53:29 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 8C2291A5C for ; Wed, 14 Feb 2024 14:53:28 -0500 (EST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-307-xgu8PcyoOk2wtCLctRURxw-1; Wed, 14 Feb 2024 14:53:27 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C2690811E81 for ; Wed, 14 Feb 2024 19:53:26 +0000 (UTC) Received: from harajuku.usersys.redhat.com.homenet.telecomitalia.it (unknown [10.45.224.86]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 56EB98077 for ; Wed, 14 Feb 2024 19:53:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: xgu8PcyoOk2wtCLctRURxw-1 From: Andrea Bolognani To: devel@lists.libvirt.org Subject: [PATCH 1/3] rpm: Always enable sysctl_config Date: Wed, 14 Feb 2024 20:53:22 +0100 Message-ID: <20240214195324.985253-2-abologna@redhat.com> In-Reply-To: <20240214195324.985253-1-abologna@redhat.com> References: <20240214195324.985253-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: 2C3YLFBRWR73EMJPDCDXMGJKYKUV4PCR X-Message-ID-Hash: 2C3YLFBRWR73EMJPDCDXMGJKYKUV4PCR X-MailFrom: abologna@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8"; x-default="true" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1707940494417100001 We currently rely on it being enabled by default. Signed-off-by: Andrea Bolognani Reviewed-by: Jiri Denemark --- libvirt.spec.in | 1 + 1 file changed, 1 insertion(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index 49ce717e1b..af2ba20c02 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1368,6 +1368,7 @@ export SOURCE_DATE_EPOCH=3D$(stat --printf=3D'%Y' %{_= specdir}/libvirt.spec) -Dqemu_moddir=3D%{qemu_moddir} \ -Dqemu_datadir=3D%{qemu_datadir} \ -Dtls_priority=3D%{tls_priority} \ + -Dsysctl_config=3Denabled \ %{?arg_userfaultfd_sysctl} \ %{?enable_werror} \ -Dexpensive_tests=3Denabled \ --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Thu May 9 13:53:50 2024 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1707940665283558.4634593121091; Wed, 14 Feb 2024 11:57:45 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 34F07173F; Wed, 14 Feb 2024 14:57:44 -0500 (EST) Received: from lists.libvirt.org.85.43.8.in-addr.arpa (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id ECDD51B59; Wed, 14 Feb 2024 14:53:47 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id E599D1A5C; Wed, 14 Feb 2024 14:53:29 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 438931A84 for ; Wed, 14 Feb 2024 14:53:29 -0500 (EST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-649-mKxgLRprMkSl-zS8duwxcw-1; Wed, 14 Feb 2024 14:53:27 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7B4CB88F3B3 for ; Wed, 14 Feb 2024 19:53:27 +0000 (UTC) Received: from harajuku.usersys.redhat.com.homenet.telecomitalia.it (unknown [10.45.224.86]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 10B851BDB1 for ; Wed, 14 Feb 2024 19:53:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: mKxgLRprMkSl-zS8duwxcw-1 From: Andrea Bolognani To: devel@lists.libvirt.org Subject: [PATCH 2/3] rpm: Always enable userfaultfd_sysctl Date: Wed, 14 Feb 2024 20:53:23 +0100 Message-ID: <20240214195324.985253-3-abologna@redhat.com> In-Reply-To: <20240214195324.985253-1-abologna@redhat.com> References: <20240214195324.985253-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: 4IL6CODPMWOVXIX4WVDO4GUQBEUJK6LT X-Message-ID-Hash: 4IL6CODPMWOVXIX4WVDO4GUQBEUJK6LT X-MailFrom: abologna@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8"; x-default="true" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1707940666653100001 Instead of enabling the feature conditionally, always enable it and then remove the installed file when building on a platform that doesn't need it. We already perform the complementary check to decide whether the file should be included in the package. Signed-off-by: Andrea Bolognani --- libvirt.spec.in | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index af2ba20c02..70d2d37502 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1283,12 +1283,6 @@ exit 1 %define arg_remote_mode -Dremote_default_mode=3Dlegacy %endif =20 -%if %{with_userfaultfd_sysctl} - %define arg_userfaultfd_sysctl -Duserfaultfd_sysctl=3Denabled -%else - %define arg_userfaultfd_sysctl -Duserfaultfd_sysctl=3Ddisabled -%endif - %define when %(date +"%%F-%%T") %define where %(hostname) %define who %{?packager}%{!?packager:Unknown} @@ -1369,7 +1363,7 @@ export SOURCE_DATE_EPOCH=3D$(stat --printf=3D'%Y' %{_= specdir}/libvirt.spec) -Dqemu_datadir=3D%{qemu_datadir} \ -Dtls_priority=3D%{tls_priority} \ -Dsysctl_config=3Denabled \ - %{?arg_userfaultfd_sysctl} \ + -Duserfaultfd_sysctl=3Denabled \ %{?enable_werror} \ -Dexpensive_tests=3Denabled \ -Dinit_script=3Dsystemd \ @@ -1518,6 +1512,10 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvi= rtd_libxl.aug rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd_libxl.a= ug %endif =20 + %if ! %{with_userfaultfd_sysctl} +rm -f $RPM_BUILD_ROOT%{_prefix}/lib/sysctl.d/60-qemu-postcopy-migration.co= nf + %endif + # Copied into libvirt-docs subpackage eventually mv $RPM_BUILD_ROOT%{_datadir}/doc/libvirt libvirt-docs =20 --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org From nobody Thu May 9 13:53:50 2024 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1707940758331491.0164772393815; Wed, 14 Feb 2024 11:59:18 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 39A5C1B7E; Wed, 14 Feb 2024 14:59:17 -0500 (EST) Received: from lists.libvirt.org.85.43.8.in-addr.arpa (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 1EAFB1C28; Wed, 14 Feb 2024 14:53:57 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 9B4CE1A72; Wed, 14 Feb 2024 14:53:31 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 9A7211A5C for ; Wed, 14 Feb 2024 14:53:30 -0500 (EST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-643-csrC0iGNNG2gh-wiTFsZ8Q-1; Wed, 14 Feb 2024 14:53:28 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 359A1101A52A for ; Wed, 14 Feb 2024 19:53:28 +0000 (UTC) Received: from harajuku.usersys.redhat.com.homenet.telecomitalia.it (unknown [10.45.224.86]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BE1ED1BDB1 for ; Wed, 14 Feb 2024 19:53:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: csrC0iGNNG2gh-wiTFsZ8Q-1 From: Andrea Bolognani To: devel@lists.libvirt.org Subject: [PATCH 3/3] meson: Drop userfaultfd_sysctl option Date: Wed, 14 Feb 2024 20:53:24 +0100 Message-ID: <20240214195324.985253-4-abologna@redhat.com> In-Reply-To: <20240214195324.985253-1-abologna@redhat.com> References: <20240214195324.985253-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: HMHCLEPBYCLY7ZHAZVUXX7YH36OQIBV4 X-Message-ID-Hash: HMHCLEPBYCLY7ZHAZVUXX7YH36OQIBV4 X-MailFrom: abologna@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8"; x-default="true" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1707940759014100001 It was introduced to make installation of the corresponding file conditional based on the build platform, but we've already changed the spec file so that all the decisions on the matter happen there, which makes having yet another meson option for the purpose unnecessary. Signed-off-by: Andrea Bolognani --- libvirt.spec.in | 2 -- meson.build | 7 ------- meson_options.txt | 1 - src/qemu/meson.build | 2 +- 4 files changed, 1 insertion(+), 11 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 70d2d37502..b3208eb21e 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1363,7 +1363,6 @@ export SOURCE_DATE_EPOCH=3D$(stat --printf=3D'%Y' %{_= specdir}/libvirt.spec) -Dqemu_datadir=3D%{qemu_datadir} \ -Dtls_priority=3D%{tls_priority} \ -Dsysctl_config=3Denabled \ - -Duserfaultfd_sysctl=3Denabled \ %{?enable_werror} \ -Dexpensive_tests=3Denabled \ -Dinit_script=3Dsystemd \ @@ -1447,7 +1446,6 @@ export SOURCE_DATE_EPOCH=3D$(stat --printf=3D'%Y' %{_= specdir}/libvirt.spec) -Dstorage_vstorage=3Ddisabled \ -Dstorage_zfs=3Ddisabled \ -Dsysctl_config=3Ddisabled \ - -Duserfaultfd_sysctl=3Ddisabled \ -Dtests=3Ddisabled \ -Dudev=3Ddisabled \ -Dwireshark_dissector=3Ddisabled \ diff --git a/meson.build b/meson.build index dbd9cad6df..63983d2a10 100644 --- a/meson.build +++ b/meson.build @@ -2019,12 +2019,6 @@ elif get_option('sysctl_config').enabled() error('sysctl configuration is supported only on linux') endif =20 -if not get_option('userfaultfd_sysctl').disabled() and conf.has('WITH_SYSC= TL') - conf.set('WITH_USERFAULTFD_SYSCTL', 1) -elif get_option('userfaultfd_sysctl').enabled() - error('userfaultfd_sysctl option requires sysctl_config to be enabled') -endif - conf.set_quoted('TLS_PRIORITY', get_option('tls_priority')) =20 =20 @@ -2325,7 +2319,6 @@ misc_summary =3D { 'virt-host-validate': conf.has('WITH_HOST_VALIDATE'), 'TLS priority': conf.get_unquoted('TLS_PRIORITY'), 'sysctl config': conf.has('WITH_SYSCTL'), - 'userfaultfd sysctl': conf.has('WITH_USERFAULTFD_SYSCTL'), } summary(misc_summary, section: 'Miscellaneous', bool_yn: true, list_sep: '= ') =20 diff --git a/meson_options.txt b/meson_options.txt index ed91d97abf..182e28b3d1 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -108,5 +108,4 @@ option('nbdkit', type: 'feature', value: 'auto', descri= ption: 'Build nbdkit stor option('nbdkit_config_default', type: 'feature', value: 'auto', descriptio= n: 'Whether to use nbdkit storage backend for network disks by default (con= figurable)') option('pm_utils', type: 'feature', value: 'auto', description: 'use pm-ut= ils for power management') option('sysctl_config', type: 'feature', value: 'auto', description: 'Whet= her to install sysctl configs') -option('userfaultfd_sysctl', type: 'feature', value: 'auto', description: = 'Whether to install sysctl config for enabling unprivileged userfaultfd') option('tls_priority', type: 'string', value: 'NORMAL', description: 'set = the default TLS session priority string') diff --git a/src/qemu/meson.build b/src/qemu/meson.build index 907893d431..7a0e908a66 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build @@ -209,7 +209,7 @@ if conf.has('WITH_QEMU') 'in_file': files('virtqemud.init.in'), } =20 - if conf.has('WITH_USERFAULTFD_SYSCTL') + if conf.has('WITH_SYSCTL') install_data( 'postcopy-migration.sysctl', install_dir: prefix / 'lib' / 'sysctl.d', --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org