Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   William Kucharski <william.kucharski@oracle.com>
To:     netdev@vger.kernel.org, linux-rdma@vger.kernel.org,
        rds-devel@oss.oracle.com, linux-kernel@vger.kernel.org
Cc:     Santosh Shilimkar <santosh.shilimkar@oracle.com>,
        "David S . Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>
Subject: [PATCH] net/rds: correct socket tunable error in rds_tcp_tune()
Date:   Wed, 17 Mar 2021 08:52:04 -0600
Message-Id: <20210317145204.7282-1-william.kucharski@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from localhost.localdomain (2601:285:8200:4089:3dd3:8aa0:5345:aaa3) by CY4PR22CA0034.namprd22.prod.outlook.com (2603:10b6:903:ed::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18 via Frontend Transport; Wed, 17 Mar 2021 14:52:11 +0000
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: be0ea8f0-0890-4a72-dba4-08d8e9543f2c
X-MS-TrafficTypeDiagnostic: CY4PR1001MB2359:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <CY4PR1001MB235943306BE73FA08B1E0944816A9@CY4PR1001MB2359.namprd10.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:962;
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: VrRq9O8KoTFBdD5WLym8lzixsS972gF4Oum1ZksrOoNN96GQksTzVhMGVaqu93vsZ31pO7xkcMgkTgG48FDZ2brl3VCtqBpi/r7UArbmxxoLdnesgcDMjFWeYrSeovSPVu9N7FZ/HjjSHNytSSndpwPPUWDU9AoSBOExfkOTivrbpoENX2xOElHcvQi6epdJYCeL83iy10h82kJwqVXQHHdvo2yAJqO35FLZncNNgUW6Nb5XT3b1LlUpAMDGheYDNjeX0FROgrePdi3FhqUWvC95rn35Lr0KIJ3tiBd7qysh7XTWpk3YE4Jo1n3SaE/gspYZlAtuyeCiTBHYt6v5lotZK9DEeNPu8i/639cqJg31R356Ypj6a4oUxQH4r1c9B6gRyMrNmq4hiKn3cqHUs31BoaSj1YPtZATo0ql3XeX3ehuDq+pzbA0rVi7oSdL4lMGbUD1xx++ve6Lscqc92+9RZrbVK198B3Q7FLProyCny/hlti9xS55wOUXW9qULgo1054jLXv930Qq4N1wQ4tsS06FknLOcjsYTUrqb7mcN2riyF2reYTn5dGFuewCFW+mL7ju5NiMGONaetU8vo5kqH1oZI/Wfltk5AHt6dsZuEhmGbq8pwXlcKBpq0T+5
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CY4PR1001MB2357.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(396003)(346002)(376002)(136003)(39860400002)(366004)(6506007)(86362001)(6666004)(2906002)(36756003)(478600001)(5660300002)(8676002)(83380400001)(2616005)(52116002)(16526019)(8936002)(4744005)(66556008)(66476007)(186003)(6512007)(69590400012)(66946007)(54906003)(44832011)(6486002)(316002)(4326008)(1076003);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?LPnYoGpGV0z5JdBNMEqMi8EhD2ycrbprkd1pDJLy7e9Va7Kmh/oxHyfiBHYE?=
 =?us-ascii?Q?l8dxHbEOc7u0MphaOfyyJnnH7jMpPh+tnnnUjddYmJa8Y2FQuoYl5/uAxpyE?=
 =?us-ascii?Q?eP9PcydX6CX2Fye9Kce4CorsnYwJfnrqSXgpavFXtXCodkS7lUQeASfKGt69?=
 =?us-ascii?Q?n5E2bHS9kgBx1tVsv4j06zjJl7QhU9+QqRCOtUm9Auxr109IXpKEWYRKtTan?=
 =?us-ascii?Q?BGDcfRq0gAOvnQKedPSgj8/rz/m65TsgFqzSoW2m0fjC7JdA1iPml5lcTqiI?=
 =?us-ascii?Q?WqSFl7gJ+iYeLF/ZsjQWQnKXvxLnNMRc6pz2w2ygSkvtFuXpHLEg0yToGJcn?=
 =?us-ascii?Q?/AfWvJyM4jyv4j+9/ZE2GkcNh4Tg8+YhQ/BIkWJlQU07qfLCEBTaZAzsLx8Y?=
 =?us-ascii?Q?6XY87kw+/t9p9Ul0dZRuLoRhPl6JXaUe+4Byzpl72HOsSVJkkeNGF2pP6oF2?=
 =?us-ascii?Q?Op1lsc9jgPSS2ugJuSEJ77iwjBZ1ilb7PhwWN4xsVLgBWhW5Ph0P0wrFmjme?=
 =?us-ascii?Q?F4Q7SBL/l+pRdHq8BH6s6Lx3aCdBvsn5tJsRrvjQXykHDLDO9QkP49d9kkf8?=
 =?us-ascii?Q?k/Y1APzlrDiaePKxpuwGjcXbXuCUA5o545ESWYwaa5KjS2Yo/yc2UI/AQxOf?=
 =?us-ascii?Q?yDefY8k19lBgh1XoIzjuLszqO5/eCZOwsp3LWYcTNt3DDKjtP+2TYQ5BnEyo?=
 =?us-ascii?Q?c6gb3a4GFr0QVg6NNuj434N+Ae3KyVD35kKPvVN9v8XFvFhcOYrznowtVrtq?=
 =?us-ascii?Q?4/FlVDIXf7SUPVdGjKNfbrPknzuQuiJg/xsbgHitdUEqG5St7S+BlpBypoir?=
 =?us-ascii?Q?jXpwxKcN77M8lHh1CbpuRbv9iA4J7KnjmuolAm/Aubh8QVtCIpvXVrWTKqsY?=
 =?us-ascii?Q?isXh/E7T/uyQ/liauPVL217FHYLKHhDmR9a0QY2wE/VftMm4nJQ2m9A2n8ZE?=
 =?us-ascii?Q?r5R2xrbJx/SJjuvKNhlO2QA9eTJeOKeQJWlWPTrFDaAnmA+judcgZcCcgK0T?=
 =?us-ascii?Q?07Nrq1k+eg+2kLdnL2yohLCta0cXiiy0oR+cCL+D9416PqmDAUQKMJcwejKV?=
 =?us-ascii?Q?x6ab+NTWPfdKb0Km6mJWh80eNyJwHaNvIWmyfkKOXbwVYi9h0IPP65hyplw2?=
 =?us-ascii?Q?XTZ/zEqHdsQwOhn6MhsAjkPOCQn79Qn9OOXrLU/Mtjs1N/E2MVHqZH+hNcCs?=
 =?us-ascii?Q?ZRO2kIxTiG9cxSQTvZFrV2EiUm2JyIkwM8pdEPT5WcKeNTZmkIctK3pLYCG8?=
 =?us-ascii?Q?AIuVzaf6oqBhRlLAzTDn14c5wpSQAbCMgXivrkXKuOnCGievAvgqd9uucdec?=
 =?us-ascii?Q?tcCV2+cJ3h1VIsyPnVUYyqUejnTK+rHISPd2Uy0bVBvnmcjC1XgHBWVK+thQ?=
 =?us-ascii?Q?s8OpDPXBmDJ8f/g1A9U7jfgNH7WS?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: be0ea8f0-0890-4a72-dba4-08d8e9543f2c
X-MS-Exchange-CrossTenant-AuthSource: CY4PR1001MB2357.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2021 14:52:12.2142
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: Zeh2SyydR/KEKO2h2TYfXUMmHwy1sxDKJOY/3M/kJJrDt2jSvnHHtazT3t7vOz/4YsxwvP2KD9b0eVqOUPK2puo/F3HuUW527rysz/up33g=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR1001MB2359
X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=9926 signatures=668683
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 malwarescore=0 spamscore=0
 bulkscore=0 mlxlogscore=999 mlxscore=0 suspectscore=0 adultscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000
 definitions=main-2103170110
X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=9926 signatures=668683
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 suspectscore=0 adultscore=0
 spamscore=0 clxscore=1011 phishscore=0 malwarescore=0 priorityscore=1501
 bulkscore=0 mlxlogscore=999 lowpriorityscore=0 impostorscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000
 definitions=main-2103170110
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Correct an error where setting /proc/sys/net/rds/tcp/rds_tcp_rcvbuf would
instead modify the socket's sk_sndbuf and would leave sk_rcvbuf untouched.

Signed-off-by: William Kucharski <william.kucharski@oracle.com>
---
 net/rds/tcp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/rds/tcp.c b/net/rds/tcp.c
index 43db0eca911f..130e5988f956 100644
--- a/net/rds/tcp.c
+++ b/net/rds/tcp.c
@@ -500,7 +500,7 @@ void rds_tcp_tune(struct socket *sock)
 		sk->sk_userlocks |= SOCK_SNDBUF_LOCK;
 	}
 	if (rtn->rcvbuf_size > 0) {
-		sk->sk_sndbuf = rtn->rcvbuf_size;
+		sk->sk_rcvbuf = rtn->rcvbuf_size;
 		sk->sk_userlocks |= SOCK_RCVBUF_LOCK;
 	}
 	release_sock(sk);
-- 
2.30.2