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: 56907 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2951809wrn; Tue, 14 Feb 2023 04:55:41 -0800 (PST) X-Google-Smtp-Source: AK7set9B7uhiKQ8RqFx0gWtIRe9JaUiAkOgwPxAklTd/xOr+DlHvBVTkW9r+4sd9sS70dPe3jMwi X-Received: by 2002:a17:902:e5ca:b0:199:25d1:e559 with SMTP id u10-20020a170902e5ca00b0019925d1e559mr3220966plf.0.1676379341634; Tue, 14 Feb 2023 04:55:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676379341; cv=none; d=google.com; s=arc-20160816; b=NXoqO+8MYXHskBmEn3FtTa/ekFwxNeKipm5zmr53u8qR/1V4B4Bfny7Wv748GK1Pg0 RKl/5Wxak8yfgqu4MkryRSDU2/KG4oQnt7DJvm3mX9ke1usBUoNaBboUGPepTDuEjo9e Dg1Zi6qIOsQ4l24G84dccChy7I8TenFq6TLwtfmNXQokk6QYyf69fqmSwNUBf+ozLnbY mJAu9OG5l27r70s8rpAww9mi28fGBehOhQ9gaf2kwO6bspIeZicx3+Ryqr6zM/aA/yDX jDlEmR64qo/aRGaFRvASWFEysoeUg3/8ZqgBExKsbHaRtEtpFPVMKb95G8GG8AeCNyNd IqdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=utq4rnGNcKrYozG1C+5fM2HgfaeXqvuWtQXk9hB2XIc=; b=Sj9O94rEE4lUHHU/dXvRA5jVL7kvNkBez1FTgotssVdEwcO5rA0yDYhrG3NEu5cSWr +Fh4AYKI6ePfq5NWXYq3K95GouuyMyVdgcRIJ1BTpm4Jzlk03jXoo7aZh2T38LlChEYO aj/N0+qBjRwG44DLVKEIqrBVZIFUGDZaYC4uc9LeUu2SY4UasgJOBuvsPNG3YkRlgPkL BJpSFDpsY7+zc9xZS1xB86KezOhVZdrvzyhN96dO7gZXetqnk/aqzyb2JqYSZ2MBixZW zqVc9EO/MYfh7jMduHaPmAPKNyXt/bboRBrFTu2cYjCtJa4h1p1athoFOd0O+wH5ti96 0R9Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=MQIZLSwk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w6-20020a170902904600b001884ba979e7si14145110plz.194.2023.02.14.04.55.29; Tue, 14 Feb 2023 04:55:41 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=MQIZLSwk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231882AbjBNMxT (ORCPT + 99 others); Tue, 14 Feb 2023 07:53:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38224 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229763AbjBNMxR (ORCPT ); Tue, 14 Feb 2023 07:53:17 -0500 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A598C1B33C for ; Tue, 14 Feb 2023 04:53:16 -0800 (PST) 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-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757811144498240648?= X-GMAIL-MSGID: =?utf-8?q?1757811144498240648?= 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,