From patchwork Tue Apr 8 20:42:46 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Durgin X-Patchwork-Id: 3951361 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E681ABFF02 for ; Tue, 8 Apr 2014 22:03:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0565E2025B for ; Tue, 8 Apr 2014 22:03:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 29D70204AF for ; Tue, 8 Apr 2014 22:03:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757843AbaDHWDI (ORCPT ); Tue, 8 Apr 2014 18:03:08 -0400 Received: from mail.hq.newdream.net ([66.33.206.127]:56375 "EHLO mail.hq.newdream.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757105AbaDHWCZ (ORCPT ); Tue, 8 Apr 2014 18:02:25 -0400 Received: from mail.hq.newdream.net (localhost [127.0.0.1]) by mail.hq.newdream.net (Postfix) with ESMTP id 9A208267D7; Tue, 8 Apr 2014 14:52:31 -0700 (PDT) Received: from vit.ops.newdream.net (unknown [38.122.20.226]) by mail.hq.newdream.net (Postfix) with ESMTPSA id 82A28267CD; Tue, 8 Apr 2014 14:52:31 -0700 (PDT) From: Josh Durgin To: ceph-devel@vger.kernel.org Cc: Guangliang Zhao Subject: [PATCH 02/11] rbd: skip the copyup when an entire object writing Date: Tue, 8 Apr 2014 13:42:46 -0700 Message-Id: X-Mailer: git-send-email 1.7.10.4 In-Reply-To: References: In-Reply-To: References: Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Guangliang Zhao It need to copyup the parent's content when layered writing, but an entire object write would overwrite it, so skip it. Signed-off-by: Guangliang Zhao Reviewed-by: Josh Durgin Reviewed-by: Alex Elder --- drivers/block/rbd.c | 49 ++++++++++++++++++++++++++++++++++--------------- 1 file changed, 34 insertions(+), 15 deletions(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index b6676b6..282bfcd 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -2645,34 +2645,53 @@ out: return ret; } -static int rbd_img_obj_request_submit(struct rbd_obj_request *obj_request) +static bool rbd_img_obj_request_simple(struct rbd_obj_request *obj_request) { struct rbd_img_request *img_request; struct rbd_device *rbd_dev; - bool known; + u64 obj_size; rbd_assert(obj_request_img_data_test(obj_request)); img_request = obj_request->img_request; rbd_assert(img_request); rbd_dev = img_request->rbd_dev; + obj_size = (u64) 1 << rbd_dev->header.obj_order; + /* Read requests didn't need special handling */ + if (!img_request_write_test(img_request)) + return true; + /* No-layered writes are simple requests*/ + if (!img_request_layered_test(img_request)) + return true; /* - * Only writes to layered images need special handling. - * Reads and non-layered writes are simple object requests. * Layered writes that start beyond the end of the overlap - * with the parent have no parent data, so they too are - * simple object requests. Finally, if the target object is - * known to already exist, its parent data has already been - * copied, so a write to the object can also be handled as a - * simple object request. + * with the parent have no parent data, so they are simple + * object requests. */ - if (!img_request_write_test(img_request) || - !img_request_layered_test(img_request) || - rbd_dev->parent_overlap <= obj_request->img_offset || - ((known = obj_request_known_test(obj_request)) && - obj_request_exists_test(obj_request))) { + if (rbd_dev->parent_overlap <= obj_request->img_offset) + return true; + /* + * If the obj_request aligns with the boundary and equals + * to the size of an object, it doesn't need copyup, because + * the obj_request will overwrite it finally. + */ + if ((!obj_request->offset) && (obj_request->length == obj_size)) + return true; + /* + * If the target object is known to already exist, its parent + * data has already been copied, so a write to the object can + * also be handled as a simple object request + */ + if (obj_request_known_test(obj_request) && + obj_request_exists_test(obj_request)) + return true; + return false; +} +static int rbd_img_obj_request_submit(struct rbd_obj_request *obj_request) +{ + if (rbd_img_obj_request_simple(obj_request)) { struct rbd_device *rbd_dev; struct ceph_osd_client *osdc; @@ -2688,7 +2707,7 @@ static int rbd_img_obj_request_submit(struct rbd_obj_request *obj_request) * start by reading the data for the full target object from * the parent so we can use it for a copyup to the target. */ - if (known) + if (obj_request_known_test(obj_request)) return rbd_img_obj_parent_read_full(obj_request); /* We don't know whether the target exists. Go find out. */