From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f42.google.com ([74.125.82.42]:33332 "EHLO mail-wm0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752491AbbKASQn (ORCPT ); Sun, 1 Nov 2015 13:16:43 -0500 Received: by wmeg8 with SMTP id g8so43338650wme.0 for ; Sun, 01 Nov 2015 10:16:42 -0800 (PST) Received: from orange.localdomain (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id 194sm13898670wmh.19.2015.11.01.10.16.41 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 Nov 2015 10:16:41 -0800 (PST) From: Ilya Dryomov To: stable@vger.kernel.org Subject: [PATCH for 3.9-3.17] rbd: require stable pages if message data CRCs are enabled Date: Sun, 1 Nov 2015 20:36:51 +0100 Message-Id: <1446406612-8799-2-git-send-email-idryomov@gmail.com> In-Reply-To: <1446406612-8799-1-git-send-email-idryomov@gmail.com> References: <1446406612-8799-1-git-send-email-idryomov@gmail.com> Sender: stable-owner@vger.kernel.org List-ID: From: Ronny Hegewald rbd requires stable pages, as it performs a crc of the page data before they are send to the OSDs. But since kernel 3.9 (patch 1d1d1a767206fbe5d4c69493b7e6d2a8d08cc0a0 "mm: only enforce stable page writes if the backing device requires it") it is not assumed anymore that block devices require stable pages. This patch sets the necessary flag to get stable pages back for rbd. In a ceph installation that provides multiple ext4 formatted rbd devices "bad crc" messages appeared regularly (ca 1 message every 1-2 minutes on every OSD that provided the data for the rbd) in the OSD-logs before this patch. After this patch this messages are pretty much gone (only ca 1-2 / month / OSD). Cc: stable@vger.kernel.org # 3.9+, needs backporting Signed-off-by: Ronny Hegewald [idryomov@gmail.com: require stable pages only in crc case, changelog] Signed-off-by: Ilya Dryomov [idryomov@gmail.com: backport to 3.9-3.17: context] --- drivers/block/rbd.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 2ea515509ca6..ff0dd53554cf 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -3443,6 +3443,9 @@ static int rbd_init_disk(struct rbd_device *rbd_dev) blk_queue_io_opt(q, segment_size); blk_queue_merge_bvec(q, rbd_merge_bvec); + if (!ceph_test_opt(rbd_dev->rbd_client->client, NOCRC)) + q->backing_dev_info.capabilities |= BDI_CAP_STABLE_WRITES; + disk->queue = q; q->queuedata = rbd_dev; -- 2.4.3