From patchwork Tue Nov 6 12:06:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Souptick Joarder X-Patchwork-Id: 10670181 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 39BF315E9 for ; Tue, 6 Nov 2018 12:03:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 26E192A3B6 for ; Tue, 6 Nov 2018 12:03:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1B28B2A3D7; Tue, 6 Nov 2018 12:03:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5E81E2A3C1 for ; Tue, 6 Nov 2018 12:03:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CB5DF6B0312; Tue, 6 Nov 2018 07:03:14 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id C3CA76B0316; Tue, 6 Nov 2018 07:03:14 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B2B3E6B0318; Tue, 6 Nov 2018 07:03:14 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) by kanga.kvack.org (Postfix) with ESMTP id 6E6A66B0312 for ; Tue, 6 Nov 2018 07:03:14 -0500 (EST) Received: by mail-pl1-f200.google.com with SMTP id w10-v6so11648542plz.0 for ; Tue, 06 Nov 2018 04:03:14 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:date:from:to:cc:subject :message-id:mime-version:content-disposition:user-agent; bh=RiHdbdvqYpYTFAYcZLs7KWL1xgogOKzdaojbQFdACIM=; b=iAXwGl5FzxMhQzu4v+5D+u7P6uO4qm7YtavD/uM9wIF57SeF32RC3Ns/AOx8Hh4ZOw aCa6K6expXD7D5+ZNHTEAL0ssphUYi1gq7hrFHdLJroysKG7y09TY0fxeHT3XgND1lTT 7nMbU1Xln3QJGl2PSgMjVCs8oxHlB84Ny52z+m8M4QZ8N7ulPmtJtV2AWQwP1aZtQhGf 6ngL3zK/M2Mf9PYTznPDn4/1CdpzvBJP4m/YjqKq3z7bhUajsIvBFtKoCP1XCTzY1AfW mLMiagxGy8mNG70ykgFAIUjg1zYLk9nZexouTeI9bKwlQTppPHO3+BonutjkB9jn43NF jYew== X-Gm-Message-State: AGRZ1gJRmBneQCLpPeizwMVZEck6RVoEg0dPrdp+aF5YNHiMmmN1o5fu gVE8jn9bnD8ywKFJP1gECWzdpvS7F9tWt1KSK1lR3nFJcYDPrJREF4EjAV5S/NG4lA7oLxL8+9/ 0xkK3vIBsDVKQMKmc66r8h2ktFXib6ZdxiE0tw3KDa/JginElSrx7WNUa/KXxqX335562s4IoT0 ec4U1t3fCCU2zKMcZqA8wz0FGN68yttPiUE/Ir1IdL2ZicHPXZ5lzuciMixpaBjz1Z00bfcgtmR eVrG7+IOr1IwPZ+3WJ38CyqzoU6LkYT/Sb3WAbtmu16xR3J4iWtk538+ZKzGliZnrZ268KmUnXH 8F4wHsMDFNHD4SL0YF51SZzVUnXoQWZYMFEkh10W3JUlgeYpIIuN9U+iietcHZA7KYiMnX0eCSH V X-Received: by 2002:a63:a84a:: with SMTP id i10mr23898354pgp.263.1541505793874; Tue, 06 Nov 2018 04:03:13 -0800 (PST) X-Received: by 2002:a63:a84a:: with SMTP id i10mr23898270pgp.263.1541505792644; Tue, 06 Nov 2018 04:03:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541505792; cv=none; d=google.com; s=arc-20160816; b=EYqYKbVlrjpquXx3hjERFCWxIkCUanTndcd8kiS5cRe8ndFC5ghnQIABLJ0her6RO4 jIi4kN4VB/N1+RVTkzOMuLwnd/tjfCJJIPWhTEn0881Zwt+c+2iLWjdK/wXIx86CcIko SltLA6LoQK0J8wPq3aqQISJCxipUzmarQhqpFqesIvPdyK8uIZPGaJQ4CHIcnyIuKawU 9yuqsdVJnL5JSTBU6R1ygQ9Io3HB5LOW/Hk/iowORz19RQ37/XANGjT62+R1+LvfHhm6 bJVtfzHq/h3OUO61XzUimNSdJDNOWfNAhnaegP3KFuHJcx1UwJgLEGSVZNOy1tEn/ckH h7tw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=user-agent:content-disposition:mime-version:message-id:subject:cc :to:from:date:dkim-signature; bh=RiHdbdvqYpYTFAYcZLs7KWL1xgogOKzdaojbQFdACIM=; b=qOD1FKLD0nWcrkUp3TGCS05hCDqLLKwXzzU/NlBNR83ckRcfrZQUg8n8Pv0gul4P3N kFykoZsICijVN70NtN/EZ/UduLYZVuwIjFvzSwocrst2InfKAXZu5VgPOX573NqO5nC1 kQaCeEQx6oZ0NFwmH0hKfCqn9feqXielmQAjK3oCO7a9QfV0yhQo2fsGlbxEErh12uCi JoYiPpJ1Xn0ZGgNncVZbNkE27SPj4cYyqBYRpdkFaX2TqboDZOdtmF1IcnnSIP4aA734 8NyQnQxIDmVPaKBnOTAPEmN6g1xRL4s382x/iRI2vUZhMOrIfyzxbfp2iqejxmoxsD5x bacA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=EDOikO6A; spf=pass (google.com: domain of jrdr.linux@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jrdr.linux@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id y2sor7936365pgp.16.2018.11.06.04.03.12 for (Google Transport Security); Tue, 06 Nov 2018 04:03:12 -0800 (PST) Received-SPF: pass (google.com: domain of jrdr.linux@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=EDOikO6A; spf=pass (google.com: domain of jrdr.linux@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jrdr.linux@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :user-agent; bh=RiHdbdvqYpYTFAYcZLs7KWL1xgogOKzdaojbQFdACIM=; b=EDOikO6AVzvimyPTNvfFb5UQuBcVJLYRC9L14XuTNNVWclyf/qegleCt9wHiRxeIyU cs5uOmJ8FpSQCEphkY+ApQffUoE9efK0fOnIv3+2nmDQn0tRNhSf7bZTv5lNGiGjE+J1 ZBlMPGglgJlYez610J6cVh3z2lbff7aEPU6ExGJSFaRMAEAx5NKaoLYt7J0mwQfncf8a 3jR/gwnuzfPc0GBrlEzQRCLPqzxCxuT6Q+uf2JjmZXnMhqi+KbVD23ahlrvQlxyNqyKF fj+/AvFiMMyp/wt4K4rqmucDjHX8+CvTj25Pk3MP6i3ZuC8OKPduUHewh4o3GA7O5Wz3 Hr0Q== X-Google-Smtp-Source: AJdET5eQmH7DlbFkiuwX4T6yni3iA7+FjnvWIuYtVXRT7JxIwk4NvoYdogbT9NwD3EVLeJnSAV6gzw== X-Received: by 2002:a63:2e02:: with SMTP id u2mr3622802pgu.9.1541505791918; Tue, 06 Nov 2018 04:03:11 -0800 (PST) Received: from jordon-HP-15-Notebook-PC ([103.227.97.195]) by smtp.gmail.com with ESMTPSA id y144-v6sm66553044pfb.81.2018.11.06.04.03.10 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 06 Nov 2018 04:03:10 -0800 (PST) Date: Tue, 6 Nov 2018 17:36:42 +0530 From: Souptick Joarder To: willy@infradead.org, akpm@linux-foundation.org, mhocko@suse.com, kirill.shutemov@linux.intel.com, dan.j.williams@intel.com, vbabka@suse.cz, riel@redhat.com, rppt@linux.ibm.com Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v3] mm: Create the new vm_fault_t type Message-ID: <20181106120544.GA3783@jordon-HP-15-Notebook-PC> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) 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: X-Virus-Scanned: ClamAV using ClamSMTP Page fault handlers are supposed to return VM_FAULT codes, but some drivers/file systems mistakenly return error numbers. Now that all drivers/file systems have been converted to use the vm_fault_t return type, change the type definition to no longer be compatible with 'int'. By making it an unsigned int, the function prototype becomes incompatible with a function which returns int. Sparse will detect any attempts to return a value which is not a VM_FAULT code. VM_FAULT_SET_HINDEX and VM_FAULT_GET_HINDEX values are changed to avoid conflict with other VM_FAULT codes. Signed-off-by: Souptick Joarder Reviewed-by: William Kucharski Reviewed-by: Mike Rapoport --- v2: Updated the change log and corrected the document part. name added to the enum that kernel-doc able to parse it. v3: Corrected the documentation. include/linux/mm.h | 46 ------------------------------ include/linux/mm_types.h | 73 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 72 insertions(+), 47 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index fcf9cc9..511a3ce 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1267,52 +1267,6 @@ static inline void clear_page_pfmemalloc(struct page *page) } /* - * Different kinds of faults, as returned by handle_mm_fault(). - * Used to decide whether a process gets delivered SIGBUS or - * just gets major/minor fault counters bumped up. - */ - -#define VM_FAULT_OOM 0x0001 -#define VM_FAULT_SIGBUS 0x0002 -#define VM_FAULT_MAJOR 0x0004 -#define VM_FAULT_WRITE 0x0008 /* Special case for get_user_pages */ -#define VM_FAULT_HWPOISON 0x0010 /* Hit poisoned small page */ -#define VM_FAULT_HWPOISON_LARGE 0x0020 /* Hit poisoned large page. Index encoded in upper bits */ -#define VM_FAULT_SIGSEGV 0x0040 - -#define VM_FAULT_NOPAGE 0x0100 /* ->fault installed the pte, not return page */ -#define VM_FAULT_LOCKED 0x0200 /* ->fault locked the returned page */ -#define VM_FAULT_RETRY 0x0400 /* ->fault blocked, must retry */ -#define VM_FAULT_FALLBACK 0x0800 /* huge page fault failed, fall back to small */ -#define VM_FAULT_DONE_COW 0x1000 /* ->fault has fully handled COW */ -#define VM_FAULT_NEEDDSYNC 0x2000 /* ->fault did not modify page tables - * and needs fsync() to complete (for - * synchronous page faults in DAX) */ - -#define VM_FAULT_ERROR (VM_FAULT_OOM | VM_FAULT_SIGBUS | VM_FAULT_SIGSEGV | \ - VM_FAULT_HWPOISON | VM_FAULT_HWPOISON_LARGE | \ - VM_FAULT_FALLBACK) - -#define VM_FAULT_RESULT_TRACE \ - { VM_FAULT_OOM, "OOM" }, \ - { VM_FAULT_SIGBUS, "SIGBUS" }, \ - { VM_FAULT_MAJOR, "MAJOR" }, \ - { VM_FAULT_WRITE, "WRITE" }, \ - { VM_FAULT_HWPOISON, "HWPOISON" }, \ - { VM_FAULT_HWPOISON_LARGE, "HWPOISON_LARGE" }, \ - { VM_FAULT_SIGSEGV, "SIGSEGV" }, \ - { VM_FAULT_NOPAGE, "NOPAGE" }, \ - { VM_FAULT_LOCKED, "LOCKED" }, \ - { VM_FAULT_RETRY, "RETRY" }, \ - { VM_FAULT_FALLBACK, "FALLBACK" }, \ - { VM_FAULT_DONE_COW, "DONE_COW" }, \ - { VM_FAULT_NEEDDSYNC, "NEEDDSYNC" } - -/* Encode hstate index for a hwpoisoned large page */ -#define VM_FAULT_SET_HINDEX(x) ((x) << 12) -#define VM_FAULT_GET_HINDEX(x) (((x) >> 12) & 0xf) - -/* * Can be called by the pagefault handler when it gets a VM_FAULT_OOM. */ extern void pagefault_out_of_memory(void); diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index 5ed8f62..cb25016 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -22,7 +22,6 @@ #endif #define AT_VECTOR_SIZE (2*(AT_VECTOR_SIZE_ARCH + AT_VECTOR_SIZE_BASE + 1)) -typedef int vm_fault_t; struct address_space; struct mem_cgroup; @@ -609,6 +608,78 @@ static inline bool mm_tlb_flush_nested(struct mm_struct *mm) struct vm_fault; +/** + * typedef vm_fault_t - Return type for page fault handlers. + * + * Page fault handlers return a bitmask of %VM_FAULT values. + */ +typedef __bitwise unsigned int vm_fault_t; + +/** + * enum vm_fault_reason - Page fault handlers return a bitmask of + * these values to tell the core VM what happened when handling the + * fault. Used to decide whether a process gets delivered SIGBUS or + * just gets major/minor fault counters bumped up. + * + * @VM_FAULT_OOM: Out Of Memory + * @VM_FAULT_SIGBUS: Bad access + * @VM_FAULT_MAJOR: Page read from storage + * @VM_FAULT_WRITE: Special case for get_user_pages + * @VM_FAULT_HWPOISON: Hit poisoned small page + * @VM_FAULT_HWPOISON_LARGE: Hit poisoned large page. Index encoded + * in upper bits + * @VM_FAULT_SIGSEGV: segmentation fault + * @VM_FAULT_NOPAGE: ->fault installed the pte, not return page + * @VM_FAULT_LOCKED: ->fault locked the returned page + * @VM_FAULT_RETRY: ->fault blocked, must retry + * @VM_FAULT_FALLBACK: huge page fault failed, fall back to small + * @VM_FAULT_DONE_COW: ->fault has fully handled COW + * @VM_FAULT_NEEDDSYNC: ->fault did not modify page tables and needs + * fsync() to complete (for synchronous page faults + * in DAX) + * @VM_FAULT_HINDEX_MASK: mask HINDEX value + * + */ +enum vm_fault_reason { + VM_FAULT_OOM = (__force vm_fault_t)0x000001, + VM_FAULT_SIGBUS = (__force vm_fault_t)0x000002, + VM_FAULT_MAJOR = (__force vm_fault_t)0x000004, + VM_FAULT_WRITE = (__force vm_fault_t)0x000008, + VM_FAULT_HWPOISON = (__force vm_fault_t)0x000010, + VM_FAULT_HWPOISON_LARGE = (__force vm_fault_t)0x000020, + VM_FAULT_SIGSEGV = (__force vm_fault_t)0x000040, + VM_FAULT_NOPAGE = (__force vm_fault_t)0x000100, + VM_FAULT_LOCKED = (__force vm_fault_t)0x000200, + VM_FAULT_RETRY = (__force vm_fault_t)0x000400, + VM_FAULT_FALLBACK = (__force vm_fault_t)0x000800, + VM_FAULT_DONE_COW = (__force vm_fault_t)0x001000, + VM_FAULT_NEEDDSYNC = (__force vm_fault_t)0x002000, + VM_FAULT_HINDEX_MASK = (__force vm_fault_t)0x0f0000, +}; + +/* Encode hstate index for a hwpoisoned large page */ +#define VM_FAULT_SET_HINDEX(x) ((__force vm_fault_t)((x) << 16)) +#define VM_FAULT_GET_HINDEX(x) (((x) >> 16) & 0xf) + +#define VM_FAULT_ERROR (VM_FAULT_OOM | VM_FAULT_SIGBUS | \ + VM_FAULT_SIGSEGV | VM_FAULT_HWPOISON | \ + VM_FAULT_HWPOISON_LARGE | VM_FAULT_FALLBACK) + +#define VM_FAULT_RESULT_TRACE \ + { VM_FAULT_OOM, "OOM" }, \ + { VM_FAULT_SIGBUS, "SIGBUS" }, \ + { VM_FAULT_MAJOR, "MAJOR" }, \ + { VM_FAULT_WRITE, "WRITE" }, \ + { VM_FAULT_HWPOISON, "HWPOISON" }, \ + { VM_FAULT_HWPOISON_LARGE, "HWPOISON_LARGE" }, \ + { VM_FAULT_SIGSEGV, "SIGSEGV" }, \ + { VM_FAULT_NOPAGE, "NOPAGE" }, \ + { VM_FAULT_LOCKED, "LOCKED" }, \ + { VM_FAULT_RETRY, "RETRY" }, \ + { VM_FAULT_FALLBACK, "FALLBACK" }, \ + { VM_FAULT_DONE_COW, "DONE_COW" }, \ + { VM_FAULT_NEEDDSYNC, "NEEDDSYNC" } + struct vm_special_mapping { const char *name; /* The name, e.g. "[vdso]". */