From patchwork Mon Aug 7 12:22:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksandr Andrushchenko X-Patchwork-Id: 9885249 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BBA3A603F2 for ; Mon, 7 Aug 2017 12:25:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ACBA028670 for ; Mon, 7 Aug 2017 12:25:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A1AA428675; Mon, 7 Aug 2017 12:25:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0484C28671 for ; Mon, 7 Aug 2017 12:25:32 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1deh3w-0007qN-V3; Mon, 07 Aug 2017 12:23:12 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1deh3u-0007nO-Ub for xen-devel@lists.xen.org; Mon, 07 Aug 2017 12:23:11 +0000 Received: from [193.109.254.147] by server-9.bemta-6.messagelabs.com id 1D/C0-03406-EAB58895; Mon, 07 Aug 2017 12:23:10 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrIIsWRWlGSWpSXmKPExsVyMfS6o+7a6I5 Ig54vehZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa0ZP4zzmgp3OFc1tdxgbGDdbdjFycQgJ9DFK /Hr5ixXEYRF4ySKxqfkZmCMh0M8q8bfhPlsXIyeQEydxet9dZgi7UmLPgX6wuJCAosTXZ9OZI EatYpI4fGM/WBGbgJHE8hs/WEBsEYEIiWOPP4A1MAuUStzYPwesRljAX+LI8ulAcQ6g1aoSP0 56goR5BRwllvVPYIXYJSdx81wnWDmngJPE897HUHsdJT6fmcE6gVFgASPDKkb14tSistQiXWO 9pKLM9IyS3MTMHF1DAzO93NTi4sT01JzEpGK95PzcTYzAwGIAgh2MHf+cDjFKcjApifLGr2iL FOJLyk+pzEgszogvKs1JLT7EKMPBoSTBWxjVESkkWJSanlqRlpkDDHGYtAQHj5IIrwpImre4I DG3ODMdInWK0Z7jypV1X5g4NqxeDySnHNgOJF9N+P+NSYglLz8vVUqcNwykTQCkLaM0D24oLC YvMcpKCfMyAp0pxFOQWpSbWYIq/4pRnINRSZh3PsgUnsy8Erjdr4DOYgI6601iK8hZJYkIKak Gxuht5QkqWmL5O81C1Cpu1R+MOVJ4M9bl6DQNn6e1j7tm3ul508p97EDrwmvznpz7+vpG+odt ay9d3lPqXH364ryilezLmJSn+/5gbDSeOWdfcNRK28l8nT8X5TkvanJ7mBb+ZrLb+Vp3v3rz9 yk5G61Xne9fdez/qfb4j1Nfcy/7YbuNN3pVnpwSS3FGoqEWc1FxIgCwtSGVxAIAAA== X-Env-Sender: andr2000@gmail.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1502108589!110775501!1 X-Originating-IP: [209.85.215.65] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 45625 invoked from network); 7 Aug 2017 12:23:09 -0000 Received: from mail-lf0-f65.google.com (HELO mail-lf0-f65.google.com) (209.85.215.65) by server-9.tower-27.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 7 Aug 2017 12:23:09 -0000 Received: by mail-lf0-f65.google.com with SMTP id 65so225294lfa.0 for ; Mon, 07 Aug 2017 05:23:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=zNA080u4iv33JRC7/H5Wr7qorJFbcRTjEG/rNidFr6o=; b=V9lCb712RJF/8oFImKJkdAn+hEvj5K62QAG6bYhvFQ7UpW2pRT+J1I2R4cWRsOnZcl AeGdgBR144h7x70A4wdO+cJUCAf7YUWfDo7Wr6DRYfhQsmn/QVQY3Owa5IkZGNkp4lfb 30K2o//t8MlJMySBihuiduVcNNqMcoRF+1StTgVkstXIxAx1g7Js9fznPDRZooQaSe0r u5q7XUS4Oo87P/R+dvTmnzpUP60rYQbz+sQi/wFD5RDK9MHxvGDq+zQF/G7lUHan0/+L IzGb3NTg/W296qd7csGukcNHrzScxqq1r73vA8DMDipTR2fEGBy8jNVj9wLoi1wpt/+I c2pg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=zNA080u4iv33JRC7/H5Wr7qorJFbcRTjEG/rNidFr6o=; b=BEbNx5HI9DdwDB3VR1wKeMFBDLgayIR5W/ehqcti1o6gxtGqbrzwUt5Me4D6j5UPrU OLP7man7ZesK9RSESna+uzAtWGB4MZSw4YkmCHQmE06XEQr8NIjlxomFzIadQ9s5fGYO ZwVICWMD+o2/CmrN+0cq0ZVvmZ6ovCG5/dyjv38gc4AMX8csDr+MQkmnYk/90IJm1xjw K64aPMDt4/xzgr6isGrNxCOLovIib5RofsF6xbaw7QmsEFm+m94WhW38O4HQHScPBx7N kcUTPD/+GdhOqrQDTOD1c3fFmRV3bBp6V6sqSbymfHET40+757Cy+lE1eu14fCok9q2c rtoQ== X-Gm-Message-State: AHYfb5hb/PZC6Vvx9q7zlwjW/e/klgtMDD54FCCINxZeRMxz/JHNUgr6 GeaPzgrV8pLvyQ== X-Received: by 10.46.69.131 with SMTP id s125mr122597lja.131.1502108588927; Mon, 07 Aug 2017 05:23:08 -0700 (PDT) Received: from a2k-HP-ProDesk-600-G2-SFF.kyiv.epam.com (ll-53.209.223.85.sovam.net.ua. [85.223.209.53]) by smtp.gmail.com with ESMTPSA id m143sm1031821lfm.77.2017.08.07.05.23.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 07 Aug 2017 05:23:08 -0700 (PDT) From: Oleksandr Andrushchenko To: alsa-devel@alsa-project.org, xen-devel@lists.xen.org, linux-kernel@vger.kernel.org Date: Mon, 7 Aug 2017 15:22:50 +0300 Message-Id: <1502108577-8099-6-git-send-email-andr2000@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1502108577-8099-1-git-send-email-andr2000@gmail.com> References: <1502108577-8099-1-git-send-email-andr2000@gmail.com> Cc: andr2000@gmail.com, Oleksandr Andrushchenko , tiwai@suse.com, perex@perex.cz Subject: [Xen-devel] [PATCH RESEND1 05/12] ALSA: vsnd: Implement Xen event channel handling X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Oleksandr Andrushchenko 1. Create event channels for all configured streams and publish corresponding ring references and event channels in Xen store, so backend can connect. 2. Implement event channel interrupt handler. 3. Create and destroy event channels with respect to Xen bus state. Signed-off-by: Oleksandr Andrushchenko --- sound/drivers/xen-front.c | 269 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 268 insertions(+), 1 deletion(-) diff --git a/sound/drivers/xen-front.c b/sound/drivers/xen-front.c index ef48cbf44cf2..a92459b2737e 100644 --- a/sound/drivers/xen-front.c +++ b/sound/drivers/xen-front.c @@ -24,14 +24,40 @@ #include #include +#include +#include #include #include #include +/* + * FIXME: usage of grant reference 0 as invalid grant reference: + * grant reference 0 is valid, but never exposed to a PV driver, + * because of the fact it is already in use/reserved by the PV console. + */ +#define GRANT_INVALID_REF 0 /* maximum number of supported streams */ #define VSND_MAX_STREAM 8 +enum xdrv_evtchnl_state { + EVTCHNL_STATE_DISCONNECTED, + EVTCHNL_STATE_CONNECTED, +}; + +struct xdrv_evtchnl_info { + struct xdrv_info *drv_info; + struct xen_sndif_front_ring ring; + int ring_ref; + int port; + int irq; + struct completion completion; + enum xdrv_evtchnl_state state; + /* latest response status and its corresponding id */ + int resp_status; + uint16_t resp_id; +}; + struct cfg_stream { int unique_id; char *xenstore_path; @@ -65,6 +91,8 @@ struct xdrv_info { struct xenbus_device *xb_dev; spinlock_t io_lock; struct mutex mutex; + int num_evt_channels; + struct xdrv_evtchnl_info *evt_chnls; struct sdev_card_plat_data cfg_plat_data; }; @@ -102,6 +130,244 @@ static struct snd_pcm_hardware sdrv_pcm_hw_default = { .fifo_size = 0, }; +static irqreturn_t xdrv_evtchnl_interrupt(int irq, void *dev_id) +{ + struct xdrv_evtchnl_info *channel = dev_id; + struct xdrv_info *drv_info = channel->drv_info; + struct xensnd_resp *resp; + RING_IDX i, rp; + unsigned long flags; + + spin_lock_irqsave(&drv_info->io_lock, flags); + if (unlikely(channel->state != EVTCHNL_STATE_CONNECTED)) + goto out; + +again: + rp = channel->ring.sring->rsp_prod; + /* ensure we see queued responses up to rp */ + rmb(); + + for (i = channel->ring.rsp_cons; i != rp; i++) { + resp = RING_GET_RESPONSE(&channel->ring, i); + if (resp->id != channel->resp_id) + continue; + switch (resp->operation) { + case XENSND_OP_OPEN: + /* fall through */ + case XENSND_OP_CLOSE: + /* fall through */ + case XENSND_OP_READ: + /* fall through */ + case XENSND_OP_WRITE: + channel->resp_status = resp->status; + complete(&channel->completion); + break; + + default: + dev_err(&drv_info->xb_dev->dev, + "Operation %d is not supported\n", + resp->operation); + break; + } + } + + channel->ring.rsp_cons = i; + if (i != channel->ring.req_prod_pvt) { + int more_to_do; + + RING_FINAL_CHECK_FOR_RESPONSES(&channel->ring, more_to_do); + if (more_to_do) + goto again; + } else + channel->ring.sring->rsp_event = i + 1; + +out: + spin_unlock_irqrestore(&drv_info->io_lock, flags); + return IRQ_HANDLED; +} + +static inline void xdrv_evtchnl_flush( + struct xdrv_evtchnl_info *channel) +{ + int notify; + + channel->ring.req_prod_pvt++; + RING_PUSH_REQUESTS_AND_CHECK_NOTIFY(&channel->ring, notify); + if (notify) + notify_remote_via_irq(channel->irq); +} + +static void xdrv_evtchnl_free(struct xdrv_info *drv_info, + struct xdrv_evtchnl_info *channel) +{ + if (!channel->ring.sring) + return; + + channel->state = EVTCHNL_STATE_DISCONNECTED; + channel->resp_status = -EIO; + complete_all(&channel->completion); + + if (channel->irq) + unbind_from_irqhandler(channel->irq, channel); + channel->irq = 0; + + if (channel->port) + xenbus_free_evtchn(drv_info->xb_dev, channel->port); + channel->port = 0; + + if (channel->ring_ref != GRANT_INVALID_REF) + gnttab_end_foreign_access(channel->ring_ref, 0, + (unsigned long)channel->ring.sring); + channel->ring_ref = GRANT_INVALID_REF; + channel->ring.sring = NULL; +} + +static void xdrv_evtchnl_free_all(struct xdrv_info *drv_info) +{ + int i; + + if (!drv_info->evt_chnls) + return; + + for (i = 0; i < drv_info->num_evt_channels; i++) + xdrv_evtchnl_free(drv_info, &drv_info->evt_chnls[i]); + + devm_kfree(&drv_info->xb_dev->dev, drv_info->evt_chnls); + drv_info->evt_chnls = NULL; +} + +static int xdrv_evtchnl_alloc(struct xdrv_info *drv_info, + struct xdrv_evtchnl_info *evt_channel) +{ + struct xenbus_device *xb_dev = drv_info->xb_dev; + struct xen_sndif_sring *sring; + grant_ref_t gref; + int ret; + + evt_channel->drv_info = drv_info; + init_completion(&evt_channel->completion); + evt_channel->state = EVTCHNL_STATE_DISCONNECTED; + evt_channel->ring_ref = GRANT_INVALID_REF; + evt_channel->ring.sring = NULL; + evt_channel->port = 0; + evt_channel->irq = 0; + + sring = (struct xen_sndif_sring *)get_zeroed_page( + GFP_NOIO | __GFP_HIGH); + if (!sring) { + ret = -ENOMEM; + goto fail; + } + + SHARED_RING_INIT(sring); + FRONT_RING_INIT(&evt_channel->ring, sring, XEN_PAGE_SIZE); + ret = xenbus_grant_ring(xb_dev, sring, 1, &gref); + if (ret < 0) + goto fail; + evt_channel->ring_ref = gref; + + ret = xenbus_alloc_evtchn(xb_dev, &evt_channel->port); + if (ret < 0) + goto fail; + + ret = bind_evtchn_to_irqhandler(evt_channel->port, + xdrv_evtchnl_interrupt, 0, xb_dev->devicetype, evt_channel); + if (ret < 0) + goto fail; + + evt_channel->irq = ret; + return 0; + +fail: + dev_err(&xb_dev->dev, "Failed to allocate ring: %d\n", ret); + return ret; +} + +static int xdrv_evtchnl_create(struct xdrv_info *drv_info, + struct xdrv_evtchnl_info *evt_channel, + const char *path) +{ + int ret; + + ret = xdrv_evtchnl_alloc(drv_info, evt_channel); + if (ret < 0) { + dev_err(&drv_info->xb_dev->dev, + "allocating event channel: %d\n", ret); + return ret; + } + + /* + * write values to Xen store, so backend can find ring reference + * and event channel + */ + ret = xenbus_printf(XBT_NIL, path, XENSND_FIELD_RING_REF, "%u", + evt_channel->ring_ref); + if (ret < 0) { + dev_err(&drv_info->xb_dev->dev, + "writing " XENSND_FIELD_RING_REF": %d\n", ret); + return ret; + } + + ret = xenbus_printf(XBT_NIL, path, XENSND_FIELD_EVT_CHNL, "%u", + evt_channel->port); + if (ret < 0) { + dev_err(&drv_info->xb_dev->dev, + "writing " XENSND_FIELD_EVT_CHNL": %d\n", ret); + return ret; + } + return 0; +} + +static int xdrv_evtchnl_create_all(struct xdrv_info *drv_info, + int num_streams) +{ + struct cfg_card *cfg_card; + int d, ret = 0; + + drv_info->evt_chnls = devm_kcalloc(&drv_info->xb_dev->dev, + num_streams, sizeof(struct xdrv_evtchnl_info), GFP_KERNEL); + if (!drv_info->evt_chnls) { + ret = -ENOMEM; + goto fail; + } + + cfg_card = &drv_info->cfg_plat_data.cfg_card; + /* iterate over devices and their streams and create event channels */ + for (d = 0; d < cfg_card->num_pcm_instances; d++) { + struct cfg_pcm_instance *pcm_instance; + int s, stream_idx; + + pcm_instance = &cfg_card->pcm_instances[d]; + + for (s = 0; s < pcm_instance->num_streams_pb; s++) { + stream_idx = pcm_instance->streams_pb[s].unique_id; + ret = xdrv_evtchnl_create(drv_info, + &drv_info->evt_chnls[stream_idx], + pcm_instance->streams_pb[s].xenstore_path); + if (ret < 0) + goto fail; + } + + for (s = 0; s < pcm_instance->num_streams_cap; s++) { + stream_idx = pcm_instance->streams_cap[s].unique_id; + ret = xdrv_evtchnl_create(drv_info, + &drv_info->evt_chnls[stream_idx], + pcm_instance->streams_cap[s].xenstore_path); + if (ret < 0) + goto fail; + } + } + if (ret < 0) + goto fail; + + drv_info->num_evt_channels = num_streams; + return 0; + +fail: + xdrv_evtchnl_free_all(drv_info); + return ret; +} + struct CFG_HW_SAMPLE_RATE { const char *name; unsigned int mask; @@ -556,6 +822,7 @@ static int cfg_card(struct xdrv_info *drv_info, static void xdrv_remove_internal(struct xdrv_info *drv_info) { + xdrv_evtchnl_free_all(drv_info); } static int xdrv_be_on_initwait(struct xdrv_info *drv_info) @@ -568,7 +835,7 @@ static int xdrv_be_on_initwait(struct xdrv_info *drv_info) ret = cfg_card(drv_info, &drv_info->cfg_plat_data, &stream_idx); if (ret < 0) return ret; - return 0; + return xdrv_evtchnl_create_all(drv_info, stream_idx); } static inline int xdrv_be_on_connected(struct xdrv_info *drv_info)