From patchwork Mon Nov 28 22:02:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 26963 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp5973082wrr; Mon, 28 Nov 2022 14:11:35 -0800 (PST) X-Google-Smtp-Source: AA0mqf7hFySluKWk+/+wfLb6fsy0d9jgP8odtVdnb47IgEgRA2GdfAUZGBvU+3sAQS4EODU5kMbR X-Received: by 2002:aa7:ca54:0:b0:46b:5f6f:a303 with SMTP id j20-20020aa7ca54000000b0046b5f6fa303mr3352146edt.110.1669673494982; Mon, 28 Nov 2022 14:11:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669673494; cv=none; d=google.com; s=arc-20160816; b=BKLzgjWxx67Tr27D58O3vH8SBCv9tvK5rqbTeIuFhPVLss68iFGMji+GopYouAi05R WSzUWaEqyxqLvzAeFyRFSo6EJHAchtAPYb4uddcwT/+dFHnYAdx0Xc+A2tt3FCOzy8Y7 Ar+4aISXzG0cxCCqO/OScbkjwSc8yrnrKAekdd4OJC8lk4hlc8qSnITMEW+I0y/jLjmR iVah8vHXS55LDAsZngiQFu1FDoYLSIQ2sBfGv4P7OgcVSVFfD+8K36q8OJv2uTC9E3V8 JsDLBSsjf+rS7la2/WikUST2QenklRsWuwAaAn5Q21ye1TjcNNmKuGYOuZtULG86Cjwk UTPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:content-transfer-encoding :content-id:mime-version:subject:cc:to:from:organization :dkim-signature; bh=xPbpoVxrgjiZ1v3Q2JskuQaETCCbk7MGRQwhwRfymp0=; b=f9nkvOvyrFPZzXa3sZ2EvBKdDeZuDbyysf6wlre/vv47/pVj5wHkTRr4PrIfDZ2cRQ nD+GIETIp7RRp+BwNZKO/X4Jxmlgw7VyydEI+OWn8Km0wVulJzTV2ALfP46PNMkN5lFr IAkH6aGyyYhrZWagHhGbVOt1/gKdmfdmdcddQR2af2j6F82QN1gBEmcicK6jbCTb38/0 wfUzQ9AfuOKvoELoh3aEzNhQyAXgLV99mtc67MBLNkCbLhZoJjtCuwqfsxFJmGGlzCQu 3jnTVh2ibGYI4M50rXcqdGNzI/lZBWblBnfw1w8qDhPzfWAuWsJZkTeKCfdDBIpkLKW1 /w5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=EFrROx1F; 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 dr5-20020a170907720500b007a7a3b40920si11800447ejc.995.2022.11.28.14.11.11; Mon, 28 Nov 2022 14:11:34 -0800 (PST) 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=EFrROx1F; 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 S234381AbiK1WD7 (ORCPT + 99 others); Mon, 28 Nov 2022 17:03:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48222 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233273AbiK1WD5 (ORCPT ); Mon, 28 Nov 2022 17:03:57 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4D262205C2 for ; Mon, 28 Nov 2022 14:03:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669672984; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xPbpoVxrgjiZ1v3Q2JskuQaETCCbk7MGRQwhwRfymp0=; b=EFrROx1FBeaStuHExh3QbKR+jfhsG08c2R86lHCplRdbTXfpRS5HjLuyHIYXrHi35ZJRmH aNxGKg8mwnuwVY8I1hEbHcrR4T9FJXpm9K5QCgbfFpocWMyOmROoNAeGfb462rvdGDL+Lc 4vM/cd9rBAoE3fmnwv7sraarKwybSe4= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-457-R_KxuDuRMS6e_XWpvLpXFQ-1; Mon, 28 Nov 2022 17:03:00 -0500 X-MC-Unique: R_KxuDuRMS6e_XWpvLpXFQ-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A2A60811E81; Mon, 28 Nov 2022 22:02:59 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id E08421415100; Mon, 28 Nov 2022 22:02:58 +0000 (UTC) Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903 From: David Howells To: torvalds@linux-foundation.org cc: dhowells@redhat.com, marc.dionne@auristor.com, linux-afs@lists.infradead.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] afs: Fix fileserver probe RTT handling MIME-Version: 1.0 Content-ID: <3528468.1669672976.1@warthog.procyon.org.uk> Date: Mon, 28 Nov 2022 22:02:56 +0000 Message-ID: <3528469.1669672976@warthog.procyon.org.uk> X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-Spam-Status: No, score=-2.1 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 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?1750760992918998003?= X-GMAIL-MSGID: =?utf-8?q?1750779554696330037?= Hi Linus, Could you apply this patch, please? Thanks, David --- The fileserver probing code attempts to work out the best fileserver to use for a volume by retrieving the RTT calculated by AF_RXRPC for the probe call sent to each server and comparing them. Sometimes, however, no RTT estimate is available and rxrpc_kernel_get_srtt() returns false, leading good fileservers to be given an RTT of UINT_MAX and thus causing the rotation algorithm to ignore them. Fix afs_select_fileserver() to ignore rxrpc_kernel_get_srtt()'s return value and just take the estimated RTT it provides - which will be capped at 1 second. Fixes: 1d4adfaf6574 ("rxrpc: Make rxrpc_kernel_get_srtt() indicate validity") Signed-off-by: David Howells Reviewed-by: Marc Dionne Tested-by: Marc Dionne cc: linux-afs@lists.infradead.org Link: https://lore.kernel.org/r/166965503999.3392585.13954054113218099395.stgit@warthog.procyon.org.uk/ --- fs/afs/fs_probe.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/afs/fs_probe.c b/fs/afs/fs_probe.c index c0031a3ab42f..3ac5fcf98d0d 100644 --- a/fs/afs/fs_probe.c +++ b/fs/afs/fs_probe.c @@ -167,8 +167,8 @@ void afs_fileserver_probe_result(struct afs_call *call) clear_bit(AFS_SERVER_FL_HAS_FS64, &server->flags); } - if (rxrpc_kernel_get_srtt(call->net->socket, call->rxcall, &rtt_us) && - rtt_us < server->probe.rtt) { + rxrpc_kernel_get_srtt(call->net->socket, call->rxcall, &rtt_us); + if (rtt_us < server->probe.rtt) { server->probe.rtt = rtt_us; server->rtt = rtt_us; alist->preferred = index;