Received: by 2002:a05:6a10:6d10:0:0:0:0 with SMTP id gq16csp765440pxb; Tue, 12 Apr 2022 12:52:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxNviZU7ekLODx+O/MG2Ll7Pil9opuJKDEqDDTikPE4rakt7ISxQoGi+bvEOLmwY8sfoQ/U X-Received: by 2002:a63:da4f:0:b0:39d:96b7:6d8 with SMTP id l15-20020a63da4f000000b0039d96b706d8mr4005812pgj.318.1649793167649; Tue, 12 Apr 2022 12:52:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649793167; cv=none; d=google.com; s=arc-20160816; b=DCxCIud0E6HOc2V6h6t47dkDC8o/rIU1B5ACU9EJpTxVP6y0b7iWQ2Po7N1yfismHz d5ipqeF4bHhxt1IfAwf1WNIX50lE/PS1pqP2C0Qxh9m/ZjvBdvR5DH4uvRQCZq8XUcQ4 pkawdQtYczANqGRF2RFO0Ne9Bvj2IS5tJOeUfrowZd/hk25JBrqKkVgGfzypcK625FY0 kKhm3nn4J8mXSxDY5F7tUcKjUzlIME3WI31RravVwYZ74tSQsKPrPRYkmTy9SFBT9ZCr Mkyk5ia2XHG0NDKy/rKS220UTkVLON/W+vWohVsSaFriDx1sUtRZeM0czeMhrHgWlQxn StLQ== 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=J9BZP2qRoelGuRoBtlJFRFPFRBBLmrUjJlj4Y+f/T1U=; b=zHD7S+AmNcGlLH4k8slgq0JkTc2yR39bEYIMOQKs7Ev8PxUkJOTJkeEfNiZWABnget MuKiQIdEgtEJ0nFPHZbNrmFSq82rvOcY2w0R1rk9b0EtkUOZxaC0Yer573WOYQcQOeiq 5rT4WzTLd4Qr5irC71PAx8KOlcS+lLjxzPeRzuSGrk6coaFYtTK59RLvDwyP26JJfJ3A KVFdgS/QRwFfCEryxjTijPVbOMUAddmJ2F9Y4TQ7qUNHY6qSLF+R0B5QeSfpjRfcjmnk 4MiS/F+jjqUPbxD7zGcSKTrZtzYNseJk1zNswVmjl/XafGf6Q+nroZ1Ha0BYVDR7+eOD qIww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=keuAjxr9; 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 il12-20020a17090b164c00b001bd14e030b0si13831841pjb.136.2022.04.12.12.52.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 12:52:47 -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=keuAjxr9; 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id E1A046BDEF; Tue, 12 Apr 2022 12:48:24 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350868AbiDLGvL (ORCPT + 99 others); Tue, 12 Apr 2022 02:51:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39530 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351617AbiDLGpY (ORCPT ); Tue, 12 Apr 2022 02:45:24 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 885FC3B2AB; Mon, 11 Apr 2022 23:38:48 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 2449C6190F; Tue, 12 Apr 2022 06:38:48 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3A283C385AA; Tue, 12 Apr 2022 06:38:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649745527; bh=xAgepn/GSiqZbXlSZ8+acp+hIg20I4xs5CckCdn+aBY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=keuAjxr9e0OLqRwhMZK/E597quXrxtqn4dw+SQ1PW20/UNjtjfF6oJNOy6opYOwsv 9WDHZTjKusWRKGgR4e3d640P0ivDVOJbZpeIbenMqfFUrLmI/F6H8grRWVADFsoJuP a7LbMVrQlqooDY86S2haVJOP8zp507MP6V6x00nI= 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.10 127/171] SUNRPC: Handle ENOMEM in call_transmit_status() Date: Tue, 12 Apr 2022 08:30:18 +0200 Message-Id: <20220412062931.559098054@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412062927.870347203@linuxfoundation.org> References: <20220412062927.870347203@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 84c8a534029c..bae42ada8c10 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c @@ -2175,6 +2175,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; @@ -2258,6 +2259,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