From patchwork Tue Jan 8 18:30:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Souptick Joarder X-Patchwork-Id: 10752741 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 C0F816C5 for ; Tue, 8 Jan 2019 18:26:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ACBCF274D1 for ; Tue, 8 Jan 2019 18:26:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9F97728F9E; Tue, 8 Jan 2019 18:26:48 +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=-1.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_WEB autolearn=no 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 0C532274D1 for ; Tue, 8 Jan 2019 18:26:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A16788E0089; Tue, 8 Jan 2019 13:26:46 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 9C4928E0038; Tue, 8 Jan 2019 13:26:46 -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 88C858E0089; Tue, 8 Jan 2019 13:26:46 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f200.google.com (mail-pg1-f200.google.com [209.85.215.200]) by kanga.kvack.org (Postfix) with ESMTP id 472C68E0038 for ; Tue, 8 Jan 2019 13:26:46 -0500 (EST) Received: by mail-pg1-f200.google.com with SMTP id o17so2510582pgi.14 for ; Tue, 08 Jan 2019 10:26:46 -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=02FYkxkdddN2o1fGBS8B3+8cHgKPZ0kLhiYW918v5Os=; b=XZA82+7i4zNRvT05y++J09wJMABfSPzL9JUkAT+UkM0jdDeKem9KUxLdRDRQ6MJUTR tQ12SC8G7sSp/91l1rGZ8rnU9POmkqEu7SQ+QUQ8BRUPZomI0yv/cLk5saW+o5BOurd9 vTL8Fzf0QPWk4S/Dt4kRjpzPjubns0na6ZLzrXd3/oJ3zFvQYH/4oqLbX0njEnlejmOb U3UDZDQMwT0qghv/NjRA6kNtTUPzHCPyzRsxgvdZNr6ojtQHuqTS4Q2HmZTv1JvhsBLm 6Th/M9W5+1c4dKD7RcH83DyhB1VL0kgMcf7qPovQCYNmvprOFS24qM/2SxpZbryCnM5N +SQg== X-Gm-Message-State: AJcUukf4hTbAjQggBc67ep3zj2OtE0z/bcaA2AFG3rkSeuH/zouu0RBU lbV6munZcrJqVqNi8mgJAhSl7m4xbsbMDkj2YA3IIvFR3LXlCUoU5yi08NC3kE1vAOfHHABAceY he+cztM29THkkz+/kNBxkvfe1aWF3n42H611Wg1o6/len82oGQtVJmBy3WetVM1igO19pOqumOd aJI/qnzDjpOGjxYwgJVOI7LN1agXQli9/X+gie6ou+ZcbfCiiX25vwOqMS1QG41OtTwrSyWky5W XF/+xPXkVS4PdUrCkQ2eX4MQ1pAFxG53Jp+KJ7UMphhnf4i98zUyzCvvnOAN5j0sp+7BcLWf2lm YZ1Ki2gG1yrsaWqZ8JOL9Lu36B4leoTMtjTEXKsE+3WeM9TBFN4l8W1D1VOiXOwef95o0dqbPPS 8 X-Received: by 2002:a17:902:48:: with SMTP id 66mr2763353pla.68.1546972005785; Tue, 08 Jan 2019 10:26:45 -0800 (PST) X-Received: by 2002:a17:902:48:: with SMTP id 66mr2763309pla.68.1546972004704; Tue, 08 Jan 2019 10:26:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546972004; cv=none; d=google.com; s=arc-20160816; b=aAEGrEFnVvEkhkiLZm2z3+rzyCnFaD+S9Ac5nWvpHRqEVscpQBhXmQW1K4SYfyAjwo ON4WplPbqpPuTom7hNNqtBFor/Phghu3LjBJPN9fcByUpERBEgs4Rp2DK7VBVN3P3fGF YYc2f/oPhOfxFjP/JpTrtCzwkohlOEz9RmRq3ANGMj2FBH5+vei2cJeV9jqKYCIYwBBi GALAVwaUJwuq2HCXgHANChg0vNDF/vKrgQPIg/+ChK4cP4Ums+Ke6OBU93WFc+R6tUxa K1Xo2NndHm9QEtVqNdecwxA+TbFwQOmVzW43cpFMrdS1chZmpw1TKVh5wilIVvYkZwT9 DFnw== 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=02FYkxkdddN2o1fGBS8B3+8cHgKPZ0kLhiYW918v5Os=; b=q6DXfTXsuybTR+V9UJt2BUdCbDy0f4EIV4AcC4DZLcr65wQtDHS6RpXl3ZwyZQvuKe XHzuHIe80dITaSnPvUiR++29m8HozbQAaihTkPa38h8BCkI42Q+YeSO9zecQT0r13q0t tDjiNR1vuqNEa2dJufyzAATmfWXz0OpoFgm8v9UPkiu4/vj2rcrtTf7sN/TYiGjlvDgv CWMJChi4BFsM0bDPHlb83VY6A97aic+67xzypQKO1cQ20WuqmX7Hs2fY4EBjQcs4iGk1 wQqwHorvIuhS6TW8QO7ZCJ0k6m4Shk3a4h5h2BEs1wFZasEFR7b5gtw3BKYcOiFu8zgE QSyQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=Q1Pqi6Dc; 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 m3sor42574667plt.31.2019.01.08.10.26.44 for (Google Transport Security); Tue, 08 Jan 2019 10:26:44 -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=Q1Pqi6Dc; 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=02FYkxkdddN2o1fGBS8B3+8cHgKPZ0kLhiYW918v5Os=; b=Q1Pqi6DcR4TrzVlQC3WcEv3td/rFnTnfeiOHbiPpACFoiXtpHXZ9B5CK9VCI/+qBtP kGQnrorhDkvakzjrOximib4wbbNG4RRq5QiQXPVjmbWiVSXgo/ibsljwV52D5WwCdns9 bngzB028B2KCMsT3RqmqBWUcUr9GmejD1xI884r4ziqvwtp0/R/PXP3RWSVogibW6xYh 6T/ZCHxmXgQBekrd4Rfa7rpW15E2oevUIwEzgtgntIrIDUyUyEyS8r6Z86hJWWst1U1x wrxc2ZR+oAjQRGaPoQRSRdIwuWCveoq1rir9k8RbckDPhukXfvfCuZMBCNs1EmJH5bi3 CdlA== X-Google-Smtp-Source: ALg8bN5cQotmlVMRl3dOzjG8RfmzUCPFzvfFkdglAYi6jXAgKIuEeANV8FJjRlvzS7dg0HntWpJsRg== X-Received: by 2002:a17:902:8e8b:: with SMTP id bg11mr2899154plb.332.1546972004186; Tue, 08 Jan 2019 10:26:44 -0800 (PST) Received: from jordon-HP-15-Notebook-PC ([49.207.53.156]) by smtp.gmail.com with ESMTPSA id t21sm99594908pgg.24.2019.01.08.10.26.41 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 08 Jan 2019 10:26:42 -0800 (PST) Date: Wed, 9 Jan 2019 00:00:41 +0530 From: Souptick Joarder To: akpm@linux-foundation.org Cc: rppt@linux.ibm.com, mhocko@suse.com, dan.j.williams@intel.com, willy@infradead.org, kirill.shutemov@linux.intel.com, vbabka@suse.cz, riel@redhat.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, william.kucharski@oracle.com Subject: [PATCH v4] mm: Create the new vm_fault_t type Message-ID: <20190108183041.GA12137@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 Reviewed-by: Matthew Wilcox --- 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. v4: Reviewed by William and Mike ( for docs part). 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]". */