From patchwork Tue Apr 30 05:28:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Chinner X-Patchwork-Id: 13648273 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id B630AC4345F for ; Tue, 30 Apr 2024 05:46:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 896596B008A; Tue, 30 Apr 2024 01:46:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 845ED6B008C; Tue, 30 Apr 2024 01:46:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5FAD06B0093; Tue, 30 Apr 2024 01:46:19 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 3344B6B0089 for ; Tue, 30 Apr 2024 01:46:19 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id E699FA0414 for ; Tue, 30 Apr 2024 05:46:18 +0000 (UTC) X-FDA: 82065112836.24.64EA007 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by imf28.hostedemail.com (Postfix) with ESMTP id 08DB5C0013 for ; Tue, 30 Apr 2024 05:46:16 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=fromorbit-com.20230601.gappssmtp.com header.s=20230601 header.b=u9DsXSKM; spf=pass (imf28.hostedemail.com: domain of david@fromorbit.com designates 209.85.214.176 as permitted sender) smtp.mailfrom=david@fromorbit.com; dmarc=pass (policy=quarantine) header.from=fromorbit.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1714455977; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=YhVbG6l51s2wWUsaX4UmS6UBTYaIND28KaQonxVRDmk=; b=4FbnezpL8rFxnwFgGjpGTzmNr7G1bla9K2NmkDw/1BzquHQNHSDpWlKZrD3TsvGhp/YayT OpBtSq262SGYKLr0necctMOKDt0hmySAXEpwpGVYipIhq5zYZXIID7rfAzXJAldvgRAqku 7qHmZJfojH88BKIU6V0b5eg52Vtdr/s= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=fromorbit-com.20230601.gappssmtp.com header.s=20230601 header.b=u9DsXSKM; spf=pass (imf28.hostedemail.com: domain of david@fromorbit.com designates 209.85.214.176 as permitted sender) smtp.mailfrom=david@fromorbit.com; dmarc=pass (policy=quarantine) header.from=fromorbit.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1714455977; a=rsa-sha256; cv=none; b=id/LDOOcVS9leTTpdkhtJWRi4wKlJIIPxGqujE0JPSEo6nVOFS1iPSslFrS9/RiNn3CCUo plXqvF8P5BIUHtoLBshs8Tqa2khD3cgr7Wl9E2zg7ZrzWHHnBJ11MD2ljVz0p9awk7MCHz 6KFAkKBDcpIVcuihBmp/kcu/uuyErbc= Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-1e4c4fb6af3so36026325ad.0 for ; Mon, 29 Apr 2024 22:46:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fromorbit-com.20230601.gappssmtp.com; s=20230601; t=1714455976; x=1715060776; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YhVbG6l51s2wWUsaX4UmS6UBTYaIND28KaQonxVRDmk=; b=u9DsXSKMQaNpYSj2XIDdX4BPM+Zq3x/58/cJ6iDlkSrLBf2ywjCPxEU9YqGxMxglVi e80rWEQ1IyDtlfkejZa4DcEAciX7ydnhw4IAATeJNqNVlYSNCbuyrbLPNdMd1ub91jzt yhjzCa4DHYsT3mPOuLTACTPqk6MTuAZlxEukrilVh8iO/Es4vdLoL1jqCHSyq80yE2l9 ZyhlfOBQEB4aRuqtzC27BwxaMmPmEPqT+hXwg/5FpDeq5x/8f2WrwHbbbh7EuyywYE6R Qgl+s/VNFdgjEviJhse74DtSSv+c0lsYs6P+UZPlXi5q2nw2B3zb7YFjcjxVb5L5z/jf bsVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714455976; x=1715060776; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YhVbG6l51s2wWUsaX4UmS6UBTYaIND28KaQonxVRDmk=; b=V5TMExN4KFiEaddOs6C8VNLUCjXo6mt/McGiC4wKrquXd0SXin8NHDd2VYx5aQ5wOG VkWhAXuGjXq7uEasJ0t8tbyF0pycOpfwmAWRQU7zcc/9raGAiG+H2cuWSKV7nSYibTtV a5tku15Hnxu/K88+drdW+I07GIXSCDPQRENEeGqd2F5yPDx5TPZ3IW/sU/QailxN67Qp 26l8nG7EQ7RS4Nhj6rMYwaToKtgDMcVDO/zIrBMIEvJatqFF6LeW7u67qkT3AIOSaNXo RRxUbX4JTV+/8TUrXnjd6C9EXM59iGpFRw5117zOH4mX2P+tO7tQcAXZdJsmYRAqpXZE ywTg== X-Gm-Message-State: AOJu0YzRyUVUYQDmoQK/g75W3yrzJinWQl2gbudezuxPR6Ww2IC1aG3K cC2bzlXwnxpjqX/0+UpZJjebzUQm8hgiEG+S2dZFuxgHGnDFs5HG2XKEU9a780wEj6yMPxrLq2v P X-Google-Smtp-Source: AGHT+IGmMVzjdjiJtHH11D0+CMXFMdRq/n5W1OeXzYwklrE0Jb2BQaYNgr6A90Q1Xy+u7Oi5ZpFZFQ== X-Received: by 2002:a17:903:11cf:b0:1e5:e5e8:73f5 with SMTP id q15-20020a17090311cf00b001e5e5e873f5mr2610844plh.2.1714455975707; Mon, 29 Apr 2024 22:46:15 -0700 (PDT) Received: from dread.disaster.area (pa49-179-32-121.pa.nsw.optusnet.com.au. [49.179.32.121]) by smtp.gmail.com with ESMTPSA id w3-20020a170902a70300b001e83a718d87sm21480895plq.19.2024.04.29.22.46.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Apr 2024 22:46:14 -0700 (PDT) Received: from [192.168.253.23] (helo=devoid.disaster.area) by dread.disaster.area with esmtp (Exim 4.96) (envelope-from ) id 1s1gJg-00FsCH-2H; Tue, 30 Apr 2024 15:46:12 +1000 Received: from dave by devoid.disaster.area with local (Exim 4.97) (envelope-from ) id 1s1gJg-0000000HUwu-0eif; Tue, 30 Apr 2024 15:46:12 +1000 From: Dave Chinner To: linux-mm@kvack.org, linux-xfs@vger.kernel.org Cc: akpm@linux-foundation.org, hch@lst.de, osalvador@suse.de, elver@google.com, vbabka@suse.cz, andreyknvl@gmail.com Subject: [PATCH 2/3] stackdepot: use gfp_nested_mask() instead of open coded masking Date: Tue, 30 Apr 2024 15:28:24 +1000 Message-ID: <20240430054604.4169568-3-david@fromorbit.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240430054604.4169568-1-david@fromorbit.com> References: <20240430054604.4169568-1-david@fromorbit.com> MIME-Version: 1.0 X-Stat-Signature: dzy15dxjzpih36m7seoo9c8apnhqyjjn X-Rspam-User: X-Rspamd-Queue-Id: 08DB5C0013 X-Rspamd-Server: rspam05 X-HE-Tag: 1714455976-149747 X-HE-Meta: U2FsdGVkX1+b/HnLxElOAFA7h54PV48+dd9ND4j5Z5aspdPNlqnlMPhZsSFqREzFeg2LkKKTyVh3Hb6AZWBUBcg2vrj4zsY85z8/eUEfx2OzLkmHnqUfkTznJZ/VN0ZarMqDKveiDc2EmyxVxD1G93Su9mywSEGx6O0sDQG4EEBwQp8tBCbqOKWV46P4755i+8uSZkUaFtsd1r8N7FwovW7hR939yLB7aR5yo3TeyWr7mFAI515hoeUPl46dy3w+whothsb+FxMUuELiEoMcf/LvMN/pIUz2BKCYlsV5VcAMxhyPCRCt9SCued7gYoJisaYsuG9j3srhm1s5taJAXdjHF/sVZ2BeeXAUZEAdUPwn01IvYSC33aLuUZPrlcqsDjs/4rFhCDx0mrNvg6FPHyTGWneggEGFd0HFKFz5mW1ixrkq/rRhnS9E6GSsBk+L2XkGobYaeB6DAT5R0F5t3HW+hVA+0NvQWP0YXs34+w/+rpYb3azcd/T4gt3OscJmHaizrqYKDWH+JPnX5FuoYPUSWNI6ILJr837DdTsNxOjUkMAjZtewpV8X3GM98aFAGizrAIxqT99+68ZcSdYNdUpekjztf+o55qVbw/KPJhZb+fvTh5RPZgQfTBMc0FDPbiGwuuidbbGNTLB3SDd7zS10BowTqfrO9iGMf7L7UFW5GKOwClgTmMZ9HHCFYFdwWt9OxzI5OtMxrem5FB8mSma9+rDmSVheAWic40tnQXo225stkjuCeQHk5IcrRH73qA7ISAEzbSnDv69V/A/XWS4Jcolu7sio6QB1oIEeWbFULmVrlKOGqMIWK1NPe62T4G6XFp4qFh4UkzY4/nY+H/3ErpXqQp8Hw6VpswYmWXYH9ORu0ik36ksRb9txG5v+j4OGaX2J+FFf+uY6Q4/y/mD++vzgE54K4Jb0AcWPcacUCjRqiQuqRVN9N5zRoODbTlgOcl8/H0ULKC5w/Gv hR5UFPr9 hUABskfJxdhFmiyXume53SwQthWH7QP7tu1tYuZLv56WQjq/J4w2VXMArs1pIWgUAFexX5W2X+pNCRYwgVG+BE7saFD9Qw1u+9CacKWFTcLQmd0BcrXYuiNo3y4YMTeXIQosAJpOH0Uj2Faspp43SCJiMdH7IaPPasbpadFR8qL7DAuEvdtDFnDLJa/FP1y3xX6plDqx928CQ5xG3r/EKke91OmY1npAYhbPlkuLTzCVCSy3bzJrQuqkaGVMczFpkyS5yUQkrbc+2US97+e/IM02uECnHlTTqEpk4/oie1IgjiqHJbXAOeUZA03okerF93jBhbLRWdzSBADstVCCAP4Dw2ixPikp9i7eqfcV2SsMCsGX4gl8zExiP4f7TDUSwCsbWP0c2zgEu2GcdWl5zICztgIRcU/F53Hzh3+IXXDfgwZa5cHRJKyWFau3vuxCU74j4PDBdtHyZhp4BD9qMV/REBsiIUGiPWftoJWc85KQtU/k= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: Dave Chinner The stackdepot code is used by KASAN and lockdep for recoding stack traces. Both of these track allocation context information, and so their internal allocations must obey the caller allocation contexts to avoid generating their own false positive warnings that have nothing to do with the code they are instrumenting/tracking. We also don't want recording stack traces to deplete emergency memory reserves - debug code is useless if it creates new issues that can't be replicated when the debug code is disabled. Switch the stackdepot allocation masking to use gfp_nested_mask() to address these issues. gfp_nested_mask() also strips GFP_ZONEMASK naturally, so that greatly simplifies this code. Signed-off-by: Dave Chinner Reviewed-by: Marco Elver --- lib/stackdepot.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/lib/stackdepot.c b/lib/stackdepot.c index 68c97387aa54..0bbae49e6177 100644 --- a/lib/stackdepot.c +++ b/lib/stackdepot.c @@ -624,15 +624,8 @@ depot_stack_handle_t stack_depot_save_flags(unsigned long *entries, * we won't be able to do that under the lock. */ if (unlikely(can_alloc && !READ_ONCE(new_pool))) { - /* - * Zero out zone modifiers, as we don't have specific zone - * requirements. Keep the flags related to allocation in atomic - * contexts and I/O. - */ - alloc_flags &= ~GFP_ZONEMASK; - alloc_flags &= (GFP_ATOMIC | GFP_KERNEL); - alloc_flags |= __GFP_NOWARN; - page = alloc_pages(alloc_flags, DEPOT_POOL_ORDER); + page = alloc_pages(gfp_nested_mask(alloc_flags), + DEPOT_POOL_ORDER); if (page) prealloc = page_address(page); }