From patchwork Thu Jun 1 13:48:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hawkins Jiawei X-Patchwork-Id: 1789084 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=NwfySpva; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QX6vL2fdbz20QB for ; Thu, 1 Jun 2023 23:49:50 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q4igQ-0005UB-0E; Thu, 01 Jun 2023 09:49:42 -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 1q4igO-0005L6-DF for qemu-devel@nongnu.org; Thu, 01 Jun 2023 09:49:40 -0400 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q4igM-0000Sd-BZ for qemu-devel@nongnu.org; Thu, 01 Jun 2023 09:49:39 -0400 Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-1b0201d9a9eso7467485ad.0 for ; Thu, 01 Jun 2023 06:49:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685627377; x=1688219377; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=XG/vGXSzD1X2DKFaeuOHuABz/AWh01w+UQ5wuAYsDFc=; b=NwfySpvaemTfiCsw5Gdy9qGLRxOICE0Y9HXbAYBITAWotmJK6mQkliiVZhvyjVR2a3 foGn0DvTwMHdBdn5/D0/+FyerQ9aXclRe2C2i0ifIoMRCrJNwvTXduF5Bh338SR8CUF9 WC5fX1x6ReeOtivdghIcy8mbHuNSAv9geHc2FkIysbhU8P0Fv3HP/9JTjet199lH+8Fr FT4FYrj9mX4LcKCFbPu3dqQ/wNpst9anAYPXx4m9X8d9l+U9Dn3ct4ufhAw032YJonuq c81WgISkLfnwoEt0bamofhwsi7ikVpf4MD6m+hP5qEe/Yqx9FluR0d71uY0sNufYp3An XyOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685627377; x=1688219377; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XG/vGXSzD1X2DKFaeuOHuABz/AWh01w+UQ5wuAYsDFc=; b=L5eh54FNKGcwHB/QAysDOZurk+94eaD5MrHITDFNUnuQYcIt2j8LZievLwzreOEgC0 d1kwX2GSRwy9MfqMsXUxH8TP4/zXWAJc6+xhRO7H83/RPxCE5ybQ67raSJsXsVVYX4+p 5sdSg79f4byQhXzcoXP4gj0UiPqvF87oyC/blyLgfd+kwrgwN3fnNXbT12ygYNs9/rO0 Xg5KS8GKtEL1JCg6cvmb3U2hxXw4GmhUH6qFNPJgKbZCLqtHa1ManMHT8GunZFs3bIiL mzdy0+qKA/sW1YHzLMO89V9acvMY8erW9DW2efW1gbYEhR2PUittsN0FF0v+EolVqFYG 3Q6A== X-Gm-Message-State: AC+VfDzgr3hpGtYW9UU2fvlUs8HMP1e3FOf9KhPabH69e58U6QOExxgF 5QjiKG7PKoqTDQd2GaeZpxA= X-Google-Smtp-Source: ACHHUZ7+5a60tCBOL7Jy1fk5Ep6uBCd5d17RAI4Wbk96IyujyS6bykecfKDIitHff+7zCVmhtsWBbg== X-Received: by 2002:a17:902:8341:b0:1a1:cb18:7f99 with SMTP id z1-20020a170902834100b001a1cb187f99mr1798298pln.30.1685627376509; Thu, 01 Jun 2023 06:49:36 -0700 (PDT) Received: from localhost ([159.226.94.115]) by smtp.gmail.com with ESMTPSA id d5-20020a170902cec500b001ac912cac1asm3492402plg.175.2023.06.01.06.49.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Jun 2023 06:49:36 -0700 (PDT) From: Hawkins Jiawei To: jasowang@redhat.com, mst@redhat.com, eperezma@redhat.com Cc: qemu-devel@nongnu.org, yin31149@gmail.com, 18801353760@163.com Subject: [PATCH v3 1/6] include/hw/virtio: make some VirtIODevice const Date: Thu, 1 Jun 2023 21:48:20 +0800 Message-Id: <894aff17408eb129254cb7f8e5aec45502f4412d.1685623090.git.yin31149@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62f; envelope-from=yin31149@gmail.com; helo=mail-pl1-x62f.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 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, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The VirtIODevice structure is not modified in virtio_vdev_has_feature(). Therefore, make it const to allow this function to accept const variables. Signed-off-by: Hawkins Jiawei Reviewed-by: Eugenio Pérez Martin --- include/hw/virtio/virtio.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h index af86ed7249..0492d26900 100644 --- a/include/hw/virtio/virtio.h +++ b/include/hw/virtio/virtio.h @@ -402,7 +402,7 @@ static inline bool virtio_has_feature(uint64_t features, unsigned int fbit) return !!(features & (1ULL << fbit)); } -static inline bool virtio_vdev_has_feature(VirtIODevice *vdev, +static inline bool virtio_vdev_has_feature(const VirtIODevice *vdev, unsigned int fbit) { return virtio_has_feature(vdev->guest_features, fbit); From patchwork Thu Jun 1 13:48:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hawkins Jiawei X-Patchwork-Id: 1789086 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=edfyMfL6; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QX6vY45JZz20QB for ; Thu, 1 Jun 2023 23:50:01 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q4igS-0005wl-Ri; Thu, 01 Jun 2023 09:49:44 -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 1q4igQ-0005gM-Pt for qemu-devel@nongnu.org; Thu, 01 Jun 2023 09:49:42 -0400 Received: from mail-pj1-x102e.google.com ([2607:f8b0:4864:20::102e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q4igP-0000TQ-1v for qemu-devel@nongnu.org; Thu, 01 Jun 2023 09:49:42 -0400 Received: by mail-pj1-x102e.google.com with SMTP id 98e67ed59e1d1-2562cc85d3dso612303a91.1 for ; Thu, 01 Jun 2023 06:49:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685627379; x=1688219379; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lB4+H7dHId7zALwS3Cq9afyCMbzCC+JyaNMHxJm0Ij8=; b=edfyMfL6Vv7rIxGf8RrxDYYTO6aoY2KyfAOcdF+5iDBK+/P5TxCmGHfrWd8E3JZbtg C2T4AQEW3HQaKGhAjcf1t4ioU1Q0V+NJ8Oohv85pCJ8mIyHRv1/SO24+ruV6I0LMQoPr /gepPzxnwiYtEtQz9aYkC7AX21SK6wjnROnMpU+pfIkwCRzyVqFYcGCSNMuFl7KqAi/S rgAIAg0xo6ymFkfuhPZxZkwDuP7uyLtJRJc1JhHN/rJ9pGn6WPYprHptwyRPakPpx6Ev DGRKXUeifSL3GdXReaJh5njccY5Rp3WlikJpXq0btxh5MK0qkbrram2AyR0tvFvaMJJ0 9bDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685627379; x=1688219379; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lB4+H7dHId7zALwS3Cq9afyCMbzCC+JyaNMHxJm0Ij8=; b=jSb0cjOe/PO/GNdQ0H2h4aO9RXRiTVoWXWvb20nTM8Ve47FQRVOsBctwtZM6A964om a4pws8NbV4Slji3tMIHozaVmMbsUuwtkWmbc/Tsnx3W+12Bn16MRCnsYLHn4i84B2hI+ se1fhmBtKpgXFJdqYMoUC0hTXezFqgzK6zuTCYMDo0liDwhMMBjocGEUhikXUPBd1HmS f6XQRdMwycZaNvlbPS3ifLcopJ3XsZ8ZMupRygS+4O3N1biu14Qp/tGG+RWeOINCUYBG GhQWKP70oAWvQlGJzR7NLweWEXd8l4GSk/86Vh23aY/QomrltXuRZjiBchz7xptGxaO0 YnJg== X-Gm-Message-State: AC+VfDz+Tv6P6/2LRGQ9cf7Dr7ZDD2PnTBM8Z/9l9J9MkNS7TUlkEICR x9EdllwPr5hTgJwaFMyKogw= X-Google-Smtp-Source: ACHHUZ41RZKJKNK/e6W1Gy6w3b43dv7Zapw9Kl+/Wd9fOtQmdkc+/xlieAFjWZu1os5RpoRNDdv0cg== X-Received: by 2002:a17:90b:17ca:b0:256:69ac:eb1 with SMTP id me10-20020a17090b17ca00b0025669ac0eb1mr9350668pjb.1.1685627379427; Thu, 01 Jun 2023 06:49:39 -0700 (PDT) Received: from localhost ([159.226.94.115]) by smtp.gmail.com with ESMTPSA id 12-20020a17090a1a0c00b0025289bc1ce4sm1497664pjk.17.2023.06.01.06.49.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Jun 2023 06:49:39 -0700 (PDT) From: Hawkins Jiawei To: jasowang@redhat.com, mst@redhat.com, eperezma@redhat.com Cc: qemu-devel@nongnu.org, yin31149@gmail.com, 18801353760@163.com Subject: [PATCH v3 2/6] vdpa: reuse virtio_vdev_has_feature() Date: Thu, 1 Jun 2023 21:48:21 +0800 Message-Id: <51fcd0b95186ef215825d420efe04e3ab9593936.1685623090.git.yin31149@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102e; envelope-from=yin31149@gmail.com; helo=mail-pj1-x102e.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 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, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org We can use virtio_vdev_has_feature() instead of manually accessing the features. Signed-off-by: Hawkins Jiawei Acked-by: Eugenio Pérez --- net/vhost-vdpa.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index 37cdc84562..e907a3c792 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -643,8 +643,7 @@ static ssize_t vhost_vdpa_net_load_cmd(VhostVDPAState *s, uint8_t class, static int vhost_vdpa_net_load_mac(VhostVDPAState *s, const VirtIONet *n) { - uint64_t features = n->parent_obj.guest_features; - if (features & BIT_ULL(VIRTIO_NET_F_CTRL_MAC_ADDR)) { + if (virtio_vdev_has_feature(&n->parent_obj, VIRTIO_NET_F_CTRL_MAC_ADDR)) { ssize_t dev_written = vhost_vdpa_net_load_cmd(s, VIRTIO_NET_CTRL_MAC, VIRTIO_NET_CTRL_MAC_ADDR_SET, n->mac, sizeof(n->mac)); @@ -662,10 +661,9 @@ static int vhost_vdpa_net_load_mq(VhostVDPAState *s, const VirtIONet *n) { struct virtio_net_ctrl_mq mq; - uint64_t features = n->parent_obj.guest_features; ssize_t dev_written; - if (!(features & BIT_ULL(VIRTIO_NET_F_MQ))) { + if (!virtio_vdev_has_feature(&n->parent_obj, VIRTIO_NET_F_MQ)) { return 0; } From patchwork Thu Jun 1 13:48:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hawkins Jiawei X-Patchwork-Id: 1789088 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=Le19K3YX; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QX6vh3k82z20QH for ; Thu, 1 Jun 2023 23:50:08 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q4igW-0006S0-5Z; Thu, 01 Jun 2023 09:49:48 -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 1q4igU-0006AZ-0c for qemu-devel@nongnu.org; Thu, 01 Jun 2023 09:49:46 -0400 Received: from mail-pg1-x532.google.com ([2607:f8b0:4864:20::532]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q4igS-0000Ui-7q for qemu-devel@nongnu.org; Thu, 01 Jun 2023 09:49:45 -0400 Received: by mail-pg1-x532.google.com with SMTP id 41be03b00d2f7-52c30fa5271so320593a12.0 for ; Thu, 01 Jun 2023 06:49:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685627383; x=1688219383; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xeSLdi9yuZuMrDKTknXLipIRbAeJX5rbyOelk6PqFnI=; b=Le19K3YXveHDhvYLM5OLu4tBZLfyNvW22J5+Cv+dCTRafiRJqycB6KQMN6KooyK8oX 54pYVCnfxrQkUmAMUbIrMMJ0jacOpzlzQmrvIdgYzx3BrXb3knIa2N0OioB/WfuzUPbL cccOQlTGo0+zAiARdFKw0I4NF7x3uNWkUYEX7JihOoVH295x5xlR2jSyYaY7Wv0FZ5CQ whIU25/d+JNbLc66zxDAYDwM6P+sh5n/fcaaCDCdHCmD5qoatMbPNhHNwtWUrQjS+e/j ZtiebMmFSTsFz0DKqAcq0RwAUbXoawc7lKnB5y6kWgapbjwzY1/WDWkPldlT0fZgT4VB jK2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685627383; x=1688219383; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xeSLdi9yuZuMrDKTknXLipIRbAeJX5rbyOelk6PqFnI=; b=kjc9o0gby4GTc3l12hB5yfFlaj9rLEAygQ0J3tnYsp01rAiDOQWGcasQe7G7i3MLBS Le/bJ9JLiUwyAFXYAN2y5Iz0KIMKH0wNZuTkhfv63Lis5TvFgDJwj5+y+rWSYb3zhXHC yasxrz91V4gu7qnFKd+3JXb2TINnf7F/C5Rhf8dIUZmQcQm2ZznhcylNPbSOszrCh/R+ lF3iVcl61gPQcN0F1h2ZVTwkX2dlVx55fetz9yKy5UCokaTBTR0S5K9Ce14dFh3pFRkZ nu03VuTiOuAEjyncUSefgssAnoop8cqQZ4xVf+4v0AdqpLixzwtdwXXtNzHXVFPVy3dO X2KQ== X-Gm-Message-State: AC+VfDxbse7CbT0sgnmIqd5urXtnQABy0AUyU++y4MY7Ue/GAUXEc0Em pvexaoq/StGu8XdGE9gRFcE= X-Google-Smtp-Source: ACHHUZ4HDBoh3uYOf9a70J+NPy1leD2w8G6g3hYOWI4MxUT03kSVPmT2L5EyzL6HhgHtxeMpH9nijw== X-Received: by 2002:a17:902:ce86:b0:1b0:3df7:5992 with SMTP id f6-20020a170902ce8600b001b03df75992mr6815382plg.32.1685627382671; Thu, 01 Jun 2023 06:49:42 -0700 (PDT) Received: from localhost ([159.226.94.115]) by smtp.gmail.com with ESMTPSA id b1-20020a170902d50100b0019aaab3f9d7sm3521385plg.113.2023.06.01.06.49.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Jun 2023 06:49:42 -0700 (PDT) From: Hawkins Jiawei To: jasowang@redhat.com, mst@redhat.com, eperezma@redhat.com Cc: qemu-devel@nongnu.org, yin31149@gmail.com, 18801353760@163.com Subject: [PATCH v3 3/6] hw/net/virtio-net: make some VirtIONet const Date: Thu, 1 Jun 2023 21:48:22 +0800 Message-Id: <91f7437bab18dff4b1bb300c80f1367e492db7ca.1685623090.git.yin31149@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::532; envelope-from=yin31149@gmail.com; helo=mail-pg1-x532.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 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, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The VirtIONet structure is not modified in virtio_net_supported_guest_offloads(). Therefore, make it const to allow this function to accept const variables. Signed-off-by: Hawkins Jiawei Reviewed-by: Eugenio Pérez --- hw/net/virtio-net.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 6df6b7329d..7b27dad6c4 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -874,7 +874,7 @@ static uint64_t virtio_net_guest_offloads_by_features(uint32_t features) return guest_offloads_mask & features; } -static inline uint64_t virtio_net_supported_guest_offloads(VirtIONet *n) +static inline uint64_t virtio_net_supported_guest_offloads(const VirtIONet *n) { VirtIODevice *vdev = VIRTIO_DEVICE(n); return virtio_net_guest_offloads_by_features(vdev->guest_features); From patchwork Thu Jun 1 13:48:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hawkins Jiawei X-Patchwork-Id: 1789085 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=aWvviQfL; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QX6vX053qz20QB for ; Thu, 1 Jun 2023 23:50:00 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q4iga-0007Om-NU; Thu, 01 Jun 2023 09:49:52 -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 1q4igY-0006nx-CF for qemu-devel@nongnu.org; Thu, 01 Jun 2023 09:49:50 -0400 Received: from mail-pf1-x42e.google.com ([2607:f8b0:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q4igV-0000VB-1e for qemu-devel@nongnu.org; Thu, 01 Jun 2023 09:49:50 -0400 Received: by mail-pf1-x42e.google.com with SMTP id d2e1a72fcca58-64d3578c25bso1065599b3a.3 for ; Thu, 01 Jun 2023 06:49:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685627385; x=1688219385; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=W8L7vEWnN/xHIgbzYUYpFswIiZV89v/BuVnxEb7tavI=; b=aWvviQfLmQj609GAVqZNZrhuUifqG7NTDchKgqSQx4oPc3B/7d/suR9VMoDdhBZtfD WdmTNZDbiP01Vr8DvBE4dyOpd7emkF1s7bcxTFgitJ9LNhoioAuN8oxg4HPTN64zvmzt 8Hr6mAZSrXuXnRHCX/3vSudvoHQIb3KghbegFcqgstrXmIqJauG1MrlcieNd9dxWwFp1 Fz4/BSqarROLBnOhekBDdQbHfF7oq9X+8XvvUf9k/ds7Oz0yEkZ/P70E1xtLPZILYpEG CB2+Et1DiYGG/Po7KC2r5pVznCblb1dK8mHXB0LGUMRP71+l+xzCHb4t7YvdXe2Lq2k/ TtyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685627385; x=1688219385; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=W8L7vEWnN/xHIgbzYUYpFswIiZV89v/BuVnxEb7tavI=; b=T4+nXKZ6248js/ghVzGpNO99bmSfse4CqrJUtss1ahzTehz2fOlNwvX9eCmBh6btVZ arble6E00E/Bp5U5K/68iK16W7tEZQr2HOW/R2WCrjbJmuQFeWPftjvDLGtMmR9Ju7g2 nfep6X4zL2zrK2i/x0ap5rN1nfIwlytBlncgZD9Bow42TONFbP2T4SoGwpscTyyJ4l2z Gg19OHNQt5xbEvXNovLbV7VWVsK9cb4F/gXU9rUl5RBOf2YSiffCEZFa9Z0RMr5va1GK aSNwfZoe8sp7JSMcjxgyDfrMcVduEvYU++iurkQ/KKrVQeukHvDRIvVxVE8mIdwTLHFP bC6g== X-Gm-Message-State: AC+VfDz5dG/NWFMKsyR4Nb13gXMcXWAtCt0BiBDwQKyB6xSV/J2f0TkK c0O3iLwIUThy9D5Dv4gi2q6omFqIMGhBd4b0 X-Google-Smtp-Source: ACHHUZ4drAmxffnzCSi4IF1sgVrFPQI5WFPNbgqCx+fcYN6RdhbjWCMr28yZdcJPo/Re5pvbPrr+5A== X-Received: by 2002:a05:6a20:9f45:b0:10b:91c5:45b5 with SMTP id ml5-20020a056a209f4500b0010b91c545b5mr9381515pzb.31.1685627385449; Thu, 01 Jun 2023 06:49:45 -0700 (PDT) Received: from localhost ([159.226.94.115]) by smtp.gmail.com with ESMTPSA id m15-20020aa7900f000000b0064d59e194b3sm5068480pfo.113.2023.06.01.06.49.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Jun 2023 06:49:45 -0700 (PDT) From: Hawkins Jiawei To: jasowang@redhat.com, mst@redhat.com, eperezma@redhat.com Cc: qemu-devel@nongnu.org, yin31149@gmail.com, 18801353760@163.com Subject: [PATCH v3 4/6] virtio-net: expose virtio_net_supported_guest_offloads() Date: Thu, 1 Jun 2023 21:48:23 +0800 Message-Id: <68226edccea8d6e51ea3f2da26d5ff2da2abc224.1685623090.git.yin31149@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42e; envelope-from=yin31149@gmail.com; helo=mail-pf1-x42e.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 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, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org To support restoring offloads state in vdpa, need to expose the function virtio_net_supported_guest_offloads(). QEMU uses this function to get the guest supported offloads and no needs to send the corresponding CVQ command if guest enables all supported features. Signed-off-by: Hawkins Jiawei --- hw/net/virtio-net.c | 2 +- include/hw/virtio/virtio-net.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 7b27dad6c4..7e8897a8bc 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -874,7 +874,7 @@ static uint64_t virtio_net_guest_offloads_by_features(uint32_t features) return guest_offloads_mask & features; } -static inline uint64_t virtio_net_supported_guest_offloads(const VirtIONet *n) +uint64_t virtio_net_supported_guest_offloads(const VirtIONet *n) { VirtIODevice *vdev = VIRTIO_DEVICE(n); return virtio_net_guest_offloads_by_features(vdev->guest_features); diff --git a/include/hw/virtio/virtio-net.h b/include/hw/virtio/virtio-net.h index ef234ffe7e..5f5dcb4572 100644 --- a/include/hw/virtio/virtio-net.h +++ b/include/hw/virtio/virtio-net.h @@ -227,5 +227,6 @@ size_t virtio_net_handle_ctrl_iov(VirtIODevice *vdev, unsigned out_num); void virtio_net_set_netclient_name(VirtIONet *n, const char *name, const char *type); +uint64_t virtio_net_supported_guest_offloads(const VirtIONet *n); #endif From patchwork Thu Jun 1 13:48:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hawkins Jiawei X-Patchwork-Id: 1789087 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=jpbBdm5N; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QX6vZ5T00z20QB for ; Thu, 1 Jun 2023 23:50:02 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q4igc-0007SD-0B; Thu, 01 Jun 2023 09:49:54 -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 1q4igZ-0007MM-Kh for qemu-devel@nongnu.org; Thu, 01 Jun 2023 09:49:51 -0400 Received: from mail-pj1-x102c.google.com ([2607:f8b0:4864:20::102c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q4igX-0000Vb-SL for qemu-devel@nongnu.org; Thu, 01 Jun 2023 09:49:51 -0400 Received: by mail-pj1-x102c.google.com with SMTP id 98e67ed59e1d1-25690e009c8so283020a91.0 for ; Thu, 01 Jun 2023 06:49:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685627388; x=1688219388; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ued2PGntEbVyYE+XZjWv3o98NO0iI/oUAsMZR1ODtOU=; b=jpbBdm5NaymKbTXrDOe34bCxP+rLD/wWS1rqnPHVmir6Ziw0Qp+z8BPK6ZTA+BudCw pY/Sb4WQOQkgkFj+mxSIGRPe/igtQHN2l7zAkIrqeDfTb/qy3Hc7CF8w6ZCVFHYoJIsQ 2zdnUBOfTPOqJLBpEbOU63yGVQRIVaHN5hTUlUHrzCXLbEDHpSqGTT/zatsn1TIskGLV OcYGY2+X2cooicP97iEuYOlUSKJVu6/SDil4Uwr78O19ItIupFaqRkY0INEnihiu9NWS CxjL54aDvrjAwHw5/L7mHgWrU995LYsckHBLnEkx7QSf2EkqxEQqFY3e1i6ggGRqwBtt 63RA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685627388; x=1688219388; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ued2PGntEbVyYE+XZjWv3o98NO0iI/oUAsMZR1ODtOU=; b=KFGaj0YAEo8uXVobztU0SldiYs53j4qvYYpPq6Tdb/f4AChy8A+Ec8zFsrLdOwO3LV 6ZvGlVpyZN1rPKQmFANqHqgTs3P+o43SEjEXvpn+ALTrprmksLQphMwmCEPKqaEDFqm7 tgieYtBglcycEHc+FFSpxQ9/5y3Oz8qI49Z/6u89qZdGC6nhhCFbkLRbzAjZyyVIpMo5 GrHezSv+Hrllk/94tCeKkoJLWPzTU/HhjnG8JHIwxJ9K0tAOyyP21phICS8FWF9ESMY5 oUIfMwmd0eJN7E/euFGKvP/JECvCRijX1QTCupjb6SwQy3Fg9q7xqgpcxCHGZodjNPM6 axXA== X-Gm-Message-State: AC+VfDyAOfrUV0NweHuzeZVv9jwKOqB+y9VKi6ob9Ns7HlXxFPc/zQ0G QCJ8zmdOrbVmt+5cG2fI/GK+AflXsgFKg4H7 X-Google-Smtp-Source: ACHHUZ7HYajNynxUxWYDmWKN877OX+iIS9R3KTXDbSqPwOlC3efoEh8B9P43IAdoNKwXkT2FsnkoOQ== X-Received: by 2002:a17:90b:190:b0:253:87e5:384a with SMTP id t16-20020a17090b019000b0025387e5384amr5839884pjs.42.1685627388173; Thu, 01 Jun 2023 06:49:48 -0700 (PDT) Received: from localhost ([159.226.94.115]) by smtp.gmail.com with ESMTPSA id hf4-20020a17090aff8400b0024e33c69ee5sm1436700pjb.5.2023.06.01.06.49.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Jun 2023 06:49:47 -0700 (PDT) From: Hawkins Jiawei To: jasowang@redhat.com, mst@redhat.com, eperezma@redhat.com Cc: qemu-devel@nongnu.org, yin31149@gmail.com, 18801353760@163.com Subject: [PATCH v3 5/6] vdpa: Add vhost_vdpa_net_load_offloads() Date: Thu, 1 Jun 2023 21:48:24 +0800 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102c; envelope-from=yin31149@gmail.com; helo=mail-pj1-x102c.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 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, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This patch introduces vhost_vdpa_net_load_offloads() to restore offloads state at device's startup. Signed-off-by: Hawkins Jiawei --- net/vhost-vdpa.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index e907a3c792..0e647886d1 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -678,6 +678,40 @@ 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 offloads; + ssize_t dev_written; + + if (!virtio_vdev_has_feature(&n->parent_obj, + VIRTIO_NET_F_CTRL_GUEST_OFFLOADS)) { + return 0; + } + + offloads = cpu_to_le64(n->curr_guest_offloads); + + if (offloads == virtio_net_supported_guest_offloads(n)) { + /* + * According to VirtIO standard, "Upon feature negotiation + * corresponding offload gets enabled to preserve + * backward compatibility." + * So we do not need to send this CVQ command if the guest + * also enables all supported offloads. + */ + return 0; + } + + dev_written = vhost_vdpa_net_load_cmd(s, VIRTIO_NET_CTRL_GUEST_OFFLOADS, + VIRTIO_NET_CTRL_GUEST_OFFLOADS_SET, + &offloads, sizeof(offloads)); + 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); @@ -700,6 +734,10 @@ static int vhost_vdpa_net_load(NetClientState *nc) if (unlikely(r)) { return r; } + r = vhost_vdpa_net_load_offloads(s, n); + if (unlikely(r)) { + return r; + } return 0; } From patchwork Thu Jun 1 13:48:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hawkins Jiawei X-Patchwork-Id: 1789089 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=OT6SMcJl; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QX6vh4jSJz20QJ for ; Thu, 1 Jun 2023 23:50:08 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q4ige-0007mO-HD; Thu, 01 Jun 2023 09:49:56 -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 1q4igc-0007Vl-5W for qemu-devel@nongnu.org; Thu, 01 Jun 2023 09:49:54 -0400 Received: from mail-pl1-x634.google.com ([2607:f8b0:4864:20::634]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q4iga-0000Wa-HX for qemu-devel@nongnu.org; Thu, 01 Jun 2023 09:49:53 -0400 Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-1b04706c974so7211305ad.2 for ; Thu, 01 Jun 2023 06:49:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685627391; x=1688219391; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=njzkDyjtwOWFxOUUDhj3QrAL+aWZx2wnp3b8e3dX67o=; b=OT6SMcJlFKjcdMk7zVlOzIhTfwgnwrQI+PnsnEmNhM8pbRB/WKzVuDQLBx4RPZiZV0 wMf6AtiEJtKVTQIlL8gSJtO4dDyNn2AeUzpFFc3INAkub0G3ODiCoHfUfRzz7KbGvWQu FmIp+EfOrjJAEIa+ZQHa9nW2h75O+4ZrhOhypq4UiSDHuPEGWaQFCOD7Fa3lUEV/6FNc eULIhlYfghHrnrbfYcb8nCUMxD2nslR3uIm9bvgTQzQj07i9gWntWhuCXMPdAva+bW6+ bnggp36G//vNZkITaXvTtSoY3Pod8NPxU6ISJYhdV7QaumLi1hmRJmHtDnSftlfmj33D vh8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685627391; x=1688219391; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=njzkDyjtwOWFxOUUDhj3QrAL+aWZx2wnp3b8e3dX67o=; b=kPdNyUTpMK3OhrcngkBgwmKAHx+66ZS2runbFHlZIzT/o0suFrtixUWt/AHsGzuWd6 Xb0JxqjqQpsBALwXAZuTDBex25FyJBWInyfu9eqtX4GyYqo6eQPHkHm68BYgRziJkSeu XIzBiLpUKfCba9JPzLnBlJr1YkmHMyXYCbgEOOnL/Pj6EVz1hwjqdDeHJlhqVkpVBXSY rxDkgdg7jpOhuXqu+kPEIvSZK21uM4gG3Gc9acoW38mEVKTn1yROXcC/yQeZHWRgtkbC rK08Ba2Qx0tppFoejGYDhES8eeGiuag+5n6dUHX3e+HgpgzQyqtJ/gLM1sFV5msc2Ofv l+Xg== X-Gm-Message-State: AC+VfDz85ulVq7VFwqxeIOpo29WoDLuTC3Db5VQDJABrIFWK8ZPZWW0L xL4CWqbnrRvSM+9YRLCiaRU= X-Google-Smtp-Source: ACHHUZ6AW/5O6bmFPfnDc88hbCAR/82wWrUX6vTmmhbj4/LjpTRezX4SLKEfhqaIXoM+D8dLjspWjA== X-Received: by 2002:a17:903:280c:b0:1b0:4502:8547 with SMTP id kp12-20020a170903280c00b001b045028547mr7266728plb.35.1685627390757; Thu, 01 Jun 2023 06:49:50 -0700 (PDT) Received: from localhost ([159.226.94.115]) by smtp.gmail.com with ESMTPSA id jj21-20020a170903049500b001a5fccab02dsm3499296plb.177.2023.06.01.06.49.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Jun 2023 06:49:50 -0700 (PDT) From: Hawkins Jiawei To: jasowang@redhat.com, mst@redhat.com, eperezma@redhat.com Cc: qemu-devel@nongnu.org, yin31149@gmail.com, 18801353760@163.com Subject: [PATCH v3 6/6] vdpa: Allow VIRTIO_NET_F_CTRL_GUEST_OFFLOADS in SVQ Date: Thu, 1 Jun 2023 21:48:25 +0800 Message-Id: <38c7a86e4b1104917d8507b5e6cbe93d682d59ae.1685623090.git.yin31149@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::634; envelope-from=yin31149@gmail.com; helo=mail-pl1-x634.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 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, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Enable SVQ with VIRTIO_NET_F_CTRL_GUEST_OFFLOADS feature. Signed-off-by: Hawkins Jiawei Acked-by: Jason Wang Acked-by: Eugenio Pérez --- net/vhost-vdpa.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index 0e647886d1..4cc24a2997 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -85,6 +85,7 @@ const int vdpa_feature_bits[] = { static const uint64_t vdpa_svq_device_features = BIT_ULL(VIRTIO_NET_F_CSUM) | BIT_ULL(VIRTIO_NET_F_GUEST_CSUM) | + BIT_ULL(VIRTIO_NET_F_CTRL_GUEST_OFFLOADS) | BIT_ULL(VIRTIO_NET_F_MTU) | BIT_ULL(VIRTIO_NET_F_MAC) | BIT_ULL(VIRTIO_NET_F_GUEST_TSO4) |