Received: by 2002:a05:6a10:6d10:0:0:0:0 with SMTP id gq16csp830539pxb; Tue, 12 Apr 2022 14:40:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxeyeENPnzm10R9YKEkdzs1W/zCIjrB09ywumy1PMiUqtFp0CzDBZU2cnjm65MIM6oKBIXc X-Received: by 2002:a17:90b:380c:b0:1cb:a43d:4c29 with SMTP id mq12-20020a17090b380c00b001cba43d4c29mr7055112pjb.240.1649799627097; Tue, 12 Apr 2022 14:40:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649799627; cv=none; d=google.com; s=arc-20160816; b=LKy/MdmYrIHuduKWTPLlVh1qsR0rGYm2n7J3+YnZziWlqnLtS61zX1D05qK5GHc1sg ygH73ooFa7wUA3zZtfHi98SdEFOkANx7f+YGVIU4hNWpBoiZSCJlR93/b8KWwaOMOslq GBjTRyyqY9rZjTa9JPPyvdSzQ9IT2ripD5yvgwAK/Th+80QyGZfRro5RVvBhXjIxmGsp RWFrdFS98QiAilG7afkNQSDClfNbFNSKgAge6pYIsrTZ2Vh62srbGM1+NgOBPfVf+DwD ECmw5oOAOdgLfkl0lNYEb50In2MuQvhSgzAWBwLXuy0LMulzEknflCePjHDTY/q3HADL z0CA== 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=QwTWnz2uaaCIqjLwDCHLrP84wIPmWwev/DrIFKbSv0o=; b=KRYT32oc4UOtWLUlprIq7dSJwGnLk04dBgncMyeqoq6F2vz6nVP5kOVPIeUWY2Idtb 7sZAA0aItttbqou7de7AfMl9Ug6qMsyJ2Ct9UOPmWoXIpoNsgGkTC6hTmblM/xHQjNIt L543lQ7wXUc1CxjAU9H+jP06iSwAvxI4jrZ1GckzW7LumP1fZYfNHpUvtwJ5rVqB90Db caYlhMQAOMd3UoZR/QGNqkJc3kCQL4szKcsvDTiJhBvcEAK1BPPbIV+TE2peRmy7yWlE 5PhGclyDFJnudPLh7dc37v/Mz5IHUFk/T465mbpHST1PXlQudJtlw/zEUwg2yDkLes0L w1aQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=jewLxgZI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id x20-20020a63fe54000000b0039ad8a5b075si3869508pgj.214.2022.04.12.14.40.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 14:40:27 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=jewLxgZI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 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 [IPv6:2620:137:e000::1:20]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 0893D11CF5E; Tue, 12 Apr 2022 13:42:08 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1380434AbiDLIWG (ORCPT + 99 others); Tue, 12 Apr 2022 04:22:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43074 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353885AbiDLHZ4 (ORCPT ); Tue, 12 Apr 2022 03:25:56 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8F677101DF; Tue, 12 Apr 2022 00:05:08 -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 ams.source.kernel.org (Postfix) with ESMTPS id 43377B81B4E; Tue, 12 Apr 2022 07:05:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id ABD26C385A6; Tue, 12 Apr 2022 07:05:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649747106; bh=9vXVE7hBRTZaQD7r+RaOOhVUqQdP69FtVpG2CWo9kbo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jewLxgZI/kOuNuSZCw8Sy//Y5fnbCGgGHLtNEcBBYr8R3ecPZ9GhSqsknffUyFwXX aIQsrdxE1f7QJYyPaWPC9qUViWppCQB/i1UiHyx0TEkcY4lMVmEpSevDkfkN4zN4BZ dInpNn8s0duSfLbFL/FTtBIOYCEHWwLOXCa1YStw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Trond Myklebust , Sasha Levin Subject: [PATCH 5.16 205/285] SUNRPC: Handle ENOMEM in call_transmit_status() Date: Tue, 12 Apr 2022 08:31:02 +0200 Message-Id: <20220412062949.576620725@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412062943.670770901@linuxfoundation.org> References: <20220412062943.670770901@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no 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 From: Trond Myklebust [ Upstream commit d3c15033b240767d0287f1c4a529cbbe2d5ded8a ] Both call_transmit() and call_bc_transmit() can now return ENOMEM, so let's make sure that we handle the errors gracefully. Fixes: 0472e4766049 ("SUNRPC: Convert socket page send code to use iov_iter()") Signed-off-by: Trond Myklebust Signed-off-by: Sasha Levin --- net/sunrpc/clnt.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index b36d235d2d6d..bf1fd6caaf92 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c @@ -2197,6 +2197,7 @@ call_transmit_status(struct rpc_task *task) * socket just returned a connection error, * then hold onto the transport lock. */ + case -ENOMEM: case -ENOBUFS: rpc_delay(task, HZ>>2); fallthrough; @@ -2280,6 +2281,7 @@ call_bc_transmit_status(struct rpc_task *task) case -ENOTCONN: case -EPIPE: break; + case -ENOMEM: case -ENOBUFS: rpc_delay(task, HZ>>2); fallthrough; -- 2.35.1