From patchwork Thu Sep 3 18:53:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 11754521 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 6AF47746 for ; Thu, 3 Sep 2020 18:54:15 +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 3B92120722 for ; Thu, 3 Sep 2020 18:54:15 +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="g67K0Q7m" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3B92120722 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]:57762 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDuNB-0002ko-Ux for patchwork-qemu-devel@patchwork.kernel.org; Thu, 03 Sep 2020 14:54:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48930) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDuMa-0001T8-Nm for qemu-devel@nongnu.org; Thu, 03 Sep 2020 14:53:36 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:49530 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 1kDuMZ-0005cI-5r for qemu-devel@nongnu.org; Thu, 03 Sep 2020 14:53:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599159214; 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=1Xa/Eo0mHN9VAabkFhhaj/1662E5XKgexnLl38Jnm0c=; b=g67K0Q7mGtKCXwDYJrjuDlKA5/NvzW6hn1y1eDA/M1Se95CMmMMVDW+8oA7gzI3TsRdu2i kikol0C1jEzDo8Aaov1n49TIAG4ORnxVcZ7mBZlnVkdE02o+QKezXQ/ooYGsR1WdKtnumj AT+3apHvyoflByWmaMfl/NHH77sbq8c= 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-406-2jTx7jw0OPyAJ4oTa2ayqQ-1; Thu, 03 Sep 2020 14:53:32 -0400 X-MC-Unique: 2jTx7jw0OPyAJ4oTa2ayqQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id ACF8D393B7 for ; Thu, 3 Sep 2020 18:53:31 +0000 (UTC) Received: from thinkpad.redhat.com (ovpn-112-218.ams2.redhat.com [10.36.112.218]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8F795672C6; Thu, 3 Sep 2020 18:53:30 +0000 (UTC) From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PATCH 1/2] vhost-vdpa: define and use default value for vhostdev Date: Thu, 3 Sep 2020 20:53:26 +0200 Message-Id: <20200903185327.774708-2-lvivier@redhat.com> In-Reply-To: <20200903185327.774708-1-lvivier@redhat.com> References: <20200903185327.774708-1-lvivier@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=lvivier@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=205.139.110.61; envelope-from=lvivier@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/03 01:28:33 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.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Jason Wang , Cindy Lu Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" vhostdev is defined as optional in net.json, and if not set /dev/vhost-vdpa-0 should be used. The default value is not set and if vhostdev is not provided QEMU crashes with a SIGSEGV exception. Fixes: 1e0a84ea49b6 ("vhost-vdpa: introduce vhost-vdpa net client") Cc: lulu@redhat.com Signed-off-by: Laurent Vivier --- net/vhost-vdpa.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index bc0e0d2d35b7..24103ef241e4 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -24,6 +24,9 @@ #include "monitor/monitor.h" #include "hw/virtio/vhost.h" +/* default vhostdev as defined in qapi/net.json */ +#define VHOST_VDPA_DEFAULT_VHOSTDEV "/dev/vhost-vdpa-0" + /* Todo:need to add the multiqueue support here */ typedef struct VhostVDPAState { NetClientState nc; @@ -224,5 +227,7 @@ int net_init_vhost_vdpa(const Netdev *netdev, const char *name, (char *)name, errp)) { return -1; } - return net_vhost_vdpa_init(peer, TYPE_VHOST_VDPA, name, opts->vhostdev); + return net_vhost_vdpa_init(peer, TYPE_VHOST_VDPA, name, + opts->has_vhostdev ? + opts->vhostdev : VHOST_VDPA_DEFAULT_VHOSTDEV); } From patchwork Thu Sep 3 18:53:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 11754523 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 64716746 for ; Thu, 3 Sep 2020 18:54:19 +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 3635720722 for ; Thu, 3 Sep 2020 18:54:19 +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="P1UaNQzW" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3635720722 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]:58140 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDuNG-0002uf-Ed for patchwork-qemu-devel@patchwork.kernel.org; Thu, 03 Sep 2020 14:54:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48944) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDuMe-0001Ym-Ry for qemu-devel@nongnu.org; Thu, 03 Sep 2020 14:53:40 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:53158) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDuMd-0005cY-8G for qemu-devel@nongnu.org; Thu, 03 Sep 2020 14:53:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599159218; 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=YVyI7uvdPvRx+1RKCkYnkMlTbAG6DGXcgOuqzNcY20I=; b=P1UaNQzWQEEG332KarEAwxeaKS5ZnPWjIEMQQhzdy7f38KI61wj+KVFhoBLRuqEi/xDdeF FHoHtf6wVwMJWqJO1zD/SZwL/x5VDcFjT/7EgE+VblYWDRb9gaTA/hOkCeeHGC6sKW4Z3w 41zJYxzrlJaAzcFJMglu6Bft/qnk1Ms= 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-209-0iZj_lCpM0O1yjtPNldNpQ-1; Thu, 03 Sep 2020 14:53:36 -0400 X-MC-Unique: 0iZj_lCpM0O1yjtPNldNpQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F11E8185A0C9 for ; Thu, 3 Sep 2020 18:53:35 +0000 (UTC) Received: from thinkpad.redhat.com (ovpn-112-218.ams2.redhat.com [10.36.112.218]) by smtp.corp.redhat.com (Postfix) with ESMTP id 10896672C6; Thu, 3 Sep 2020 18:53:31 +0000 (UTC) From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PATCH 2/2] vhost-vdpa: improve error reporting Date: Thu, 3 Sep 2020 20:53:27 +0200 Message-Id: <20200903185327.774708-3-lvivier@redhat.com> In-Reply-To: <20200903185327.774708-1-lvivier@redhat.com> References: <20200903185327.774708-1-lvivier@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=lvivier@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=lvivier@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/03 01:47:17 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Jason Wang , Cindy Lu Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Use Error framework to report the id of the device and the details of the error (vhostdev name and errno). For instance: qemu-system-x86_64 ... -netdev vhost-vdpa,id=hostnet1 ... hostnet1: Cannot open '/dev/vhost-vdpa-0': No such file or directory Signed-off-by: Laurent Vivier Reviewed-by: Philippe Mathieu-Daudé --- net/vhost-vdpa.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index 24103ef241e4..8260902334ae 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -176,7 +176,8 @@ static NetClientInfo net_vhost_vdpa_info = { }; static int net_vhost_vdpa_init(NetClientState *peer, const char *device, - const char *name, const char *vhostdev) + const char *name, const char *vhostdev, + Error **errp) { NetClientState *nc = NULL; VhostVDPAState *s; @@ -189,11 +190,15 @@ static int net_vhost_vdpa_init(NetClientState *peer, const char *device, s = DO_UPCAST(VhostVDPAState, nc, nc); vdpa_device_fd = qemu_open(vhostdev, O_RDWR); if (vdpa_device_fd == -1) { - return -errno; + error_setg_errno(errp, errno, "%s: Cannot open '%s'", name, vhostdev); + return -1; } s->vhost_vdpa.device_fd = vdpa_device_fd; ret = vhost_vdpa_add(nc, (void *)&s->vhost_vdpa); - assert(s->vhost_net); + if (ret == -1) { + error_setg(errp, "%s: Cannot add vhost-vdpa '%s'", name, vhostdev); + return -1; + } return ret; } @@ -229,5 +234,6 @@ int net_init_vhost_vdpa(const Netdev *netdev, const char *name, } return net_vhost_vdpa_init(peer, TYPE_VHOST_VDPA, name, opts->has_vhostdev ? - opts->vhostdev : VHOST_VDPA_DEFAULT_VHOSTDEV); + opts->vhostdev : VHOST_VDPA_DEFAULT_VHOSTDEV, + errp); }