From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 94AD4C43441 for ; Thu, 22 Nov 2018 15:47:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 63509206B2 for ; Thu, 22 Nov 2018 15:47:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 63509206B2 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405865AbeKWC1K (ORCPT ); Thu, 22 Nov 2018 21:27:10 -0500 Received: from mx2.suse.de ([195.135.220.15]:53174 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728825AbeKWC1K (ORCPT ); Thu, 22 Nov 2018 21:27:10 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id DF9C0AC52; Thu, 22 Nov 2018 15:47:14 +0000 (UTC) Date: Thu, 22 Nov 2018 16:47:14 +0100 Message-ID: From: Takashi Iwai To: Oleksandr Andrushchenko Cc: xen-devel@lists.xenproject.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, alsa-devel@alsa-project.org, jgross@suse.com, boris.ostrovsky@oracle.com, Oleksandr Andrushchenko Subject: Re: [alsa-devel] [Xen-devel][PATCH 3/3] ALSA: xen-front: Use Xen common shared buffer implementation In-Reply-To: <20181122100230.14976-3-andr2000@gmail.com> References: <20181122100230.14976-1-andr2000@gmail.com> <20181122100230.14976-3-andr2000@gmail.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/26 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 22 Nov 2018 11:02:30 +0100, Oleksandr Andrushchenko wrote: > > @@ -214,12 +221,19 @@ static void stream_clear(struct xen_snd_front_pcm_stream_info *stream) > stream->out_frames = 0; > atomic_set(&stream->hw_ptr, 0); > xen_snd_front_evtchnl_pair_clear(stream->evt_pair); > - xen_snd_front_shbuf_clear(&stream->sh_buf); > + memset(&stream->shbuf, 0, sizeof(stream->shbuf)); > + stream->buffer = NULL; > + stream->buffer_sz = 0; > + stream->pages = NULL; > + stream->num_pages = 0; > } > > static void stream_free(struct xen_snd_front_pcm_stream_info *stream) > { > - xen_snd_front_shbuf_free(&stream->sh_buf); > + xen_front_pgdir_shbuf_unmap(&stream->shbuf); > + xen_front_pgdir_shbuf_free(&stream->shbuf); > + free_pages_exact(stream->buffer, stream->buffer_sz); > + kfree(stream->pages); > stream_clear(stream); > } > > @@ -421,10 +435,34 @@ static int alsa_close(struct snd_pcm_substream *substream) > return 0; > } > > +static int shbuf_setup_backstore(struct xen_snd_front_pcm_stream_info *stream, > + size_t buffer_sz) > +{ > + int i; > + > + stream->buffer_sz = buffer_sz; > + stream->buffer = alloc_pages_exact(stream->buffer_sz, GFP_KERNEL); > + if (!stream->buffer) > + return -ENOMEM; This keeps the NULL stream->buffer, and then the caller goes to the error path via stream_free() which will lead to an Oops due to the unconditional call of free_pages_exact(). thanks, Takashi