Received: by 2002:ac0:a594:0:0:0:0:0 with SMTP id m20-v6csp478707imm; Mon, 21 May 2018 09:03:44 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqJR5uz1r9xLbZxN3iqfi9PA6wgLFPBxAtAszbCTwya5UmRFRjqeOzpeZn3A7zKPaxQisNu X-Received: by 2002:a63:ba17:: with SMTP id k23-v6mr8144640pgf.47.1526918623948; Mon, 21 May 2018 09:03:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526918623; cv=none; d=google.com; s=arc-20160816; b=Zfg7lSQRJD3qTihSSY9FcThk+FHIaThteQNKADVc6hgHqHhE1ZtqXKLoMS3mTstevU 8C2oqbJtFX280YMLO5UDSPaAGmMUlYmABvhgV3CHTAISyZBbfTk2GEcnedbjxfkqGGQv YSTyFmsdSg4GF2aFAak+BfeHKY2VEyXeSAMCIa7XUh7mTChqvzRAUAwXuLsgDm1duM5i 2sZu1sr2XvcQRlTtKx3NVQkVgvstihzBW1bor+5aqVrOl4NIjmsEV9gREuEL3wtXIUoq t7Qnz+RLZCWp7GiF6Hm2Wg4MM1BZ8cHqxS3BOWe4nw0LDRroVEi92Pf2WV0w4KdBw9YB f/oA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=xiyvKUSyAo46Ta8XQem4G1cW/bmr/9e4BVMDXCdj5NA=; b=VJJiOfFD2dPN7aQxb3EU0WqWr6UxFjut1c9Ys99BoBVxSYQCq4KFAM0yfkSedI+DUn zEXajZMcRHUktIDRIcxAt6+lOm8teEoKbAJ5+2aK7/lEcVFQqxD/sk8Qs7sx/YpoUkTn Zj4UP32pTP+syvjUNxerbvEBJvrTirIxCLbHGV/hEbCVOtnTTT9vGZrUvRVYAHU1WqvI 7mL0wdFCP993D8C8CRMAkHJAC6tWh/CfYurs6raleVGkXIb3+9OSBUj/NxCmimkORDDV 4ccBULlnP00xVEI15edCZSkQaJz3CaxWB4/4o2mDhKRX1SWIAuSnNXFKtW1o2N80iyOl +TZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@wdc.com header.s=dkim.wdc.com header.b=XXVNqbKH; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t5-v6si11358449pgu.341.2018.05.21.09.03.13; Mon, 21 May 2018 09:03:43 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@wdc.com header.s=dkim.wdc.com header.b=XXVNqbKH; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753091AbeEUQCj (ORCPT + 99 others); Mon, 21 May 2018 12:02:39 -0400 Received: from esa6.hgst.iphmx.com ([216.71.154.45]:59151 "EHLO esa6.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752311AbeEUQC3 (ORCPT ); Mon, 21 May 2018 12:02:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1526918549; x=1558454549; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=L0NW75MMmUGm5WB/BvYl7lqjIJcbfm5fBgwyrgfFks0=; b=XXVNqbKHrCC2g3DxdkDaLwcPSZeTE4suFHei10BmpqHPXxxH8Vt7dHKo SmDwc92rbQyedubmATWY6gJeMFeonqnjdCsIlxWm6K+qvXgZvsgiznanu UqkqpZVAvXKFR8wpMbMgKehW9C+l5ZsUeZ8rMJJiAc4Wi0Qzq6ZvsKsNj 6D9pmOOMEBNngVKylIsrhrFmh+cyRaWFkdaNff+FAIyDyOZooP36BiL4K 1xtDvOrfAcDYc63kfv9g0oYVvNh3MzaHFRs48EMXUsnui/fB6ctVAawf7 XPNo04UhJrZBEv1o25l7mcw0wxXfaCL3VUYajkP7/ZJmVdk2Bs8cK8NMK Q==; X-IronPort-AV: E=Sophos;i="5.49,426,1520870400"; d="scan'208";a="79445389" Received: from uls-op-cesaip01.wdc.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 22 May 2018 00:02:29 +0800 Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep01.wdc.com with ESMTP; 21 May 2018 08:53:25 -0700 Received: from penguito-adamm.sdcorp.global.sandisk.com ([10.11.47.13]) by uls-op-cesaip02.wdc.com with ESMTP; 21 May 2018 09:02:29 -0700 From: adam.manzanares@wdc.com To: viro@zeniv.linux.org.uk, linux-fsdevel@vger.kernel.org, axboe@kernel.dk, bcrl@kvack.org Cc: tglx@linutronix.de, mingo@kernel.org, pombredanne@nexb.com, kstewart@linuxfoundation.org, gregkh@linuxfoundation.org, bigeasy@linutronix.de, jack@suse.cz, darrick.wong@oracle.com, rgoldwyn@suse.com, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, linux-aio@kvack.org, linux-api@vger.kernel.org, hch@infradread.org, Adam Manzanares Subject: [PATCH v5 2/5] fs: Convert kiocb rw_hint from enum to u16 Date: Mon, 21 May 2018 09:01:44 -0700 Message-Id: <20180521160147.2372-3-adam.manzanares@wdc.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180521160147.2372-1-adam.manzanares@wdc.com> References: <20180521160147.2372-1-adam.manzanares@wdc.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Adam Manzanares In order to avoid kiocb bloat for per command iopriority support, rw_hint is converted from enum to a u16. Added a guard around ki_hint assigment. Signed-off-by: Adam Manzanares --- include/linux/fs.h | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/include/linux/fs.h b/include/linux/fs.h index 7f07977bdfd7..50de40dbbb85 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -284,6 +284,8 @@ enum rw_hint { WRITE_LIFE_EXTREME = RWH_WRITE_LIFE_EXTREME, }; +#define MAX_KI_HINT ((1 << 16) - 1) /* ki_hint type is u16 */ + #define IOCB_EVENTFD (1 << 0) #define IOCB_APPEND (1 << 1) #define IOCB_DIRECT (1 << 2) @@ -299,7 +301,7 @@ struct kiocb { void (*ki_complete)(struct kiocb *iocb, long ret, long ret2); void *private; int ki_flags; - enum rw_hint ki_hint; + u16 ki_hint; } __randomize_layout; static inline bool is_sync_kiocb(struct kiocb *kiocb) @@ -1927,12 +1929,19 @@ static inline enum rw_hint file_write_hint(struct file *file) static inline int iocb_flags(struct file *file); +static inline u16 ki_hint_validate(enum rw_hint hint) +{ + if (hint > MAX_KI_HINT) + return 0; + return hint; +} + static inline void init_sync_kiocb(struct kiocb *kiocb, struct file *filp) { *kiocb = (struct kiocb) { .ki_filp = filp, .ki_flags = iocb_flags(filp), - .ki_hint = file_write_hint(filp), + .ki_hint = ki_hint_validate(file_write_hint(filp)), }; } -- 2.15.1