From nobody Wed Apr 24 19:32:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1617818209; cv=none; d=zohomail.com; s=zohoarc; b=AqFI3ckI6oYtcKB4LVZRjV/zolVrxa+X9ZMhjJKvtwYb+zsRuZfm+WuS4fzVyDlAVyXIDS2nFjDB6vmhNuIZCWvNtYB7p/DgyG4TOsnd5DY2xxpNeY48vw4Io+CKPRPQU+Qd6NYOnPS37+Hnpku0X0O1/qnUYABkpSzRJ7d8yOM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617818209; h=Content-Type:Content-Transfer-Encoding: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=jnCAkOcfGszri20i0852EFJ2ThU9LkMIEdv7NlyJnp0=; b=OO28n9zNP6GzQpFFz9SKngZDbXOWVv++PVA5OGmNTiqjnwrKn11zq1hichfTQAhWKZsdePk0a6EXL+7c2ujNXpEDNOH/bBAev5AEBO0PTXILbedIG+2FW+j2e8X+bou4jor09F9t8SYa7B4UePzZ7qcK1PqSr44Pnh0yFSvcHaI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1617818209745435.02472962582215; Wed, 7 Apr 2021 10:56:49 -0700 (PDT) Received: from localhost ([::1]:51094 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lUCQ4-0005Dy-MH for importer@patchew.org; Wed, 07 Apr 2021 13:56:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48968) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUCNo-0002Ez-Q2 for qemu-devel@nongnu.org; Wed, 07 Apr 2021 13:54:29 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:57082) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUCNm-0005Uu-CQ for qemu-devel@nongnu.org; Wed, 07 Apr 2021 13:54:27 -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-220-K6q9f3eyMH-e0nvWkX9INQ-1; Wed, 07 Apr 2021 13:54:21 -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 D745F107ACE6; Wed, 7 Apr 2021 17:54:20 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-115-14.ams2.redhat.com [10.36.115.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0A4D510013D7; Wed, 7 Apr 2021 17:54:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617818065; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jnCAkOcfGszri20i0852EFJ2ThU9LkMIEdv7NlyJnp0=; b=Z+W0DUwxIifsqPD27wowE/gwwjnCJKACKpgWu54JHUF6J1o3WHbgKevqC8EgVmcvz/II2W 0uldQp/CKfwOXL35edExbgw1/vCUcYN3UFm59dQvrBg1l5UoeMh8c4Qy38aOvkiY8oC9Qu b32+sAcVT2i7QUSpdmZdbKmVkEWd1B8= X-MC-Unique: K6q9f3eyMH-e0nvWkX9INQ-1 From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, andrey.gruzdev@virtuozzo.com, huangy81@chinatelecom.cn Subject: [PULL 1/6] virtiofsd: Fix security.capability comparison Date: Wed, 7 Apr 2021 18:54:11 +0100 Message-Id: <20210407175416.201555-2-dgilbert@redhat.com> In-Reply-To: <20210407175416.201555-1-dgilbert@redhat.com> References: <20210407175416.201555-1-dgilbert@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=dgilbert@redhat.com X-Mimecast-Spam-Score: 0 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=170.10.133.124; envelope-from=dgilbert@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: "Dr. David Alan Gilbert" My security fix for the security.capability remap has a silly early segfault in a simple case where there is an xattrmapping but it doesn't remap the security.capability. Fixes: e586edcb41054 ("virtiofs: drop remapped security.capability xattr as= needed") Signed-off-by: Dr. David Alan Gilbert Message-Id: <20210401145845.78445-1-dgilbert@redhat.com> Reviewed-by: Connor Kuehl Signed-off-by: Dr. David Alan Gilbert --- tools/virtiofsd/passthrough_ll.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough= _ll.c index b144320e48..1553d2ef45 100644 --- a/tools/virtiofsd/passthrough_ll.c +++ b/tools/virtiofsd/passthrough_ll.c @@ -2636,7 +2636,8 @@ static void parse_xattrmap(struct lo_data *lo) strerror(ret)); exit(1); } - if (!strcmp(lo->xattr_security_capability, "security.capability")) { + if (!lo->xattr_security_capability || + !strcmp(lo->xattr_security_capability, "security.capability")) { /* 1-1 mapping, don't need to do anything */ free(lo->xattr_security_capability); lo->xattr_security_capability =3D NULL; --=20 2.31.1 From nobody Wed Apr 24 19:32:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1617818926; cv=none; d=zohomail.com; s=zohoarc; b=gNXtRElGjfn+KxaLl2NQJzplzFwlxXI3dkUgFdlBijXXJtz5fBAxYYwhgA1PCrdFfmlvtubxu/CtkEKtTIFoNlbULFFNHyQ6neMpd5DVewG4cGQsiJjjSYlQF0+nXs5K5hAyK2UKC2fpX7bmR1BZ/g50h7ptLH5XwolwP2BlHtU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617818926; h=Content-Type:Content-Transfer-Encoding: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=UirJB2TY5uZjh5FGig/cYbwwdZRpiZlC0hJj63uQjrg=; b=UsCAmiQR2FGSWYzZcrm0hbIIkjopnusqnVPPYzQlbctqIl6bKmHrgmQXakeFgKWc1cVQatsewcS1AnFBe7OwXU/aihlGC9VcwkW4VzTLIK3DY+BITui2y372Oj1wgzqN3KiqMbt+sHCM8HHpHDZqxHV/bbGKeTfxNP5TuFn7xGU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1617818926100252.56236977108233; Wed, 7 Apr 2021 11:08:46 -0700 (PDT) Received: from localhost ([::1]:48850 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lUCbc-0007y6-Vn for importer@patchew.org; Wed, 07 Apr 2021 14:08:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48958) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUCNn-0002E4-Ue for qemu-devel@nongnu.org; Wed, 07 Apr 2021 13:54:28 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:25928) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUCNm-0005UT-0d for qemu-devel@nongnu.org; Wed, 07 Apr 2021 13:54:27 -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-260-vU27lmcSMKeJkHwwJpaUbA-1; Wed, 07 Apr 2021 13:54:22 -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 04FF784B9A0; Wed, 7 Apr 2021 17:54:22 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-115-14.ams2.redhat.com [10.36.115.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2FF9310013D7; Wed, 7 Apr 2021 17:54:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617818065; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UirJB2TY5uZjh5FGig/cYbwwdZRpiZlC0hJj63uQjrg=; b=YRKGaFlQOvI+Rvfamvo249WpiEvMPegHrra9RvQLQkv6xayL2cbiKqiTuhmjgVgAYN2XsK p2sW6/yRX8yiRAtrZUf3Org41Qf2w+EJXdCFFffo9gBQYJWxwbbKG4SW/Ry1NZ+2zcLPkp hxA4n92ln5OsmM/g8vlNVfSBdDjsUQU= X-MC-Unique: vU27lmcSMKeJkHwwJpaUbA-1 From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, andrey.gruzdev@virtuozzo.com, huangy81@chinatelecom.cn Subject: [PULL 2/6] migration: Fix missing qemu_fflush() on buffer file in bg_migration_thread Date: Wed, 7 Apr 2021 18:54:12 +0100 Message-Id: <20210407175416.201555-3-dgilbert@redhat.com> In-Reply-To: <20210407175416.201555-1-dgilbert@redhat.com> References: <20210407175416.201555-1-dgilbert@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=dgilbert@redhat.com X-Mimecast-Spam-Score: 0 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=170.10.133.124; envelope-from=dgilbert@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Andrey Gruzdev Added missing qemu_fflush() on buffer file holding precopy device state. Increased initial QIOChannelBuffer allocation to 512KB to avoid reallocs. Typical configurations often require >200KB for device state and VMDESC. Fixes: 8518278a6af589ccc401f06e35f171b1e6fae800 (migration: implementation of background snapshot thread) Signed-off-by: Andrey Gruzdev Message-Id: <20210401092226.102804-2-andrey.gruzdev@virtuozzo.com> Reviewed-by: Dr. David Alan Gilbert Signed-off-by: Dr. David Alan Gilbert --- migration/migration.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/migration/migration.c b/migration/migration.c index ca8b97baa5..00e13f9d58 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -3812,7 +3812,7 @@ static void *bg_migration_thread(void *opaque) * with vCPUs running and, finally, write stashed non-RAM part of * the vmstate from the buffer to the migration stream. */ - s->bioc =3D qio_channel_buffer_new(128 * 1024); + s->bioc =3D qio_channel_buffer_new(512 * 1024); qio_channel_set_name(QIO_CHANNEL(s->bioc), "vmstate-buffer"); fb =3D qemu_fopen_channel_output(QIO_CHANNEL(s->bioc)); object_unref(OBJECT(s->bioc)); @@ -3866,6 +3866,12 @@ static void *bg_migration_thread(void *opaque) if (qemu_savevm_state_complete_precopy_non_iterable(fb, false, false))= { goto fail; } + /* + * Since we are going to get non-iterable state data directly + * from s->bioc->data, explicit flush is needed here. + */ + qemu_fflush(fb); + /* Now initialize UFFD context and start tracking RAM writes */ if (ram_write_tracking_start()) { goto fail; --=20 2.31.1 From nobody Wed Apr 24 19:32:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1617818259; cv=none; d=zohomail.com; s=zohoarc; b=Dvh7MAnlwz70gceAgEp7OUFawWpVEwsHihBn52gK7yqT6M4C62ARFbBmgZqy+XejMErYss5AlsnIjHq50LQmQx/8+4+K+49hK2KoB9XPwKNnvM8n3v7uCf328gIu5MbpwN8V7vp/5hf85Z6tbyB7gaNXQLUS5HaFJhb7Fx3OQWo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617818259; h=Content-Type:Content-Transfer-Encoding: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=CApt4YVZe8dalznNHwV9qgpeG5mlB6qk179DmDj0bLU=; b=SV7cgXrXcDP78GpEn+e0tLiLOBQhwbVDhNmq9afANUIK42MXfAoEr3P148S5lbEy8XnrKiHTNhiEvmAtLgo6WyCQWWna/ajU4EDBBtKCJsDTeypljuDDMg5LmvqM1+HXCSqSO0Px62mksMizRaRsCMmRw5zTeTu2444CLhLZ0S4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1617818259173885.4567321596156; Wed, 7 Apr 2021 10:57:39 -0700 (PDT) Received: from localhost ([::1]:54578 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lUCQs-0006eG-3D for importer@patchew.org; Wed, 07 Apr 2021 13:57:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48974) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUCNr-0002HB-Fk for qemu-devel@nongnu.org; Wed, 07 Apr 2021 13:54:31 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:20598) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUCNn-0005VN-8P for qemu-devel@nongnu.org; Wed, 07 Apr 2021 13:54:30 -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-543-n3_sF7_vNXSeuGjFlPOGag-1; Wed, 07 Apr 2021 13:54:24 -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 2A4FA801FCE; Wed, 7 Apr 2021 17:54:23 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-115-14.ams2.redhat.com [10.36.115.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 51C4510013D7; Wed, 7 Apr 2021 17:54:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617818066; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CApt4YVZe8dalznNHwV9qgpeG5mlB6qk179DmDj0bLU=; b=guPuLeEVpPZgy7jsB7NaZjHMqK2I2Mpx6EuYMbDA4GQGj+Lbb58GglDafYLBYtHUNDPJiH WbZTmESqBOpIO9xz6WAO0JazrSW0Gu+hZP43rI4oajHmSic701ZcDJVemAfFgGFfDVdrYr AVyX6WE9P+HHF+CgNhms/hpDvqB7VdQ= X-MC-Unique: n3_sF7_vNXSeuGjFlPOGag-1 From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, andrey.gruzdev@virtuozzo.com, huangy81@chinatelecom.cn Subject: [PULL 3/6] migration: Inhibit virtio-balloon for the duration of background snapshot Date: Wed, 7 Apr 2021 18:54:13 +0100 Message-Id: <20210407175416.201555-4-dgilbert@redhat.com> In-Reply-To: <20210407175416.201555-1-dgilbert@redhat.com> References: <20210407175416.201555-1-dgilbert@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=dgilbert@redhat.com X-Mimecast-Spam-Score: 0 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=216.205.24.124; envelope-from=dgilbert@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Andrey Gruzdev The same thing as for incoming postcopy - we cannot deal with concurrent RAM discards when using background snapshot feature in outgoing migration. Fixes: 8518278a6af589ccc401f06e35f171b1e6fae800 (migration: implementation of background snapshot thread) Signed-off-by: Andrey Gruzdev Reported-by: David Hildenbrand Reviewed-by: David Hildenbrand Message-Id: <20210401092226.102804-3-andrey.gruzdev@virtuozzo.com> Signed-off-by: Dr. David Alan Gilbert --- hw/virtio/virtio-balloon.c | 8 ++++++-- include/migration/misc.h | 2 ++ migration/migration.c | 8 ++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c index e770955176..d120bf8f43 100644 --- a/hw/virtio/virtio-balloon.c +++ b/hw/virtio/virtio-balloon.c @@ -66,8 +66,12 @@ static bool virtio_balloon_pbp_matches(PartiallyBalloone= dPage *pbp, =20 static bool virtio_balloon_inhibited(void) { - /* Postcopy cannot deal with concurrent discards, so it's special. */ - return ram_block_discard_is_disabled() || migration_in_incoming_postco= py(); + /* + * Postcopy cannot deal with concurrent discards, + * so it's special, as well as background snapshots. + */ + return ram_block_discard_is_disabled() || migration_in_incoming_postco= py() || + migration_in_bg_snapshot(); } =20 static void balloon_inflate_page(VirtIOBalloon *balloon, diff --git a/include/migration/misc.h b/include/migration/misc.h index bccc1b6b44..738675ef52 100644 --- a/include/migration/misc.h +++ b/include/migration/misc.h @@ -70,6 +70,8 @@ bool migration_in_postcopy_after_devices(MigrationState *= ); void migration_global_dump(Monitor *mon); /* True if incomming migration entered POSTCOPY_INCOMING_DISCARD */ bool migration_in_incoming_postcopy(void); +/* True if background snapshot is active */ +bool migration_in_bg_snapshot(void); =20 /* migration/block-dirty-bitmap.c */ void dirty_bitmap_mig_init(void); diff --git a/migration/migration.c b/migration/migration.c index 00e13f9d58..be4729e7c8 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1976,6 +1976,14 @@ bool migration_in_incoming_postcopy(void) return ps >=3D POSTCOPY_INCOMING_DISCARD && ps < POSTCOPY_INCOMING_END; } =20 +bool migration_in_bg_snapshot(void) +{ + MigrationState *s =3D migrate_get_current(); + + return migrate_background_snapshot() && + migration_is_setup_or_active(s->state); +} + bool migration_is_idle(void) { MigrationState *s =3D current_migration; --=20 2.31.1 From nobody Wed Apr 24 19:32:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1617818744; cv=none; d=zohomail.com; s=zohoarc; b=hI/vrQleFZsLCML+/7aOgu8k1g4uoSI1xtHVHksc2DlRfqmj9R+fYGmFLa1DPZctUcAljqhxdvJEw95HSg2nlHJGHrNvCPOC9BJQIgLi7gnwOMNhTYu3Ilzq2/084hJvqGXPKZcNlqGJIhYmxuCU3f5CZiL0fLLq1IDrtmm9ohE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617818744; h=Content-Type:Content-Transfer-Encoding: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=a5Vy5QOQ+5HwVDlIw7ETRAG3mK0m+9IKLmDtnDNiCws=; b=la7iw939hJPZ1EIqbUpot1TcRE3FMYwrY+85nb5goAcU7o8YktuXN8XYr8vPGFhNxR8k/Uw5vXo6ldFjLxvB/OGlDEcthW6ReLg3xXU8MKZwRSGsxr+pouNJRUZV8mSWlK5DT/SxoDbEGrIJzs1fY5pwZSeCjon9G7Yun3s+JmM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1617818744899561.8912903679302; Wed, 7 Apr 2021 11:05:44 -0700 (PDT) Received: from localhost ([::1]:44900 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lUCYh-00065M-Lk for importer@patchew.org; Wed, 07 Apr 2021 14:05:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49004) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUCNu-0002JC-BK for qemu-devel@nongnu.org; Wed, 07 Apr 2021 13:54:34 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:50456) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUCNq-0005Wa-UE for qemu-devel@nongnu.org; Wed, 07 Apr 2021 13:54:33 -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-512-fM44LD29NmWnjIhhXdwC9w-1; Wed, 07 Apr 2021 13:54:25 -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 519D51922965; Wed, 7 Apr 2021 17:54:24 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-115-14.ams2.redhat.com [10.36.115.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 75A7E10013D7; Wed, 7 Apr 2021 17:54:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617818069; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=a5Vy5QOQ+5HwVDlIw7ETRAG3mK0m+9IKLmDtnDNiCws=; b=I/j1OV9Rn30oo5cz/A8lIQ3bdLomm71wCbSE7XJLuOrgPm+JttP+WlKHO4CJFVz5K1or7H uj6CzEqMYZ9zyCSNYICAxqdDAfh+rUgA5kpacSf2j+Rxsq5mb//HqXWEz7XxLSKrVX6E3M kzu6ZxlCqlcZCdVdQFpnZGzjZE4j1tQ= X-MC-Unique: fM44LD29NmWnjIhhXdwC9w-1 From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, andrey.gruzdev@virtuozzo.com, huangy81@chinatelecom.cn Subject: [PULL 4/6] migration: Pre-fault memory before starting background snasphot Date: Wed, 7 Apr 2021 18:54:14 +0100 Message-Id: <20210407175416.201555-5-dgilbert@redhat.com> In-Reply-To: <20210407175416.201555-1-dgilbert@redhat.com> References: <20210407175416.201555-1-dgilbert@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=dgilbert@redhat.com X-Mimecast-Spam-Score: 0 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=63.128.21.124; envelope-from=dgilbert@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Andrey Gruzdev This commit solves the issue with userfault_fd WP feature that background snapshot is based on. For any never poluated or discarded memory page, the UFFDIO_WRITEPROTECT ioctl() would skip updating PTE for that page, thereby loosing WP setting for it. So we need to pre-fault pages for each RAM block to be protected before making a userfault_fd wr-protect ioctl(). Fixes: 278e2f551a095b234de74dca9c214d5502a1f72c (migration: support UFFD write fault processing in ram_save_iterate()) Signed-off-by: Andrey Gruzdev Reported-by: David Hildenbrand Reviewed-by: David Hildenbrand Message-Id: <20210401092226.102804-4-andrey.gruzdev@virtuozzo.com> Signed-off-by: Dr. David Alan Gilbert dgilbert: Bodged ifdef __linux__ on ram_write_tracking_prepare, should really go in a stub --- migration/migration.c | 8 +++++++ migration/ram.c | 49 +++++++++++++++++++++++++++++++++++++++++++ migration/ram.h | 1 + 3 files changed, 58 insertions(+) diff --git a/migration/migration.c b/migration/migration.c index be4729e7c8..8ca034136b 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -3827,6 +3827,14 @@ static void *bg_migration_thread(void *opaque) =20 update_iteration_initial_status(s); =20 + /* + * Prepare for tracking memory writes with UFFD-WP - populate + * RAM pages before protecting. + */ +#ifdef __linux__ + ram_write_tracking_prepare(); +#endif + qemu_savevm_state_header(s->to_dst_file); qemu_savevm_state_setup(s->to_dst_file); =20 diff --git a/migration/ram.c b/migration/ram.c index 40e78952ad..7e2bc0fdd3 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1560,6 +1560,55 @@ out: return ret; } =20 +/* + * ram_block_populate_pages: populate memory in the RAM block by reading + * an integer from the beginning of each page. + * + * Since it's solely used for userfault_fd WP feature, here we just + * hardcode page size to qemu_real_host_page_size. + * + * @bs: RAM block to populate + */ +static void ram_block_populate_pages(RAMBlock *bs) +{ + char *ptr =3D (char *) bs->host; + + for (ram_addr_t offset =3D 0; offset < bs->used_length; + offset +=3D qemu_real_host_page_size) { + char tmp =3D *(ptr + offset); + + /* Don't optimize the read out */ + asm volatile("" : "+r" (tmp)); + } +} + +/* + * ram_write_tracking_prepare: prepare for UFFD-WP memory tracking + */ +void ram_write_tracking_prepare(void) +{ + RAMBlock *bs; + + RCU_READ_LOCK_GUARD(); + + RAMBLOCK_FOREACH_NOT_IGNORED(bs) { + /* Nothing to do with read-only and MMIO-writable regions */ + if (bs->mr->readonly || bs->mr->rom_device) { + continue; + } + + /* + * Populate pages of the RAM block before enabling userfault_fd + * write protection. + * + * This stage is required since ioctl(UFFDIO_WRITEPROTECT) with + * UFFDIO_WRITEPROTECT_MODE_WP mode setting would silently skip + * pages with pte_none() entries in page table. + */ + ram_block_populate_pages(bs); + } +} + /* * ram_write_tracking_start: start UFFD-WP memory tracking * diff --git a/migration/ram.h b/migration/ram.h index 6378bb3ebc..4833e9fd5b 100644 --- a/migration/ram.h +++ b/migration/ram.h @@ -82,6 +82,7 @@ void colo_incoming_start_dirty_log(void); /* Background snapshot */ bool ram_write_tracking_available(void); bool ram_write_tracking_compatible(void); +void ram_write_tracking_prepare(void); int ram_write_tracking_start(void); void ram_write_tracking_stop(void); =20 --=20 2.31.1 From nobody Wed Apr 24 19:32:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1617818384; cv=none; d=zohomail.com; s=zohoarc; b=N6oUqYXwUkQtkPvCumqxxtSzeiazz7pyjRk4P8FlZhEDcgAx17cm+935HUI0w3oUCTuhDkKU2sTbj9nMlIESCCVIl4941TC5bTnYMt7iUlI7c2d/jZnP+JxM2jxdPgMVgtfNwc301TBHV4n7oTnB9c1VNTOTZPoNSpfjUKjC2Hk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617818384; h=Content-Type:Content-Transfer-Encoding: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=1Fvg4XJbhkURkN0ZGS3cdPHZEZSLnyf8pMDA1DK8gXg=; b=aurqf4rC4dkWeg6c2MPG5SS0+SKUqtTmgxgFtq+mMYdZ+RYlghcFQCpriRbqbcSJL7D0RPP1eE5FRsvEMvAb0xDnG/Z2Q1uIgTGUg6mfDWYxESLUtO2yccGY7pOk0CnQ9o8a2LoLYThUSmVIIMKeLg5XPef0D9CDlaZNm4WuvYs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1617818384172397.2186446362697; Wed, 7 Apr 2021 10:59:44 -0700 (PDT) Received: from localhost ([::1]:35064 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lUCSs-0001l6-RC for importer@patchew.org; Wed, 07 Apr 2021 13:59:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48994) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUCNt-0002Ie-AG for qemu-devel@nongnu.org; Wed, 07 Apr 2021 13:54:33 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:31608) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUCNr-0005XX-8P for qemu-devel@nongnu.org; Wed, 07 Apr 2021 13:54:32 -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-544-E_A3y3WnMRecP7bYWBItxg-1; Wed, 07 Apr 2021 13:54:26 -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 75A5F1922961; Wed, 7 Apr 2021 17:54:25 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-115-14.ams2.redhat.com [10.36.115.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9D1D410013D7; Wed, 7 Apr 2021 17:54:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617818070; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1Fvg4XJbhkURkN0ZGS3cdPHZEZSLnyf8pMDA1DK8gXg=; b=ijOCldrr1vezFHlEeAe0LYNpseZNdhL7pVnroGAedUKhD89KAAX1NblscPffjjympfdYgr P1+lO8FyPJGj8KSUR2uwcp8wZ2Fkx6UR05n9rN3Fy4Xm66CbV7PqJUkUOlE5F92oVSzFOL sJCfnjl/dHaI5jXrpdo6hHvdCTrZ+o0= X-MC-Unique: E_A3y3WnMRecP7bYWBItxg-1 From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, andrey.gruzdev@virtuozzo.com, huangy81@chinatelecom.cn Subject: [PULL 5/6] migration: Rename 'bs' to 'block' in background snapshot code Date: Wed, 7 Apr 2021 18:54:15 +0100 Message-Id: <20210407175416.201555-6-dgilbert@redhat.com> In-Reply-To: <20210407175416.201555-1-dgilbert@redhat.com> References: <20210407175416.201555-1-dgilbert@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=dgilbert@redhat.com X-Mimecast-Spam-Score: 0 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=63.128.21.124; envelope-from=dgilbert@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Andrey Gruzdev Rename 'bs' to commonly used 'block' in migration/ram.c background snapshot code. Signed-off-by: Andrey Gruzdev Reported-by: David Hildenbrand Message-Id: <20210401092226.102804-5-andrey.gruzdev@virtuozzo.com> Reviewed-by: Dr. David Alan Gilbert Signed-off-by: Dr. David Alan Gilbert --- migration/ram.c | 86 +++++++++++++++++++++++++------------------------ 1 file changed, 44 insertions(+), 42 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index 7e2bc0fdd3..4682f3625c 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1455,7 +1455,7 @@ static RAMBlock *poll_fault_page(RAMState *rs, ram_ad= dr_t *offset) { struct uffd_msg uffd_msg; void *page_address; - RAMBlock *bs; + RAMBlock *block; int res; =20 if (!migrate_background_snapshot()) { @@ -1468,9 +1468,9 @@ static RAMBlock *poll_fault_page(RAMState *rs, ram_ad= dr_t *offset) } =20 page_address =3D (void *)(uintptr_t) uffd_msg.arg.pagefault.address; - bs =3D qemu_ram_block_from_host(page_address, false, offset); - assert(bs && (bs->flags & RAM_UF_WRITEPROTECT) !=3D 0); - return bs; + block =3D qemu_ram_block_from_host(page_address, false, offset); + assert(block && (block->flags & RAM_UF_WRITEPROTECT) !=3D 0); + return block; } =20 /** @@ -1526,7 +1526,7 @@ bool ram_write_tracking_compatible(void) { const uint64_t uffd_ioctls_mask =3D BIT(_UFFDIO_WRITEPROTECT); int uffd_fd; - RAMBlock *bs; + RAMBlock *block; bool ret =3D false; =20 /* Open UFFD file descriptor */ @@ -1537,15 +1537,15 @@ bool ram_write_tracking_compatible(void) =20 RCU_READ_LOCK_GUARD(); =20 - RAMBLOCK_FOREACH_NOT_IGNORED(bs) { + RAMBLOCK_FOREACH_NOT_IGNORED(block) { uint64_t uffd_ioctls; =20 /* Nothing to do with read-only and MMIO-writable regions */ - if (bs->mr->readonly || bs->mr->rom_device) { + if (block->mr->readonly || block->mr->rom_device) { continue; } /* Try to register block memory via UFFD-IO to track writes */ - if (uffd_register_memory(uffd_fd, bs->host, bs->max_length, + if (uffd_register_memory(uffd_fd, block->host, block->max_length, UFFDIO_REGISTER_MODE_WP, &uffd_ioctls)) { goto out; } @@ -1567,13 +1567,13 @@ out: * Since it's solely used for userfault_fd WP feature, here we just * hardcode page size to qemu_real_host_page_size. * - * @bs: RAM block to populate + * @block: RAM block to populate */ -static void ram_block_populate_pages(RAMBlock *bs) +static void ram_block_populate_pages(RAMBlock *block) { - char *ptr =3D (char *) bs->host; + char *ptr =3D (char *) block->host; =20 - for (ram_addr_t offset =3D 0; offset < bs->used_length; + for (ram_addr_t offset =3D 0; offset < block->used_length; offset +=3D qemu_real_host_page_size) { char tmp =3D *(ptr + offset); =20 @@ -1587,13 +1587,13 @@ static void ram_block_populate_pages(RAMBlock *bs) */ void ram_write_tracking_prepare(void) { - RAMBlock *bs; + RAMBlock *block; =20 RCU_READ_LOCK_GUARD(); =20 - RAMBLOCK_FOREACH_NOT_IGNORED(bs) { + RAMBLOCK_FOREACH_NOT_IGNORED(block) { /* Nothing to do with read-only and MMIO-writable regions */ - if (bs->mr->readonly || bs->mr->rom_device) { + if (block->mr->readonly || block->mr->rom_device) { continue; } =20 @@ -1605,7 +1605,7 @@ void ram_write_tracking_prepare(void) * UFFDIO_WRITEPROTECT_MODE_WP mode setting would silently skip * pages with pte_none() entries in page table. */ - ram_block_populate_pages(bs); + ram_block_populate_pages(block); } } =20 @@ -1618,7 +1618,7 @@ int ram_write_tracking_start(void) { int uffd_fd; RAMState *rs =3D ram_state; - RAMBlock *bs; + RAMBlock *block; =20 /* Open UFFD file descriptor */ uffd_fd =3D uffd_create_fd(UFFD_FEATURE_PAGEFAULT_FLAG_WP, true); @@ -1629,27 +1629,27 @@ int ram_write_tracking_start(void) =20 RCU_READ_LOCK_GUARD(); =20 - RAMBLOCK_FOREACH_NOT_IGNORED(bs) { + RAMBLOCK_FOREACH_NOT_IGNORED(block) { /* Nothing to do with read-only and MMIO-writable regions */ - if (bs->mr->readonly || bs->mr->rom_device) { + if (block->mr->readonly || block->mr->rom_device) { continue; } =20 /* Register block memory with UFFD to track writes */ - if (uffd_register_memory(rs->uffdio_fd, bs->host, - bs->max_length, UFFDIO_REGISTER_MODE_WP, NULL)) { + if (uffd_register_memory(rs->uffdio_fd, block->host, + block->max_length, UFFDIO_REGISTER_MODE_WP, NULL)) { goto fail; } /* Apply UFFD write protection to the block memory range */ - if (uffd_change_protection(rs->uffdio_fd, bs->host, - bs->max_length, true, false)) { + if (uffd_change_protection(rs->uffdio_fd, block->host, + block->max_length, true, false)) { goto fail; } - bs->flags |=3D RAM_UF_WRITEPROTECT; - memory_region_ref(bs->mr); + block->flags |=3D RAM_UF_WRITEPROTECT; + memory_region_ref(block->mr); =20 - trace_ram_write_tracking_ramblock_start(bs->idstr, bs->page_size, - bs->host, bs->max_length); + trace_ram_write_tracking_ramblock_start(block->idstr, block->page_= size, + block->host, block->max_length); } =20 return 0; @@ -1657,19 +1657,20 @@ int ram_write_tracking_start(void) fail: error_report("ram_write_tracking_start() failed: restoring initial mem= ory state"); =20 - RAMBLOCK_FOREACH_NOT_IGNORED(bs) { - if ((bs->flags & RAM_UF_WRITEPROTECT) =3D=3D 0) { + RAMBLOCK_FOREACH_NOT_IGNORED(block) { + if ((block->flags & RAM_UF_WRITEPROTECT) =3D=3D 0) { continue; } /* * In case some memory block failed to be write-protected * remove protection and unregister all succeeded RAM blocks */ - uffd_change_protection(rs->uffdio_fd, bs->host, bs->max_length, fa= lse, false); - uffd_unregister_memory(rs->uffdio_fd, bs->host, bs->max_length); + uffd_change_protection(rs->uffdio_fd, block->host, block->max_leng= th, + false, false); + uffd_unregister_memory(rs->uffdio_fd, block->host, block->max_leng= th); /* Cleanup flags and remove reference */ - bs->flags &=3D ~RAM_UF_WRITEPROTECT; - memory_region_unref(bs->mr); + block->flags &=3D ~RAM_UF_WRITEPROTECT; + memory_region_unref(block->mr); } =20 uffd_close_fd(uffd_fd); @@ -1683,24 +1684,25 @@ fail: void ram_write_tracking_stop(void) { RAMState *rs =3D ram_state; - RAMBlock *bs; + RAMBlock *block; =20 RCU_READ_LOCK_GUARD(); =20 - RAMBLOCK_FOREACH_NOT_IGNORED(bs) { - if ((bs->flags & RAM_UF_WRITEPROTECT) =3D=3D 0) { + RAMBLOCK_FOREACH_NOT_IGNORED(block) { + if ((block->flags & RAM_UF_WRITEPROTECT) =3D=3D 0) { continue; } /* Remove protection and unregister all affected RAM blocks */ - uffd_change_protection(rs->uffdio_fd, bs->host, bs->max_length, fa= lse, false); - uffd_unregister_memory(rs->uffdio_fd, bs->host, bs->max_length); + uffd_change_protection(rs->uffdio_fd, block->host, block->max_leng= th, + false, false); + uffd_unregister_memory(rs->uffdio_fd, block->host, block->max_leng= th); =20 - trace_ram_write_tracking_ramblock_stop(bs->idstr, bs->page_size, - bs->host, bs->max_length); + trace_ram_write_tracking_ramblock_stop(block->idstr, block->page_s= ize, + block->host, block->max_length); =20 /* Cleanup flags and remove reference */ - bs->flags &=3D ~RAM_UF_WRITEPROTECT; - memory_region_unref(bs->mr); + block->flags &=3D ~RAM_UF_WRITEPROTECT; + memory_region_unref(block->mr); } =20 /* Finally close UFFD file descriptor */ --=20 2.31.1 From nobody Wed Apr 24 19:32:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1617819162; cv=none; d=zohomail.com; s=zohoarc; b=FhlXTPd7AO88B4dBe5T8yvARhJ2RHmPnmohksy5J6YVi/rxApbh1TA2LQyHfk7gWZysAjvJbaDyoQi1bFWZ3ntnk/MNRBcJK/KnK1EglCc99iE4msCm0G1SkWrI5wgkk+8q2qLY91W3IsEM7Lr8VKxtevdCJ+1rx1bwq3SuTtHE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617819162; h=Content-Type:Content-Transfer-Encoding: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=ObZ2vlQK97CMHKkNw/SiRADijpH8mwk57xEQkdO/b8k=; b=adEW6bHNKFC0xIR7hNxYhVeoLTGLm22MksUx0AvDhY49AdhzGA0ILBNee0tUvMw+20dztSgXkvvANcRoXgwIch0bsJJf12gZiSpT5dfoG/gJ55PDuEA58oulkPP8tAnoCLcfk2LyWUp/pQUTx/qbyU5jh7s62IB9y/5VVdIgDWc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1617819162810643.0435171383701; Wed, 7 Apr 2021 11:12:42 -0700 (PDT) Received: from localhost ([::1]:53232 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lUCfR-0001V8-Qq for importer@patchew.org; Wed, 07 Apr 2021 14:12:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49006) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUCNv-0002LP-4K for qemu-devel@nongnu.org; Wed, 07 Apr 2021 13:54:35 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:34850) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUCNs-0005Xf-Df for qemu-devel@nongnu.org; Wed, 07 Apr 2021 13:54:34 -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-154-xoLPAgN7O8uzQECA2FPqHw-1; Wed, 07 Apr 2021 13:54:27 -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 999D884B9A8; Wed, 7 Apr 2021 17:54:26 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-115-14.ams2.redhat.com [10.36.115.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id C2CA2104254C; Wed, 7 Apr 2021 17:54:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617818071; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ObZ2vlQK97CMHKkNw/SiRADijpH8mwk57xEQkdO/b8k=; b=HF28ywFnvk9UFwIxJ8iXQ5uuMXKnK0YUq5JbkRDyJVpLjQWBv5edSPLjupnccfU3eSyCue C3UExGXxPAZGBhRSeT5sg06wrnTz66rYVVb6c3HIOYzksCwQH5ZO1DwoA/KrZ5BtnLratL ezJcwaCzyfS6gSk7RRTejobbgIhXOAc= X-MC-Unique: xoLPAgN7O8uzQECA2FPqHw-1 From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, andrey.gruzdev@virtuozzo.com, huangy81@chinatelecom.cn Subject: [PULL 6/6] tests/migration: fix parameter of auto-converge migration Date: Wed, 7 Apr 2021 18:54:16 +0100 Message-Id: <20210407175416.201555-7-dgilbert@redhat.com> In-Reply-To: <20210407175416.201555-1-dgilbert@redhat.com> References: <20210407175416.201555-1-dgilbert@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=dgilbert@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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=170.10.133.124; envelope-from=dgilbert@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Hyman Huang(=E9=BB=84=E5=8B=87) when execute the following test command: $ ./guestperf-batch.py --auto-converge \ --auto-converge-step {percent} ... test aborts and error message be throwed as the following: "Parameter 'x-cpu-throttle-increment' is unexpected" The reason is that 'x-cpu-throttle-increment' has been deprecated and 'cpu-throttle-increment' was introduced Since v2.7. Use the new parameter instead. Signed-off-by: Hyman Huang(=E9=BB=84=E5=8B=87) Message-Id: <0195d34a317ce3cc417b3efd275e30cad35a7618.1616513998.git.huangy= 81@chinatelecom.cn> Reviewed-by: Dr. David Alan Gilbert Signed-off-by: Dr. David Alan Gilbert --- tests/migration/guestperf/engine.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/migration/guestperf/engine.py b/tests/migration/guestper= f/engine.py index e399447940..6b49aed579 100644 --- a/tests/migration/guestperf/engine.py +++ b/tests/migration/guestperf/engine.py @@ -102,7 +102,7 @@ def _migrate_progress(self, vm): info.get("downtime", 0), info.get("expected-downtime", 0), info.get("setup-time", 0), - info.get("x-cpu-throttle-percentage", 0), + info.get("cpu-throttle-percentage", 0), ) =20 def _migrate(self, hardware, scenario, src, dst, connect_uri): @@ -135,7 +135,7 @@ def _migrate(self, hardware, scenario, src, dst, connec= t_uri): "state": True } ]) resp =3D src.command("migrate-set-parameters", - x_cpu_throttle_increment=3Dscenario._auto_c= onverge_step) + cpu_throttle_increment=3Dscenario._auto_con= verge_step) =20 if scenario._post_copy: resp =3D src.command("migrate-set-capabilities", --=20 2.31.1