From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 62934C32750 for ; Fri, 2 Aug 2019 09:39:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3293420679 for ; Fri, 2 Aug 2019 09:39:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564738755; bh=Nvpk3o6z0JURHwi3kxDN540I1uLy1pmfPguA2yNufLQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ICTSJUpvXGcoaXDnU5oTZC9fkoQiwQSh5VE+GOkI7exdnXbp+9impXa6Sju/yqoyj TXAORoZ1vsk1cgevgYlgL7NFMO/YQ8jEK2iQmzD3HpBDOBQiKUmZcTwCjBmnC4Xnz6 tPeF8TZxuPka6LS+U8mrh2hKC4X1Bwe88uxEb7h4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389679AbfHBJd5 (ORCPT ); Fri, 2 Aug 2019 05:33:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:33576 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391458AbfHBJd4 (ORCPT ); Fri, 2 Aug 2019 05:33:56 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 86183217D6; Fri, 2 Aug 2019 09:33:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564738436; bh=Nvpk3o6z0JURHwi3kxDN540I1uLy1pmfPguA2yNufLQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ow7PFFsWxdptMkoJ8GRsSBJ+JdPBmi0grWknCvQVGFb9VUOJJjIcWYePNgIDrlaAz DyXgsLiTYeFVvigOYWQB4Iw3Ui+ieUpn6y61xDmxWiP8CXONj5eYjycXKvuuxBuhDj J2mZFoTvJJ15x+rYs+IvmNJVYyRseo7UWwQIdeGc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "J. Bruce Fields" , Sasha Levin Subject: [PATCH 4.4 103/158] nfsd: give out fewer session slots as limit approaches Date: Fri, 2 Aug 2019 11:28:44 +0200 Message-Id: <20190802092225.478275192@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190802092203.671944552@linuxfoundation.org> References: <20190802092203.671944552@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit de766e570413bd0484af0b580299b495ada625c3 ] Instead of granting client's full requests until we hit our DRC size limit and then failing CREATE_SESSIONs (and hence mounts) completely, start granting clients smaller slot tables as we approach the limit. The factor chosen here is pretty much arbitrary. Signed-off-by: J. Bruce Fields Signed-off-by: Sasha Levin --- fs/nfsd/nfs4state.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index ba27a5ff8677..eb0f8af5203a 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -1396,6 +1396,11 @@ static u32 nfsd4_get_drc_mem(struct nfsd4_channel_attrs *ca) spin_lock(&nfsd_drc_lock); avail = min((unsigned long)NFSD_MAX_MEM_PER_SESSION, nfsd_drc_max_mem - nfsd_drc_mem_used); + /* + * Never use more than a third of the remaining memory, + * unless it's the only way to give this client a slot: + */ + avail = clamp_t(int, avail, slotsize, avail/3); num = min_t(int, num, avail / slotsize); nfsd_drc_mem_used += num * slotsize; spin_unlock(&nfsd_drc_lock); -- 2.20.1