From patchwork Fri Mar 11 10:43:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charan Teja Kalla X-Patchwork-Id: 12777817 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id B5EA2C433F5 for ; Fri, 11 Mar 2022 10:45:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0F9558D0005; Fri, 11 Mar 2022 05:45:07 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 080BB8D0001; Fri, 11 Mar 2022 05:45:07 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E8C358D0005; Fri, 11 Mar 2022 05:45:06 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (relay.hostedemail.com [64.99.140.27]) by kanga.kvack.org (Postfix) with ESMTP id D66298D0001 for ; Fri, 11 Mar 2022 05:45:06 -0500 (EST) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id A4EE424F6D for ; Fri, 11 Mar 2022 10:45:06 +0000 (UTC) X-FDA: 79231773012.12.30FBB8A Received: from alexa-out-sd-01.qualcomm.com (alexa-out-sd-01.qualcomm.com [199.106.114.38]) by imf17.hostedemail.com (Postfix) with ESMTP id F0BC14001F for ; Fri, 11 Mar 2022 10:45:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; i=@quicinc.com; q=dns/txt; s=qcdkim; t=1646995506; x=1678531506; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=qyQGJ2He+N8AB6+cRhEVM5D86zlY5Me+dRbYbcq+MQQ=; b=wjc2AwIytEzBbYj7M7Y6igMdHuJNv6jWd5Dscew278G+bgXIAs5w2Vdh z17vuTH2D8udbbfKXKdbJHz5PUeODtBtlhWMtJ09byqahgRRFAe7v40zn UVNm5j/6hDsEquMajhbF+SUo2VyQ/WjjKaT6CVTw3LTyVGbbbD7REvM2f g=; Received: from unknown (HELO ironmsg-SD-alpha.qualcomm.com) ([10.53.140.30]) by alexa-out-sd-01.qualcomm.com with ESMTP; 11 Mar 2022 02:45:05 -0800 X-QCInternal: smtphost Received: from nasanex01c.na.qualcomm.com ([10.47.97.222]) by ironmsg-SD-alpha.qualcomm.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Mar 2022 02:45:05 -0800 Received: from nalasex01a.na.qualcomm.com (10.47.209.196) by nasanex01c.na.qualcomm.com (10.47.97.222) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.15; Fri, 11 Mar 2022 02:45:05 -0800 Received: from hu-charante-hyd.qualcomm.com (10.80.80.8) by nalasex01a.na.qualcomm.com (10.47.209.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.15; Fri, 11 Mar 2022 02:45:00 -0800 From: Charan Teja Kalla To: , , , , , , , , , CC: , , Charan Teja Reddy Subject: [PATCH V5,1/2] mm: fadvise: move 'endbyte' calculations to helper function Date: Fri, 11 Mar 2022 16:13:51 +0530 Message-ID: <3dbba7655209709198b4e58ea677160732f3fb3f.1646987674.git.quic_charante@quicinc.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01b.na.qualcomm.com (10.46.141.250) To nalasex01a.na.qualcomm.com (10.47.209.196) X-Stat-Signature: 313qcj5zsqq3j5ooo76okp9ym558y7o7 Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=quicinc.com header.s=qcdkim header.b=wjc2AwIy; spf=pass (imf17.hostedemail.com: domain of quic_charante@quicinc.com designates 199.106.114.38 as permitted sender) smtp.mailfrom=quic_charante@quicinc.com; dmarc=pass (policy=none) header.from=quicinc.com X-Rspam-User: X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: F0BC14001F X-HE-Tag: 1646995505-669081 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000003, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Charan Teja Reddy Move the 'endbyte' calculations that determines last byte that fadvise can to a helper function. This is a preparatory change made for shmem_fadvise() functionality in the next patch. No functional changes in this patch. Signed-off-by: Charan Teja Reddy --- Changes in V5: -- Moved the 'endbyte' calculation to a helper function. -- This patch is newly raised in V5 thus no change exists from v1 to v4. mm/fadvise.c | 11 +---------- mm/internal.h | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/mm/fadvise.c b/mm/fadvise.c index d6baa4f..086e929 100644 --- a/mm/fadvise.c +++ b/mm/fadvise.c @@ -65,16 +65,7 @@ int generic_fadvise(struct file *file, loff_t offset, loff_t len, int advice) return 0; } - /* - * Careful about overflows. Len == 0 means "as much as possible". Use - * unsigned math because signed overflows are undefined and UBSan - * complains. - */ - endbyte = (u64)offset + (u64)len; - if (!len || endbyte < len) - endbyte = -1; - else - endbyte--; /* inclusive */ + endbyte = fadvise_calc_endbyte(offset, len); switch (advice) { case POSIX_FADV_NORMAL: diff --git a/mm/internal.h b/mm/internal.h index d8030039..91bb17d 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -506,6 +506,27 @@ static inline void vunmap_range_noflush(unsigned long start, unsigned long end) #endif /* !CONFIG_MMU */ /* + * Helper function to get the endbyte of a file that fadvise can operate on. + */ +static inline loff_t fadvise_calc_endbyte(loff_t offset, loff_t len) +{ + loff_t endbyte; + + /* + * Careful about overflows. Len == 0 means "as much as possible". Use + * unsigned math because signed overflows are undefined and UBSan + * complains. + */ + endbyte = (u64)offset + (u64)len; + if (!len || endbyte < len) + endbyte = -1; + else + endbyte--; /* inclusive */ + + return endbyte; +} + +/* * Return the mem_map entry representing the 'offset' subpage within * the maximally aligned gigantic page 'base'. Handle any discontiguity * in the mem_map at MAX_ORDER_NR_PAGES boundaries.