From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rusty Russell Subject: Re: [PATCHv7 3/4] virtio_console: Merge struct buffer_token into struct port_buffer Date: Tue, 23 Oct 2012 10:49:24 +1030 Message-ID: <87fw56hwfn.fsf@rustcorp.com.au> References: <1350287856-5284-1-git-send-email-sjur.brandeland@stericsson.com> <1350287856-5284-4-git-send-email-sjur.brandeland@stericsson.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1350287856-5284-4-git-send-email-sjur.brandeland@stericsson.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: virtualization-bounces@lists.linux-foundation.org Errors-To: virtualization-bounces@lists.linux-foundation.org To: Amit Shah Cc: "Michael S. Tsirkin" , Linus Walleij , linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, Masami Hiramatsu , Sjur =?utf-8?Q?Br=C3=A6ndeland?= List-Id: virtualization@lists.linuxfoundation.org c2p1ci5icmFuZGVsYW5kQHN0ZXJpY3Nzb24uY29tIHdyaXRlczoKPiBGcm9tOiBTanVyIEJyw6Zu ZGVsYW5kIDxzanVyLmJyYW5kZWxhbmRAc3Rlcmljc3Nvbi5jb20+Cj4KPiBSZWZhY3RvcmluZyB0 aGUgc3BsaWNlIGZ1bmN0aW9uYWxpdHkgYnkgdW5pZnlpbmcgdGhlIGFwcHJvYWNoIGZvcgo+IHNl bmRpbmcgc2NhdHRlci1saXN0cyBhbmQgcmVndWxhciBidWZmZXJzLiBUaGlzIHNpbXBsaWZpZXMK PiBidWZmZXIgaGFuZGxpbmcgYW5kIHJlZHVjZXMgY29kZSBzaXplLiBTcGxpY2Ugd2lsbCBub3cg YWxsb2NhdGUKPiBhIHBvcnRfYnVmZmVyIGFuZCBzZW5kX2J1ZigpIGFuZCBmcmVlX2J1ZigpIGNh biBhbHdheXMgYmUgdXNlZAo+IGZvciBhbnkgYnVmZmVyLgo+Cj4gU2lnbmVkLW9mZi1ieTogU2p1 ciBCcsOmbmRlbGFuZCA8c2p1ci5icmFuZGVsYW5kQHN0ZXJpY3Nzb24uY29tPgoKVGhpcyBsb29r cyBzZW5zaWJsZTsgYSBjb3VwbGUgb2YgZXh0cmEgYmxhbmsgbGluZXMgaW5zZXJ0ZWQgdGhvdWdo LgoKQW1pdD8KCj4gQEAgLTEwMzMsNiArMTAwOCw4IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZmls ZV9vcGVyYXRpb25zIHBvcnRfZm9wcyA9IHsKPiAgc3RhdGljIGludCBwdXRfY2hhcnModTMyIHZ0 ZXJtbm8sIGNvbnN0IGNoYXIgKmJ1ZiwgaW50IGNvdW50KQo+ICB7Cj4gIAlzdHJ1Y3QgcG9ydCAq cG9ydDsKPiArCXN0cnVjdCBzY2F0dGVybGlzdCBzZ1sxXTsKPiArCj4gIAo+ICAJaWYgKHVubGlr ZWx5KGVhcmx5X3B1dF9jaGFycykpCj4gIAkJcmV0dXJuIGVhcmx5X3B1dF9jaGFycyh2dGVybW5v LCBidWYsIGNvdW50KTsKPiBAQCAtMTA0MSw3ICsxMDE4LDkgQEAgc3RhdGljIGludCBwdXRfY2hh cnModTMyIHZ0ZXJtbm8sIGNvbnN0IGNoYXIgKmJ1ZiwgaW50IGNvdW50KQo+ICAJaWYgKCFwb3J0 KQo+ICAJCXJldHVybiAtRVBJUEU7Cj4gIAo+IC0JcmV0dXJuIHNlbmRfYnVmKHBvcnQsICh2b2lk ICopYnVmLCBjb3VudCwgZmFsc2UpOwo+ICsJc2dfaW5pdF9vbmUoc2csIGJ1ZiwgY291bnQpOwo+ ICsJcmV0dXJuIF9fc2VuZF90b19wb3J0KHBvcnQsIHNnLCAxLCBjb3VudCwgKHZvaWQgKilidWYs IGZhbHNlKTsKPiArCj4gIH0KPiAgCj4gIC8qCgpDaGVlcnMsClJ1c3R5LgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpWaXJ0dWFsaXphdGlvbiBtYWlsaW5n IGxpc3QKVmlydHVhbGl6YXRpb25AbGlzdHMubGludXgtZm91bmRhdGlvbi5vcmcKaHR0cHM6Ly9s aXN0cy5saW51eGZvdW5kYXRpb24ub3JnL21haWxtYW4vbGlzdGluZm8vdmlydHVhbGl6YXRpb24= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756574Ab2JWCB4 (ORCPT ); Mon, 22 Oct 2012 22:01:56 -0400 Received: from ozlabs.org ([203.10.76.45]:57115 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756518Ab2JWCA5 convert rfc822-to-8bit (ORCPT ); Mon, 22 Oct 2012 22:00:57 -0400 From: Rusty Russell To: sjur.brandeland@stericsson.com, Amit Shah Cc: "Michael S. Tsirkin" , Linus Walleij , Masami Hiramatsu , Ohad Ben-Cohen , linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, sjurbren@gmail.com, Sjur =?utf-8?Q?Br=C3=A6ndeland?= Subject: Re: [PATCHv7 3/4] virtio_console: Merge struct buffer_token into struct port_buffer In-Reply-To: <1350287856-5284-4-git-send-email-sjur.brandeland@stericsson.com> References: <1350287856-5284-1-git-send-email-sjur.brandeland@stericsson.com> <1350287856-5284-4-git-send-email-sjur.brandeland@stericsson.com> User-Agent: Notmuch/0.14 (http://notmuchmail.org) Emacs/23.4.1 (i686-pc-linux-gnu) Date: Tue, 23 Oct 2012 10:49:24 +1030 Message-ID: <87fw56hwfn.fsf@rustcorp.com.au> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org sjur.brandeland@stericsson.com writes: > From: Sjur Brændeland > > Refactoring the splice functionality by unifying the approach for > sending scatter-lists and regular buffers. This simplifies > buffer handling and reduces code size. Splice will now allocate > a port_buffer and send_buf() and free_buf() can always be used > for any buffer. > > Signed-off-by: Sjur Brændeland This looks sensible; a couple of extra blank lines inserted though. Amit? > @@ -1033,6 +1008,8 @@ static const struct file_operations port_fops = { > static int put_chars(u32 vtermno, const char *buf, int count) > { > struct port *port; > + struct scatterlist sg[1]; > + > > if (unlikely(early_put_chars)) > return early_put_chars(vtermno, buf, count); > @@ -1041,7 +1018,9 @@ static int put_chars(u32 vtermno, const char *buf, int count) > if (!port) > return -EPIPE; > > - return send_buf(port, (void *)buf, count, false); > + sg_init_one(sg, buf, count); > + return __send_to_port(port, sg, 1, count, (void *)buf, false); > + > } > > /* Cheers, Rusty.