[net][PATCH v2 2/2] RDS: Fix the atomicity for congestion map update

Path	csiph.com!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod
From	Santosh Shilimkar <santosh.shilimkar@oracle.com>
Newsgroups	linux.kernel
Subject	[net][PATCH v2 2/2] RDS: Fix the atomicity for congestion map update
Date	Thu, 14 Apr 2016 19:50:03 +0200
Message-ID	<rnTyX-5JF-29@gated-at.bofh.it> (permalink)
References	<rnTyW-5JF-13@gated-at.bofh.it>
X-Original-To	netdev@vger.kernel.org, davem@davemloft.net
X-Mailer	git-send-email 1.9.1
X-Source-IP	userv0022.oracle.com [156.151.31.74]
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	41
Organization	linux.* mail to news gateway
X-Original-Cc	linux-kernel@vger.kernel.org, Santosh Shilimkar <santosh.shilimkar@oracle.com>
X-Original-Date	Thu, 14 Apr 2016 10:43:27 -0700
X-Original-Message-ID	<1460655807-26236-3-git-send-email-santosh.shilimkar@oracle.com>
X-Original-References	<1460655807-26236-1-git-send-email-santosh.shilimkar@oracle.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1379159

Show key headers only | View raw

Two different threads with different rds sockets may be in
rds_recv_rcvbuf_delta() via receive path. If their ports
both map to the same word in the congestion map, then
using non-atomic ops to update it could cause the map to
be incorrect. Lets use atomics to avoid such an issue.

Full credit to Wengang <wen.gang.wang@oracle.com> for
finding the issue, analysing it and also pointing out
to offending code with spin lock based fix.

Reviewed-by: Leon Romanovsky <leon@leon.nu>
Signed-off-by: Wengang Wang <wen.gang.wang@oracle.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
---
 net/rds/cong.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/rds/cong.c b/net/rds/cong.c
index e6144b8..6641bcf 100644
--- a/net/rds/cong.c
+++ b/net/rds/cong.c
@@ -299,7 +299,7 @@ void rds_cong_set_bit(struct rds_cong_map *map, __be16 port)
 	i = be16_to_cpu(port) / RDS_CONG_MAP_PAGE_BITS;
 	off = be16_to_cpu(port) % RDS_CONG_MAP_PAGE_BITS;
 
-	__set_bit_le(off, (void *)map->m_page_addrs[i]);
+	set_bit_le(off, (void *)map->m_page_addrs[i]);
 }
 
 void rds_cong_clear_bit(struct rds_cong_map *map, __be16 port)
@@ -313,7 +313,7 @@ void rds_cong_clear_bit(struct rds_cong_map *map, __be16 port)
 	i = be16_to_cpu(port) / RDS_CONG_MAP_PAGE_BITS;
 	off = be16_to_cpu(port) % RDS_CONG_MAP_PAGE_BITS;
 
-	__clear_bit_le(off, (void *)map->m_page_addrs[i]);
+	clear_bit_le(off, (void *)map->m_page_addrs[i]);
 }
 
 static int rds_cong_test_bit(struct rds_cong_map *map, __be16 port)
-- 
1.9.1

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[net][PATCH v2 0/2] RDS: couple of fixes for 4.6 Santosh Shilimkar <santosh.shilimkar@oracle.com> - 2016-04-14 19:50 +0200
  [net][PATCH v2 2/2] RDS: Fix the atomicity for congestion map update Santosh Shilimkar <santosh.shilimkar@oracle.com> - 2016-04-14 19:50 +0200

csiph-web