From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 00330C433E0 for ; Mon, 1 Jun 2020 18:01:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D7BA0207DF for ; Mon, 1 Jun 2020 18:01:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591034488; bh=rbcTU3Yo7zIMTC9JrcwkjCahHKebrwlrLcVz0uZRW9I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=OQONrOrbPw9ScHd9aGbSJ9i+2U909xXo1MUSQnoEFeLX0aDya5kc9n2CxnmLZMvut Yh131S1FGaR3zHDNGmX9LgfBc4Ta9jvooIpdOawjZ/Y9o1v022D7OmzzflQpmkY9L6 3DgnGy7wxfDYc2/V+ehsDov38hAxMePevaxePE/4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729047AbgFASB1 (ORCPT ); Mon, 1 Jun 2020 14:01:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:44176 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728638AbgFASBR (ORCPT ); Mon, 1 Jun 2020 14:01:17 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3CF452065C; Mon, 1 Jun 2020 18:01:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591034476; bh=rbcTU3Yo7zIMTC9JrcwkjCahHKebrwlrLcVz0uZRW9I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UkQbFFw5wPM20fG6CGGz+ny0o4dCPsxzjXC5dBR5DFwLvBixx/aeftC5LLXWF3FzO 7fUWEmlbOlmiArnHu7smq7GleBa7sywjjJ8UC9+omJRKAb4deBXvxFXO9/+yRH95Pp NzThBgOQEu5oFTG5MnIuiIUcje20Bp7sUdsO8bzg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jerry Lee , Ilya Dryomov , Sasha Levin Subject: [PATCH 4.14 47/77] libceph: ignore pool overlay and cache logic on redirects Date: Mon, 1 Jun 2020 19:53:52 +0200 Message-Id: <20200601174024.770934336@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200601174016.396817032@linuxfoundation.org> References: <20200601174016.396817032@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jerry Lee [ Upstream commit 890bd0f8997ae6ac0a367dd5146154a3963306dd ] OSD client should ignore cache/overlay flag if got redirect reply. Otherwise, the client hangs when the cache tier is in forward mode. [ idryomov: Redirects are effectively deprecated and no longer used or tested. The original tiering modes based on redirects are inherently flawed because redirects can race and reorder, potentially resulting in data corruption. The new proxy and readproxy tiering modes should be used instead of forward and readforward. Still marking for stable as obviously correct, though. ] Cc: stable@vger.kernel.org URL: https://tracker.ceph.com/issues/23296 URL: https://tracker.ceph.com/issues/36406 Signed-off-by: Jerry Lee Reviewed-by: Ilya Dryomov Signed-off-by: Ilya Dryomov Signed-off-by: Sasha Levin --- net/ceph/osd_client.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index 92b2641ab93b..753cbfd32dab 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -3444,7 +3444,9 @@ static void handle_reply(struct ceph_osd *osd, struct ceph_msg *msg) * supported. */ req->r_t.target_oloc.pool = m.redirect.oloc.pool; - req->r_flags |= CEPH_OSD_FLAG_REDIRECTED; + req->r_flags |= CEPH_OSD_FLAG_REDIRECTED | + CEPH_OSD_FLAG_IGNORE_OVERLAY | + CEPH_OSD_FLAG_IGNORE_CACHE; req->r_tid = 0; __submit_request(req, false); goto out_unlock_osdc; -- 2.25.1