From nobody Fri Apr 19 05:51:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1487660031075125.4274937943868; Mon, 20 Feb 2017 22:53:51 -0800 (PST) Received: from localhost ([::1]:42603 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cg4Kb-0005FQ-DD for importer@patchew.org; Tue, 21 Feb 2017 01:53:49 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55496) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cg4Ji-0004wW-4N for qemu-devel@nongnu.org; Tue, 21 Feb 2017 01:52:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cg4Jh-0002t4-4Q for qemu-devel@nongnu.org; Tue, 21 Feb 2017 01:52:54 -0500 Received: from mail-pg0-x241.google.com ([2607:f8b0:400e:c05::241]:35749) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cg4Jb-0002l0-JF; Tue, 21 Feb 2017 01:52:47 -0500 Received: by mail-pg0-x241.google.com with SMTP id 1so9482495pgz.2; Mon, 20 Feb 2017 22:52:47 -0800 (PST) Received: from luffy.com (23.83.233.186.16clouds.com. [23.83.233.186]) by smtp.gmail.com with ESMTPSA id m21sm38897787pgh.4.2017.02.20.22.52.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Feb 2017 22:52:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=3TtAD/ObYYyQJ+khC2CXsK8bxrvAJwT84BwQ7+mkDeQ=; b=QyWmZXA20AqgpZ3T17+2V/Cjx4R1Qt7LJp59cL39F9HMBARYlW6Nc/jXmQA9r4YR88 NDl02WT6PfX6oY9Y2e1LL4jd33TRNgFEBA0FTVIQZVsT/9gzY2aQFfIDCMo9IpLSc/iE L6+jjGcGvFM0Xb2IjBzPwtWscXgI1cNAFAWyv608p5j1gvLBwp9wqnv0nf7yxkQRapbO o5qbCRT41SLpTKpaJH838ZBVLPottCOozr3+OQeSXXcAuFjg2lvfuAKt7v0m1rNvovBM 0Y4xw07h0vSBvq+nFGHETnpJ7eZM5oz0tZQ0JSE/fEJrV5ep63YTZXGg4PnA1uuCgtK8 N7mw== 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; bh=3TtAD/ObYYyQJ+khC2CXsK8bxrvAJwT84BwQ7+mkDeQ=; b=nXsfoWv+XemkVLBMcSnYDFhGDrv62fgR4Q8dmwJpK5fpFY0izExUrIHpmH6RJxC0Yp 9sGPJuzbVGTKM2IAv+2ZPCRFIYI0xbbMXApNSBZVGpoQOXjl+z+Yv3lB+Zm6FdYv/hpv m8qbaEmO5C7nujBs0g2T0fegqQGaSrExw/r62R8zQzgfHafoNHvPL1eoa8d0I1QGDVbK OGzPjBsQ4/p3wWIZLvOPRwUGCexQOS8pqJ7Bes/IkvIj3vt1B8OL7rpK2cDz3efCRyS4 UG059reBYqpMt3edCJc2YJiz80IEs6zxAa9HwO8qnT1+LwH1YPaPmIeMu2W7/ChU0j5g UYPQ== X-Gm-Message-State: AMke39kiD//IJW+iyQe0bWgVjNo0QYAtrR8TaKrGiJRkCpPeHHaCpPpcIJKe0icOT6lHHw== X-Received: by 10.84.208.227 with SMTP id c32mr37207393plj.71.1487659966558; Mon, 20 Feb 2017 22:52:46 -0800 (PST) From: jazeltq@gmail.com To: jdurgin@redhat.com, jcody@redhat.com, dillaman@redhat.com, kwolf@redhat.com, mreitz@redhat.com, qemu-block@nongnu.org Date: Tue, 21 Feb 2017 14:50:03 +0800 Message-Id: <20170221065003.26103-1-jazeltq@gmail.com> X-Mailer: git-send-email 2.10.2 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400e:c05::241 Subject: [Qemu-devel] [RFC v6] RBD: Add support readv,writev for rbd X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: tianqing , ceph-devel@vger.kernel.org, jazeltq@gmail.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: tianqing Rbd can do readv and writev directly, so wo do not need to transform iov to buf or vice versa any more. Signed-off-by: tianqing --- block/rbd.c | 80 ++++++++++++++++++++++++++++++++++++++++++---------------= ---- 1 file changed, 56 insertions(+), 24 deletions(-) diff --git a/block/rbd.c b/block/rbd.c index a57b3e3..22e8e69 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -62,6 +62,13 @@ #define RBD_MAX_SNAP_NAME_SIZE 128 #define RBD_MAX_SNAPS 100 =20 +/* The LIBRBD_SUPPORTS_IOVEC is defined in librbd.h */ +#ifdef LIBRBD_SUPPORTS_IOVEC +#define LIBRBD_USE_IOVEC 1 +#else +#define LIBRBD_USE_IOVEC 0 +#endif + typedef enum { RBD_AIO_READ, RBD_AIO_WRITE, @@ -310,6 +317,17 @@ static int qemu_rbd_set_conf(rados_t cluster, const ch= ar *conf, return ret; } =20 +static void qemu_rbd_memset(RADOSCB *rcb, int64_t offs) +{ + if (LIBRBD_USE_IOVEC) { + RBDAIOCB *acb =3D rcb->acb; + iov_memset(acb->qiov->iov, acb->qiov->niov, offs, 0, + acb->qiov->size - offs); + } else { + memset(rcb->buf + offs, 0, rcb->size - offs); + } +} + static int qemu_rbd_create(const char *filename, QemuOpts *opts, Error **e= rrp) { Error *local_err =3D NULL; @@ -426,11 +444,11 @@ static void qemu_rbd_complete_aio(RADOSCB *rcb) } } else { if (r < 0) { - memset(rcb->buf, 0, rcb->size); + qemu_rbd_memset(rcb, 0); acb->ret =3D r; acb->error =3D 1; } else if (r < rcb->size) { - memset(rcb->buf + r, 0, rcb->size - r); + qemu_rbd_memset(rcb, r); if (!acb->error) { acb->ret =3D rcb->size; } @@ -441,10 +459,13 @@ static void qemu_rbd_complete_aio(RADOSCB *rcb) =20 g_free(rcb); =20 - if (acb->cmd =3D=3D RBD_AIO_READ) { - qemu_iovec_from_buf(acb->qiov, 0, acb->bounce, acb->qiov->size); + if (!LIBRBD_USE_IOVEC) { + if (acb->cmd =3D=3D RBD_AIO_READ) { + qemu_iovec_from_buf(acb->qiov, 0, acb->bounce, acb->qiov->size= ); + } + qemu_vfree(acb->bounce); } - qemu_vfree(acb->bounce); + acb->common.cb(acb->common.opaque, (acb->ret > 0 ? 0 : acb->ret)); =20 qemu_aio_unref(acb); @@ -655,7 +676,6 @@ static BlockAIOCB *rbd_start_aio(BlockDriverState *bs, RBDAIOCB *acb; RADOSCB *rcb =3D NULL; rbd_completion_t c; - char *buf; int r; =20 BDRVRBDState *s =3D bs->opaque; @@ -664,27 +684,29 @@ static BlockAIOCB *rbd_start_aio(BlockDriverState *bs, acb->cmd =3D cmd; acb->qiov =3D qiov; assert(!qiov || qiov->size =3D=3D size); - if (cmd =3D=3D RBD_AIO_DISCARD || cmd =3D=3D RBD_AIO_FLUSH) { - acb->bounce =3D NULL; - } else { - acb->bounce =3D qemu_try_blockalign(bs, qiov->size); - if (acb->bounce =3D=3D NULL) { - goto failed; + + rcb =3D g_new(RADOSCB, 1); + + if (!LIBRBD_USE_IOVEC) { + if (cmd =3D=3D RBD_AIO_DISCARD || cmd =3D=3D RBD_AIO_FLUSH) { + acb->bounce =3D NULL; + } else { + acb->bounce =3D qemu_try_blockalign(bs, qiov->size); + if (acb->bounce =3D=3D NULL) { + goto failed; + } } + if (cmd =3D=3D RBD_AIO_WRITE) { + qemu_iovec_to_buf(acb->qiov, 0, acb->bounce, qiov->size); + } + rcb->buf =3D acb->bounce; } + acb->ret =3D 0; acb->error =3D 0; acb->s =3D s; =20 - if (cmd =3D=3D RBD_AIO_WRITE) { - qemu_iovec_to_buf(acb->qiov, 0, acb->bounce, qiov->size); - } - - buf =3D acb->bounce; - - rcb =3D g_new(RADOSCB, 1); rcb->acb =3D acb; - rcb->buf =3D buf; rcb->s =3D acb->s; rcb->size =3D size; r =3D rbd_aio_create_completion(rcb, (rbd_callback_t) rbd_finish_aiocb= , &c); @@ -694,10 +716,18 @@ static BlockAIOCB *rbd_start_aio(BlockDriverState *bs, =20 switch (cmd) { case RBD_AIO_WRITE: - r =3D rbd_aio_write(s->image, off, size, buf, c); +#ifdef LIBRBD_SUPPORTS_IOVEC + r =3D rbd_aio_writev(s->image, qiov->iov, qiov->niov, off, c); +#else + r =3D rbd_aio_write(s->image, off, size, rcb->buf, c); +#endif break; case RBD_AIO_READ: - r =3D rbd_aio_read(s->image, off, size, buf, c); +#ifdef LIBRBD_SUPPORTS_IOVEC + r =3D rbd_aio_readv(s->image, qiov->iov, qiov->niov, off, c); +#else + r =3D rbd_aio_read(s->image, off, size, rcb->buf, c); +#endif break; case RBD_AIO_DISCARD: r =3D rbd_aio_discard_wrapper(s->image, off, size, c); @@ -712,14 +742,16 @@ static BlockAIOCB *rbd_start_aio(BlockDriverState *bs, if (r < 0) { goto failed_completion; } - return &acb->common; =20 failed_completion: rbd_aio_release(c); failed: g_free(rcb); - qemu_vfree(acb->bounce); + if (!LIBRBD_USE_IOVEC) { + qemu_vfree(acb->bounce); + } + qemu_aio_unref(acb); return NULL; } --=20 2.10.2