From nobody Wed Nov 27 17:53:11 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=1697726386; cv=none; d=zohomail.com; s=zohoarc; b=SFj9gh7g30iHBdpnWo9dMkytmFVSovwb0Cs9L0+X/KCnVgvX46TSYE6ZYDxRXSctgVuP+2ElPiFLqrFtj5DurmTzGVOx3mqkvLsoxMCXVoSZnDwdKlYWghT3U7Ki79Ux3Tm/7KakuAN0Ttq1gPEk00WqhvGgjZuQUgcDu6V3wPU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1697726386; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=TtI1/7mXSdwyIYgaG5r3zTLrequ93X4VfvtMc/V9V2A=; b=Y0wmX3Vldtj0yCKpDORpSOgrvL5cXRCbckDGxotf2tk3NIrOUjpeonEq2z9R3m7SqqwMYPAHoY4MIoVa91EwjXAJxZMoaVZWgT2LvdrMPjZzKIrDqfqrdI52j01BHYIx3BEk1UtCzDHsbc9EiiZAxoMOLGUHGJrTjzKvx+54WU4= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1697726386809857.2245333014762; Thu, 19 Oct 2023 07:39:46 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtU7l-0006pC-3b; Thu, 19 Oct 2023 10:35:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qtU7k-0006ob-0i for qemu-devel@nongnu.org; Thu, 19 Oct 2023 10:35:44 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qtU7i-0000N1-He for qemu-devel@nongnu.org; Thu, 19 Oct 2023 10:35:43 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-227-bfAvH8m4OPasuuNRnO4bdg-1; Thu, 19 Oct 2023 10:35:40 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4C63210201E6; Thu, 19 Oct 2023 14:35:39 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.192.162]) by smtp.corp.redhat.com (Postfix) with ESMTP id 16F7BC1596D; Thu, 19 Oct 2023 14:35:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697726141; 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=TtI1/7mXSdwyIYgaG5r3zTLrequ93X4VfvtMc/V9V2A=; b=bT/hvWgV2gYuvCnwdBRuCIOXP8tMWy8LxlUBKZ4BqA04EfTk7BztRnUMPh9MjYUCBF/Mbe xprshc2y+TqGpbzJm0jyNJs3qGjmo/UOosCpWjOiKfErIARA1v34WXZFSbm1nY35oAxCzZ A8NhzaBxnuXlpLTVTbWCuUoRhtlc1wY= X-MC-Unique: bfAvH8m4OPasuuNRnO4bdg-1 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: Shannon , Parav Pandit , Stefano Garzarella , "Michael S. Tsirkin" , yin31149@gmail.com, Jason Wang , Yajun Wu , Zhu Lingshan , Lei Yang , Dragos Tatulea , Juan Quintela , Laurent Vivier , si-wei.liu@oracle.com, Gautam Dawar Subject: [RFC PATCH 16/18] vdpa: add vhost_vdpa_net_load_setup NetClient callback Date: Thu, 19 Oct 2023 16:34:53 +0200 Message-Id: <20231019143455.2377694-17-eperezma@redhat.com> In-Reply-To: <20231019143455.2377694-1-eperezma@redhat.com> References: <20231019143455.2377694-1-eperezma@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 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.129.124; envelope-from=eperezma@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, 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.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1697726387713100001 So the vDPA backend knows when a migration incoming starts. NicState argument is needed so we can get the dma address space. Signed-off-by: Eugenio P=C3=A9rez --- include/net/net.h | 4 ++++ net/vhost-vdpa.c | 10 ++++++++++ 2 files changed, 14 insertions(+) diff --git a/include/net/net.h b/include/net/net.h index 2fb1c9181c..e0ecf85bf6 100644 --- a/include/net/net.h +++ b/include/net/net.h @@ -42,6 +42,7 @@ typedef struct NICConf { =20 /* Net clients */ =20 +struct NICState; typedef void (NetPoll)(NetClientState *, bool enable); typedef bool (NetCanReceive)(NetClientState *); typedef int (NetStart)(NetClientState *); @@ -69,6 +70,8 @@ typedef void (SocketReadStateFinalize)(SocketReadState *r= s); typedef void (NetAnnounce)(NetClientState *); typedef bool (SetSteeringEBPF)(NetClientState *, int); typedef bool (NetCheckPeerType)(NetClientState *, ObjectClass *, Error **); +/* This can be called before start & pair, so get also the peer */ +typedef int (NetMigrationLoadSetup)(NetClientState *, struct NICState *); =20 typedef struct NetClientInfo { NetClientDriver type; @@ -98,6 +101,7 @@ typedef struct NetClientInfo { NetAnnounce *announce; SetSteeringEBPF *set_steering_ebpf; NetCheckPeerType *check_peer_type; + NetMigrationLoadSetup *load_setup; } NetClientInfo; =20 struct NetClientState { diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index 31df7e91a1..507cb946d2 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -396,6 +396,15 @@ static void vhost_vdpa_net_client_stop(NetClientState = *nc) } } =20 +static int vhost_vdpa_net_load_setup(NetClientState *nc, NICState *nic) +{ + VhostVDPAState *s =3D DO_UPCAST(VhostVDPAState, nc, nc); + VirtIONet *n =3D qemu_get_nic_opaque(&nic->ncs[0]); + + vhost_vdpa_load_setup(s->vhost_vdpa.shared, n->parent_obj.dma_as); + return 0; +} + static NetClientInfo net_vhost_vdpa_info =3D { .type =3D NET_CLIENT_DRIVER_VHOST_VDPA, .size =3D sizeof(VhostVDPAState), @@ -407,6 +416,7 @@ static NetClientInfo net_vhost_vdpa_info =3D { .has_vnet_hdr =3D vhost_vdpa_has_vnet_hdr, .has_ufo =3D vhost_vdpa_has_ufo, .check_peer_type =3D vhost_vdpa_check_peer_type, + .load_setup =3D vhost_vdpa_net_load_setup, }; =20 static int64_t vhost_vdpa_get_vring_group(int device_fd, unsigned vq_index, --=20 2.39.3