From patchwork Mon Aug 31 08:27:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Wang X-Patchwork-Id: 11745831 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C72BB13B1 for ; Mon, 31 Aug 2020 08:30:18 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 9BC9E2073A for ; Mon, 31 Aug 2020 08:30:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="GWgLHWxE" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9BC9E2073A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:50460 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kCfCj-0004zD-Jz for patchwork-qemu-devel@patchwork.kernel.org; Mon, 31 Aug 2020 04:30:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41498) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kCfAs-0001PX-Hp for qemu-devel@nongnu.org; Mon, 31 Aug 2020 04:28:22 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:57456) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kCfAo-0005pd-Uy for qemu-devel@nongnu.org; Mon, 31 Aug 2020 04:28:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598862496; 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=KZ5NCeGJm4EmgeA3oDH7PFBVHCkQ2/Sa67CewjIBd08=; b=GWgLHWxExssq1oHDcMyyhXtFgJsqZrrJ9rmB9IWhKp1OvPn3JECJ/G8vpTy6OopvMRgp4s c8yKWmy4th0g49IqU0NosZmWjwFnplOIJoeO74iKiKsz9m/Zxo8kT9nXy12K44/6WrdmQd gfgtKjTIl5YGmiMoRj1j1yqODZ5oCsE= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-142-GJs7O13DO36ee8kHUqYZUw-1; Mon, 31 Aug 2020 04:28:14 -0400 X-MC-Unique: GJs7O13DO36ee8kHUqYZUw-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 87D808015DB for ; Mon, 31 Aug 2020 08:28:13 +0000 (UTC) Received: from jason-ThinkPad-X1-Carbon-6th.redhat.com (ovpn-12-88.pek2.redhat.com [10.72.12.88]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5D9115D9D3; Mon, 31 Aug 2020 08:28:03 +0000 (UTC) From: Jason Wang To: jasowang@redhat.com, qemu-devel@nongnu.org Subject: [PATCH 1/9] vhost-vdpa: remove the default devname Date: Mon, 31 Aug 2020 16:27:29 +0800 Message-Id: <20200831082737.10983-2-jasowang@redhat.com> In-Reply-To: <20200831082737.10983-1-jasowang@redhat.com> References: <20200831082737.10983-1-jasowang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jasowang@redhat.com X-Mimecast-Spam-Score: 0.0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=63.128.21.124; envelope-from=jasowang@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/31 03:02:42 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.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_H5=-1, RCVD_IN_MSPIKE_WL=-0.01, 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: lulu@redhat.com, mst@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" The code doesn't have a default vhostdev, so remove the default description in net.json. Signed-off-by: Jason Wang --- qapi/net.json | 1 - 1 file changed, 1 deletion(-) diff --git a/qapi/net.json b/qapi/net.json index ddb113e5e5..a2a94fad3e 100644 --- a/qapi/net.json +++ b/qapi/net.json @@ -438,7 +438,6 @@ # specifications with a vendor specific control path. # # @vhostdev: path of vhost-vdpa device -# (default:'/dev/vhost-vdpa-0') # # @queues: number of queues to be created for multiqueue vhost-vdpa # (default: 1) From patchwork Mon Aug 31 08:27:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Wang X-Patchwork-Id: 11745815 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A29DD13B6 for ; Mon, 31 Aug 2020 08:29:13 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 7680320767 for ; Mon, 31 Aug 2020 08:29:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="DgKTv6r9" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7680320767 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:44480 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kCfBg-0002Xy-Fm for patchwork-qemu-devel@patchwork.kernel.org; Mon, 31 Aug 2020 04:29:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41530) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kCfB4-0001Vs-0V for qemu-devel@nongnu.org; Mon, 31 Aug 2020 04:28:34 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:31995) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kCfB2-0005v1-Ch for qemu-devel@nongnu.org; Mon, 31 Aug 2020 04:28:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598862511; 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=nGjmJH/3NbHPzzFzN8AJV+tMt3zsZYmZtsBmylGI+hc=; b=DgKTv6r9x5vwv0LKVCOIx+HEkegJXbPjNmwaNe37zpfN5iJVl8o2NF94uQvR/i8fIQdWRL vD5QIFcNtRZHi7q+8XqikKgeyeZeqXr0TG559Qv0MKQi/Oc4MORRIFdgu2mtp0vj0ikEWd IsbdZWandqFx6VDB0/KF5CTlbD/J8oY= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-519-MZGW5lj8OKKdIPqt15G-9g-1; Mon, 31 Aug 2020 04:28:29 -0400 X-MC-Unique: MZGW5lj8OKKdIPqt15G-9g-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6A5BA10ABDA4; Mon, 31 Aug 2020 08:28:28 +0000 (UTC) Received: from jason-ThinkPad-X1-Carbon-6th.redhat.com (ovpn-12-88.pek2.redhat.com [10.72.12.88]) by smtp.corp.redhat.com (Postfix) with ESMTP id A86295D9D3; Mon, 31 Aug 2020 08:28:14 +0000 (UTC) From: Jason Wang To: jasowang@redhat.com, qemu-devel@nongnu.org Subject: [PATCH 2/9] vhost-vdpa: mandate vhostdev Date: Mon, 31 Aug 2020 16:27:30 +0800 Message-Id: <20200831082737.10983-3-jasowang@redhat.com> In-Reply-To: <20200831082737.10983-1-jasowang@redhat.com> References: <20200831082737.10983-1-jasowang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jasowang@redhat.com X-Mimecast-Spam-Score: 0.0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=jasowang@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/31 03:43:46 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.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_H5=-1, RCVD_IN_MSPIKE_WL=-0.01, 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: qemu-stable@nongnu.org, lulu@redhat.com, mst@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" vhost-dev is mandatory for vhost-vdpa to be initialized otherwise net_vhost_vdpa_init will pass an uninitialized pointer to qemu_open() which will lead a SIGSEV: #0 0x0000555555c3a640 in strstart (str=str@entry=0x0, val=val@entry=0x555555dbcb65 "/dev/fdset/", ptr=ptr@entry=0x7fffffffdfb8) at ../util/cutils.c:77 #1 0x0000555555c572a7 in qemu_open (name=name@entry=0x0, flags=flags@entry=2) at ../util/osdep.c:294 #2 0x000055555584314a in net_vhost_vdpa_init (device=0x555555c81baa "vhost-vdpa", vhostdev=0x0, name=0x555556396600 "hn0", peer=0x0) at ../net/vhost-vdpa.c:187 #3 0x000055555584314a in net_init_vhost_vdpa (netdev=, name=0x555556396600 "hn0", peer=0x0, errp=) at ../net/vhost-vdpa.c:227 #4 0x000055555587e8c9 in net_client_init1 (netdev=0x555556398790, is_netdev=is_netdev@entry=true, errp=errp@entry=0x7fffffffe290) at ../net/net.c:1008 #5 0x000055555587ecc7 in net_client_init (opts=0x555556192ff0, is_netdev=, errp=0x7fffffffe290) at ../net/net.c:1113 #6 0x0000555555c33082 in qemu_opts_foreach (list=, func=func@entry=0x55555587ed50 , opaque=opaque@entry=0x0, errp=errp@entry=0x7fffffffe290) at ../util/qemu-option.c:1172 #7 0x0000555555880057 in net_init_clients (errp=errp@entry=0x7fffffffe290) at ../net/net.c:1494 #8 0x0000555555a7f8e9 in qemu_init (argc=, argv=, envp=) at ../softmmu/vl.c:4250 #9 0x00005555557f26cd in main (argc=, argv=, envp=) at ../softmmu/main.c:49 Cc: qemu-stable@nongnu.org Signed-off-by: Jason Wang --- net/vhost-vdpa.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index bc0e0d2d35..b7221beaa1 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -206,7 +206,7 @@ static int net_vhost_check_net(void *opaque, QemuOpts *opts, Error **errp) } if (strcmp(netdev, name) == 0 && !g_str_has_prefix(driver, "virtio-net-")) { - error_setg(errp, "vhost-vdpa requires frontend driver virtio-net-*"); + error_setg(errp, "Vhost-vdpa requires frontend driver virtio-net-*"); return -1; } return 0; @@ -224,5 +224,9 @@ int net_init_vhost_vdpa(const Netdev *netdev, const char *name, (char *)name, errp)) { return -1; } + if (!opts->has_vhostdev) { + error_setg(errp, "vhost-vdpa requires vhostdev to be set"); + return -1; + } return net_vhost_vdpa_init(peer, TYPE_VHOST_VDPA, name, opts->vhostdev); } From patchwork Mon Aug 31 08:27:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Wang X-Patchwork-Id: 11745817 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D311F13B6 for ; Mon, 31 Aug 2020 08:29:30 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 887A42098B for ; Mon, 31 Aug 2020 08:29:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="RVTWLCZv" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 887A42098B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:46232 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kCfBx-0003GL-6B for patchwork-qemu-devel@patchwork.kernel.org; Mon, 31 Aug 2020 04:29:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41652) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kCfBJ-0001v1-Dv for qemu-devel@nongnu.org; Mon, 31 Aug 2020 04:28:49 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:51906 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kCfBH-0005wm-Tq for qemu-devel@nongnu.org; Mon, 31 Aug 2020 04:28:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598862527; 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=K5tETAoLbfuWF+hCqz5qMjRY7nddCTTiomGWd9L5PXY=; b=RVTWLCZv+bSV2l0+fL+EKz04xS4VkUvRo7Ez70uLvDer+izxwmi8cBfaC6MFgLXU35hdyU L5lRSiPqnMDeHoPVJdUr5Ys7aAcp/S9jtV12nGrGNPtIPPd7fZVO+5AG+KUDAjBnwnl8dI l89qnmMswqieq/3R1A9xrksvQhgo/f8= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-288-6d2eNRiaPzuH4zTJ5qlulQ-1; Mon, 31 Aug 2020 04:28:45 -0400 X-MC-Unique: 6d2eNRiaPzuH4zTJ5qlulQ-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2D51910ABDA3 for ; Mon, 31 Aug 2020 08:28:44 +0000 (UTC) Received: from jason-ThinkPad-X1-Carbon-6th.redhat.com (ovpn-12-88.pek2.redhat.com [10.72.12.88]) by smtp.corp.redhat.com (Postfix) with ESMTP id A24FE5D9D3; Mon, 31 Aug 2020 08:28:29 +0000 (UTC) From: Jason Wang To: jasowang@redhat.com, qemu-devel@nongnu.org Subject: [PATCH 3/9] vhost-vdpa: remove the unnecessary assert(s->vhost_net) Date: Mon, 31 Aug 2020 16:27:31 +0800 Message-Id: <20200831082737.10983-4-jasowang@redhat.com> In-Reply-To: <20200831082737.10983-1-jasowang@redhat.com> References: <20200831082737.10983-1-jasowang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jasowang@redhat.com X-Mimecast-Spam-Score: 0.0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=205.139.110.120; envelope-from=jasowang@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/31 02:13:08 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, 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: lulu@redhat.com, mst@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" vhost_vdpa_add() can fail before s->vhost_net is set and net_vhost_vdpa_init() can report error. So there's no need for this assert. Let's remove it. Signed-off-by: Jason Wang --- net/vhost-vdpa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index b7221beaa1..c4568b885e 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -190,7 +190,7 @@ static int net_vhost_vdpa_init(NetClientState *peer, const char *device, } s->vhost_vdpa.device_fd = vdpa_device_fd; ret = vhost_vdpa_add(nc, (void *)&s->vhost_vdpa); - assert(s->vhost_net); + return ret; } From patchwork Mon Aug 31 08:27:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Wang X-Patchwork-Id: 11745851 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7CCE5138A for ; Mon, 31 Aug 2020 08:32:07 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 5085C2073A for ; Mon, 31 Aug 2020 08:32:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Gd3cMDES" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5085C2073A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:55828 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kCfEU-0007EL-Hn for patchwork-qemu-devel@patchwork.kernel.org; Mon, 31 Aug 2020 04:32:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41698) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kCfBZ-0002Ha-7w for qemu-devel@nongnu.org; Mon, 31 Aug 2020 04:29:05 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:27130 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kCfBX-000615-Ap for qemu-devel@nongnu.org; Mon, 31 Aug 2020 04:29:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598862542; 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=5+BCakrOKFcEAOoI1USC566br9qYiCMgtiiLkMLNqrQ=; b=Gd3cMDESvH9gAMOqbNERID5qxl3C4wLy++I2bUzp1RUNJG0nWg1D3+oqpapT2CC3KejRwe FQ2mnblPSj7w/maALid1b63bYtyRhyRtSQoHgnNFOiq5V68D9IThSbRywM8KOH5qpqX7q2 vK6wbAxttzNN6t9Oji4ufCQOS4bh8a4= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-35-L8prCKE3Nl6fCGFyC79R4w-1; Mon, 31 Aug 2020 04:28:59 -0400 X-MC-Unique: L8prCKE3Nl6fCGFyC79R4w-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EDDE910ABDA0 for ; Mon, 31 Aug 2020 08:28:58 +0000 (UTC) Received: from jason-ThinkPad-X1-Carbon-6th.redhat.com (ovpn-12-88.pek2.redhat.com [10.72.12.88]) by smtp.corp.redhat.com (Postfix) with ESMTP id 87D5D5D9D3; Mon, 31 Aug 2020 08:28:45 +0000 (UTC) From: Jason Wang To: jasowang@redhat.com, qemu-devel@nongnu.org Subject: [PATCH 4/9] vhost-vdpa: refine info string Date: Mon, 31 Aug 2020 16:27:32 +0800 Message-Id: <20200831082737.10983-5-jasowang@redhat.com> In-Reply-To: <20200831082737.10983-1-jasowang@redhat.com> References: <20200831082737.10983-1-jasowang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jasowang@redhat.com X-Mimecast-Spam-Score: 0.0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=207.211.31.81; envelope-from=jasowang@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/31 03:06:35 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lulu@redhat.com, mst@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" We use "vhost-vdpa" as nic info string which is not useful, let's add the vhostdev path. before: info network v0: index=0,type=vhost-vdpa,vhost-vdpa after: info network v0: index=0,type=vhost-vdpa,vhostdev=/dev/vhost-vdpa-0 Signed-off-by: Jason Wang Reviewed-by: Laurent Vivier --- net/vhost-vdpa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index c4568b885e..397d4d3082 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -181,7 +181,7 @@ static int net_vhost_vdpa_init(NetClientState *peer, const char *device, int ret = 0; assert(name); nc = qemu_new_net_client(&net_vhost_vdpa_info, peer, device, name); - snprintf(nc->info_str, sizeof(nc->info_str), TYPE_VHOST_VDPA); + snprintf(nc->info_str, sizeof(nc->info_str), "vhostdev=%s", vhostdev); nc->queue_index = 0; s = DO_UPCAST(VhostVDPAState, nc, nc); vdpa_device_fd = qemu_open(vhostdev, O_RDWR); From patchwork Mon Aug 31 08:27:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Wang X-Patchwork-Id: 11745829 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 07ECA13B1 for ; Mon, 31 Aug 2020 08:30:08 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id D01982073A for ; Mon, 31 Aug 2020 08:30:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="LdUdtoQA" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D01982073A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:49468 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kCfCY-0004Ya-Rl for patchwork-qemu-devel@patchwork.kernel.org; Mon, 31 Aug 2020 04:30:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41776) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kCfBo-0002sS-6v for qemu-devel@nongnu.org; Mon, 31 Aug 2020 04:29:20 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:26796 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kCfBm-00064W-Ck for qemu-devel@nongnu.org; Mon, 31 Aug 2020 04:29:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598862557; 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=4hh/qZDjFKTi3QwYN/AbYw7PuAXqiDG6gOeX+DBWFSg=; b=LdUdtoQA88SOb6tiJfGJt8CDDrWBpXxaSeQ1H9JHngwVIJkwigWUV1izNIc6LMk2w/DMmD ANv7cRG0umx5OcN3LgCEPP3EpDA+zZkkoThXDjR9VHcKo0WW1N6BdBpMETeo9iDekg7yeb LiPT4nxyhOR9Ude/Gdc8i1xp2wtZi4A= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-416-3Zad95GxNDC76flnCVfGLQ-1; Mon, 31 Aug 2020 04:29:15 -0400 X-MC-Unique: 3Zad95GxNDC76flnCVfGLQ-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A8DF2801AC4 for ; Mon, 31 Aug 2020 08:29:14 +0000 (UTC) Received: from jason-ThinkPad-X1-Carbon-6th.redhat.com (ovpn-12-88.pek2.redhat.com [10.72.12.88]) by smtp.corp.redhat.com (Postfix) with ESMTP id D02155D9D3; Mon, 31 Aug 2020 08:29:00 +0000 (UTC) From: Jason Wang To: jasowang@redhat.com, qemu-devel@nongnu.org Subject: [PATCH 5/9] vhost-vdpa: remove the unnecessary initialization Date: Mon, 31 Aug 2020 16:27:33 +0800 Message-Id: <20200831082737.10983-6-jasowang@redhat.com> In-Reply-To: <20200831082737.10983-1-jasowang@redhat.com> References: <20200831082737.10983-1-jasowang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jasowang@redhat.com X-Mimecast-Spam-Score: 0.0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=205.139.110.120; envelope-from=jasowang@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/31 02:13:08 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, 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: lulu@redhat.com, mst@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Jason Wang Reviewed-by: Laurent Vivier --- net/vhost-vdpa.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index 397d4d3082..bcbf49d55b 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -175,10 +175,10 @@ static NetClientInfo net_vhost_vdpa_info = { static int net_vhost_vdpa_init(NetClientState *peer, const char *device, const char *name, const char *vhostdev) { - NetClientState *nc = NULL; + NetClientState *nc; VhostVDPAState *s; - int vdpa_device_fd = -1; - int ret = 0; + int vdpa_device_fd; + int ret; assert(name); nc = qemu_new_net_client(&net_vhost_vdpa_info, peer, device, name); snprintf(nc->info_str, sizeof(nc->info_str), "vhostdev=%s", vhostdev); From patchwork Mon Aug 31 08:27:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Wang X-Patchwork-Id: 11745859 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 923DF138A for ; Mon, 31 Aug 2020 08:33:21 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 659B92073A for ; Mon, 31 Aug 2020 08:33:21 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="bQpBtZCL" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 659B92073A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:58518 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kCfFg-0008Nc-Co for patchwork-qemu-devel@patchwork.kernel.org; Mon, 31 Aug 2020 04:33:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41934) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kCfCC-0003iP-16 for qemu-devel@nongnu.org; Mon, 31 Aug 2020 04:29:44 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:24442 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kCfCA-000668-3Z for qemu-devel@nongnu.org; Mon, 31 Aug 2020 04:29:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598862580; 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=Ex8PBSv6bXHMCw9LpxfF6xvEd3IoS3Vnyb9p5IrtWKA=; b=bQpBtZCL2jrfXV97mwyBRAKy2Be+909+ZW1JCLLWhXansw8s8x+0Zti9wAz4+Qvs+DlhVp UthHKTW4EFdTqNmbR7F6AWLgtQ779qPyHFp/jdXVeYPQ1ht9Voa648m+ThzhSHwK2+IL4G E4ntH9H57wBRr7DRlYwMqqda/IlQ0Go= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-146-sgPAQTYVPFCo-dwOgqxYKw-1; Mon, 31 Aug 2020 04:29:38 -0400 X-MC-Unique: sgPAQTYVPFCo-dwOgqxYKw-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EC53F1019626 for ; Mon, 31 Aug 2020 08:29:37 +0000 (UTC) Received: from jason-ThinkPad-X1-Carbon-6th.redhat.com (ovpn-12-88.pek2.redhat.com [10.72.12.88]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3D31A5D9D3; Mon, 31 Aug 2020 08:29:18 +0000 (UTC) From: Jason Wang To: jasowang@redhat.com, qemu-devel@nongnu.org Subject: [PATCH 6/9] vhost-vdpa: remove the unnecessary queue index assignment Date: Mon, 31 Aug 2020 16:27:34 +0800 Message-Id: <20200831082737.10983-7-jasowang@redhat.com> In-Reply-To: <20200831082737.10983-1-jasowang@redhat.com> References: <20200831082737.10983-1-jasowang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jasowang@redhat.com X-Mimecast-Spam-Score: 0.0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=205.139.110.61; envelope-from=jasowang@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/31 03:56:57 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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: lulu@redhat.com, mst@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" The nc is allocated through g_malloc0(), so no need to assign its queue_index to zero. Signed-off-by: Jason Wang Reviewed-by: Laurent Vivier --- net/vhost-vdpa.c | 1 - 1 file changed, 1 deletion(-) diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index bcbf49d55b..1d3ac89135 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -182,7 +182,6 @@ static int net_vhost_vdpa_init(NetClientState *peer, const char *device, assert(name); nc = qemu_new_net_client(&net_vhost_vdpa_info, peer, device, name); snprintf(nc->info_str, sizeof(nc->info_str), "vhostdev=%s", vhostdev); - nc->queue_index = 0; s = DO_UPCAST(VhostVDPAState, nc, nc); vdpa_device_fd = qemu_open(vhostdev, O_RDWR); if (vdpa_device_fd == -1) { From patchwork Mon Aug 31 08:27:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Wang X-Patchwork-Id: 11745843 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7FD4913B1 for ; Mon, 31 Aug 2020 08:31:02 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 5448F2073A for ; Mon, 31 Aug 2020 08:31:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="EWDFC206" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5448F2073A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:52902 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kCfDR-00061F-Hd for patchwork-qemu-devel@patchwork.kernel.org; Mon, 31 Aug 2020 04:31:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41950) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kCfCJ-000425-0u for qemu-devel@nongnu.org; Mon, 31 Aug 2020 04:29:51 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:50326) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kCfCH-00066Y-02 for qemu-devel@nongnu.org; Mon, 31 Aug 2020 04:29:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598862588; 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=ssFNL+9qWeW2P1mJTJW0Zet2cgcckYhuIXxlrOvmdhI=; b=EWDFC20677lvi4lSTLkKjYfV/UCe2NPB9QmZ2epULzO1yz6oYvTY8eazKivGj0N/iVczw3 vSxI/9UW6UYBWthX8n/TKd0kA02RVFKxGewL7aelLXc+QszygvF8nahkjD2GSfGmNGtjUG Jpyq5vGvoUTdqA4niy1rXdDbdMxD76o= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-527-wG_5OrXnM0-K52Cof_QwpQ-1; Mon, 31 Aug 2020 04:29:46 -0400 X-MC-Unique: wG_5OrXnM0-K52Cof_QwpQ-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AA05D1019626 for ; Mon, 31 Aug 2020 08:29:45 +0000 (UTC) Received: from jason-ThinkPad-X1-Carbon-6th.redhat.com (ovpn-12-88.pek2.redhat.com [10.72.12.88]) by smtp.corp.redhat.com (Postfix) with ESMTP id 842145D9D3; Mon, 31 Aug 2020 08:29:38 +0000 (UTC) From: Jason Wang To: jasowang@redhat.com, qemu-devel@nongnu.org Subject: [PATCH 7/9] vhost-vdpa: squash net_vhost_vdpa_init() into net_init_vhost_vdpa() Date: Mon, 31 Aug 2020 16:27:35 +0800 Message-Id: <20200831082737.10983-8-jasowang@redhat.com> In-Reply-To: <20200831082737.10983-1-jasowang@redhat.com> References: <20200831082737.10983-1-jasowang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jasowang@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=jasowang@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/31 03:43:46 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.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_H5=-1, RCVD_IN_MSPIKE_WL=-0.01, 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: lulu@redhat.com, mst@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" This patch squashes net_vhost_vdpa_init() into net_init_vhost_vdpa(). This will simplify adding pre open file descriptor support. Signed-off-by: Jason Wang Reviewed-by: Laurent Vivier --- net/vhost-vdpa.c | 41 +++++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index 1d3ac89135..f5cc4e8326 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -172,27 +172,6 @@ static NetClientInfo net_vhost_vdpa_info = { .has_ufo = vhost_vdpa_has_ufo, }; -static int net_vhost_vdpa_init(NetClientState *peer, const char *device, - const char *name, const char *vhostdev) -{ - NetClientState *nc; - VhostVDPAState *s; - int vdpa_device_fd; - int ret; - assert(name); - nc = qemu_new_net_client(&net_vhost_vdpa_info, peer, device, name); - snprintf(nc->info_str, sizeof(nc->info_str), "vhostdev=%s", vhostdev); - s = DO_UPCAST(VhostVDPAState, nc, nc); - vdpa_device_fd = qemu_open(vhostdev, O_RDWR); - if (vdpa_device_fd == -1) { - return -errno; - } - s->vhost_vdpa.device_fd = vdpa_device_fd; - ret = vhost_vdpa_add(nc, (void *)&s->vhost_vdpa); - - return ret; -} - static int net_vhost_check_net(void *opaque, QemuOpts *opts, Error **errp) { const char *name = opaque; @@ -215,6 +194,10 @@ int net_init_vhost_vdpa(const Netdev *netdev, const char *name, NetClientState *peer, Error **errp) { const NetdevVhostVDPAOptions *opts; + NetClientState *nc; + VhostVDPAState *s; + int vdpa_device_fd; + int ret; assert(netdev->type == NET_CLIENT_DRIVER_VHOST_VDPA); opts = &netdev->u.vhost_vdpa; @@ -227,5 +210,19 @@ int net_init_vhost_vdpa(const Netdev *netdev, const char *name, error_setg(errp, "vhost-vdpa requires vhostdev to be set"); return -1; } - return net_vhost_vdpa_init(peer, TYPE_VHOST_VDPA, name, opts->vhostdev); + + assert(name); + + nc = qemu_new_net_client(&net_vhost_vdpa_info, peer, TYPE_VHOST_VDPA, name); + snprintf(nc->info_str, sizeof(nc->info_str), "vhostdev=%s", opts->vhostdev); + + s = DO_UPCAST(VhostVDPAState, nc, nc); + vdpa_device_fd = qemu_open(opts->vhostdev, O_RDWR); + if (vdpa_device_fd == -1) { + return -errno; + } + s->vhost_vdpa.device_fd = vdpa_device_fd; + ret = vhost_vdpa_add(nc, (void *)&s->vhost_vdpa); + + return ret; } From patchwork Mon Aug 31 08:27:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Wang X-Patchwork-Id: 11745865 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0752C138A for ; Mon, 31 Aug 2020 08:35:05 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id CFA4B2073A for ; Mon, 31 Aug 2020 08:35:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="F9k8dEuM" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CFA4B2073A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:38646 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kCfHL-0003JW-VC for patchwork-qemu-devel@patchwork.kernel.org; Mon, 31 Aug 2020 04:35:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42016) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kCfCa-0004cq-Cj for qemu-devel@nongnu.org; Mon, 31 Aug 2020 04:30:08 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:38803) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kCfCY-00069N-Lk for qemu-devel@nongnu.org; Mon, 31 Aug 2020 04:30:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598862605; 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=IbfvPAiCabBkFl5XLOooMr9PCV39oAlzl08KWcLQmGs=; b=F9k8dEuMcZR91HQr2IEly2YeAeU8wLSIc1QjHwqErfCDE8SgaBeBt7GllZUaXgY6eYwDVu p6RR4C/cvcCRuXWDXosvcUPqF7nJu4ujcHqHrqHCyy0NQGFD1JS4b3TnEQ2Vk00DFh//qK 3HScEdGPVec4ST6LVT8uR2ibt39RaVo= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-434-erqCnJW5PKqMsDvuRG_ACw-1; Mon, 31 Aug 2020 04:30:03 -0400 X-MC-Unique: erqCnJW5PKqMsDvuRG_ACw-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3E9E618BE161 for ; Mon, 31 Aug 2020 08:30:02 +0000 (UTC) Received: from jason-ThinkPad-X1-Carbon-6th.redhat.com (ovpn-12-88.pek2.redhat.com [10.72.12.88]) by smtp.corp.redhat.com (Postfix) with ESMTP id 18ADD5D9DD; Mon, 31 Aug 2020 08:29:46 +0000 (UTC) From: Jason Wang To: jasowang@redhat.com, qemu-devel@nongnu.org Subject: [PATCH 8/9] vhost-vdpa: add accurate error string when fail to open vhost vDPA device Date: Mon, 31 Aug 2020 16:27:36 +0800 Message-Id: <20200831082737.10983-9-jasowang@redhat.com> In-Reply-To: <20200831082737.10983-1-jasowang@redhat.com> References: <20200831082737.10983-1-jasowang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jasowang@redhat.com X-Mimecast-Spam-Score: 0.0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=63.128.21.124; envelope-from=jasowang@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/31 03:02:42 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.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_H5=-1, RCVD_IN_MSPIKE_WL=-0.01, 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: lulu@redhat.com, mst@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" This patch adds more accurate error string when fail to open vhost vDPA device. Signed-off-by: Jason Wang --- net/vhost-vdpa.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index f5cc4e8326..9a6f0b63d3 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -219,6 +219,7 @@ int net_init_vhost_vdpa(const Netdev *netdev, const char *name, s = DO_UPCAST(VhostVDPAState, nc, nc); vdpa_device_fd = qemu_open(opts->vhostdev, O_RDWR); if (vdpa_device_fd == -1) { + error_setg(errp, "Fail to open vhost-vdpa device %s", opts->vhostdev); return -errno; } s->vhost_vdpa.device_fd = vdpa_device_fd; From patchwork Mon Aug 31 08:27:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Wang X-Patchwork-Id: 11745877 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3004A138A for ; Mon, 31 Aug 2020 08:36:45 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 0493E206EB for ; Mon, 31 Aug 2020 08:36:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="JgM8zzqV" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0493E206EB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:46988 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kCfIy-0006iB-0e for patchwork-qemu-devel@patchwork.kernel.org; Mon, 31 Aug 2020 04:36:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42042) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kCfCi-0004wF-0y for qemu-devel@nongnu.org; Mon, 31 Aug 2020 04:30:16 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:24104) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kCfCf-00069z-IJ for qemu-devel@nongnu.org; Mon, 31 Aug 2020 04:30:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598862612; 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=v2uE0+ed78+UFuOqAdJL2VFp4mJybTxMVKwhf5ZD7i8=; b=JgM8zzqV/6ls1/D4zWswt1Mn4WtgtgHH9JbSKfvzNxRAPgWyGSLsRYnJHruXlvZgQCDvq0 hGHLOj31EARHwKRZnTASGwPJ/7kGtvYqgbM7VpwEKCpq7AHaV36w4SmUqug5KfG3eo6eQf vnCUTHrrsFZLFNGaiyCW/DnsXYWzkSM= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-398-YnZJy_q6On-jVkfNBGzcew-1; Mon, 31 Aug 2020 04:30:10 -0400 X-MC-Unique: YnZJy_q6On-jVkfNBGzcew-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8CE23802B77 for ; Mon, 31 Aug 2020 08:30:09 +0000 (UTC) Received: from jason-ThinkPad-X1-Carbon-6th.redhat.com (ovpn-12-88.pek2.redhat.com [10.72.12.88]) by smtp.corp.redhat.com (Postfix) with ESMTP id 023D95D9E2; Mon, 31 Aug 2020 08:30:02 +0000 (UTC) From: Jason Wang To: jasowang@redhat.com, qemu-devel@nongnu.org Subject: [PATCH 9/9] vhost-vdpa: allow pre-opend file descriptor Date: Mon, 31 Aug 2020 16:27:37 +0800 Message-Id: <20200831082737.10983-10-jasowang@redhat.com> In-Reply-To: <20200831082737.10983-1-jasowang@redhat.com> References: <20200831082737.10983-1-jasowang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jasowang@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=63.128.21.124; envelope-from=jasowang@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/31 03:02:42 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.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_H5=-1, RCVD_IN_MSPIKE_WL=-0.01, 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: Markus Armbruster , lulu@redhat.com, mst@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" This patch allows to initialize vhost-vdpa network backend with pre opened vhost-vdpa file descriptor. This is useful for running unprivileged qemu through libvirt. Cc: Eric Blake Cc: Markus Armbruster Signed-off-by: Jason Wang --- net/vhost-vdpa.c | 24 +++++++++++++++++++----- qapi/net.json | 5 ++++- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index 9a6f0b63d3..f6385cd264 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -206,20 +206,34 @@ int net_init_vhost_vdpa(const Netdev *netdev, const char *name, (char *)name, errp)) { return -1; } - if (!opts->has_vhostdev) { - error_setg(errp, "vhost-vdpa requires vhostdev to be set"); + if (!(opts->has_vhostdev ^ opts->has_fd)) { + error_setg(errp, "Vhost-vdpa requires either vhostdev or fd to be set"); return -1; } assert(name); nc = qemu_new_net_client(&net_vhost_vdpa_info, peer, TYPE_VHOST_VDPA, name); - snprintf(nc->info_str, sizeof(nc->info_str), "vhostdev=%s", opts->vhostdev); + if (opts->has_vhostdev) { + snprintf(nc->info_str, sizeof(nc->info_str), + "vhostdev=%s", opts->vhostdev); + vdpa_device_fd = qemu_open(opts->vhostdev, O_RDWR); + if (vdpa_device_fd == -1) { + error_setg(errp, "Fail to open vhost-vdpa device %s", + opts->vhostdev); + return -errno; + } + } else { + snprintf(nc->info_str, sizeof(nc->info_str), "fd=%s", opts->fd); + vdpa_device_fd = monitor_fd_param(cur_mon, opts->fd, errp); + if (vdpa_device_fd == -1) { + return -1; + } + } s = DO_UPCAST(VhostVDPAState, nc, nc); - vdpa_device_fd = qemu_open(opts->vhostdev, O_RDWR); if (vdpa_device_fd == -1) { - error_setg(errp, "Fail to open vhost-vdpa device %s", opts->vhostdev); + return -errno; } s->vhost_vdpa.device_fd = vdpa_device_fd; diff --git a/qapi/net.json b/qapi/net.json index a2a94fad3e..5ad60c3045 100644 --- a/qapi/net.json +++ b/qapi/net.json @@ -442,12 +442,15 @@ # @queues: number of queues to be created for multiqueue vhost-vdpa # (default: 1) # +# @fd: file descriptor of an already opened vhost-vdpa (since 5.2) +# # Since: 5.1 ## { 'struct': 'NetdevVhostVDPAOptions', 'data': { '*vhostdev': 'str', - '*queues': 'int' } } + '*queues': 'int', + '*fd': 'str' } } ## # @NetClientDriver: