From patchwork Mon Feb 6 14:21:32 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: 13130018 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 22A22C61DA4 for ; Mon, 6 Feb 2023 14:22:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 69E506B0074; Mon, 6 Feb 2023 09:22:26 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 64C736B0073; Mon, 6 Feb 2023 09:22:26 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 42ABA6B0075; Mon, 6 Feb 2023 09:22:26 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 2CFED6B0073 for ; Mon, 6 Feb 2023 09:22:26 -0500 (EST) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id A081B404B8 for ; Mon, 6 Feb 2023 14:22:25 +0000 (UTC) X-FDA: 80437082250.24.E99161E Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by imf24.hostedemail.com (Postfix) with ESMTP id 6F19E180010 for ; Mon, 6 Feb 2023 14:22:22 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=quicinc.com header.s=qcppdkim1 header.b=CbdBKVR+; spf=pass (imf24.hostedemail.com: domain of quic_charante@quicinc.com designates 205.220.180.131 as permitted sender) smtp.mailfrom=quic_charante@quicinc.com; dmarc=pass (policy=none) header.from=quicinc.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1675693342; 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=wzCZ9/SzNTONcWU7bNN6TFRXX6N3AyuqU22WW+kLAGI=; b=zqb4AI2ajfUmpFplEdvHFEfqLr91FMwhou2J5RNwjoTSrONpVv/+XEZ1ZigzPHfshWFnNb 4VJge3AoGMG1+/3/3iyAZaqX9T2lOqHBpc+kazZvHTLkXU4Hx0FilHvz9R97d0I+Md57fY eK6uTTq5SXLp5Xzw9rCSNBglzdSNNO8= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=quicinc.com header.s=qcppdkim1 header.b=CbdBKVR+; spf=pass (imf24.hostedemail.com: domain of quic_charante@quicinc.com designates 205.220.180.131 as permitted sender) smtp.mailfrom=quic_charante@quicinc.com; dmarc=pass (policy=none) header.from=quicinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1675693342; a=rsa-sha256; cv=none; b=YET5CE36Y510BGYIxLxoUDacyZhcc0AyEoUm/5WH1TauLxmNfBAhatn4HUh3S8QWglFRyg 7SBE01fxhVB+z5DR9GfMFGe2w9XdBEOBrxRTubjuYppFOKX8GC+iCWSJOhzlADtRZlHPhk xs0bVPCLFf5gpb4n7bb+7YUlevUuKO8= Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 316BMGSg022772; Mon, 6 Feb 2023 14:22:15 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=wzCZ9/SzNTONcWU7bNN6TFRXX6N3AyuqU22WW+kLAGI=; b=CbdBKVR+0joO17jmjxiSRmIesShn6fUW7DoNLKYNrK1raZIWzzh0UJcR1sy5nzOUNAYb rlsSSRpQ4kWmTpNMbeyT36QF9Uo2TTvHUAaw/d5iFgyjWu7BWGsMme9T8W1pmGnKUl3v T1K/cOr7QfMDoxrHFbWaj+ZoS/eqyeOfy/R/hUq++xDBZ8LwHZa8118E3Rjtb5SEkhbj eikwrqhnG/khLGRsjaW2ikenRJGNQiAlcjuQuHyxtbKdDAcWx8QhkmBEMQNrJppR8WIn JOycWO0ZVjg7ao9rZZCaJXo9Jazq155B4HaRkjAYNWbOZsPvvfFxzWuVMUSrzzgxXt/5 mA== Received: from nalasppmta01.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3nhechbx9h-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 06 Feb 2023 14:22:15 +0000 Received: from nalasex01a.na.qualcomm.com (nalasex01a.na.qualcomm.com [10.47.209.196]) by NALASPPMTA01.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 316EMDDq024859 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 6 Feb 2023 14:22:13 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; Mon, 6 Feb 2023 06:22:09 -0800 From: Charan Teja Kalla To: , , , , , , , , , CC: , , Charan Teja Kalla Subject: [PATCH V6 1/2] mm: fadvise: move 'endbyte' calculations to helper function Date: Mon, 6 Feb 2023 19:51:32 +0530 Message-ID: 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-GUID: WUGLv_jSvpjhDXLissC4DuFRDJhKQlJm X-Proofpoint-ORIG-GUID: WUGLv_jSvpjhDXLissC4DuFRDJhKQlJm X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.122.1 definitions=2023-02-06_07,2023-02-06_03,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1011 impostorscore=0 adultscore=0 spamscore=0 lowpriorityscore=0 bulkscore=0 malwarescore=0 mlxlogscore=841 priorityscore=1501 mlxscore=0 phishscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2302060123 X-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: a4w45dfjdk4dhzbkcakf1n3zdgteaqt8 X-Rspamd-Queue-Id: 6F19E180010 X-HE-Tag: 1675693342-455417 X-HE-Meta: U2FsdGVkX1+h7KxEFSqZdXFa+sxLYAgKE0g20tbef28tK/Azfc1H2PP/Ot1hbpV7JjUq4Sc8XE4OYPQCoJuy1vjM1mkRNSSGASuyFhjZWhtHutJMoyzFboH368RC7CdzqLJnXGZQYncKGDTmtGSR64MXTt61C1tYZlFfQvDNxFQAAcf4CfDhCqQ5OkpYfj2lfFWAfu3jb5ZSBnct8i9tnBgloDJxo7kekZS8krAQ+uy+9ENKLnPrbWEd5ZwgMJE8ws9FzVQCZtIMSCXGz4P6hyfxwEVSD+cqw9pyXZ9uPrV4ywA+O894D72L7sNwN/lttxdUYlOzVftRDDXFexPmfAHsxc/jnmFeyp469jnyN7Wv6kms156FyQmjMo7bss4XqMc0B0Dwe1DH3W2AVM4Qw/SdPr0IMkMRSgVOo3XAyVsJUFhrpewBKwfmsbw8EAnfTAdy6yiYGdV1Acilv5RrhU011UVYFmf1rG9DniwQ9VVWNiW1n3tWqlArlUBGv+cpK2wgUoROYUf198K5BeTDgtdGOpFH+yXpAXWOWyaWDAYvcre7C4FQgaC/3iSLBJB9Lke4s5RjMwi/ft3Q0Zww7I2DzCXb5ixRvh83R/7hgQWN48xERTRBh6iursLrOeW8BUGCOpOS+4PSfHDfTI75ltlaKxw9uPqYVbzxrQdV2/HqZyLMmpFj/pqjqrjmFYhYBdRn8S+cXUHxAYjtUD8DqOyVcGmlmCJ/CJWNQxnNEmB05FOnDKn41tXtiV7JehrAkbYarP4dvldvNdO5LUSLFiwdkQmWvWtucKH3hk47v49Y3SEQG+XANkue0Lsrjio36YpS/7jn86lrPZglAYH6X0nTKuCITcPp0+2R82dgQtc8vs+HHyzV+fcKMpAk+wieDPw/uw7PoDhN0O9FsV2iaeHcbL+Z7MlrYmUbJ7cZWn28NCef7CC0RBAkgroxzBETzBYx0t87Utlp1nhSzg3 b1wF9lSi sTJv9mk97jGglvP8PblCCgxeIUppvwFYHhW+wU8Ob4Bct9ausjzxYpytBy8IZf1qi5mSFRqnRj01dgpvgRddqlhW9V35TYTIU793farckofTuSP9COLMK96JgelKHgOYHR0hsrY83p0mgi/uFJ4jZKnpYul6JxKc0UFqrBGchGWHTp4he59MPBPMIZ4ycYKT4fCT+enx6fXDIHb4QaJEl4Teisz6YwJtDy7Q72LAmBEir1oE= 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 bf04fec..10169c6 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 bcf75a8..47858af 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -637,6 +637,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,