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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 50EB9C433F5 for ; Tue, 15 Feb 2022 15:27:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239963AbiBOP2B (ORCPT ); Tue, 15 Feb 2022 10:28:01 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:47442 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239837AbiBOP1r (ORCPT ); Tue, 15 Feb 2022 10:27:47 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EFD4CA94C5; Tue, 15 Feb 2022 07:27:31 -0800 (PST) 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 7D396615F0; Tue, 15 Feb 2022 15:27:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 35A89C340F3; Tue, 15 Feb 2022 15:27:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1644938850; bh=NlYiKCzMphCEljHl8byhWKGsGFsOAvjFrsw6xUZdgSs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=u8Rhp1s2D77mGd7msnOu40KcXPl6/vH/HSMWqZBtMqsNlD5D1BsVUILBbh6rQFmpM E0SFHFaj/Jk5jSjZlczJ44+POHvvzlz3YOWj/7fgMgfUSVqQ5RxbdyNric0z4o0Fzc Q9gk7n+jLMMAANntgQBYc7OeJetbrT1TX7GUM7VypVcSK4CH1gmsOU0dNFUWCrI+jr 4NwV3KLIZTIlk+SW3QUUz8xYwvwb5KASh63mWytK6WWsYRBr+hHWdRFAwW9V2ASmks yIRYsGPpXV4JGGR3FGZOQvsMGNlI15umJclun6ZwRUAFxzGNUI7OazR9RRmRSrG9fV RUIjEA+YIclaA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Shakeel Butt , Jens Axboe , Sasha Levin , io-uring@vger.kernel.org Subject: [PATCH AUTOSEL 5.16 17/34] mm: io_uring: allow oom-killer from io_uring_setup Date: Tue, 15 Feb 2022 10:26:40 -0500 Message-Id: <20220215152657.580200-17-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220215152657.580200-1-sashal@kernel.org> References: <20220215152657.580200-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Shakeel Butt [ Upstream commit 0a3f1e0beacf6cc8ae5f846b0641c1df476e83d6 ] On an overcommitted system which is running multiple workloads of varying priorities, it is preferred to trigger an oom-killer to kill a low priority workload than to let the high priority workload receiving ENOMEMs. On our memory overcommitted systems, we are seeing a lot of ENOMEMs instead of oom-kills because io_uring_setup callchain is using __GFP_NORETRY gfp flag which avoids the oom-killer. Let's remove it and allow the oom-killer to kill a lower priority job. Signed-off-by: Shakeel Butt Link: https://lore.kernel.org/r/20220125051736.2981459-1-shakeelb@google.com Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- fs/io_uring.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/fs/io_uring.c b/fs/io_uring.c index 698db7fb62e06..a92f276f21d9c 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -8872,10 +8872,9 @@ static void io_mem_free(void *ptr) static void *io_mem_alloc(size_t size) { - gfp_t gfp_flags = GFP_KERNEL | __GFP_ZERO | __GFP_NOWARN | __GFP_COMP | - __GFP_NORETRY | __GFP_ACCOUNT; + gfp_t gfp = GFP_KERNEL_ACCOUNT | __GFP_ZERO | __GFP_NOWARN | __GFP_COMP; - return (void *) __get_free_pages(gfp_flags, get_order(size)); + return (void *) __get_free_pages(gfp, get_order(size)); } static unsigned long rings_size(unsigned sq_entries, unsigned cq_entries, -- 2.34.1