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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 C9019C76190 for ; Fri, 26 Jul 2019 13:51:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9F46422CE8 for ; Fri, 26 Jul 2019 13:51:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564149100; bh=tkiLADUTcUdV6ynKUj8SgvQBjOlu9A4vwPtyAlQ+mE4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=VfZ93+hX+Y8TQjNvj8EcYvY6KvjgoOkA2WxV090v8ZJDwESvRb+vsWAnFeWbCmqxB BLQcE8i69tkJtPOin4CuoblJ7LwJQfLEbIggKZQTMpomYna5c160CwsCn+nldMajrm fIaZNTY1Lq5CsqckLw+yKajLs/vphk8Agw//dfXs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727994AbfGZNve (ORCPT ); Fri, 26 Jul 2019 09:51:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:51794 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727212AbfGZNnv (ORCPT ); Fri, 26 Jul 2019 09:43:51 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 96AC822CD0; Fri, 26 Jul 2019 13:43:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564148630; bh=tkiLADUTcUdV6ynKUj8SgvQBjOlu9A4vwPtyAlQ+mE4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MOyGbOiBR9yiJYf0dLJq1b3e+bL47OaBJ4vYEY1Xleq75DKH8mQWTIYEO8fdSeCwz 7wWYUZGQIWCw2CKl476h7UDTERwiPPyMuq2Fxsqs9FRO2b5KXEGM+cIBLmWvvjCyGA VyhukRAV+IQB5zNMSsQo2KyhaOb3T1pBb5T1Ab2Y= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Andrea Parri , "Paul E. McKenney" , Peter Zijlstra , "Yan, Zheng" , Ilya Dryomov , Sasha Levin , ceph-devel@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 13/37] ceph: fix improper use of smp_mb__before_atomic() Date: Fri, 26 Jul 2019 09:43:08 -0400 Message-Id: <20190726134332.12626-13-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190726134332.12626-1-sashal@kernel.org> References: <20190726134332.12626-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Andrea Parri [ 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 3e27a28aa44a..60b70f0985f6 100644 --- a/fs/ceph/super.h +++ b/fs/ceph/super.h @@ -517,7 +517,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