From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AB8JxZrMfSdAnBWCNm6p8le1eXzPBkmKwzr1UDf/eI9KTozEI3HhdTLe5uuDH4Lwy8Q4GAckqmzY ARC-Seal: i=1; a=rsa-sha256; t=1525116424; cv=none; d=google.com; s=arc-20160816; b=rCtLSlJgZd5/wtBroPRTPknRfRz04jynf1DYfwkeiT/Ak1blpLtBrhzY9BCX4Fj2fq 98R+dx7XtEmniEy4NP9200iTcgjF6t3JYhXXAAZx5Yd/h9sdfaDa73KJyLkOyjDuF8jc hAElm9Uqq/3NaKC0SjyNUwQFHC+oL9neQ2GGazwtfyg0C2qEV++utEFAqIh7dmNISBsT aRsi9Bh7wU7KPRA6/fhBonootu3RCYcP5AExNT2knho0yIfgMjoGK9UBR2+E61n6v4Lr BN92OqmQELIbkuiln6LIET7V+bcXzZQ9oAlU48SgO/JnqMoBpv9gBkLMouAEcg79FDJN XGrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:dmarc-filter:arc-authentication-results; bh=+h0Va9S7975yoTsZqUb2VnHjB01h0dX+1uZRtkIM24o=; b=ZLynKxNsKGdsGRM3j0mN4QmtSQTD/8Edd4vvB5vhNiYXxylzdbyDPm8mHTL09fZ9U9 ywGC3dSrEy3GDC9Elxe47wcpLXkhNybqCj0sxa0lVd6g6XJj1qAQskh4qAlWlEkIpbPt M7XiU50VX8qQoFBAHUyA0sD+70Z3opfrFCgjNvshp+bUfH3j6G8swkb75Y/wBys9U+eh OPKAfkCWDqK7EgDBdKHLUIbDxAjyqBrGcC4IsaH+GRvhVvzv8WCUQh5owhYkgplcJcts VlGKUn1eZzbWnNF71wRVFFfIxgO5dOvheXBKwh4ObtEHy+aOcEbXrDqO4G8ar7QGlAv1 mGHQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of srs0=k66p=ht=linuxfoundation.org=gregkh@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=SRS0=K66P=HT=linuxfoundation.org=gregkh@kernel.org Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of srs0=k66p=ht=linuxfoundation.org=gregkh@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=SRS0=K66P=HT=linuxfoundation.org=gregkh@kernel.org DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DCDA722DC0 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: mail.kernel.org; spf=fail smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Michael S. Tsirkin" Subject: [PATCH 4.14 23/91] virtio_console: dont tie bufs to a vq Date: Mon, 30 Apr 2018 12:24:05 -0700 Message-Id: <20180430184005.403756809@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180430184004.216234025@linuxfoundation.org> References: <20180430184004.216234025@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1599200479987044089?= X-GMAIL-MSGID: =?utf-8?q?1599200479987044089?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Michael S. Tsirkin commit 2855b33514d290c51d52d94e25d3ef942cd4d578 upstream. an allocated buffer doesn't need to be tied to a vq - only vq->vdev is ever used. Pass the function the just what it needs - the vdev. Cc: stable@vger.kernel.org Signed-off-by: Michael S. Tsirkin Signed-off-by: Greg Kroah-Hartman --- drivers/char/virtio_console.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) --- a/drivers/char/virtio_console.c +++ b/drivers/char/virtio_console.c @@ -422,7 +422,7 @@ static void reclaim_dma_bufs(void) } } -static struct port_buffer *alloc_buf(struct virtqueue *vq, size_t buf_size, +static struct port_buffer *alloc_buf(struct virtio_device *vdev, size_t buf_size, int pages) { struct port_buffer *buf; @@ -445,16 +445,16 @@ static struct port_buffer *alloc_buf(str return buf; } - if (is_rproc_serial(vq->vdev)) { + if (is_rproc_serial(vdev)) { /* * Allocate DMA memory from ancestor. When a virtio * device is created by remoteproc, the DMA memory is * associated with the grandparent device: * vdev => rproc => platform-dev. */ - if (!vq->vdev->dev.parent || !vq->vdev->dev.parent->parent) + if (!vdev->dev.parent || !vdev->dev.parent->parent) goto free_buf; - buf->dev = vq->vdev->dev.parent->parent; + buf->dev = vdev->dev.parent->parent; /* Increase device refcnt to avoid freeing it */ get_device(buf->dev); @@ -838,7 +838,7 @@ static ssize_t port_fops_write(struct fi count = min((size_t)(32 * 1024), count); - buf = alloc_buf(port->out_vq, count, 0); + buf = alloc_buf(port->portdev->vdev, count, 0); if (!buf) return -ENOMEM; @@ -957,7 +957,7 @@ static ssize_t port_fops_splice_write(st if (ret < 0) goto error_out; - buf = alloc_buf(port->out_vq, 0, pipe->nrbufs); + buf = alloc_buf(port->portdev->vdev, 0, pipe->nrbufs); if (!buf) { ret = -ENOMEM; goto error_out; @@ -1374,7 +1374,7 @@ static unsigned int fill_queue(struct vi nr_added_bufs = 0; do { - buf = alloc_buf(vq, PAGE_SIZE, 0); + buf = alloc_buf(vq->vdev, PAGE_SIZE, 0); if (!buf) break;