Message ID | 20230515161723.530352001@linuxfoundation.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp7084054vqo; Mon, 15 May 2023 10:35:35 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ66rsA0IE1St7Q29IyiFLJhdD/xwp/sltKIl7snQKdlseTwuTQNo7MSTMjUODDYcAny2qfy X-Received: by 2002:a17:90a:bd8f:b0:24d:ff56:f8c5 with SMTP id z15-20020a17090abd8f00b0024dff56f8c5mr36944470pjr.42.1684172134742; Mon, 15 May 2023 10:35:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684172134; cv=none; d=google.com; s=arc-20160816; b=kxxJpfZBCL7KkRgR+nrPHfVYWgObZ7omthFj713YhTD1E/JUcipESCRwP9Q8YiQ+2P L9s9+jaXEUzgI9sgiZnF50LgOJ1mI5wVWhC+oETQXjRplq34mE9X1gAmLnE499DCJFxt JgWWTPbs5VB1Q7rYi317oETEfEDUtOBP5Qyhgbosc3Je1OCL9dbHYj9btqrdG6gyPjAs FiHt3Kiy7eQtmY+LFd9GfWBt/0Lm6Kpemsi9G0JtTy+fdmQnVqlUIUB1zJKQn5Be8bOC iYjXW2ASHFI+M8tQyeCeegd/1rSZLwJpcSoZLZXtndHA3qPbiOolhGDM8qXNIUqciFJS zqPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=r8Vby3suRkAqFGBH8+P1vijoxvSLrjEz7GT4qPbmoeY=; b=nUDAgKNj5Ijnqr5/a7X60X6P1wVqkNjA/3eVP5fIu4HfAn//jtdJduZp5bi59IJXLO bSTnv7R5UkLXiZ6qRrXIRVikxp8r7Y2RlsUaalA+6vuXaHEisNg8mHgegKCRHc+v9uh6 O7ry6EfDehVXtvWu+ImYujjIRDH+qCn2KRMKkqSQ5J2sVRU3otowp8gfUsPGg0IhNGbO cK5WNvmXhooDR5tj4wmT00CkYRPX1EA1f0JQIGRX6iWuQFebFygR7h7Gc5mBhLSl+m4x IWX2W8v9mCHEBNFoenRMQuY/QWQ9cp9c1V+8p5mh8pRFnEbNKPfVakyEW6WM7fzvySKt Mvfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=pPDRqyDM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g9-20020a17090a128900b00247101dd0c1si94308pja.15.2023.05.15.10.35.18; Mon, 15 May 2023 10:35:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=pPDRqyDM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243633AbjEORFp (ORCPT <rfc822;peekingduck44@gmail.com> + 99 others); Mon, 15 May 2023 13:05:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47508 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243742AbjEORFM (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Mon, 15 May 2023 13:05:12 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DB8D683C5; Mon, 15 May 2023 10:03:48 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 5D08762AA7; Mon, 15 May 2023 17:03:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 35D8EC4339B; Mon, 15 May 2023 17:03:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1684170214; bh=43pq+UjSaKTzdKcTZSc3BjZWUVTfug1scezW8PiZqrk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pPDRqyDM4UXbgM6QIIzixQs6Qs6lOG7/T6g0isuRjU4KmGWIWj7rX7oloBRcBkN98 ymJfE81WgNqB+ZQ1hZ4IVu9nVAkwM/LnGFq1F5ORQhz8+kErticgUgRoVtasKzJxU9 iFYQ/IdBO4Y6/fUPuceC/Boi6lHA2vi0WWzHyTV4= From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: stable@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, patches@lists.linux.dev, David Howells <dhowells@redhat.com>, Marc Dionne <marc.dionne@auristor.com>, "David S. Miller" <davem@davemloft.net>, Eric Dumazet <edumazet@google.com>, Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>, linux-afs@lists.infradead.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Sasha Levin <sashal@kernel.org> Subject: [PATCH 6.1 061/239] rxrpc: Fix hard call timeout units Date: Mon, 15 May 2023 18:25:24 +0200 Message-Id: <20230515161723.530352001@linuxfoundation.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230515161721.545370111@linuxfoundation.org> References: <20230515161721.545370111@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1765982480518956653?= X-GMAIL-MSGID: =?utf-8?q?1765982480518956653?= |
Series |
None
|
|
Commit Message
Greg KH
May 15, 2023, 4:25 p.m. UTC
From: David Howells <dhowells@redhat.com> [ Upstream commit 0d098d83c5d9e107b2df7f5e11f81492f56d2fe7 ] The hard call timeout is specified in the RXRPC_SET_CALL_TIMEOUT cmsg in seconds, so fix the point at which sendmsg() applies it to the call to convert to jiffies from seconds, not milliseconds. Fixes: a158bdd3247b ("rxrpc: Fix timeout of a call that hasn't yet been granted a channel") Signed-off-by: David Howells <dhowells@redhat.com> cc: Marc Dionne <marc.dionne@auristor.com> cc: "David S. Miller" <davem@davemloft.net> cc: Eric Dumazet <edumazet@google.com> cc: Jakub Kicinski <kuba@kernel.org> cc: Paolo Abeni <pabeni@redhat.com> cc: linux-afs@lists.infradead.org cc: netdev@vger.kernel.org cc: linux-kernel@vger.kernel.org Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <sashal@kernel.org> --- net/rxrpc/sendmsg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/rxrpc/sendmsg.c b/net/rxrpc/sendmsg.c index d4e4e94f4f987..71e40f91dd398 100644 --- a/net/rxrpc/sendmsg.c +++ b/net/rxrpc/sendmsg.c @@ -736,7 +736,7 @@ int rxrpc_do_sendmsg(struct rxrpc_sock *rx, struct msghdr *msg, size_t len) fallthrough; case 1: if (p.call.timeouts.hard > 0) { - j = msecs_to_jiffies(p.call.timeouts.hard); + j = p.call.timeouts.hard * HZ; now = jiffies; j += now; WRITE_ONCE(call->expect_term_by, j);