Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp2982591imu; Mon, 19 Nov 2018 08:58:18 -0800 (PST) X-Google-Smtp-Source: AJdET5ctIbkP9q3W/BN5TFbIEJtnowZ6pRuWJRxXUgd/8TKqxaWcutKhbe0077hf+6iR/OG+YvKV X-Received: by 2002:a17:902:7882:: with SMTP id q2mr23765487pll.305.1542646697990; Mon, 19 Nov 2018 08:58:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542646697; cv=none; d=google.com; s=arc-20160816; b=kou8iMEmIz0uUFoNcszJGG9o29lbvJVjTbA2tva6/wv1gGn1nBJWTkiQ4vPB8Ldvqz D9tGWKdqcMLHlNJFC5l2hwLin2uS28DqGQQB+8IEiYYilzEMMq6vHG+pUehSnlPvcdrQ ky0xE3tsv90w2hUtui9ZY3+VoySD0X3Pxeu13AulW0DDKfhP4I3JaYNlD6zioiHMbcnp zmggFAlITCdTcxjob1Jfl49KhQBtW400SQvgLFcYWO2buQlT2Bn4tbUSyCrq0ubgGY3j 0eIj13O5kCWAcmUxWVrL4MNWrlQ3RcxzIa8mo7fOMw7Ix/xhBQaWDD2/mGqs7/GUioe/ OMLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=JLymxWruy7FswxGvzkhuCvm6KcpWoKAvr/vbap+1ctw=; b=DJu6n174sTfmtcwl+uGoJOfA2fJNbU/vd2a/rGKdc+BZjcM/9GWnLEv+aLst3eXVM+ Klsbt42g0dNSSyt01RCptsmGrBqNepwWNpgdSqyOPSVtnnQUH0TVvAcXa/7s0CkSgQ4K ay/ELYiDdxCnRJGlvz0Insedx2eOdnXvsAIibyiicw9yQWfV93x3mwBwsaIhh9fmTP1u 3wQXY6p0CTEUVY52dhsI2KDo/VkdxnzeHg8F2qNSP6TOzro90jZvlqCCTBxFmS/8Ohll hLRlQ+1kUbvpSIFBMGacPwALXmmNBFW4zP5sxR9YphhtUwn+Gu3paRWotytr0QNambAp 2+dg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=tNnBllJt; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q16si7706166pfh.138.2018.11.19.08.58.03; Mon, 19 Nov 2018 08:58:17 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=tNnBllJt; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404190AbeKTDU2 (ORCPT + 99 others); Mon, 19 Nov 2018 22:20:28 -0500 Received: from mail.kernel.org ([198.145.29.99]:59810 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404007AbeKTDU1 (ORCPT ); Mon, 19 Nov 2018 22:20:27 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.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 F3F692147A; Mon, 19 Nov 2018 16:56:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1542646572; bh=1+rAxTvgfV4OcR0KV84OlVpwWzvR+++N8qctT5PH3U4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tNnBllJt/nNKdETwKUApFKV7OWhU/tuh2x1SWcmXDJS4gsQ941S5L3XC3rZV3snSA i8W/U11N/d7M+Q8L25Cv5MLMjdc3Tn0tdz/rPakbqOX/QhnWU7KoEUi1SJKleQp1Xl 5kQJO7bBxIRKCU9YKNW29ZLZc94/Ksq7hDFogGdE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tang Junhui , Coly Li , Jens Axboe Subject: [PATCH 4.4 001/160] bcache: fix miss key refill->end in writeback Date: Mon, 19 Nov 2018 17:27:20 +0100 Message-Id: <20181119162630.228835543@linuxfoundation.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181119162630.031306128@linuxfoundation.org> References: <20181119162630.031306128@linuxfoundation.org> User-Agent: quilt/0.65 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 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Tang Junhui commit 2d6cb6edd2c7fb4f40998895bda45006281b1ac5 upstream. refill->end record the last key of writeback, for example, at the first time, keys (1,128K) to (1,1024K) are flush to the backend device, but the end key (1,1024K) is not included, since the bellow code: if (bkey_cmp(k, refill->end) >= 0) { ret = MAP_DONE; goto out; } And in the next time when we refill writeback keybuf again, we searched key start from (1,1024K), and got a key bigger than it, so the key (1,1024K) missed. This patch modify the above code, and let the end key to be included to the writeback key buffer. Signed-off-by: Tang Junhui Cc: stable@vger.kernel.org Signed-off-by: Coly Li Signed-off-by: Jens Axboe Signed-off-by: Greg Kroah-Hartman --- drivers/md/bcache/btree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/md/bcache/btree.c +++ b/drivers/md/bcache/btree.c @@ -2372,7 +2372,7 @@ static int refill_keybuf_fn(struct btree struct keybuf *buf = refill->buf; int ret = MAP_CONTINUE; - if (bkey_cmp(k, refill->end) >= 0) { + if (bkey_cmp(k, refill->end) > 0) { ret = MAP_DONE; goto out; }