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 9F93DC433F5 for ; Sat, 7 May 2022 22:49:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344671AbiEGWxD (ORCPT ); Sat, 7 May 2022 18:53:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33498 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231174AbiEGWxC (ORCPT ); Sat, 7 May 2022 18:53:02 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B142E1EC42 for ; Sat, 7 May 2022 15:49:14 -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 554B8B80CCC for ; Sat, 7 May 2022 22:49:13 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EE440C385A5; Sat, 7 May 2022 22:49:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1651963752; bh=mYCGLA1xwcE2/eM3lLD32EISLuQKjo1bbpIwPEzaysc=; h=Date:To:From:Subject:From; b=pzUalElbbWclMlYKMLmama4X8FjN7HUQWIXmM5rzgNdQcm+GteC2HOAFa0HeosNWi uPoBuPt5o1VKBuAGOULQbvco1gSD43Zyn1ZURATNAJMTvgOcn6Sc+sZgiF1o+TEFvO nNRXz84rDk05sAHPUueJUjWj5B91jNmNz7RTLuks= Date: Sat, 07 May 2022 15:49:11 -0700 To: mm-commits@vger.kernel.org, vvs@openvz.org, rostedt@goodmis.org, mingo@redhat.com, akpm@linux-foundation.org, akpm@linux-foundation.org From: Andrew Morton Subject: + tracing-incorrect-gfp_t-conversion-fix.patch added to mm-unstable branch Message-Id: <20220507224911.EE440C385A5@smtp.kernel.org> Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The patch titled Subject: tracing-incorrect-gfp_t-conversion-fix has been added to the -mm mm-unstable branch. Its filename is tracing-incorrect-gfp_t-conversion-fix.patch This patch should soon appear in the mm-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via the mm-everything branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there every 2-3 working days ------------------------------------------------------ From: Andrew Morton Subject: tracing-incorrect-gfp_t-conversion-fix add FUL macro for readability Cc: Ingo Molnar Cc: Steven Rostedt Cc: Vasily Averin Signed-off-by: Andrew Morton --- include/trace/events/mmflags.h | 84 ++++++++++++++++--------------- 1 file changed, 44 insertions(+), 40 deletions(-) --- a/include/trace/events/mmflags.h~tracing-incorrect-gfp_t-conversion-fix +++ a/include/trace/events/mmflags.h @@ -13,53 +13,57 @@ * Thus most bits set go first. */ +#define FUL __force unsigned long + #define __def_gfpflag_names \ - {(__force unsigned long)GFP_TRANSHUGE, "GFP_TRANSHUGE"}, \ - {(__force unsigned long)GFP_TRANSHUGE_LIGHT, "GFP_TRANSHUGE_LIGHT"}, \ - {(__force unsigned long)GFP_HIGHUSER_MOVABLE, "GFP_HIGHUSER_MOVABLE"},\ - {(__force unsigned long)GFP_HIGHUSER, "GFP_HIGHUSER"}, \ - {(__force unsigned long)GFP_USER, "GFP_USER"}, \ - {(__force unsigned long)GFP_KERNEL_ACCOUNT, "GFP_KERNEL_ACCOUNT"}, \ - {(__force unsigned long)GFP_KERNEL, "GFP_KERNEL"}, \ - {(__force unsigned long)GFP_NOFS, "GFP_NOFS"}, \ - {(__force unsigned long)GFP_ATOMIC, "GFP_ATOMIC"}, \ - {(__force unsigned long)GFP_NOIO, "GFP_NOIO"}, \ - {(__force unsigned long)GFP_NOWAIT, "GFP_NOWAIT"}, \ - {(__force unsigned long)GFP_DMA, "GFP_DMA"}, \ - {(__force unsigned long)__GFP_HIGHMEM, "__GFP_HIGHMEM"}, \ - {(__force unsigned long)GFP_DMA32, "GFP_DMA32"}, \ - {(__force unsigned long)__GFP_HIGH, "__GFP_HIGH"}, \ - {(__force unsigned long)__GFP_ATOMIC, "__GFP_ATOMIC"}, \ - {(__force unsigned long)__GFP_IO, "__GFP_IO"}, \ - {(__force unsigned long)__GFP_FS, "__GFP_FS"}, \ - {(__force unsigned long)__GFP_NOWARN, "__GFP_NOWARN"}, \ - {(__force unsigned long)__GFP_RETRY_MAYFAIL, "__GFP_RETRY_MAYFAIL"}, \ - {(__force unsigned long)__GFP_NOFAIL, "__GFP_NOFAIL"}, \ - {(__force unsigned long)__GFP_NORETRY, "__GFP_NORETRY"}, \ - {(__force unsigned long)__GFP_COMP, "__GFP_COMP"}, \ - {(__force unsigned long)__GFP_ZERO, "__GFP_ZERO"}, \ - {(__force unsigned long)__GFP_NOMEMALLOC, "__GFP_NOMEMALLOC"}, \ - {(__force unsigned long)__GFP_MEMALLOC, "__GFP_MEMALLOC"}, \ - {(__force unsigned long)__GFP_HARDWALL, "__GFP_HARDWALL"}, \ - {(__force unsigned long)__GFP_THISNODE, "__GFP_THISNODE"}, \ - {(__force unsigned long)__GFP_RECLAIMABLE, "__GFP_RECLAIMABLE"}, \ - {(__force unsigned long)__GFP_MOVABLE, "__GFP_MOVABLE"}, \ - {(__force unsigned long)__GFP_ACCOUNT, "__GFP_ACCOUNT"}, \ - {(__force unsigned long)__GFP_WRITE, "__GFP_WRITE"}, \ - {(__force unsigned long)__GFP_RECLAIM, "__GFP_RECLAIM"}, \ - {(__force unsigned long)__GFP_DIRECT_RECLAIM, "__GFP_DIRECT_RECLAIM"},\ - {(__force unsigned long)__GFP_KSWAPD_RECLAIM, "__GFP_KSWAPD_RECLAIM"},\ - {(__force unsigned long)__GFP_ZEROTAGS, "__GFP_ZEROTAGS"} \ + {(FUL)GFP_TRANSHUGE, "GFP_TRANSHUGE"}, \ + {(FUL)GFP_TRANSHUGE_LIGHT, "GFP_TRANSHUGE_LIGHT"}, \ + {(FUL)GFP_HIGHUSER_MOVABLE, "GFP_HIGHUSER_MOVABLE"}, \ + {(FUL)GFP_HIGHUSER, "GFP_HIGHUSER"}, \ + {(FUL)GFP_USER, "GFP_USER"}, \ + {(FUL)GFP_KERNEL_ACCOUNT, "GFP_KERNEL_ACCOUNT"}, \ + {(FUL)GFP_KERNEL, "GFP_KERNEL"}, \ + {(FUL)GFP_NOFS, "GFP_NOFS"}, \ + {(FUL)GFP_ATOMIC, "GFP_ATOMIC"}, \ + {(FUL)GFP_NOIO, "GFP_NOIO"}, \ + {(FUL)GFP_NOWAIT, "GFP_NOWAIT"}, \ + {(FUL)GFP_DMA, "GFP_DMA"}, \ + {(FUL)__GFP_HIGHMEM, "__GFP_HIGHMEM"}, \ + {(FUL)GFP_DMA32, "GFP_DMA32"}, \ + {(FUL)__GFP_HIGH, "__GFP_HIGH"}, \ + {(FUL)__GFP_ATOMIC, "__GFP_ATOMIC"}, \ + {(FUL)__GFP_IO, "__GFP_IO"}, \ + {(FUL)__GFP_FS, "__GFP_FS"}, \ + {(FUL)__GFP_NOWARN, "__GFP_NOWARN"}, \ + {(FUL)__GFP_RETRY_MAYFAIL, "__GFP_RETRY_MAYFAIL"}, \ + {(FUL)__GFP_NOFAIL, "__GFP_NOFAIL"}, \ + {(FUL)__GFP_NORETRY, "__GFP_NORETRY"}, \ + {(FUL)__GFP_COMP, "__GFP_COMP"}, \ + {(FUL)__GFP_ZERO, "__GFP_ZERO"}, \ + {(FUL)__GFP_NOMEMALLOC, "__GFP_NOMEMALLOC"}, \ + {(FUL)__GFP_MEMALLOC, "__GFP_MEMALLOC"}, \ + {(FUL)__GFP_HARDWALL, "__GFP_HARDWALL"}, \ + {(FUL)__GFP_THISNODE, "__GFP_THISNODE"}, \ + {(FUL)__GFP_RECLAIMABLE, "__GFP_RECLAIMABLE"}, \ + {(FUL)__GFP_MOVABLE, "__GFP_MOVABLE"}, \ + {(FUL)__GFP_ACCOUNT, "__GFP_ACCOUNT"}, \ + {(FUL)__GFP_WRITE, "__GFP_WRITE"}, \ + {(FUL)__GFP_RECLAIM, "__GFP_RECLAIM"}, \ + {(FUL)__GFP_DIRECT_RECLAIM, "__GFP_DIRECT_RECLAIM"}, \ + {(FUL)__GFP_KSWAPD_RECLAIM, "__GFP_KSWAPD_RECLAIM"}, \ + {(FUL)__GFP_ZEROTAGS, "__GFP_ZEROTAGS"} \ #ifdef CONFIG_KASAN_HW_TAGS -#define __def_gfpflag_names_kasan , \ - {(__force unsigned long)__GFP_SKIP_ZERO, "__GFP_SKIP_ZERO"}, \ - {(__force unsigned long)__GFP_SKIP_KASAN_POISON, "__GFP_SKIP_KASAN_POISON"}, \ - {(__force unsigned long)__GFP_SKIP_KASAN_UNPOISON, "__GFP_SKIP_KASAN_UNPOISON"} +#define __def_gfpflag_names_kasan , \ + {(FUL)__GFP_SKIP_ZERO, "__GFP_SKIP_ZERO"}, \ + {(FUL)__GFP_SKIP_KASAN_POISON, "__GFP_SKIP_KASAN_POISON"}, \ + {(FUL)__GFP_SKIP_KASAN_UNPOISON,"__GFP_SKIP_KASAN_UNPOISON"} #else #define __def_gfpflag_names_kasan #endif +#undef FUL + #define show_gfp_flags(flags) \ (flags) ? __print_flags(flags, "|", \ __def_gfpflag_names __def_gfpflag_names_kasan \ _ Patches currently in -mm which might be from akpm@linux-foundation.org are mm-create-new-mm-swaph-header-file-fix.patch mm-page_alloc-cache-the-result-of-node_dirty_ok-fix.patch mm-check-against-orig_pte-for-finish_fault-fix-checkpatch-fixes.patch mm-hugetlb-only-drop-uffd-wp-special-pte-if-required-fix-fix.patch kfence-enable-check-kfence-canary-on-panic-via-boot-param-fix.patch lib-kstrtoxc-add-false-true-support-to-kstrtobool-fix.patch mm-vmscan-not-necessary-to-re-init-the-list-for-each-iteration-fix.patch mm-make-minimum-slab-alignment-a-runtime-property-fix.patch tracing-incorrect-gfp_t-conversion-fix.patch proc-fix-dentry-inode-overinstantiating-under-proc-pid-net-checkpatch-fixes.patch linux-next-rejects.patch linux-next-git-rejects.patch mm-oom_killc-fix-vm_oom_kill_table-ifdeffery.patch