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 60240C433F5 for ; Thu, 21 Apr 2022 19:40:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1392036AbiDUTmY (ORCPT ); Thu, 21 Apr 2022 15:42:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48120 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1382742AbiDUTmX (ORCPT ); Thu, 21 Apr 2022 15:42:23 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 22D874D61B for ; Thu, 21 Apr 2022 12:39:33 -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 B552161B0E for ; Thu, 21 Apr 2022 19:39:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 16F6BC385A5; Thu, 21 Apr 2022 19:39:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1650569972; bh=cwSiyySuj8NmRWoZc9++FyE+PJq/+KifVhixW+J/PpA=; h=Date:To:From:Subject:From; b=RCerWpx4XL5R+hbaTjpqUStYdKdWBinZ+bNc4WF6xMRFzTmEPqFpwHA1ktRnB+MBq 4tW2gZ54bJCPrrJWXqOC/RLZg98EklxYrCuCs7RMeX7iGU+k9ALkUivWMWYHx9hQRR bdpxIT09TxWjkM6wr9lLNolguKQtsVy/iz47Hv+c= Date: Thu, 21 Apr 2022 12:39:31 -0700 To: mm-commits@vger.kernel.org, peterx@redhat.com, lkp@intel.com, akpm@linux-foundation.org, akpm@linux-foundation.org From: Andrew Morton Subject: + mm-hugetlb-only-drop-uffd-wp-special-pte-if-required-fix-fix.patch added to -mm tree Message-Id: <20220421193932.16F6BC385A5@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: mm-hugetlb-only-drop-uffd-wp-special-pte-if-required-fix-fix has been added to the -mm tree. Its filename is mm-hugetlb-only-drop-uffd-wp-special-pte-if-required-fix-fix.patch This patch should soon appear at https://ozlabs.org/~akpm/mmots/broken-out/mm-hugetlb-only-drop-uffd-wp-special-pte-if-required-fix-fix.patch and later at https://ozlabs.org/~akpm/mmotm/broken-out/mm-hugetlb-only-drop-uffd-wp-special-pte-if-required-fix-fix.patch 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 and is updated there every 3-4 working days ------------------------------------------------------ From: Andrew Morton Subject: mm-hugetlb-only-drop-uffd-wp-special-pte-if-required-fix-fix move zap_flags_t from mm.h to hugetlb.h to fix build issues Reported-by: kernel test robot Cc: Peter Xu Signed-off-by: Andrew Morton --- include/linux/hugetlb.h | 10 ++++++++++ include/linux/mm.h | 10 ---------- 2 files changed, 10 insertions(+), 10 deletions(-) --- a/include/linux/hugetlb.h~mm-hugetlb-only-drop-uffd-wp-special-pte-if-required-fix-fix +++ a/include/linux/hugetlb.h @@ -1124,4 +1124,14 @@ bool want_pmd_share(struct vm_area_struc #define flush_hugetlb_tlb_range(vma, addr, end) flush_tlb_range(vma, addr, end) #endif +typedef unsigned int __bitwise zap_flags_t; + +/* + * Whether to drop the pte markers, for example, the uffd-wp information for + * file-backed memory. This should only be specified when we will completely + * drop the page in the mm, either by truncation or unmapping of the vma. By + * default, the flag is not set. + */ +#define ZAP_FLAG_DROP_MARKER ((__force zap_flags_t) BIT(0)) + #endif /* _LINUX_HUGETLB_H */ --- a/include/linux/mm.h~mm-hugetlb-only-drop-uffd-wp-special-pte-if-required-fix-fix +++ a/include/linux/mm.h @@ -3431,14 +3431,4 @@ madvise_set_anon_name(struct mm_struct * } #endif -typedef unsigned int __bitwise zap_flags_t; - -/* - * Whether to drop the pte markers, for example, the uffd-wp information for - * file-backed memory. This should only be specified when we will completely - * drop the page in the mm, either by truncation or unmapping of the vma. By - * default, the flag is not set. - */ -#define ZAP_FLAG_DROP_MARKER ((__force zap_flags_t) BIT(0)) - #endif /* _LINUX_MM_H */ _ Patches currently in -mm which might be from akpm@linux-foundation.org are mm.patch kasan-fix-sleeping-function-called-from-invalid-context-on-rt-kernel-fix.patch mm-create-new-mm-swaph-header-file-fix.patch mm-shmem-make-shmem_init-return-void-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 mm-vmscan-fix-comment-for-current_may_throttle-fix.patch ksm-count-ksm-merging-pages-for-each-process-fix.patch mm-memory_hotplug-refactor-hotadd_init_pgdat-and-try_online_node-checkpatch-fixes.patch proc-fix-dentry-inode-overinstantiating-under-proc-pid-net-checkpatch-fixes.patch fs-proc-kcorec-remove-check-of-list-iterator-against-head-past-the-loop-body-fix.patch add-fat-messages-to-printk-index-checkpatch-fixes.patch linux-next-rejects.patch mm-oom_killc-fix-vm_oom_kill_table-ifdeffery.patch