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,URIBL_BLOCKED,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 DBBA1C0650F for ; Mon, 5 Aug 2019 13:29:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AE57B20644 for ; Mon, 5 Aug 2019 13:29:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565011797; bh=T48npYXpwQ+wHXrgIa7n0neno7aLyYJh/ORAU4PfIDE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=WXgBeFBmZVSedAUHwRL1QmVQg/CCw9jilyqHspC5YlhVxnYfN9mrIZKSJMJMpuKlX 31emJNMbeY/UctUirFVLsEuaGLce93w3Z95prIK5Bz3mSDJIjXX9nHQCMqAe78Oc5P VaZ+V7E7croEYMBISnOOeR4c2EGchnsopif0Evuk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729431AbfHEN3w (ORCPT ); Mon, 5 Aug 2019 09:29:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:57502 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729962AbfHENVU (ORCPT ); Mon, 5 Aug 2019 09:21:20 -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 51F312075B; Mon, 5 Aug 2019 13:21:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565011279; bh=T48npYXpwQ+wHXrgIa7n0neno7aLyYJh/ORAU4PfIDE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DigtdGd0IcfQMmTkWOV+cAbK79fVJ7gkcwq8/Wlh6+yPlCGgBn+pldbjL3fpD7jxb kwG5+mIffdNDlMJtWAXTCyvnfothGyZSrzSjOvUMPFPbez1TWdlpBTU+9l/V7x1b6i mlwOwJGGK2150+LkH9hzxffIzPCdDmU9/5zFkN04= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Paul E. McKenney" , Peter Zijlstra , Andrea Parri , "Yan, Zheng" , Ilya Dryomov , Sasha Levin Subject: [PATCH 5.2 032/131] ceph: fix improper use of smp_mb__before_atomic() Date: Mon, 5 Aug 2019 15:01:59 +0200 Message-Id: <20190805124953.582609540@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190805124951.453337465@linuxfoundation.org> References: <20190805124951.453337465@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit 749607731e26dfb2558118038c40e9c0c80d23b5 ] This barrier only applies to the read-modify-write operations; in particular, it does not apply to the atomic64_set() primitive. Replace the barrier with an smp_mb(). Fixes: fdd4e15838e59 ("ceph: rework dcache readdir") Reported-by: "Paul E. McKenney" Reported-by: Peter Zijlstra Signed-off-by: Andrea Parri Reviewed-by: "Yan, Zheng" Signed-off-by: Ilya Dryomov Signed-off-by: Sasha Levin --- fs/ceph/super.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/fs/ceph/super.h b/fs/ceph/super.h index edec39aa5ce20..1d313d0536f9d 100644 --- a/fs/ceph/super.h +++ b/fs/ceph/super.h @@ -544,7 +544,12 @@ static inline void __ceph_dir_set_complete(struct ceph_inode_info *ci, long long release_count, long long ordered_count) { - smp_mb__before_atomic(); + /* + * Makes sure operations that setup readdir cache (update page + * cache and i_size) are strongly ordered w.r.t. the following + * atomic64_set() operations. + */ + smp_mb(); atomic64_set(&ci->i_complete_seq[0], release_count); atomic64_set(&ci->i_complete_seq[1], ordered_count); } -- 2.20.1