From patchwork Thu Oct 14 09:15:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lin Ma X-Patchwork-Id: 1540844 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=suse.com header.i=@suse.com header.a=rsa-sha256 header.s=mimecast20200619 header.b=hD6YoneR; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HVP0w59vPz9s1l for ; Thu, 14 Oct 2021 20:16:48 +1100 (AEDT) Received: from localhost ([::1]:34748 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mawr0-0004V0-HB for incoming@patchwork.ozlabs.org; Thu, 14 Oct 2021 05:16:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57698) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mawqU-0004SU-8t for qemu-devel@nongnu.org; Thu, 14 Oct 2021 05:16:14 -0400 Received: from de-smtp-delivery-102.mimecast.com ([194.104.111.102]:56825) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mawqS-0004sS-72 for qemu-devel@nongnu.org; Thu, 14 Oct 2021 05:16:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1634202970; 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=dqRb/X/zKAjbS/bE0msOjMIr6hIIXNWz7D+xIVKDYmI=; b=hD6YoneRYXDYXidmFVCirrIDc7+kzMd3ZBnlW2rg7yCjnWtfttF1Q5HT0/UG9w29K4aQ0g cJBe1fFszeTQzfOILk98JeBRP/EpWG/HHjRRi+rgqgqGhP4HchZexzjTE6XgSdntwTP1C+ S9KYRrRh/y+uHLt+8rEdYQIwvmgi0DA= Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05lp2104.outbound.protection.outlook.com [104.47.17.104]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-12-VAwSAKIFPOywBODZC9soIg-2; Thu, 14 Oct 2021 11:16:09 +0200 X-MC-Unique: VAwSAKIFPOywBODZC9soIg-2 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aavhlsK4DB+7QngL1+S4hletap67EUeToFpUfGIEgGFAa/ciBbeH9WKL0Y1UiiZslS48sUn1p5NI6KfTWYfQtGrn51l7aV+QAuun1fzk8pz0Y6ykzHx9uaYhJb5KfBuelyfsYoD0OQLFv4WDRFNPf7/F6xquyLs2Mngedls5ge/qLqTFpFamY0om+OnF5mI34Hp8XNny3A0MHhUmRv1TnonN8zl1T7FynUQMvO6pWBfj1oWb9CoxpxPpuXgrzrKnBPMO1rdy2i6U+5qfIiB2VAjUJV22XJP4sbNrNTz9+Ud/1lsPNvaVMM1BrkVL+be65vwiTwRCYMsXakjfN67H+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=lyoMlmNamqTAnnw9+oC1L9n4Snb8jHygLcrqKderjBg=; b=aYWE0GGC/HhEXxZCuRN/Avv/9JZ2/vYAU/k9yOnRsViA70zqRJw93iwws0mIEWt+yQ5z6lqLM1HIqH6iQ8+R8x9Dpy5zca1CO++riz/MZNgj6mYBIW/m2beZb2kUJSJD5w8U94CaJhFtISHuk7z6wxPAFSSxLscB/LTW80X6ASIHax1SyqQ2GPEx4JLRbscaECWunZnNDsgj9/zfFNBg3YB716DQFfejJEYRMxNq+MjpUi5jQ0/3DwhKeGhR03kLPgpqhX+T3GfX82IL249Hg1BlRc2G2HlcdQAiFU39hFeyJyKXWN9eYN/iOBmSyItn7ni5TV9AFnmkqE+m2JRozQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=suse.com; Received: from AM9PR04MB8602.eurprd04.prod.outlook.com (2603:10a6:20b:439::12) by AM9PR04MB8955.eurprd04.prod.outlook.com (2603:10a6:20b:40a::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.21; Thu, 14 Oct 2021 09:16:07 +0000 Received: from AM9PR04MB8602.eurprd04.prod.outlook.com ([fe80::5499:6698:e99f:cf7f]) by AM9PR04MB8602.eurprd04.prod.outlook.com ([fe80::5499:6698:e99f:cf7f%8]) with mapi id 15.20.4608.016; Thu, 14 Oct 2021 09:16:07 +0000 From: Lin Ma To: qemu-devel@nongnu.org CC: quintela@redhat.com, dgilbert@redhat.com, Lin Ma Subject: [PATCH 1/3] migration: introduce postcopy-uffd-usermode-only capability Date: Thu, 14 Oct 2021 17:15:49 +0800 Message-ID: <20211014091551.15201-2-lma@suse.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20211014091551.15201-1-lma@suse.com> References: <20211014091551.15201-1-lma@suse.com> X-ClientProxiedBy: HK2PR02CA0164.apcprd02.prod.outlook.com (2603:1096:201:1f::24) To AM9PR04MB8602.eurprd04.prod.outlook.com (2603:10a6:20b:439::12) MIME-Version: 1.0 Received: from localhost (60.251.47.115) by HK2PR02CA0164.apcprd02.prod.outlook.com (2603:1096:201:1f::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.16 via Frontend Transport; Thu, 14 Oct 2021 09:16:06 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c1ba8c6e-152e-44bd-1e77-08d98ef34119 X-MS-TrafficTypeDiagnostic: AM9PR04MB8955: X-LD-Processed: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba,ExtFwd X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:118; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jw8u/iV/6O7usNhdz5mvPPYyvQYbEG/U/4WCZq5A1szwuZl4ck8Y5wJVr2egoNPjzWTyf+EudRs6RU/CQI6OfDAM+UlBRynszEMhrbGFdj03kndLQmHiucB/BUSp109/lpOHTi0tUb/NXV8injC3/ASrOchVw1IrNfcT5qPCjm7azsOOzSMb+YKVeB5VAy+Ky67zi3l2Cfa6QkZZjFmZ2NxbRIhau5MyRtCTn0a/ipipOttnUy0UyYgp4DxAENs8RLj1IGBqI4+3BoTrhwjXHJDio0R2SzQSrwu1LQoeq92U6enMbkh7hryyW3iQQlpa8j/GWGogXykaHJKpOnT5/G1mzN42xUKAdwq5eAfeaJc2tDoc1uZNeyqMnzLU6BYjD4JeUh4nMUVXueCIsz6A0JiZ9ECUh9Ufap135utVuVXt8T+V7ZIblrEJmYlBF5sPJ2pxD6Y2HTV6miSirgQmPpG4DzZ+idPgs2Sk7jvQm2N3TbJd1TiUJUrwd7dUPxXvlriYhP4NLDaAtn2myY4PwXxQVbBvoxpClWWD86C+7LDM3L3f/3jTy9aui0T9aS74XrDYcfb7WF9mq0XyYrj6XAAu64wh7q38QpzZoL8EWHZeg7bpFPf61gndtSbDsYCirR0CgGYZFdWm0o3pxNsL/g== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM9PR04MB8602.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(366004)(66556008)(66476007)(6496006)(55236004)(2906002)(38100700002)(86362001)(26005)(36756003)(66946007)(316002)(186003)(6486002)(107886003)(6666004)(83380400001)(2616005)(5660300002)(508600001)(8936002)(1076003)(956004)(6916009)(8676002)(4326008); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: GXwI9KOswoSpmhXhVrFn3k2S0GcSBpzHCBT7KQzYdPjTrFdHW0TJBQwaorERENCl7GjYesqJTwoqO2n36iuDmXQODsVRZbWhPe0zWAYSJiyP6Gbdj400V+hZf9D9qkZjQAMzR99SgvHZZuMzG64uEXHVTtaMS9gdzwwE8lpbQ3IeGEKUr36oYh64G9dqcDseeAPKE8Z79ptW51dtTGGpDLZL//CgiV5doVMtW854kxMVTBH7CovTIaSVlI+gNss5C3vumx9hTae0czRSKprqm4XDU5nB7rkoMN5g2MivzluirDkpZLBcluvyIzmqG2lTsLXdWfHwlLxsUsDqMjpAiBcXyn4GKDQDBzoFAq0Yu/rQlqNabQ9sCo4nylQDsbouoYyPjDF7dRpQhTGxiC65I+LofktidvjVVoxN/e2ImQF23xNbsxv/xayxh9YbvmpXhnDoZgi0P/CV/hQvBdj46D25Ezm9WQWnvHW/onSvwP/TT/lYDz/SZRd7GtjOcdeAHZqI0yE2QeA1Hciu9WCij1XneIOTv9Vn7Z96BWx7gV19LhiP+4DxXuQxrzm4MqhOnwcUxVLPx+vWh8d6/faOoLg0KQiVi33JdNWuya4o3ju4t4tgMPoV9qwJ0eCvFtLNk+B2mHhG0UorHF5X2mDILQ9dH6Z9mqRiEu2g2x2vEr/uYrL7z+0w5q3iRSch/d2AwWbaRYfXe8VyoGRlXhoM6ucQ37WU5ugfEoFpEeoQvh7t1sPGB/hX+7GjFI8j81WwecJv0qkiD7t2ZSiE8meTHuoqu3OpP9ydnwR54h8sAkn5U3CDsrDeyJE7xZHG4mKupsoo/Y0a2A9y+sP+TMlLt4zmn5JNHD+k03gLmYxFVx+1ac0uohF2S7iaABnhzPyeGfTg0zcjnHfETexU+8DLV/UQSJrpBCugG4IDzKECDHJReeKkhO6IHisU3QraT4gcf1/vO6IfFHK9K14TjV5VJJvH05lhD7RKnNeZ0wB+Lnrq2GFRUm7jELwoZ/ywWmoRwke5VK0yGqHtfeM6gvTh+kPUDtrpdP/27a78PWl78tUQ2TpAqu85ycF6l1HeqlrPNa8Niil57ZXnzf0ZBIdRrZOdVnmbhnW9TFfC9XN0B3rMYwRg3oeLVTOP0YESArRUUWfGh27TJ1if90/+3/8gvp4/KYc3FZXleTWBoVvn7ivAWt3Lals7IQUmqVeV84WTRLBF/0NfIetMJDn3IKN2D5Y5RZg28rNnghU7VM8JqJXn2qSQF/vg+s0Gj7PMYjllJ9TF2XLJVnAIbD+cWXNYX74Mg43q7Z6tOEWPMYXJ3o6B4N02S9SVXGWbZWZ/Fm1Y X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: c1ba8c6e-152e-44bd-1e77-08d98ef34119 X-MS-Exchange-CrossTenant-AuthSource: AM9PR04MB8602.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Oct 2021 09:16:07.0754 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: R+ffDEHvyUfGrktD3jmfscHPINVzFS6Gv5+gZGrYz0Z6s7Xy4lsIiDpxFfBP6vHI X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8955 Received-SPF: pass client-ip=194.104.111.102; envelope-from=lma@suse.com; helo=de-smtp-delivery-102.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The default value of unprivileged_userfaultfd sysctl knob was changed to 0 since kernel v5.11 by commit d0d4730a: userfaultfd: add user-mode only option to unprivileged_userfaultfd sysctl knob. In this mode, An unprivileged user (without SYS_CAP_PTRACE capability) must pass UFFD_USER_MODE_ONLY to userfaultd or the API will fail with EPERM. So add a capability to pass UFFD_USER_MODE_ONLY to support it. Signed-off-by: Lin Ma --- migration/migration.c | 9 +++++++++ migration/migration.h | 1 + migration/postcopy-ram.c | 22 +++++++++++++++++++--- qapi/migration.json | 8 +++++++- 4 files changed, 36 insertions(+), 4 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index 6ac807ef3d..86212dcb70 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -2380,6 +2380,15 @@ bool migrate_postcopy_blocktime(void) return s->enabled_capabilities[MIGRATION_CAPABILITY_POSTCOPY_BLOCKTIME]; } +bool migrate_postcopy_uffd_usermode_only(void) +{ + MigrationState *s; + + s = migrate_get_current(); + + return s->enabled_capabilities[MIGRATION_CAPABILITY_POSTCOPY_UFFD_USERMODE_ONLY]; +} + bool migrate_use_compression(void) { MigrationState *s; diff --git a/migration/migration.h b/migration/migration.h index 7a5aa8c2fd..a516d7f59f 100644 --- a/migration/migration.h +++ b/migration/migration.h @@ -358,6 +358,7 @@ int migrate_decompress_threads(void); bool migrate_use_events(void); bool migrate_postcopy_blocktime(void); bool migrate_background_snapshot(void); +bool migrate_postcopy_uffd_usermode_only(void); /* Sending on the return path - generic and then for each message type */ void migrate_send_rp_shut(MigrationIncomingState *mis, diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c index 2e9697bdd2..078c558626 100644 --- a/migration/postcopy-ram.c +++ b/migration/postcopy-ram.c @@ -206,9 +206,14 @@ static bool receive_ufd_features(uint64_t *features) struct uffdio_api api_struct = {0}; int ufd; bool ret = true; + int flags; + + flags = O_CLOEXEC; + if (migrate_postcopy_uffd_usermode_only()) + flags |= UFFD_USER_MODE_ONLY; /* if we are here __NR_userfaultfd should exists */ - ufd = syscall(__NR_userfaultfd, O_CLOEXEC); + ufd = syscall(__NR_userfaultfd, flags); if (ufd == -1) { error_report("%s: syscall __NR_userfaultfd failed: %s", __func__, strerror(errno)); @@ -352,13 +357,18 @@ bool postcopy_ram_supported_by_host(MigrationIncomingState *mis) struct uffdio_range range_struct; uint64_t feature_mask; Error *local_err = NULL; + int flags; if (qemu_target_page_size() > pagesize) { error_report("Target page size bigger than host page size"); goto out; } - ufd = syscall(__NR_userfaultfd, O_CLOEXEC); + flags = O_CLOEXEC; + if (migrate_postcopy_uffd_usermode_only()) + flags |= UFFD_USER_MODE_ONLY; + + ufd = syscall(__NR_userfaultfd, flags); if (ufd == -1) { error_report("%s: userfaultfd not available: %s", __func__, strerror(errno)); @@ -1064,8 +1074,14 @@ retry: int postcopy_ram_incoming_setup(MigrationIncomingState *mis) { + int flags; + + flags = O_CLOEXEC | O_NONBLOCK; + if (migrate_postcopy_uffd_usermode_only()) + flags |= UFFD_USER_MODE_ONLY; + /* Open the fd for the kernel to give us userfaults */ - mis->userfault_fd = syscall(__NR_userfaultfd, O_CLOEXEC | O_NONBLOCK); + mis->userfault_fd = syscall(__NR_userfaultfd, flags); if (mis->userfault_fd == -1) { error_report("%s: Failed to open userfault fd: %s", __func__, strerror(errno)); diff --git a/qapi/migration.json b/qapi/migration.json index 88f07baedd..3af1ec4cec 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -452,6 +452,11 @@ # procedure starts. The VM RAM is saved with running VM. # (since 6.0) # +# @postcopy-uffd-usermode-only: If enabled, It allows unprivileged users to use +# userfaultfd but with the restriction that page +# faults from only user mode can be handled. +# (since 6.2.0) +# # Since: 1.2 ## { 'enum': 'MigrationCapability', @@ -459,7 +464,8 @@ 'compress', 'events', 'postcopy-ram', 'x-colo', 'release-ram', 'block', 'return-path', 'pause-before-switchover', 'multifd', 'dirty-bitmaps', 'postcopy-blocktime', 'late-block-activate', - 'x-ignore-shared', 'validate-uuid', 'background-snapshot'] } + 'x-ignore-shared', 'validate-uuid', 'background-snapshot', + 'postcopy-uffd-usermode-only'] } ## # @MigrationCapabilityStatus: From patchwork Thu Oct 14 09:15:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lin Ma X-Patchwork-Id: 1540845 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=suse.com header.i=@suse.com header.a=rsa-sha256 header.s=mimecast20200619 header.b=P6clHcaq; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HVP2x0jQ0z9s1l for ; Thu, 14 Oct 2021 20:18:33 +1100 (AEDT) Received: from localhost ([::1]:39100 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mawsg-0007SE-Tq for incoming@patchwork.ozlabs.org; Thu, 14 Oct 2021 05:18:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57710) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mawqY-0004Ye-2U for qemu-devel@nongnu.org; Thu, 14 Oct 2021 05:16:18 -0400 Received: from de-smtp-delivery-102.mimecast.com ([194.104.109.102]:60726) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mawqW-0004x1-GK for qemu-devel@nongnu.org; Thu, 14 Oct 2021 05:16:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1634202975; 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=2S9iL41NSqbJfl5zDDMPdK5n1EtXnrbKBBSa6/jZEN0=; b=P6clHcaq3P/cXoAJHd2dWXJJKvcAxP/kt6jLFXHF7sn9f5prCimjew/uiVRPFGKyiV1tKC aCBzPmPhR0UNu005Iw8mwPixfFJfP89T90h7oujCwtYxj6VFsHI9zcaaRH/jEnaOAv01z4 xdKEblPqXuQOyLI4uklkbcjpB+KaCCY= Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05lp2107.outbound.protection.outlook.com [104.47.17.107]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-31-_pGwaUnrOTKsm-ltP6dYVw-1; Thu, 14 Oct 2021 11:16:14 +0200 X-MC-Unique: _pGwaUnrOTKsm-ltP6dYVw-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NB2GQfXnMMQhi3pqW/PZRhUfLOPU9bi8TccTr2NZKSAehmbiqSkYeuDfOf/t82dFaoUBoVPDxtM1922ghYQS9eDXsa0Veii5av8Gu9KRfawRuRtVn/Pw3FtoYocTazgTsY/V2b0OvQM8aq1UZDHLzivMkbnOk5skLtbdKvXpjiXk2+k2lPJ16Qzfqu9NkDTtihz7quiJkfO8WUUOpZzi9Ts+MRqXet/jZIyqhcR+XHGxaKuyyCCXeTFyWQa7ammHdCM20y6QoIIt646UXt0XyWp9EZrdNhDEQYjQoyw1kzheAc7ZqoarI/0HhEMxeeZ83VAZjo+fShooZ8qzTkl6BQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=vdQaJMn/T2harU81bZZbQwjknYRtew8ZCIfFGn180es=; b=d0GRLPumBTxlQeXC1wUpCivG6h3UW2JzGyed+9E6sXmVJ+VqNjvnRUtxmipIDkKO+VPsp0iI7N0/bwsXgDGsAUui4OJswsaBeG1g31di7NfA0KYGB1H/zg7vwTOxipQDUDOJB11kEkhKCWl3MWu5pm82OhXe9GdLEKIinGn0Sqna9DS7Z7mopraGWZZr+B51vkVMJKs5tQAc8QgeCTrAHQwpEHF2OgM227CkM3ie8fOoCECROEXehQODKfjsPilO3GAzVnubLGo7xRB2FCqxninaiyyZ2XWGsIbHEhBFoUGSugZKjPkeEuuTszGPNnUFNdamW6ZNiRAisMSpyNDEww== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=suse.com; Received: from AM9PR04MB8602.eurprd04.prod.outlook.com (2603:10a6:20b:439::12) by AM9PR04MB8955.eurprd04.prod.outlook.com (2603:10a6:20b:40a::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.21; Thu, 14 Oct 2021 09:16:13 +0000 Received: from AM9PR04MB8602.eurprd04.prod.outlook.com ([fe80::5499:6698:e99f:cf7f]) by AM9PR04MB8602.eurprd04.prod.outlook.com ([fe80::5499:6698:e99f:cf7f%8]) with mapi id 15.20.4608.016; Thu, 14 Oct 2021 09:16:13 +0000 From: Lin Ma To: qemu-devel@nongnu.org CC: quintela@redhat.com, dgilbert@redhat.com, Lin Ma Subject: [PATCH 2/3] migration: postcopy-uffd-usermode-only documentation Date: Thu, 14 Oct 2021 17:15:50 +0800 Message-ID: <20211014091551.15201-3-lma@suse.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20211014091551.15201-1-lma@suse.com> References: <20211014091551.15201-1-lma@suse.com> X-ClientProxiedBy: HK2PR02CA0173.apcprd02.prod.outlook.com (2603:1096:201:1f::33) To AM9PR04MB8602.eurprd04.prod.outlook.com (2603:10a6:20b:439::12) MIME-Version: 1.0 Received: from localhost (60.251.47.115) by HK2PR02CA0173.apcprd02.prod.outlook.com (2603:1096:201:1f::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.16 via Frontend Transport; Thu, 14 Oct 2021 09:16:12 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6e0d3b6f-9818-4abe-d5cc-08d98ef344c3 X-MS-TrafficTypeDiagnostic: AM9PR04MB8955: X-LD-Processed: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba,ExtFwd X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6430; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3XMiB170nW9+9waQ6W7PPT5hQ1kocqVRt8C49aQaGMHatchhGDgkdd1PfjnJNRKBR5qW4T4uHKajNnvsd9mDetynAPEfmRYsPn08dyvJULLuBUIQdjfdvJIS0Weoakc3zBkY5tweqwynov2fbvItSJ0UWLEiFp3id4KtUY1TxV/GYFyLXSysiqUmWY9LtyG353O0HEZnUsVZZ05qTvhYE85opGunvPYEv1nSETnff2X5OczVMGtChxYcazCpXpK4TNs/3Cjg2JLs5CQdZhdwmjAJxWYA3VnAPCHEWdYlFp024pHUa7QzXpEtVNweDD114MISmS+RKnZQujC4owVolW+WUSC3yb80HbxcmBO1Jwqf7g71XkGWcCaHjdTck/XYESgXPDRBJj4MNv0hiK7DrBeUpjcEtpeFdM+8Z5lxqgOI2n4lnjmFpQK+kjmsCLYhA9ohy/42IQuTUJMpPy+c9p6ZImkX8ABLLWqFES9eBT/DatIAvOPdOnBBVBXU81ACYSnZEFiovre4yTtClpLYNmIDRzqbSVxvcVXdDfXM9uwQG4YOZhZRxzFYiX0p0jhAduR+IQevxIxr65L8nVejLSTNppvZCcgRKkP0js1naoOb85GWI4o2ckH2rukfdt9aa1tKR15Lw0BE6SFWBKVT9g== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM9PR04MB8602.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(366004)(66556008)(66476007)(6496006)(55236004)(2906002)(38100700002)(86362001)(26005)(36756003)(66946007)(316002)(4744005)(186003)(6486002)(107886003)(6666004)(83380400001)(2616005)(5660300002)(508600001)(8936002)(1076003)(956004)(6916009)(8676002)(4326008); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Ree38xHsvPvavUaUEup60JGLxIuHsB3017iLWb/BwB0wK2KgUp+4VKwdv/YI8hLm56wGw69/1+TVNxfvozkldciiQnh3tz2hFIkixOItxbGQtIpjzOI5ukD3b9bnVayKbXORuYyRztgYZZu198FT57loz6Aq1DajwZIWkPhjYGbJkU0qzyE49Jsekph9v1lZY7MFqQ+6DRA+r0lLgb9jkZgaRtZUnxSKhQvBmomIpFZbM/mz3WRQvD0LtOoRNzylwq7ReEoxLCDRrpsordDvdzJGtvUOIZIsNd2aZS5BsY1wEjsP/k6Nxxgawcce5+dwgOtA9kvnYw6gDRzb0dGGYvM8yt8FMTgK4k/dL5ROChTVRh1EnnKjTo7X9fjJl+bCELoxPE7HlV5wdbuFcaGaUXxZ5AmDrfRJhdQdeScd+rRK8qPFQ14MkPCZ8LI7fxgYsxun0WYFQG1LGXGOqAbgowIXDHwYlTwxAIvnuD54aoNhLDeXOWoPGf46g3uiejZ8EjjMH8/gyftF2ZhSYVHE/1q/Y100+yBF9CC3bO0EmMMFSuBbsnc2GtPSAgguiYbrPEN92u5n42C11KIo+ojpGAU4kaLqMPFcZ6NN243FvUQ2C5N1cmoYV9GZYy6dA4OZMU/Uo1q4fc4baQW8goMxpvMvUMhCKx0LYGTO81/+y6FPnM5CF7ieAmrx1f6G4AhXgKM9j0E5jo5N2oaoPkmTYVZIC+/rQ7g+ioflaPG4+xYEjwVNxRaMDQgQrfj1E1GI0hJiHlORrNnYNxwFEZZA/qjK2AW9gkUQHtpe2HfkqYP5jy5YNxNdTWjOIhR6sRQpANUEwVpmyQcSyG005YkTjXPi66+//EtxvK4dXem0rMfUwW7ODsdojkLb3pumzgdTEesN5fm+ml/OMFRQOA4umMSpcBXRx8b845A7nrmwABhSw5ujeUNenTqU/6oEOcHT+pBJqupUw7olJz0lmDqV6EnyZJMB0w4MHgA2bNL73Xi6pwOw+zQYNFuyo+BCQavozbp3djC4NIvdrY4vZkSAxZAqqrsgTjA5jHZjaBUVlJa0Q2GwMMKY6WfOxeJEfDh8xpg1NXMYTPC/wfiZfLXeFyIfk2iYm2xGaQPenhIIGLb9YPWGhaJTWDr3Zxc848zyzQfB1FAkDm2pl3jmfu8I/B/QiMFnT2I7SNDrhux8RgBrqW0+7O+Z/ZPK3S3v1orgOE5quqjgruN7Qeu0Pd6tGw8VeJ6/0F41C6+2m0ZAzx1pqfkmvjsgpufHrBOGE+B2L/o4eIF++KxgyYpUvGefWQ5cbG/rDqzeP3vVqFUpG3QAQQyaUk3ia86GKRveDW1o X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6e0d3b6f-9818-4abe-d5cc-08d98ef344c3 X-MS-Exchange-CrossTenant-AuthSource: AM9PR04MB8602.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Oct 2021 09:16:13.2642 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Cfhbodhqn6WW5bTDiq8KyCu6dtANOqve3lNaGo9gcyx27Sp29Aa4hrrVM6msLhi7 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8955 Received-SPF: pass client-ip=194.104.109.102; envelope-from=lma@suse.com; helo=de-smtp-delivery-102.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Lin Ma --- docs/devel/migration.rst | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/devel/migration.rst b/docs/devel/migration.rst index 2401253482..dfdd3f20b4 100644 --- a/docs/devel/migration.rst +++ b/docs/devel/migration.rst @@ -639,6 +639,15 @@ postcopy-blocktime value of qmp command will show overlapped blocking time for all vCPU, postcopy-vcpu-blocktime will show list of blocking time per vCPU. +Since kernel v5.11, Unprivileged user (without SYS_CAP_PTRACE capability) +must pass UFFD_USER_MODE_ONLY to userfaultd if the unprivileged_userfaultfd +sysctl knob is 0. + +To allow unprivileged user postcopy, Issue this command on destination +monitor prior to turning on postcopy-ram: + +``migrate_set_capability postcopy-uffd-usermode-only on`` + .. note:: During the postcopy phase, the bandwidth limits set using ``migrate_set_parameter`` is ignored (to avoid delaying requested pages that From patchwork Thu Oct 14 09:15:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lin Ma X-Patchwork-Id: 1540846 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=suse.com header.i=@suse.com header.a=rsa-sha256 header.s=mimecast20200619 header.b=C34Z2+V8; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HVP4k0PySz9s1l for ; Thu, 14 Oct 2021 20:20:06 +1100 (AEDT) Received: from localhost ([::1]:42066 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mawuB-00011n-Rq for incoming@patchwork.ozlabs.org; Thu, 14 Oct 2021 05:20:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57780) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mawqe-0004lc-Va for qemu-devel@nongnu.org; Thu, 14 Oct 2021 05:16:25 -0400 Received: from de-smtp-delivery-102.mimecast.com ([194.104.111.102]:38341) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mawqd-00051f-86 for qemu-devel@nongnu.org; Thu, 14 Oct 2021 05:16:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1634202981; 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=h4C7b7jtf2NXK+xt0rNa6NStSs5CJW3Ym1UIwDaHS8o=; b=C34Z2+V8zx08D/Igyl/pMO8dOKdQxoWp/y4TwvLXNM8pFjUH+XH3ecO3LA7zkLUUWutMjZ vJgchGTNCDbkEG8BLcPnAo4qrsVvOXUDvQpftnwdaAoJ8Deznml8yI8shEoM3S6ouQ3T+P b7GFh0SIuJLb3hZe2Yaiv2nuP+8L87c= Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-am5eur03lp2052.outbound.protection.outlook.com [104.47.8.52]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-4-NNpIlvL1OaassmGogEZ1Sg-1; Thu, 14 Oct 2021 11:16:20 +0200 X-MC-Unique: NNpIlvL1OaassmGogEZ1Sg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Sc64UADqdeZ0uPqErpXDAqehyGmtJNFBhAaV3IGq1r5zW3dRGDKEFmk9ah+dQiSRzMHdO+Fo+GrC1hjDFFX87P8Fn6tu13LPTxP1Y5SPe4cDcv8CBYx9ZC1ER4kSkpZOYr+0e5hQjcpiyekNlkeGZMsT7PjlBcRH1N8RaHZS/BPMfL9R7FT+oRDrgYTyiYk2L2xveUutMza6t4Sc4yqDzGHJ2a8iKy9e77YWC3sLYjwbbzEk4yvztTBojwb00ZznCI5wa5Uv1OJMle0FO/LcLHieg51HywiaLOzxqYnBHh6W+nM6dEMhl9rI1tywXC2XnLBVS36hSmiyKVWDYPhYcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=2fuGTTIAZYKp4k9JyA/zCdCJp0OJW1Np2q1gighPCpw=; b=CD9ZD4IV+pK61UfQSOeyxUiTfGAzwE8kcLUMO8TuROu5AxEHcpyhUueOIPkM3dUCAWPRJjFLlbTgUJI/p/T4SteGopVPLa46Ye/k19fyA6nlXUvNxCzg1Yq3BIPQV2SpdGljpFzkTubPExf1t0sm4I2yU9LrYTN2NkuNsTH9/N8SsWK+zkVhC4B0C/6tUkugHU16SWLVtCkSCjFioT1Xr36144b17NEHvohvs7IZ19/C18cLgye6hiztAZQoVREd6SubpNCTjNm4sS52ubl7qBukUzv1eq/EB4gnP7vp5/Lp0TLypZsnSVcj72qq7nt/RXpjVpdIwzKOFsU6dAFHUw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=suse.com; Received: from AM9PR04MB8602.eurprd04.prod.outlook.com (2603:10a6:20b:439::12) by AM9PR04MB8826.eurprd04.prod.outlook.com (2603:10a6:20b:409::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.15; Thu, 14 Oct 2021 09:16:20 +0000 Received: from AM9PR04MB8602.eurprd04.prod.outlook.com ([fe80::5499:6698:e99f:cf7f]) by AM9PR04MB8602.eurprd04.prod.outlook.com ([fe80::5499:6698:e99f:cf7f%8]) with mapi id 15.20.4608.016; Thu, 14 Oct 2021 09:16:20 +0000 From: Lin Ma To: qemu-devel@nongnu.org CC: quintela@redhat.com, dgilbert@redhat.com, Lin Ma Subject: [PATCH 3/3] tests: add postcopy-uffd-usermode-only capability into migration-test Date: Thu, 14 Oct 2021 17:15:51 +0800 Message-ID: <20211014091551.15201-4-lma@suse.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20211014091551.15201-1-lma@suse.com> References: <20211014091551.15201-1-lma@suse.com> X-ClientProxiedBy: HK0PR01CA0071.apcprd01.prod.exchangelabs.com (2603:1096:203:a6::35) To AM9PR04MB8602.eurprd04.prod.outlook.com (2603:10a6:20b:439::12) MIME-Version: 1.0 Received: from localhost (60.251.47.115) by HK0PR01CA0071.apcprd01.prod.exchangelabs.com (2603:1096:203:a6::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.25 via Frontend Transport; Thu, 14 Oct 2021 09:16:19 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 95bf8360-eeda-4822-0ff3-08d98ef348ea X-MS-TrafficTypeDiagnostic: AM9PR04MB8826: X-LD-Processed: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba,ExtFwd X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2000; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aRFmlh6KyvQ6Y7DZmz9+wYCQrtbhZWuiPD7VRNJNYcduvJEqOaWmcP80vtMVGoXLjr3tDcQdk4bukH5/yjPt9MuM7g55whTW+CAgb/XUx8mna6V/n+5kOOiuf4RNUTZQpKgTQSCySr+aepI5nXFjS8NbuEqWarQRAZJOast6T4ugCyn9yyij5H8J//LsAconyEblUGWovAR2YlqG6SlbfTCXvdfOpjJW5oGkyT6xUC1jexvNXucGCgamg/LTgBaMZi8C63sJObnGwag9rvUw7B9ZxVe/jwwDZ4Mt/AasV9+hZ8IlidiW3e4ebq0QoT2yWQoNpDobCydmwqf0/no4TGdnI4cdOhk4Uc8yGGEwST/qJB9D1pz2QN9t7PumFFVJ6p2/A/NwNUfz7Lep4GYWLNi6mw3d0p6c3eQTzNkh2BagTZGA1GhQztjLdltmzeW9RI5E/rcSDz3Uaq3dusHpn085WGO3Ock6ufXbbcllWG+Fev39yK7FW5HYY1GwZMwK4ehGCgUNPGQ/2D0b70qW6KSv32SE5c+qNf304JCmOW7DjhpcAAY3sVw1e9uSrO84bHCMXB/7rBIRdSD74uH9g26AgHvkFPqmlKZ2hkI2KOfMTzaBSn4IVkK5zcBpBjTYQHkyzfE9HdT62H9ci2STIQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM9PR04MB8602.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(366004)(6666004)(66946007)(6916009)(66556008)(66476007)(508600001)(8676002)(107886003)(1076003)(86362001)(8936002)(5660300002)(38100700002)(83380400001)(55236004)(6496006)(186003)(2906002)(4326008)(2616005)(956004)(26005)(6486002)(316002)(36756003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: vqrA3/Fc6r5Q7KhDbelUJbURo9CfqokH0IsNuqsV+9Sp9kplqn9XCyAd4bgJJaL2VdutkSd/nxZdkMMulfjDrF9NDDKeM+Oq5tQU6YBC1m45XvM3+eR+rK9AxBosj1CCSkxfLSJ2CL1HO180CvJ7NlSQo/BjhIhq5Cwn4ra+0vGNSmipW3x/+x9eZHK7+4fFGDJCZ8WazOkghq39+iJ5c5uejyVsqY5vGRJwEOPwH3vzutMCIOnhOQ0BZH1ijPJQHIH3DjfkjB3VhTTziVHBSFNG0dYDuDsqUXWBaO9dfV0g9g7KHM7XiC8gALBiXKZ3F+u6QamBKZMIbH+duHQ2LGsbTmPvw+F+FpeIWTF5Rt/ABoWdOF741rN60WCrQjDbjZCy+j6MtHWbvY1ANXEtJTlI6D8+2W8YCBO94opnZOFgRmKo5doPXyaCnixf+BYC5lXx+xI4z7Y0a3YlsaV/o5KemmGmtknrQwhiu1YqCOlOEdICP/iqVKLKXBGDdJ4mzv83W3chOzAxyz7q27dDLTbYeZOVxOfNLCsTOoJGPELDr6ppqcpBB2VWFtAU9CaaBU1c7v3A8PM3BQttgnzgumynUex4taix/yfFR2ix1VX5U4EFlBlbpw1KcdjxO4819BF2rQXs3uvCGZ/KakvEDN2X31YbCP/cDuRDQSYu6i9Z89Dsa45/pQ7D9j035oZvauGBpnqL9WKr1R0W0cYavpDsIRy3VxNfPHJYpeI/vHCjrXYIa6IrXOuQMyUhNk98eABBVb7ivrM9xaJwWlO0ToYaa22oGHt6squJROHEz2FEyp7xhB7+lGUZthl22tqy6AuufhjWpc85Pumcx1q7ygkoZD6htooZeb448rVTAIkVQCsKLyDodAqSe4K6D5kP9OiUC+ISk0NN69nSbfsmsAcJsVdBT/enrdWYHMeRBhZNuEhhUO59GIRsYi2XBquZW64l3DraMhOYjiM2javz2pDK3CeV/O8QFrzniryqspY7CWJCIKXKYkxBVh2PZQ+0TYrAYU42lsQ3v3KNRcEmbzH/RSth6XVUKBpwtoLurTLolRCY45XfMdhrrrP3u/mZzA/qzgnkZIB3UG4hCu/H6Pt95s/yA//8oQss76hzJedJ7ELrpN+6lRPXKcGMbdPN5mp/bEOxit3QZavZgbbfr1c6ZSdfotmYmq+zE/26CXqk/ppPaN8F/+yHIARZiyDTZ4/lYkiXxF3JRNMxqNt6Xbkn0spdrlBzObAeqTBPssrL2cclCZRPPBWs3tMxJtBg5i87zcYipM9+YiJ7VwClpZsc0iyz0suECpmWiDvONLnr9Jjb0JaXpmEVXEUQOG1W X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 95bf8360-eeda-4822-0ff3-08d98ef348ea X-MS-Exchange-CrossTenant-AuthSource: AM9PR04MB8602.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Oct 2021 09:16:20.2057 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: OZRA1d/Hg27ZZSM76J6sRE/5WkBJWJhp1eGzaHB4aH8qw/6cMs8WkyvQm79EOhtx X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8826 Received-SPF: pass client-ip=194.104.111.102; envelope-from=lma@suse.com; helo=de-smtp-delivery-102.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Lin Ma --- tests/qtest/migration-test.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index cc5e83d98a..0cd4f49bed 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -38,6 +38,7 @@ unsigned start_address; unsigned end_address; static bool uffd_feature_thread_id; +static bool uffd_usermode_only; /* A downtime where the test really should converge */ #define CONVERGE_DOWNTIME 1000 @@ -60,8 +61,12 @@ static bool ufd_version_check(void) int ufd = syscall(__NR_userfaultfd, O_CLOEXEC); if (ufd == -1) { - g_test_message("Skipping test: userfaultfd not available"); - return false; + ufd = syscall(__NR_userfaultfd, O_CLOEXEC | UFFD_USER_MODE_ONLY); + if (ufd == -1) { + g_test_message("Skipping test: userfaultfd not available"); + return false; + } else + uffd_usermode_only = true; } api_struct.api = UFFD_API; @@ -670,6 +675,8 @@ static int migrate_postcopy_prepare(QTestState **from_ptr, } migrate_set_capability(from, "postcopy-ram", true); + if (uffd_usermode_only) + migrate_set_capability(to, "postcopy-uffd-usermode-only", true); migrate_set_capability(to, "postcopy-ram", true); migrate_set_capability(to, "postcopy-blocktime", true);