From patchwork Tue Feb 14 12:51:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charan Teja Kalla X-Patchwork-Id: 13140006 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 364A5C05027 for ; Tue, 14 Feb 2023 12:53:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 85F3E6B0073; Tue, 14 Feb 2023 07:53:16 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7E8B26B0074; Tue, 14 Feb 2023 07:53:16 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 662AF6B0075; Tue, 14 Feb 2023 07:53:16 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 5409E6B0073 for ; Tue, 14 Feb 2023 07:53:16 -0500 (EST) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 1D3DB16074B for ; Tue, 14 Feb 2023 12:53:16 +0000 (UTC) X-FDA: 80465887992.29.CC5920F Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) by imf30.hostedemail.com (Postfix) with ESMTP id A82AF8001E for ; Tue, 14 Feb 2023 12:53:13 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=quicinc.com header.s=qcppdkim1 header.b=MQIZLSwk; dmarc=pass (policy=none) header.from=quicinc.com; spf=pass (imf30.hostedemail.com: domain of quic_charante@quicinc.com designates 205.220.168.131 as permitted sender) smtp.mailfrom=quic_charante@quicinc.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1676379194; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=utq4rnGNcKrYozG1C+5fM2HgfaeXqvuWtQXk9hB2XIc=; b=zyk9xdhtvNDadC7FsI3qTcQgLKP0hfeFzLSrZnAVs82EIHEO3VWmWBL8pJKpPV3PhaBk1I CjprLzutpijYfk8MCeD+rupqs+i82RCA7mBoTqn4d5AT/7HnMzG1hMoc5BrWY8Y+9KX+dr WChTiuTdACvXePole/CsH9RblHm8PDY= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=quicinc.com header.s=qcppdkim1 header.b=MQIZLSwk; dmarc=pass (policy=none) header.from=quicinc.com; spf=pass (imf30.hostedemail.com: domain of quic_charante@quicinc.com designates 205.220.168.131 as permitted sender) smtp.mailfrom=quic_charante@quicinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1676379194; a=rsa-sha256; cv=none; b=c/5rSOs3+k8s2xHlbt9N3Kw9KMoV3doiU+Z/ov0iPLRJ7b9fap1kjTEmyZra7WHVsBEgDW xOgnN2XhishimXAH1nvRtB1U+AqyukZrRLyb9MqywyxEiGp1w0/kjh3hnDzSt+D1bmrqaE 8YFvXQ+Sc9VxYEbNbFAbPGyrpsu08bk= Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 31E0fC1t012982; Tue, 14 Feb 2023 12:52:44 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=qcppdkim1; bh=utq4rnGNcKrYozG1C+5fM2HgfaeXqvuWtQXk9hB2XIc=; b=MQIZLSwkcacp6oiVHBe1FurOYTKBqSLMmG4I8VR+4/zgIJyhjHozMV/kGXQMnlo2fwGM bsVe115H+Zo0mgOBg+f6rG0IaQ1GHZmHWjySImCs2H2W+A6qTSxbw4JEpHujifQTFLCQ oze2agpOKw5v6hK2Hj8aS7pnyPNnWKJwTkJNMnbMyJ/wr6BcQ9YZoTMC9wwew01fP4GF KFltPohQBE7wQfaOImuWBpMdjrxB2K6Y7ajkDQMDfK7QzcwClkLPXXu45f3GdLei+m8O qhMIw50hR6VkxBxoQwai8X2Th0bw1CJ/KFoz+wMPtSdISpKjnSk74pRkVs/BC63RTb83 Wg== Received: from nalasppmta03.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3nqyygsg8t-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 14 Feb 2023 12:52:43 +0000 Received: from nalasex01a.na.qualcomm.com (nalasex01a.na.qualcomm.com [10.47.209.196]) by NALASPPMTA03.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 31ECqgUX027761 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 14 Feb 2023 12:52:42 GMT 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.36; Tue, 14 Feb 2023 04:52:38 -0800 From: Charan Teja Kalla To: , , , , , , , CC: , , Charan Teja Kalla Subject: [PATCH V7 1/2] mm: fadvise: move 'endbyte' calculations to helper function Date: Tue, 14 Feb 2023 18:21:49 +0530 Message-ID: <22de7e716051abbafc01fab9f479f4d5b03745ca.1676378702.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-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-ORIG-GUID: qsEuu0IDWaNceXdkAideEoef-5w9LH3U X-Proofpoint-GUID: qsEuu0IDWaNceXdkAideEoef-5w9LH3U X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.170.22 definitions=2023-02-14_07,2023-02-14_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 phishscore=0 impostorscore=0 malwarescore=0 adultscore=0 mlxlogscore=753 mlxscore=0 priorityscore=1501 lowpriorityscore=0 spamscore=0 bulkscore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2302140111 X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: A82AF8001E X-Stat-Signature: 459otkzbdaeo88pkpa5cdpbnjssoo3j9 X-HE-Tag: 1676379193-921837 X-HE-Meta: U2FsdGVkX19P1fynyE4F8CmGUTj5hNpXLYPLwOWQJgA9LsK+vWc3LnSxkrHNrAaKndjQ2eQPejjmq0y9JXpGyJ5GQKw/SOA8vuuVbrKPDBi8QD/t3S02cdV2hi3eD18Uncx2xdE2r4vSgiBSiOvavhGOhjqNA0DeSGPTAI0NvU8wPv7wnzy7eZ7jIfDzksILR8wWb4MQ2mZHe7q11Rq1qYSY2YXnsJ/0eIlk+62cs2TxrHFFXhs4qsz7D6eQqG3psqSowQXs5RhF2BBaVCa6Hdwr51jkuHuyyfnBrDEOQUR0zBprJbKeEWdveZ2dfQjS0AxeiCK3mzvzFYjYeY3mkqAt8Lf9AorWMjHruFUJuiLrNT0Vm8NYZHx+SCbredsEtX0JeTmTR8ow9ftw6l2QhMYbYYmJmcPDy5mVSXjJyQyPwoOxPuC1Fk1xx2UPpCJdikoRe6/+FKdl5fGzgOawVz6t/H4nlxYjdWLy7VNHC4Vk4RGrQRt6+Uz8ojDPO+rGAhH+ZpLvKoL/P0+kS4WiKv/yIJLpLDaC2837mUUiZ7elkBXLv+yKCM20lbwWACs5v4EU5gFduFYyFUHoalLlg6LSNhWOuurWF2gnCUhVRpbqQ2bHlO3d9gR8IJXCUncPphaO7UROqd8O8sGJnM7sNvaSQS+rppNi158bUJQmbJvmENnuJ0WbNeW06bDoBu5inA2bY4T6qsUiawebUUZ5qsv6Vj6ruis6qAeA4o+BGNCDhQ8KbWNXmxSCw5sNd8Z14qebjUgXfDy0Rl3np9gAhYsMicbizEiHRdrikQ5eYqoMu1vXr6UCxH0XqBvKumGyXjzwv/sA3B41i4vhNLTJ8Tx+ru2c8QoGXL0UQV3a1yxvry9+7Eao1/ra8wLLOpodnEN/QRRtmRsWXX181hFD9rpYpGLimKiEK6FnmRQfyWw3sRRxq0C2WZHtUzq2pYCABH03eHef9PF7i9WitVN uqVRNG31 dW7gWY+YV09jqzkJPYORNhOpi/9r8tCDDB9pU0CudN53Hq0L+fIkeYD307QJBEXV/QRbvqUV8sDFsbhsY10TbMC9Cm66ntUG1KjQMcX+WY/uWqZKNaRd/0R1BJR0GgUXnoCWJV2+f60t3iC7H1jSArsGF/2y7bvzFfB3LlA8z/Oe+/uFadXvByOz6/eZDtwL+sQdEgCsGzWV0xzrmiBop2RQh4duB9mVOK3mtrVa5xs2ydLo= 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: 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 Kalla --- 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 fb7c5f4..1b3cac5 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 = LLONG_MAX; - 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 dfb37e9..4445e48 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -657,6 +657,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 = LLONG_MAX; + else + endbyte--; /* inclusive */ + + return endbyte; +} + /* Memory initialisation debug and verification */ enum mminit_level { MMINIT_WARNING,