From nobody Mon Feb 9 03:47:25 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; dkim=pass; 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; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1651134508; cv=none; d=zohomail.com; s=zohoarc; b=ByrheaR/Yee3VbCK6+2BJJNmi6Ejr5btNmNW+EYhVltw9VCGZRcWMl2968tzYDLtiJKk0hkTNg40dJudJFyNifUjiU89Dg3MAfS2hSRce/3EYP2hRak80xxSyeTLApyKzOd3zvEoLqeHSAcmHRSoUBLQo7jhqwfVMOecPnMpIZ4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1651134508; 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=pzS6PLrR2PHAizt1+i4tl6giJjA8snqDfs2l2Q2VBs0=; b=SmTDEvw5v4ctXzNcpoI5XKN7Kqo31baeOfix+4vEjVdmRVlVLMaFYm3gUBAGzCcsIVtXM9lKa/Hx0ej1df1m/UJ/e9wjUQwuuKvBlMFlmmXO5owL3dCKLuULOOsqa4GBkYQ6OhODXR7dJhYJVVqqIt7RwrufVvwTvfFUhEXvhno= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1651134508860714.6954278293413; Thu, 28 Apr 2022 01:28:28 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.316184.535076 (Exim 4.92) (envelope-from ) id 1njzVP-0000c7-L0; Thu, 28 Apr 2022 08:28:07 +0000 Received: by outflank-mailman (output) from mailman id 316184.535076; Thu, 28 Apr 2022 08:28:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1njzVO-0000U1-5y; Thu, 28 Apr 2022 08:28:06 +0000 Received: by outflank-mailman (input) for mailman id 316184; Thu, 28 Apr 2022 08:27:56 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1njzVE-0005SM-F9 for xen-devel@lists.xenproject.org; Thu, 28 Apr 2022 08:27:56 +0000 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 1827338a-c6cd-11ec-8fc3-03012f2f19d4; Thu, 28 Apr 2022 10:27:51 +0200 (CEST) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id A49C61F88C; Thu, 28 Apr 2022 08:27:51 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 695A913491; Thu, 28 Apr 2022 08:27:51 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id eDY0GAdQamIBLgAAMHmgww (envelope-from ); Thu, 28 Apr 2022 08:27:51 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 1827338a-c6cd-11ec-8fc3-03012f2f19d4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1651134471; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pzS6PLrR2PHAizt1+i4tl6giJjA8snqDfs2l2Q2VBs0=; b=nFFFyryTPJUwSGLm0DOiWi5pBKFreuwVT6dtG6vv7wwwjuQBZiXQURV9kZVktg8KWsLx1t ilLRU/ya4Wl0h4xf0vilOs5Q1STs8uNfcYkc77DBM7WYb0v8XRhp6kV9DQJWf22LPv4YH4 YeMQaNn8uOAEoouaJA49F3Fl0qU4Z08= From: Juergen Gross To: xen-devel@lists.xenproject.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: Juergen Gross , Oleksandr Andrushchenko , David Airlie , Daniel Vetter Subject: [PATCH v2 14/19] xen/drmfront: use xenbus_setup_ring() and xenbus_teardown_ring() Date: Thu, 28 Apr 2022 10:27:38 +0200 Message-Id: <20220428082743.16593-15-jgross@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220428082743.16593-1-jgross@suse.com> References: <20220428082743.16593-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1651134509091100023 Content-Type: text/plain; charset="utf-8" Simplify drmfront's ring creation and removal via xenbus_setup_ring() and xenbus_teardown_ring(). Signed-off-by: Juergen Gross --- drivers/gpu/drm/xen/xen_drm_front_evtchnl.c | 43 ++++++--------------- 1 file changed, 11 insertions(+), 32 deletions(-) diff --git a/drivers/gpu/drm/xen/xen_drm_front_evtchnl.c b/drivers/gpu/drm/= xen/xen_drm_front_evtchnl.c index 4006568b9e32..e52afd792346 100644 --- a/drivers/gpu/drm/xen/xen_drm_front_evtchnl.c +++ b/drivers/gpu/drm/xen/xen_drm_front_evtchnl.c @@ -123,12 +123,12 @@ static irqreturn_t evtchnl_interrupt_evt(int irq, voi= d *dev_id) static void evtchnl_free(struct xen_drm_front_info *front_info, struct xen_drm_front_evtchnl *evtchnl) { - unsigned long page =3D 0; + void *page =3D NULL; =20 if (evtchnl->type =3D=3D EVTCHNL_TYPE_REQ) - page =3D (unsigned long)evtchnl->u.req.ring.sring; + page =3D evtchnl->u.req.ring.sring; else if (evtchnl->type =3D=3D EVTCHNL_TYPE_EVT) - page =3D (unsigned long)evtchnl->u.evt.page; + page =3D evtchnl->u.evt.page; if (!page) return; =20 @@ -147,8 +147,7 @@ static void evtchnl_free(struct xen_drm_front_info *fro= nt_info, xenbus_free_evtchn(front_info->xb_dev, evtchnl->port); =20 /* end access and free the page */ - if (evtchnl->gref !=3D INVALID_GRANT_REF) - gnttab_end_foreign_access(evtchnl->gref, page); + xenbus_teardown_ring(&page, 1, &evtchnl->gref); =20 memset(evtchnl, 0, sizeof(*evtchnl)); } @@ -158,8 +157,7 @@ static int evtchnl_alloc(struct xen_drm_front_info *fro= nt_info, int index, enum xen_drm_front_evtchnl_type type) { struct xenbus_device *xb_dev =3D front_info->xb_dev; - unsigned long page; - grant_ref_t gref; + void *page; irq_handler_t handler; int ret; =20 @@ -168,44 +166,25 @@ static int evtchnl_alloc(struct xen_drm_front_info *f= ront_info, int index, evtchnl->index =3D index; evtchnl->front_info =3D front_info; evtchnl->state =3D EVTCHNL_STATE_DISCONNECTED; - evtchnl->gref =3D INVALID_GRANT_REF; =20 - page =3D get_zeroed_page(GFP_NOIO | __GFP_HIGH); - if (!page) { - ret =3D -ENOMEM; + ret =3D xenbus_setup_ring(xb_dev, GFP_NOIO | __GFP_HIGH, &page, + 1, &evtchnl->gref); + if (ret) goto fail; - } =20 if (type =3D=3D EVTCHNL_TYPE_REQ) { struct xen_displif_sring *sring; =20 init_completion(&evtchnl->u.req.completion); mutex_init(&evtchnl->u.req.req_io_lock); - sring =3D (struct xen_displif_sring *)page; - SHARED_RING_INIT(sring); - FRONT_RING_INIT(&evtchnl->u.req.ring, sring, XEN_PAGE_SIZE); - - ret =3D xenbus_grant_ring(xb_dev, sring, 1, &gref); - if (ret < 0) { - evtchnl->u.req.ring.sring =3D NULL; - free_page(page); - goto fail; - } + sring =3D page; + XEN_FRONT_RING_INIT(&evtchnl->u.req.ring, sring, XEN_PAGE_SIZE); =20 handler =3D evtchnl_interrupt_ctrl; } else { - ret =3D gnttab_grant_foreign_access(xb_dev->otherend_id, - virt_to_gfn((void *)page), 0); - if (ret < 0) { - free_page(page); - goto fail; - } - - evtchnl->u.evt.page =3D (struct xendispl_event_page *)page; - gref =3D ret; + evtchnl->u.evt.page =3D page; handler =3D evtchnl_interrupt_evt; } - evtchnl->gref =3D gref; =20 ret =3D xenbus_alloc_evtchn(xb_dev, &evtchnl->port); if (ret < 0) --=20 2.34.1