From patchwork Sun Apr 26 14:10:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Dryomov X-Patchwork-Id: 6276501 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D4902BF4A6 for ; Sun, 26 Apr 2015 14:11:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 080912035B for ; Sun, 26 Apr 2015 14:11:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2FA272035E for ; Sun, 26 Apr 2015 14:11:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753269AbbDZOLO (ORCPT ); Sun, 26 Apr 2015 10:11:14 -0400 Received: from mail-lb0-f182.google.com ([209.85.217.182]:33971 "EHLO mail-lb0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752920AbbDZOLL (ORCPT ); Sun, 26 Apr 2015 10:11:11 -0400 Received: by lbcga7 with SMTP id ga7so65563164lbc.1 for ; Sun, 26 Apr 2015 07:11:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=7CO1moZyrMnkVVQY6SYIPuAncsSUdZLQ5rVp6KUnVYY=; b=fMBKas3o2F/G3vIp7usijAjTXmBGbr8512z9dZ1mqV/bkJUKpR8BjLJFtlOP9Yl6+T r8LCHeeZTgef+8U+VJb09CaOuT+tERTC0a9roA6As0uHJBw91+xLRZnCXTtx3+eISpMJ Hz5GQs7JKc+60MA2PRy8UXH5M+o+B0llcz57nzygJNxOiuKXpRlOk/2AWngHJ+nU1RRX f7VyZv1cw9E30JsZMzQCsUQl3AyoKqAeg4VQCph8NOGZLfy1nUhYuQ67pBGdzUzFaqzk 1PYApFVBRJefyHYmivG1LChIwSMondHvYbrqcbpQ9fC2y+ttm47kz6K+pi9WoN1Yndlv Yo7g== X-Received: by 10.112.204.6 with SMTP id ku6mr6282076lbc.73.1430057469550; Sun, 26 Apr 2015 07:11:09 -0700 (PDT) Received: from localhost.localdomain ([109.110.66.238]) by mx.google.com with ESMTPSA id uf11sm4095301lac.11.2015.04.26.07.11.08 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 26 Apr 2015 07:11:08 -0700 (PDT) From: Ilya Dryomov To: ceph-devel@vger.kernel.org Cc: Alex Elder Subject: [PATCH] rbd: end I/O the entire obj_request on error Date: Sun, 26 Apr 2015 17:10:45 +0300 Message-Id: <1430057445-42944-1-git-send-email-idryomov@gmail.com> X-Mailer: git-send-email 1.9.3 Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_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 When we end I/O struct request with error, we need to pass obj_request->length as @nr_bytes so that the entire obj_request worth of bytes is completed. Otherwise block layer ends up confused and we trip on rbd_assert(more ^ (which == img_request->obj_request_count)); in rbd_img_obj_callback() due to more being true no matter what. We already do it in most cases but we are missing some, in particular those where we don't even get a chance to submit any obj_requests, due to an early -ENOMEM for example. A number of obj_request->xferred assignments seem to be redundant but I haven't touched any of obj_request->xferred stuff to keep this small and isolated. Cc: Alex Elder Cc: stable@vger.kernel.org # 3.10+ Reported-by: Shawn Edwards Signed-off-by: Ilya Dryomov --- drivers/block/rbd.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 812523330a78..ec6c5c6e1ac9 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -2264,6 +2264,11 @@ static bool rbd_img_obj_end_request(struct rbd_obj_request *obj_request) result, xferred); if (!img_request->result) img_request->result = result; + /* + * Need to end I/O on the entire obj_request worth of + * bytes in case of error. + */ + xferred = obj_request->length; } /* Image object requests don't own their page array */