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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id BBA49C47DDB for ; Fri, 26 Jan 2024 22:08:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1E4656B0096; Fri, 26 Jan 2024 17:08:10 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 193B26B0098; Fri, 26 Jan 2024 17:08:10 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0842C6B0099; Fri, 26 Jan 2024 17:08:10 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id E91D96B0098 for ; Fri, 26 Jan 2024 17:08:09 -0500 (EST) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id B66E91A0FCA for ; Fri, 26 Jan 2024 22:08:09 +0000 (UTC) X-FDA: 81722851098.24.924A4CE Received: from out-182.mta0.migadu.com (out-182.mta0.migadu.com [91.218.175.182]) by imf25.hostedemail.com (Postfix) with ESMTP id EDC63A000C for ; Fri, 26 Jan 2024 22:08:06 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=HiaE8sSD; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf25.hostedemail.com: domain of kent.overstreet@linux.dev designates 91.218.175.182 as permitted sender) smtp.mailfrom=kent.overstreet@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1706306887; 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:references:dkim-signature; bh=hUkCrxHZnuGUOf1eWli04G60P3ry1f7NLrQ01CZWHvU=; b=0+hr1vAl1ZT76MBUsGJpx82WUTO91fHcq8H+zo761zzefjCEDKYB7xYLWJmcurr4G3I/ma X5eiUvnefJevTQFz8XcL4B4ULYwdNTlPHpO53H6OeXNDxHw0yVgOjTBQzUY6qL5+n0donB yVPIBYQtdXFQhxaPOntXxYDnEXR0pRc= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=HiaE8sSD; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf25.hostedemail.com: domain of kent.overstreet@linux.dev designates 91.218.175.182 as permitted sender) smtp.mailfrom=kent.overstreet@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706306887; a=rsa-sha256; cv=none; b=qfAhOH6o0qZ2Ph97BZYPekIIjT7pMU81wBNFCV2FuwCbjViUUiDzg9rtA8LL8RzlPILm13 mUayfpjINzOoBv/dNIKqNgnDyxopJfVND47wPRtbSpVW+phm37hWvi+xs6zBgZUsCs2luJ iyLALcFPJKNVGVA0b5x2Xc3zdFcQd7g= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1706306884; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=hUkCrxHZnuGUOf1eWli04G60P3ry1f7NLrQ01CZWHvU=; b=HiaE8sSDXRpZ4TySRs0B766b2V1BZSQn0nBnuW3qDOkFUgDWFumKJxcuU/mINuNeUxPqEG jbtvS60Lxx4mGTZqCwddyILH5BKtoiwGx65wAu76T2pBdyJ4Nz2Jveskq8nhLfA4pTty6i yrt/P+YllfrixgPOGJyk1Eas7Sxqsts= From: Kent Overstreet To: linux-mm@kvack.org Cc: Kent Overstreet , Vlastimil Babka , Matthew Wilcox , Michal Hocko , "Darrick J . Wong" Subject: [PATCH 1/2] mm: introduce memalloc_flags_{save,restore} Date: Fri, 26 Jan 2024 17:07:55 -0500 Message-ID: <20240126220756.395187-1-kent.overstreet@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: EDC63A000C X-Stat-Signature: dzc6bj79r8hmw4hfnkph794ac9ekrphh X-Rspam-User: X-HE-Tag: 1706306886-483468 X-HE-Meta: U2FsdGVkX1+tjy7elD//1PUhOvHKaW8NnzVWyiiTVNVEWjQg7kvmjv0RZntjRooM/ymnGgBB/HY58TzKMRuD4b/+g3GKmGxS0HF2bm7ZRVzGFVpfqHspOXxMRT9MoHzG5gK19So8COLmUrtckrmxxUXAZM8nIWrb+2Ij4GjRtxp7gy61bL3Ree3XAEI9Oyy9dJ9GUv4HAUBgQ+2c7qIyyYW3FWs79ULCzJ0MaZQbjcLS/zOxYbmwzE07J0iGto1IxYeMUjIZk4DHpegpsYGhqvd9oPjTIk8KX5czeIHGoAffNxRNX4qgp1wNdoHoR9SwSnk1H66yxID/hpZTmQdXrj7NcK1LbPME4wTUk52pl9P3CO0u1hlL3wb7UaPtIn02ecyMk8YMMtLNsqQaDsq60UfAMW4UiqIbfSSS0BdFNv66mG72qtv1C4/vBnrgD94dNBq/5qb4QR2Gk24tRwIFStTDksJLmuBzUPvjoZT3HnKAmg018wsJ8znlwAPfpW0uA2F3jH5fMyuBkfPJe0Zo2Kpb6pW47Hh7wYyVeZaTSYwrXuktmfNMpoLJXlSM/XNv082cM2B4Ei0xTDqrhm1jklec8ZG4Q0KnB2R8pX+GLY6KpOaytBNXgdAgJ7RlWqhH9+SnSaUdy/foF9hinBed4Days5uzDpI2Gv93lJQlrJyM6SgxFYSYDqYhjPEWlamHCERyrVQMjFp9TWumtZgOoyER1rPfOtp6R3EZ2kSNL1vNnnhwYe8AyD+tDE/5X763SMTpBJv42d2DvOCGLa76ddYDVeBmOZeeNqC4074OgVgAnnp1fNIaml0K688MrqNBcs8nruUHzWvHAoE2S9FNSjxxRs6QNGPrCoqSGJtPCi5lN4E4y6tb7Q2V11YwAQ/nBmzbyc2PvxlCLsdbnbcezCHWmLKh1rsZWL071288BX5gOHOqMID2kKqT8GTOjgIzrRXFdIMJzNObxmm1d1t k5YvnIGW B66ou3HPna5v6JN0S5H70NxY86LHBSf4LfHprqOr9+HY+D5+2pw9P9KaCZeFIOsiHicNo1t/hCgWGiCQt59fmoOedpkU8Ok8lCywnYQv26jVAWmhCREBAQdMaMK5QhCA32jL+CCvkUl220r6oUvNhg/Twl8PR3GOxAoRmL/FWiKs0BKpWUJVZDG9muXEX+8IURzPg6+06M1NdKX2hMiqAYvAGW4Z9MtD1hUsaGl9BGZpbYYU1dqVbcgPaXA== 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: Our proliferation of memalloc_*_{save,restore} APIs is getting a bit silly, this adds a generic version and converts the existing save/restore functions to wrappers. Signed-off-by: Kent Overstreet Cc: Vlastimil Babka Cc: Matthew Wilcox Cc: Michal Hocko Cc: Darrick J. Wong --- include/linux/sched/mm.h | 43 ++++++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/include/linux/sched/mm.h b/include/linux/sched/mm.h index 9a19f1b42f64..f00d7ecc2adf 100644 --- a/include/linux/sched/mm.h +++ b/include/linux/sched/mm.h @@ -306,6 +306,24 @@ static inline void might_alloc(gfp_t gfp_mask) might_sleep_if(gfpflags_allow_blocking(gfp_mask)); } +/** + * memalloc_flags_save - Add a PF_* flag to current->flags, save old value + * + * This allows PF_* flags to be conveniently added, irrespective of current + * value, and then the old version restored with memalloc_flags_restore(). + */ +static inline unsigned memalloc_flags_save(unsigned flags) +{ + unsigned oldflags = ~current->flags & flags; + current->flags |= flags; + return oldflags; +} + +static inline void memalloc_flags_restore(unsigned flags) +{ + current->flags &= ~flags; +} + /** * memalloc_noio_save - Marks implicit GFP_NOIO allocation scope. * @@ -319,9 +337,7 @@ static inline void might_alloc(gfp_t gfp_mask) */ static inline unsigned int memalloc_noio_save(void) { - unsigned int flags = current->flags & PF_MEMALLOC_NOIO; - current->flags |= PF_MEMALLOC_NOIO; - return flags; + return memalloc_flags_save(PF_MEMALLOC_NOIO); } /** @@ -334,7 +350,7 @@ static inline unsigned int memalloc_noio_save(void) */ static inline void memalloc_noio_restore(unsigned int flags) { - current->flags = (current->flags & ~PF_MEMALLOC_NOIO) | flags; + memalloc_flags_restore(flags); } /** @@ -350,9 +366,7 @@ static inline void memalloc_noio_restore(unsigned int flags) */ static inline unsigned int memalloc_nofs_save(void) { - unsigned int flags = current->flags & PF_MEMALLOC_NOFS; - current->flags |= PF_MEMALLOC_NOFS; - return flags; + return memalloc_flags_save(PF_MEMALLOC_NOFS); } /** @@ -365,32 +379,27 @@ static inline unsigned int memalloc_nofs_save(void) */ static inline void memalloc_nofs_restore(unsigned int flags) { - current->flags = (current->flags & ~PF_MEMALLOC_NOFS) | flags; + memalloc_flags_restore(flags); } static inline unsigned int memalloc_noreclaim_save(void) { - unsigned int flags = current->flags & PF_MEMALLOC; - current->flags |= PF_MEMALLOC; - return flags; + return memalloc_flags_save(PF_MEMALLOC); } static inline void memalloc_noreclaim_restore(unsigned int flags) { - current->flags = (current->flags & ~PF_MEMALLOC) | flags; + memalloc_flags_restore(flags); } static inline unsigned int memalloc_pin_save(void) { - unsigned int flags = current->flags & PF_MEMALLOC_PIN; - - current->flags |= PF_MEMALLOC_PIN; - return flags; + return memalloc_flags_save(PF_MEMALLOC_PIN); } static inline void memalloc_pin_restore(unsigned int flags) { - current->flags = (current->flags & ~PF_MEMALLOC_PIN) | flags; + memalloc_flags_restore(flags); } #ifdef CONFIG_MEMCG -- 2.43.0