Message ID | 20230515161723.676271897@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 b10csp7083323vqo; Mon, 15 May 2023 10:34:13 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5+X4Vhf8YaP0ZWHsREkRGEyppBi9aK0VeEcew1Uxz6XYGRsU2+gb6PBj2ViVrpnZlS0l6o X-Received: by 2002:a05:6a20:1454:b0:105:5800:c51b with SMTP id a20-20020a056a20145400b001055800c51bmr9020829pzi.30.1684172053436; Mon, 15 May 2023 10:34:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684172053; cv=none; d=google.com; s=arc-20160816; b=zBY7l3cidyZVCHmkxdftpP2vQb31H963o62qZIC2SJL8SVCSWMxYGY6Us99ENpzuEo FdaspE4HwmA7DDblysQSlKt/Ov90wAGxhuMIiXhQyExutGhE/2bHxThHs0U/WmYmHMbS Q9QK8d8SYM3Q2BFm4gqbkfrMNq2oHaTEuNt9pW/+ejFgRSMQsFr6G96Ts5LcdAwau7ra PPiDgxVdCqPAJrlV8C5UcLn+/5iJUwmJe8piwlEcBxckzdDEBO6aAgN+jizEYMvFDFgD REgocc7YjzexU0UKO3cSutdxg4bFldntc7uLnqCGlUkQSKnjjc8aFDr1CIqSUxUytMlR 0dYg== 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=rmcfu91Y/ZvzI1fxBPuFPYV6As+GAkITRon9UG9LnpU=; b=EKj4PsTNZCum7pFxPNqVB0uYbj8xkpn44iNKLMeJxpCaVwdTCt1vGgIN6Q3UY6QhNW F2fczIb3cEJsP/QDadx7bpLdzaqtRaSoOFc8Tk0GSxTziTTHFVrymCdHc4+KpKdBdpI0 Jq2P4Z0DK8m1evdrcU4lMzFhiW2/uK9tlrTNfNF/HAr1cWz3N5Y1XCfdbaKjW/CPjlqP JShzz3yOxFh1b2+Hl5czCi331OCQbeB6NnhMKfjMWBJ+lAUsPS83AI8jg98U3HFWySa3 hBo+cDT40gSsXio4zhM3+74WtjdHypivNsjSeJs8FlNsd//S0TaQS/8yJ8U6I4T0aswZ cURg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=JeCjWOiM; 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 k6-20020a17090a7f0600b002474fcf3bdasi20765pjl.146.2023.05.15.10.34.01; Mon, 15 May 2023 10:34:13 -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=JeCjWOiM; 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 S243826AbjEORSN (ORCPT <rfc822;peekingduck44@gmail.com> + 99 others); Mon, 15 May 2023 13:18:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60818 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243944AbjEORRo (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Mon, 15 May 2023 13:17:44 -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 B45EB11DB5; Mon, 15 May 2023 10:16:14 -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 6B39462BF1; Mon, 15 May 2023 17:16:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5B452C433D2; Mon, 15 May 2023 17:16:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1684170971; bh=pNiizyDEe5fd2zn2IYaro9F9LlUAbjtfNlsCfxVgYGg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JeCjWOiMBm8OA0HTiJiq5MJERD8jZLfutsQrVJfTEUg77zNnr5WMWq/5/yQGRKNn3 uBUZFMQJcT5Kv+4Q2+QtS41hiZt867aOiX6IOGP2JaX5V6TqtfrXHHb+vsdggylIPm ZX4BXR20lUV48XhNqrqMX+Z8Py4kVp3AIi3BNyuw= 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.2 059/242] rxrpc: Fix hard call timeout units Date: Mon, 15 May 2023 18:26:25 +0200 Message-Id: <20230515161723.676271897@linuxfoundation.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230515161721.802179972@linuxfoundation.org> References: <20230515161721.802179972@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?1765982394867102379?= X-GMAIL-MSGID: =?utf-8?q?1765982394867102379?= |
Series |
None
|
|
Commit Message
Greg KH
May 15, 2023, 4:26 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 6caa47d352ed6..7498a77b5d397 100644 --- a/net/rxrpc/sendmsg.c +++ b/net/rxrpc/sendmsg.c @@ -699,7 +699,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);