From patchwork Fri Nov 25 14:38:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eugenio Perez Martin X-Patchwork-Id: 13056005 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id D195FC4332F for ; Fri, 25 Nov 2022 14:40:27 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyZrR-0000g4-Q4; Fri, 25 Nov 2022 09:39:25 -0500 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 1oyZrI-0000XD-Gn for qemu-devel@nongnu.org; Fri, 25 Nov 2022 09:39:18 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oyZrH-00038e-5x for qemu-devel@nongnu.org; Fri, 25 Nov 2022 09:39:16 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669387154; 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=F2VpqQKVORRbr48LJsvmH9TJHcd/mfI6aheJxQHaM0c=; b=HbBukQpBrE6aGKpuCbFYVZaWNduKi7GX15zL7D0PCXZ0m5d6OpAnEt0aFVQBZ2mqQh4sqv ito0VfbqclZWQKoRmyShlZJMfexGHOeqtX/3zTpN47mO8UZ6Nm6gA83vjgO25YEfvST6nC VypcXvw+jt7TiT5MGH4QdWUyGxaEZec= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-372-PjzSrwMbNM2wk7hgzjuUBA-1; Fri, 25 Nov 2022 09:39:10 -0500 X-MC-Unique: PjzSrwMbNM2wk7hgzjuUBA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8246A29AB3FF; Fri, 25 Nov 2022 14:39:10 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.192.112]) by smtp.corp.redhat.com (Postfix) with ESMTP id 711B920290A2; Fri, 25 Nov 2022 14:39:08 +0000 (UTC) From: =?utf-8?q?Eugenio_P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: Gautam Dawar , Laurent Vivier , Eli Cohen , Parav Pandit , Stefano Garzarella , Liuxiangdong , Harpreet Singh Anand , "Michael S. Tsirkin" , Jason Wang , Zhu Lingshan , Si-Wei Liu , Cindy Lu Subject: [RFC PATCH 2/3] vdpa: load guest offloads at device start Date: Fri, 25 Nov 2022 15:38:58 +0100 Message-Id: <20221125143859.2211494-3-eperezma@redhat.com> In-Reply-To: <20221125143859.2211494-1-eperezma@redhat.com> References: <20221125143859.2211494-1-eperezma@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 Received-SPF: pass client-ip=170.10.133.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_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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org This allows to migrate them. Save some device's startup time if they are the default. Signed-off-by: Eugenio Pérez --- net/vhost-vdpa.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index 2b4b85d8f8..7ce094bd67 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -423,6 +423,34 @@ static int vhost_vdpa_net_load_mq(VhostVDPAState *s, return *s->status != VIRTIO_NET_OK; } +static int vhost_vdpa_net_load_offloads(VhostVDPAState *s, + const VirtIONet *n) +{ + uint64_t features = n->parent_obj.guest_features; + uint64_t guest_offloads_mask; + ssize_t dev_written; + + if (!n->has_vnet_hdr || !(features & VIRTIO_NET_F_CTRL_GUEST_OFFLOADS)) { + return 0; + } + + if (n->curr_guest_offloads == + virtio_net_guest_offloads_by_features(features)) { + return 0; + } + + guest_offloads_mask = cpu_to_le64(n->curr_guest_offloads); + dev_written = vhost_vdpa_net_load_cmd(s, VIRTIO_NET_CTRL_GUEST_OFFLOADS, + VIRTIO_NET_CTRL_GUEST_OFFLOADS_SET, + &guest_offloads_mask, + sizeof(uint64_t)); + if (unlikely(dev_written < 0)) { + return dev_written; + } + + return *s->status != VIRTIO_NET_OK; +} + static int vhost_vdpa_net_load(NetClientState *nc) { VhostVDPAState *s = DO_UPCAST(VhostVDPAState, nc, nc); @@ -445,8 +473,7 @@ static int vhost_vdpa_net_load(NetClientState *nc) if (unlikely(r)) { return r; } - - return 0; + return vhost_vdpa_net_load_offloads(s, n); } static NetClientInfo net_vhost_vdpa_cvq_info = {