From patchwork Fri Jun 20 09:09:42 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Dryomov X-Patchwork-Id: 4387441 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id AFD1E9F433 for ; Fri, 20 Jun 2014 09:10:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D2EFF202AE for ; Fri, 20 Jun 2014 09:10:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AFFF52038C for ; Fri, 20 Jun 2014 09:10:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965902AbaFTJJ5 (ORCPT ); Fri, 20 Jun 2014 05:09:57 -0400 Received: from mail-lb0-f172.google.com ([209.85.217.172]:61123 "EHLO mail-lb0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965860AbaFTJJz (ORCPT ); Fri, 20 Jun 2014 05:09:55 -0400 Received: by mail-lb0-f172.google.com with SMTP id c11so2183312lbj.31 for ; Fri, 20 Jun 2014 02:09:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=JBWjUXL1Kw/F71Pou9bN2MNc6/00krBvjhutXzMozdQ=; b=blovQVVBhqgsDLAA7jmZumciI3yyNfXOlnaJwM1IiZkxDXlVj7GSqqfyiU48L98xa2 9+oGf5HNz2EKiHhY+kc1S8zQ0c2Bj+ZSCZWgJf/SS9QqAY4u2uTl0CBAMv40v+vNZz1d //4cRKUqcfmZEpCmwa74IWmJRqEn3QpHObcaTNvnQeDCRYJnHVqiwsEp+F6FrDKiy3Jy V02rtvhuOG/MdJBEN1cRQHicmRQ1YvZvBW+IZRhpFx0EWlBUm8J42hTEDE4N2xpRzVPr s40R83D+m/1ZOl2bEMrudp2faG6socgUCx7+iwEElPofnkLWgSDxf9unukjo5QJQ1X4w 9CLA== X-Gm-Message-State: ALoCoQnKnAtNnc6qrFjVFWx3QDjUUAhbycirCyTjeRuqCbWRjzgwbw9bKu0Ajg2C0QXZ6Vpg1IRU X-Received: by 10.152.7.37 with SMTP id g5mr1701802laa.14.1403255393953; Fri, 20 Jun 2014 02:09:53 -0700 (PDT) Received: from localhost ([109.110.66.173]) by mx.google.com with ESMTPSA id ob4sm6144013lbc.30.2014.06.20.02.09.52 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 20 Jun 2014 02:09:53 -0700 (PDT) From: Ilya Dryomov To: ceph-devel@vger.kernel.org Subject: [PATCH 3/4] rbd: rbd_obj_request_wait() should cancel the request if interrupted Date: Fri, 20 Jun 2014 13:09:42 +0400 Message-Id: <1403255383-5729-4-git-send-email-ilya.dryomov@inktank.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1403255383-5729-1-git-send-email-ilya.dryomov@inktank.com> References: <1403255383-5729-1-git-send-email-ilya.dryomov@inktank.com> 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.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 rbd_obj_request_wait() should cancel the underlying OSD request if interrupted. Otherwise libceph will hold onto it indefinitely, causing assert failures or leaking the original object request. Fixes: http://tracker.ceph.com/issues/6628 Signed-off-by: Ilya Dryomov Reviewed-by: --- drivers/block/rbd.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index b2c98c1bc037..1701595648ce 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -1558,13 +1558,25 @@ static void rbd_img_request_complete(struct rbd_img_request *img_request) rbd_img_request_put(img_request); } -/* Caller is responsible for rbd_obj_request_destroy(obj_request) */ - +/* + * Wait for an object request to complete. If interrupted, cancel the + * underlying osd request. + */ static int rbd_obj_request_wait(struct rbd_obj_request *obj_request) { - dout("%s: obj %p\n", __func__, obj_request); + int ret; + + dout("%s obj %p\n", __func__, obj_request); - return wait_for_completion_interruptible(&obj_request->completion); + ret = wait_for_completion_interruptible(&obj_request->completion); + if (ret < 0) { + dout("%s obj %p interrupted\n", __func__, obj_request); + ceph_osdc_cancel_request(obj_request->osd_req); + return ret; + } + + dout("%s obj %p done\n", __func__, obj_request); + return 0; } /*