From patchwork Thu Mar 31 00:50:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shamir Rabinovitch X-Patchwork-Id: 604004 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3qbJGH0ZKWz9sDC for ; Thu, 31 Mar 2016 19:53:59 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755948AbcCaIx4 (ORCPT ); Thu, 31 Mar 2016 04:53:56 -0400 Received: from aserp1040.oracle.com ([141.146.126.69]:46207 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753669AbcCaIxx (ORCPT ); Thu, 31 Mar 2016 04:53:53 -0400 Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id u2V8rorZ010871 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 31 Mar 2016 08:53:51 GMT Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by aserv0022.oracle.com (8.13.8/8.13.8) with ESMTP id u2V8roc4014976 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 31 Mar 2016 08:53:50 GMT Received: from abhmp0012.oracle.com (abhmp0012.oracle.com [141.146.116.18]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id u2V8rnOx008326; Thu, 31 Mar 2016 08:53:49 GMT Received: from shamir-net-srv.us.oracle.com (/10.211.3.142) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 31 Mar 2016 01:53:49 -0700 From: shamir rabinovitch To: rds-devel@oss.oracle.com, netdev@vger.kernel.org Cc: davem@davemloft.net, shamir.rabinovitch@oracle.com Subject: [PATCH] rds: rds-stress show all zeros after few minutes Date: Wed, 30 Mar 2016 20:50:02 -0400 Message-Id: <1459385402-28449-1-git-send-email-shamir.rabinovitch@oracle.com> X-Mailer: git-send-email 1.7.1 X-Source-IP: aserv0022.oracle.com [141.146.126.234] Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Issue can be seen on platforms that use 8K and above page size while rds fragment size is 4K. On those platforms single page is shared between 2 or more rds fragments. Each fragment has it's own offeset and rds cong map code need to take this offset to account. Not taking this offset to account lead to reading the data fragment as congestion map fragment and hang of the rds transmit due to far cong map corruption. Reviewed-by: Wengang Wang Reviewed-by: Ajaykumar Hotchandani Acked-by: Santosh Shilimkar Tested-by: Anand Bibhuti Signed-off-by: shamir rabinovitch --- net/rds/ib_recv.c | 2 +- net/rds/iw_recv.c | 2 +- net/rds/page.c | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/net/rds/ib_recv.c b/net/rds/ib_recv.c index 977fb86..abc8cc8 100644 --- a/net/rds/ib_recv.c +++ b/net/rds/ib_recv.c @@ -796,7 +796,7 @@ static void rds_ib_cong_recv(struct rds_connection *conn, addr = kmap_atomic(sg_page(&frag->f_sg)); - src = addr + frag_off; + src = addr + frag->f_sg.offset + frag_off; dst = (void *)map->m_page_addrs[map_page] + map_off; for (k = 0; k < to_copy; k += 8) { /* Record ports that became uncongested, ie diff --git a/net/rds/iw_recv.c b/net/rds/iw_recv.c index a66d179..62a1738 100644 --- a/net/rds/iw_recv.c +++ b/net/rds/iw_recv.c @@ -585,7 +585,7 @@ static void rds_iw_cong_recv(struct rds_connection *conn, addr = kmap_atomic(frag->f_page); - src = addr + frag_off; + src = addr + frag->f_offset + frag_off; dst = (void *)map->m_page_addrs[map_page] + map_off; for (k = 0; k < to_copy; k += 8) { /* Record ports that became uncongested, ie diff --git a/net/rds/page.c b/net/rds/page.c index 5a14e6d..715cbaa 100644 --- a/net/rds/page.c +++ b/net/rds/page.c @@ -135,8 +135,9 @@ int rds_page_remainder_alloc(struct scatterlist *scat, unsigned long bytes, if (rem->r_offset != 0) rds_stats_inc(s_page_remainder_hit); - rem->r_offset += bytes; - if (rem->r_offset == PAGE_SIZE) { + /* some hw (e.g. sparc) require aligned memory */ + rem->r_offset += ALIGN(bytes, 8); + if (rem->r_offset >= PAGE_SIZE) { __free_page(rem->r_page); rem->r_page = NULL; }