* [net-next][PATCH 0/2] RDS: couple of fixes for 4.6 @ 2016-04-08 22:26 Santosh Shilimkar 2016-04-08 22:26 ` [net-next][PATCH 1/2] RDS: fix endianness for dp_ack_seq Santosh Shilimkar ` (2 more replies) 0 siblings, 3 replies; 5+ messages in thread From: Santosh Shilimkar @ 2016-04-08 22:26 UTC (permalink / raw) To: netdev, davem; +Cc: linux-kernel Patches are also available at below git tree. git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux.git for_4.6/net-next/rds-fixes Qing Huang (1): RDS: fix endianness for dp_ack_seq Santosh Shilimkar (1): RDS: Fix the atomicity for congestion map update net/rds/cong.c | 4 ++-- net/rds/ib_cm.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) -- 1.9.1 ^ permalink raw reply [flat|nested] 5+ messages in thread
* [net-next][PATCH 1/2] RDS: fix endianness for dp_ack_seq 2016-04-08 22:26 [net-next][PATCH 0/2] RDS: couple of fixes for 4.6 Santosh Shilimkar @ 2016-04-08 22:26 ` Santosh Shilimkar 2016-04-08 22:26 ` [net-next][PATCH 2/2] RDS: Fix the atomicity for congestion map update Santosh Shilimkar 2016-04-14 3:36 ` [net-next][PATCH 0/2] RDS: couple of fixes for 4.6 David Miller 2 siblings, 0 replies; 5+ messages in thread From: Santosh Shilimkar @ 2016-04-08 22:26 UTC (permalink / raw) To: netdev, davem; +Cc: linux-kernel, Santosh Shilimkar From: Qing Huang <qing.huang@oracle.com> dp->dp_ack_seq is used in big endian format. We need to do the big endianness conversion when we assign a value in host format to it. Signed-off-by: Qing Huang <qing.huang@oracle.com> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@oracle.com> --- net/rds/ib_cm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/rds/ib_cm.c b/net/rds/ib_cm.c index 8764970..310cabc 100644 --- a/net/rds/ib_cm.c +++ b/net/rds/ib_cm.c @@ -194,7 +194,7 @@ static void rds_ib_cm_fill_conn_param(struct rds_connection *conn, dp->dp_protocol_major = RDS_PROTOCOL_MAJOR(protocol_version); dp->dp_protocol_minor = RDS_PROTOCOL_MINOR(protocol_version); dp->dp_protocol_minor_mask = cpu_to_be16(RDS_IB_SUPPORTED_PROTOCOLS); - dp->dp_ack_seq = rds_ib_piggyb_ack(ic); + dp->dp_ack_seq = cpu_to_be64(rds_ib_piggyb_ack(ic)); /* Advertise flow control */ if (ic->i_flowctl) { -- 1.9.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [net-next][PATCH 2/2] RDS: Fix the atomicity for congestion map update 2016-04-08 22:26 [net-next][PATCH 0/2] RDS: couple of fixes for 4.6 Santosh Shilimkar 2016-04-08 22:26 ` [net-next][PATCH 1/2] RDS: fix endianness for dp_ack_seq Santosh Shilimkar @ 2016-04-08 22:26 ` Santosh Shilimkar 2016-04-14 3:36 ` [net-next][PATCH 0/2] RDS: couple of fixes for 4.6 David Miller 2 siblings, 0 replies; 5+ messages in thread From: Santosh Shilimkar @ 2016-04-08 22:26 UTC (permalink / raw) To: netdev, davem; +Cc: linux-kernel, Santosh Shilimkar 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 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [net-next][PATCH 0/2] RDS: couple of fixes for 4.6 2016-04-08 22:26 [net-next][PATCH 0/2] RDS: couple of fixes for 4.6 Santosh Shilimkar 2016-04-08 22:26 ` [net-next][PATCH 1/2] RDS: fix endianness for dp_ack_seq Santosh Shilimkar 2016-04-08 22:26 ` [net-next][PATCH 2/2] RDS: Fix the atomicity for congestion map update Santosh Shilimkar @ 2016-04-14 3:36 ` David Miller 2016-04-14 17:44 ` santosh.shilimkar 2 siblings, 1 reply; 5+ messages in thread From: David Miller @ 2016-04-14 3:36 UTC (permalink / raw) To: santosh.shilimkar; +Cc: netdev, linux-kernel From: Santosh Shilimkar <santosh.shilimkar@oracle.com> Date: Fri, 8 Apr 2016 15:26:38 -0700 > Patches are also available at below git tree. > > git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux.git for_4.6/net-next/rds-fixes "Bug fixes for 4.6" do not get targetted at the net-next tree, that's for 4.7 development. ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [net-next][PATCH 0/2] RDS: couple of fixes for 4.6 2016-04-14 3:36 ` [net-next][PATCH 0/2] RDS: couple of fixes for 4.6 David Miller @ 2016-04-14 17:44 ` santosh.shilimkar 0 siblings, 0 replies; 5+ messages in thread From: santosh.shilimkar @ 2016-04-14 17:44 UTC (permalink / raw) To: David Miller; +Cc: netdev, linux-kernel On 4/13/16 8:36 PM, David Miller wrote: > From: Santosh Shilimkar <santosh.shilimkar@oracle.com> > Date: Fri, 8 Apr 2016 15:26:38 -0700 > >> Patches are also available at below git tree. >> >> git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux.git for_4.6/net-next/rds-fixes > > "Bug fixes for 4.6" do not get targetted at the net-next tree, that's > for 4.7 development. > Sorry. Should have based it against 'net'. Just posted re-based version. Thanks !! Regards, Santosh ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-04-14 17:44 UTC | newest] Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2016-04-08 22:26 [net-next][PATCH 0/2] RDS: couple of fixes for 4.6 Santosh Shilimkar 2016-04-08 22:26 ` [net-next][PATCH 1/2] RDS: fix endianness for dp_ack_seq Santosh Shilimkar 2016-04-08 22:26 ` [net-next][PATCH 2/2] RDS: Fix the atomicity for congestion map update Santosh Shilimkar 2016-04-14 3:36 ` [net-next][PATCH 0/2] RDS: couple of fixes for 4.6 David Miller 2016-04-14 17:44 ` santosh.shilimkar
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.