From patchwork Fri Apr 28 20:27:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 88722 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1196019vqo; Fri, 28 Apr 2023 13:33:18 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5mOhV2+BrijJ0VuJjwRrBs1T+MXqL+oisSYKcgD0snPGMfuq8EfXg44YnlLN4MDxS2sldW X-Received: by 2002:a05:6a20:3c8b:b0:f2:93b7:a452 with SMTP id b11-20020a056a203c8b00b000f293b7a452mr8170405pzj.4.1682713998592; Fri, 28 Apr 2023 13:33:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682713998; cv=none; d=google.com; s=arc-20160816; b=CADrgOSdrdBNcenF9LC8sALhQexOLwnwP3rS39WLpMVK5M5hYTEgsT1OenjCjgZaiG fRNXp0O5GhOfa/7MFUiUj0PGKsUuXbhELXEgryWxmKAI1WtAKae087RO3KSai7O2clD9 IvHRf0lWre5dGKwk5BQQzE8c455uOjwqWkvxYO2BgCQXIrH08EtYwogb8otfDqjZQBGZ Z8bzdaIylD1mbsSMZvGo8t6lc493waiotf0vLlPEnoH0kC8gQuIs7jDDXqoWJmdSL2Jz GHByWPG3m8VrzC8NssuJLwDQqTKwAymNfD1KukvIeluR3d9rOc1zAFnh/TJkbicbWd9b njbA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=DkAuLfIA1LUx/lCmA4KCtexilyauLFcUmjHzEvy7rws=; b=l9vzm6dHTyufVOd1pWk4bCYa4sUFMX86rtxyk5weyfJQ8937n8hZfvD0urmeFb43g9 RoCEa7lpNQVoDfmMHAxKfTHy29+kFhvW5SvSREmzSkC+PXxX2U+x/2hDtfpCSB2vzSnZ 8OIP55YqVEJicztmyUlMu0Tj/CxUsSQhI29SFuYBt+TZ2sQPpJ/Sjv5KXaee1Jjc5rnP gB7xbiDkdSmd2Bo22oSSltRVDycjhfr+gqeEYDoXE7E9mSBs+GvJ/ArMdpREe5kI1z3s oB8TOakV0XyLJPwPfsGrCZCg+2nKAV5LLt6Uo0xAOyOE82L1JZxf1u0RYCrdzCVmyWpd pI6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=A4d1WqkA; 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=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c5-20020a6566c5000000b0051f8b655dfdsi22739396pgw.18.2023.04.28.13.33.04; Fri, 28 Apr 2023 13:33:18 -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=@redhat.com header.s=mimecast20190719 header.b=A4d1WqkA; 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=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229862AbjD1U3G (ORCPT + 99 others); Fri, 28 Apr 2023 16:29:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47250 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346453AbjD1U27 (ORCPT ); Fri, 28 Apr 2023 16:28:59 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DC8EC2107 for ; Fri, 28 Apr 2023 13:28:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682713685; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DkAuLfIA1LUx/lCmA4KCtexilyauLFcUmjHzEvy7rws=; b=A4d1WqkA+TAUHvhVB6aOREPsxVQbXX/Z+JYnQCvBm1aUP/0hOaJoewuaLtPvIquMP31gjH F1qAMamQbERxNQEnHDSC5Gl5R+78a3Ra/sU2NeX0m40Aj4XZEQiBmIkyy1WSVWWqB4XsgT QM1X+/0kokndvoXKOSISq8uMbziqSMI= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-446-jlyFBSwpMDeMNo5CjpPXkA-1; Fri, 28 Apr 2023 16:28:03 -0400 X-MC-Unique: jlyFBSwpMDeMNo5CjpPXkA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 234FA3811F21; Fri, 28 Apr 2023 20:28:03 +0000 (UTC) Received: from warthog.procyon.org.uk.com (unknown [10.42.28.174]) by smtp.corp.redhat.com (Postfix) with ESMTP id 06D592166B4F; Fri, 28 Apr 2023 20:28:01 +0000 (UTC) From: David Howells To: netdev@vger.kernel.org Cc: David Howells , Marc Dionne , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-afs@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH net 1/3] rxrpc: Fix hard call timeout units Date: Fri, 28 Apr 2023 21:27:54 +0100 Message-Id: <20230428202756.1186269-2-dhowells@redhat.com> In-Reply-To: <20230428202756.1186269-1-dhowells@redhat.com> References: <20230428202756.1186269-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Spam-Status: No, score=-2.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1764453513524216145?= X-GMAIL-MSGID: =?utf-8?q?1764453513524216145?= 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 cc: Marc Dionne cc: "David S. Miller" cc: Eric Dumazet cc: Jakub Kicinski cc: Paolo Abeni cc: linux-afs@lists.infradead.org cc: netdev@vger.kernel.org cc: linux-kernel@vger.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 6caa47d352ed..7498a77b5d39 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);