Received: by 2002:a05:7412:419a:b0:f3:1519:9f41 with SMTP id i26csp4169409rdh; Tue, 28 Nov 2023 13:58:33 -0800 (PST) X-Google-Smtp-Source: AGHT+IH+NFG0n+TxPME1A20I3FHxY4GbsCxq4/lxm3ttptYLlEKq9wSyvXWgDQXLObeyQb+8meks X-Received: by 2002:a05:622a:109:b0:411:5528:64f6 with SMTP id u9-20020a05622a010900b00411552864f6mr19924260qtw.27.1701208712934; Tue, 28 Nov 2023 13:58:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701208712; cv=none; d=google.com; s=arc-20160816; b=XXaMlbZlI0+jXiBtJ5sAfNaqK2ZOBC9apLW0k09k86xGzslXJGBbfA3UJgWm4eAQJp wEuph+nj3tqACzCi0N0qNpjSKHYMHp6S9JeHBltd2eOtvx34aMSQpeNU7l/HU+caeVBs mec1PvD/wyBQh6kllkIgJepMvz1dd5/O+qX/ex7WdZVKA5ItnsSBXU6xVzAyBu6mtKYb gK2Bz30mApOQePaam+wPC2H7AeUgRoGiy/TVuRhgkQ4KQ+N6Yfo2j6YkmTZ3cAOm5/Ut uz3+wPMxOFcDrA5Z9ckqhqEkMwM8zHcArlGUmL7C2YwclaIYI9pi0dfg39gnhzZWN6TU yMVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:user-agent:message-id:date:cc:to :from:subject:dkim-signature; bh=/6WaiPcZRBLsP2qYDHv5SrT2bj2hyGL0FvsVw4pbTzU=; fh=xkJJ9G/tfqFUcIeP82drScMuFzbH6I4bp3/iFRpdd9E=; b=kyjQaJfk8+lm+oNArI60qm7o1ygcympTmPQeDseXH8okmPkCtoupGbAhHxXwwqWukH gvRzyDPaKBGUJwyfrf2dggP1A5TAEjRmBROnCAh7Ed1XxF2NUhFNpr6qn6gA5iV+oUNo wDyBFG4UpMnc71EFQcw5p0cZyCX/He/wWT4W1IYAD9C+Y/m9x55fc1xJyy+tMm/QvaGv V3OwlQS/4RWmyWFKZOPUReW4sj8hKy3yeDsayqosXCV0/yn8OCLlbYH8MCzfhYrFnPUJ kQ2mbkQK8wSuR/eMZYn7gPyStlgCPu2oyDQoWWcIDKZRV/8SL//RGMBl++v4PgDiLKfL bZWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="P/SJZnKp"; spf=pass (google.com: domain of linux-nfs+bounces-136-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-nfs+bounces-136-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id fk10-20020a05622a558a00b004238e50730dsi12092635qtb.73.2023.11.28.13.58.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Nov 2023 13:58:32 -0800 (PST) Received-SPF: pass (google.com: domain of linux-nfs+bounces-136-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="P/SJZnKp"; spf=pass (google.com: domain of linux-nfs+bounces-136-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-nfs+bounces-136-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id AFE1B1C20AD3 for ; Tue, 28 Nov 2023 21:58:32 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A9163481B3; Tue, 28 Nov 2023 21:58:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="P/SJZnKp" X-Original-To: linux-nfs@vger.kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 87BED44390; Tue, 28 Nov 2023 21:58:29 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D881DC433C8; Tue, 28 Nov 2023 21:58:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1701208709; bh=BZcsOnpseq2BxUhXsipGk+vTl+/VRCernHgeK+y2XZM=; h=Subject:From:To:Cc:Date:From; b=P/SJZnKpxUvNTmy6WwvPgDAbZ0i3l8SMjxwhr7Hl2IZTCrHHZUyQpO9bCO+YblB9s w0RmqvnsEXuLTgcDmC30KRCnITiEWH1zH4ASZRLN3e0pw5MG4Bm/fBZZrX/bMpV+02 r9edrRh4ezyIvsNfIY1ad/03kmLBmfyG+J9akKZnecyTJOPGOPSc28IeO107pQLCvc dHEM2ANKEHWejsUjLe4MGtasbvRee5XziiLAd8FGcRBfOoe+jNiyv5vmFkEpBtBCyr 2Lf237zPAb2cVW0Dp+0V8UeAY8I5X/RvxrxHCHDf30dfAYRstLdtFliyDTULBawKsA bAJ+rXs2YI57A== Subject: [PATCH 0/2] nfsd fixes for 6.6.y From: Chuck Lever To: stable@vger.kernel.org Cc: linux-nfs@vger.kernel.org Date: Tue, 28 Nov 2023 16:58:27 -0500 Message-ID: <170120862772.1376.15036820033774301160.stgit@klimt.1015granger.net> User-Agent: StGit/1.5 Precedence: bulk X-Mailing-List: linux-nfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Backport of upstream fixes to NFSD's duplicate reply cache. These have been hand-applied and tested with the same reproducer as was used to create the upstream fixes. --- Chuck Lever (2): NFSD: Fix "start of NFS reply" pointer passed to nfsd_cache_update() NFSD: Fix checksum mismatches in the duplicate reply cache fs/nfsd/cache.h | 4 +-- fs/nfsd/nfscache.c | 64 +++++++++++++++++++++++++++++++--------------- fs/nfsd/nfssvc.c | 14 ++++++++-- 3 files changed, 57 insertions(+), 25 deletions(-) -- Chuck Lever