From nobody Tue Feb 10 01:31:31 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631620431943430.3189699224491; Tue, 14 Sep 2021 04:53:51 -0700 (PDT) Received: from localhost ([::1]:45254 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQ70Y-0007lm-Po for importer@patchew.org; Tue, 14 Sep 2021 07:53:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45442) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQ6yv-000574-78 for qemu-devel@nongnu.org; Tue, 14 Sep 2021 07:52:09 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:49287) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQ6yt-0007M0-9K for qemu-devel@nongnu.org; Tue, 14 Sep 2021 07:52:08 -0400 Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-345-N5q4HjDeOymW1mOesTMX5Q-1; Tue, 14 Sep 2021 07:52:04 -0400 Received: by mail-wr1-f70.google.com with SMTP id h5-20020a5d6885000000b0015e21e37523so416344wru.10 for ; Tue, 14 Sep 2021 04:52:04 -0700 (PDT) Received: from localhost (static-109-144-85-188.ipcom.comunitel.net. [188.85.144.109]) by smtp.gmail.com with ESMTPSA id z2sm902461wma.45.2021.09.14.04.52.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Sep 2021 04:52:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1631620326; 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=+zeSAaNIJ8LGsRizhhQi316gUImulpKF6JrfafoodSk=; b=fUMJVt5wkGalCPpUjRX8Nu0wdKhEegfHjdrW7B0N6PX4IzB3N1u02fPxn/XBMAWCuDBd6b 4ecRmxxhrgZa8rcrGYSRhO7i9zXs1cdRX88cSePI46MewGxYHymvwT5HrlAbNIn905YrlR 2gSNjilUi/OXICrsZjdetMgbnqJ29Lo= X-MC-Unique: N5q4HjDeOymW1mOesTMX5Q-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+zeSAaNIJ8LGsRizhhQi316gUImulpKF6JrfafoodSk=; b=PqHMYN2UYxjClwxU7N+6gNPqbNT3XWe4ng8QELE+01Vb0RrSCsKqK0Prkd1Pk1qpTb Y5WE1gZPYpw+7is1UXBGTOYS75pHY33QnCCWoLYtCokwEabECRZk0B0BSDZpQ/CNb66m /Heih1UbNByQLjfcQvaLPBw1sNstdLC1Ih7/beQiU2mdwQEwaUjgVQt1t38yyva6rvGa uye0Cg5ebihGpT1h+HJe0s7f2vpOJGrm913ExRT6/39hLSH9r/8HJzC7YXAu261x3sQ1 N83sBAAPq7ffMD4oTyPRezUKung51gBu8NfORt5D3mI8K3RJaVXLS1mm5pBSjxLbKRKB sPLw== X-Gm-Message-State: AOAM530Cn+MQKaTO3CJ0xt80f5vuswNrLXmRG3gFuoXlcQxvITwzEU3h fZyYL4m49rl6BHMZc8+gjnqubT+AVOQGJXqrX6cRjilx+pbqxhywnddupAfRUdb8+c7SUuGTVMG sHwlN6WsM/3B6N0djOIMlC9L9XnVfKmYZ+iaI4+1cjsrm67xRVl+nW3CuVCiYlznbqhw= X-Received: by 2002:a1c:7c0f:: with SMTP id x15mr1673630wmc.149.1631620322903; Tue, 14 Sep 2021 04:52:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzl2iN+oyB0Xsywyi75coN098dXuHX29hefI/ym1SSGaTh34QpbYJsFFd2D2+tIeFPnZncIRA== X-Received: by 2002:a1c:7c0f:: with SMTP id x15mr1673589wmc.149.1631620322454; Tue, 14 Sep 2021 04:52:02 -0700 (PDT) From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PULL 3/5] migration/rdma: Try to register On-Demand Paging memory region Date: Tue, 14 Sep 2021 13:51:55 +0200 Message-Id: <20210914115157.35868-4-quintela@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210914115157.35868-1-quintela@redhat.com> References: <20210914115157.35868-1-quintela@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=quintela@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=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.398, 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_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: , Cc: "Dr. David Alan Gilbert" , Li Zhijian , Juan Quintela Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1631620433360100005 Content-Type: text/plain; charset="utf-8" From: Li Zhijian Previously, for the fsdax mem-backend-file, it will register failed with Operation not supported. In this case, we can try to register it with On-Demand Paging[1] like what rpma_mr_reg() does on rpma[2]. [1]: https://community.mellanox.com/s/article/understanding-on-demand-pagin= g--odp-x [2]: http://pmem.io/rpma/manpages/v0.9.0/rpma_mr_reg.3 CC: Marcel Apfelbaum Signed-off-by: Li Zhijian Reviewed-by: Marcel Apfelbaum Signed-off-by: Juan Quintela --- migration/rdma.c | 73 ++++++++++++++++++++++++++++++------------ migration/trace-events | 1 + 2 files changed, 54 insertions(+), 20 deletions(-) diff --git a/migration/rdma.c b/migration/rdma.c index 5c2d113aa9..eb80431aae 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -1117,19 +1117,47 @@ static int qemu_rdma_alloc_qp(RDMAContext *rdma) return 0; } =20 +/* Check whether On-Demand Paging is supported by RDAM device */ +static bool rdma_support_odp(struct ibv_context *dev) +{ + struct ibv_device_attr_ex attr =3D {0}; + int ret =3D ibv_query_device_ex(dev, NULL, &attr); + if (ret) { + return false; + } + + if (attr.odp_caps.general_caps & IBV_ODP_SUPPORT) { + return true; + } + + return false; +} + static int qemu_rdma_reg_whole_ram_blocks(RDMAContext *rdma) { int i; RDMALocalBlocks *local =3D &rdma->local_ram_blocks; =20 for (i =3D 0; i < local->nb_blocks; i++) { + int access =3D IBV_ACCESS_LOCAL_WRITE | IBV_ACCESS_REMOTE_WRITE; + local->block[i].mr =3D ibv_reg_mr(rdma->pd, local->block[i].local_host_addr, - local->block[i].length, - IBV_ACCESS_LOCAL_WRITE | - IBV_ACCESS_REMOTE_WRITE + local->block[i].length, access ); + + if (!local->block[i].mr && + errno =3D=3D ENOTSUP && rdma_support_odp(rdma->verbs)) { + access |=3D IBV_ACCESS_ON_DEMAND; + /* register ODP mr */ + local->block[i].mr =3D + ibv_reg_mr(rdma->pd, + local->block[i].local_host_addr, + local->block[i].length, access); + trace_qemu_rdma_register_odp_mr(local->block[i].block_name= ); + } + if (!local->block[i].mr) { perror("Failed to register local dest ram block!"); break; @@ -1215,28 +1243,33 @@ static int qemu_rdma_register_and_get_keys(RDMACont= ext *rdma, */ if (!block->pmr[chunk]) { uint64_t len =3D chunk_end - chunk_start; + int access =3D rkey ? IBV_ACCESS_LOCAL_WRITE | IBV_ACCESS_REMOTE_W= RITE : + 0; =20 trace_qemu_rdma_register_and_get_keys(len, chunk_start); =20 - block->pmr[chunk] =3D ibv_reg_mr(rdma->pd, - chunk_start, len, - (rkey ? (IBV_ACCESS_LOCAL_WRITE | - IBV_ACCESS_REMOTE_WRITE) : 0)); - - if (!block->pmr[chunk]) { - perror("Failed to register chunk!"); - fprintf(stderr, "Chunk details: block: %d chunk index %d" - " start %" PRIuPTR " end %" PRIuPTR - " host %" PRIuPTR - " local %" PRIuPTR " registrations: %d\n", - block->index, chunk, (uintptr_t)chunk_start, - (uintptr_t)chunk_end, host_addr, - (uintptr_t)block->local_host_addr, - rdma->total_registrations); - return -1; + block->pmr[chunk] =3D ibv_reg_mr(rdma->pd, chunk_start, len, acces= s); + if (!block->pmr[chunk] && + errno =3D=3D ENOTSUP && rdma_support_odp(rdma->verbs)) { + access |=3D IBV_ACCESS_ON_DEMAND; + /* register ODP mr */ + block->pmr[chunk] =3D ibv_reg_mr(rdma->pd, chunk_start, len, a= ccess); + trace_qemu_rdma_register_odp_mr(block->block_name); } - rdma->total_registrations++; } + if (!block->pmr[chunk]) { + perror("Failed to register chunk!"); + fprintf(stderr, "Chunk details: block: %d chunk index %d" + " start %" PRIuPTR " end %" PRIuPTR + " host %" PRIuPTR + " local %" PRIuPTR " registrations: %d\n", + block->index, chunk, (uintptr_t)chunk_start, + (uintptr_t)chunk_end, host_addr, + (uintptr_t)block->local_host_addr, + rdma->total_registrations); + return -1; + } + rdma->total_registrations++; =20 if (lkey) { *lkey =3D block->pmr[chunk]->lkey; diff --git a/migration/trace-events b/migration/trace-events index a1c0f034ab..5f6aa580de 100644 --- a/migration/trace-events +++ b/migration/trace-events @@ -212,6 +212,7 @@ qemu_rdma_poll_write(const char *compstr, int64_t comp,= int left, uint64_t block qemu_rdma_poll_other(const char *compstr, int64_t comp, int left) "other c= ompletion %s (%" PRId64 ") received left %d" qemu_rdma_post_send_control(const char *desc) "CONTROL: sending %s.." qemu_rdma_register_and_get_keys(uint64_t len, void *start) "Registering %"= PRIu64 " bytes @ %p" +qemu_rdma_register_odp_mr(const char *name) "Try to register On-Demand Pag= ing memory region: %s" qemu_rdma_registration_handle_compress(int64_t length, int index, int64_t = offset) "Zapping zero chunk: %" PRId64 " bytes, index %d, offset %" PRId64 qemu_rdma_registration_handle_finished(void) "" qemu_rdma_registration_handle_ram_blocks(void) "" --=20 2.31.1