From nobody Tue Feb 10 04:14:12 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1589182335; cv=none; d=zohomail.com; s=zohoarc; b=YLVTwJRAIm/0wzI8EOq5RXCPjfDQx4QL1PIzLsJ2ymIfvULMaKz38F2+gbm8EtVoZCFpxqE5LRyOcx5tag7TwNC760RO8sIRSrzdbe00eR04I6RkcT8uOdUhh1jgVFEVF7cx0yf2XTXfSOj027wXgAtfr8N4B1pth8WwYZLdwzQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589182335; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=NU18x/FUrjaNsLNI8lQSGiUwrPT9i03qW7hrlnIRaNw=; b=XvZ568OBhVUsgn9q795omg2mYP/fiT1MdDbDqLTMOpNIXI2yMj+VvWl/OzT7bgSPUR4bbA921/eb5OzrPRWhr77fHLFPW4ymfrbN2KZl99yXnRUlI39T2Jh/M+PgERkjMeyH1nvN2ldiHBuVcFxDb/vR7zB/ZTBD0DnPzvWzURI= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1589182335930562.0524818381372; Mon, 11 May 2020 00:32:15 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jY2uv-0004KL-ON; Mon, 11 May 2020 07:32:01 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jY2uu-0004KE-JG for xen-devel@lists.xenproject.org; Mon, 11 May 2020 07:32:00 +0000 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 7d0c3f72-9359-11ea-b07b-bc764e2007e4; Mon, 11 May 2020 07:31:55 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 00914AC90; Mon, 11 May 2020 07:31:56 +0000 (UTC) X-Inumbo-ID: 7d0c3f72-9359-11ea-b07b-bc764e2007e4 X-Virus-Scanned: by amavisd-new at test-mx.suse.de From: Juergen Gross To: xen-devel@lists.xenproject.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] xen/xenbus: let xenbus_map_ring_valloc() return errno values only Date: Mon, 11 May 2020 09:31:51 +0200 Message-Id: <20200511073151.19043-3-jgross@suse.com> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200511073151.19043-1-jgross@suse.com> References: <20200511073151.19043-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Juergen Gross , Boris Ostrovsky , Stefano Stabellini Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Content-Type: text/plain; charset="utf-8" Today xenbus_map_ring_valloc() can return either a negative errno value (-ENOMEM or -EINVAL) or a grant status value. This is a mess as e.g -ENOMEM and GNTST_eagain have the same numeric value. Fix that by turning all grant mapping errors into -ENOENT. This is no problem as all callers of xenbus_map_ring_valloc() only use the return value to print an error message, and in case of mapping errors the grant status value has already been printed by __xenbus_map_ring() before. Signed-off-by: Juergen Gross Reviewed-by: Boris Ostrovsky --- drivers/xen/xenbus/xenbus_client.c | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/drivers/xen/xenbus/xenbus_client.c b/drivers/xen/xenbus/xenbus= _client.c index d8e5c5e4fa67..5e6b256ca916 100644 --- a/drivers/xen/xenbus/xenbus_client.c +++ b/drivers/xen/xenbus/xenbus_client.c @@ -456,8 +456,7 @@ EXPORT_SYMBOL_GPL(xenbus_free_evtchn); * Map @nr_grefs pages of memory into this domain from another * domain's grant table. xenbus_map_ring_valloc allocates @nr_grefs * pages of virtual address space, maps the pages to that address, and - * sets *vaddr to that address. Returns 0 on success, and GNTST_* - * (see xen/include/interface/grant_table.h) or -ENOMEM / -EINVAL on + * sets *vaddr to that address. Returns 0 on success, and -errno on * error. If an error is returned, device will switch to * XenbusStateClosing and the error message will be saved in XenStore. */ @@ -477,18 +476,11 @@ int xenbus_map_ring_valloc(struct xenbus_device *dev,= grant_ref_t *gnt_refs, return -ENOMEM; =20 info->node =3D kzalloc(sizeof(*info->node), GFP_KERNEL); - if (!info->node) { + if (!info->node) err =3D -ENOMEM; - goto out; - } - - err =3D ring_ops->map(dev, info, gnt_refs, nr_grefs, vaddr); - - /* Some hypervisors are buggy and can return 1. */ - if (err > 0) - err =3D GNTST_general_error; + else + err =3D ring_ops->map(dev, info, gnt_refs, nr_grefs, vaddr); =20 - out: kfree(info->node); kfree(info); return err; @@ -507,7 +499,6 @@ static int __xenbus_map_ring(struct xenbus_device *dev, bool *leaked) { int i, j; - int err =3D GNTST_okay; =20 if (nr_grefs > XENBUS_MAX_RING_GRANTS) return -EINVAL; @@ -522,7 +513,6 @@ static int __xenbus_map_ring(struct xenbus_device *dev, =20 for (i =3D 0; i < nr_grefs; i++) { if (info->map[i].status !=3D GNTST_okay) { - err =3D info->map[i].status; xenbus_dev_fatal(dev, info->map[i].status, "mapping in shared page %d from domain %d", gnt_refs[i], dev->otherend_id); @@ -531,7 +521,7 @@ static int __xenbus_map_ring(struct xenbus_device *dev, handles[i] =3D info->map[i].handle; } =20 - return GNTST_okay; + return 0; =20 fail: for (i =3D j =3D 0; i < nr_grefs; i++) { @@ -554,7 +544,7 @@ static int __xenbus_map_ring(struct xenbus_device *dev, } } =20 - return err; + return -ENOENT; } =20 /** --=20 2.26.1