From mboxrd@z Thu Jan 1 00:00:00 1970 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 0A00DC76195 for ; Tue, 28 Mar 2023 09:42:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 143CE6B0074; Tue, 28 Mar 2023 05:42:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0C9696B007B; Tue, 28 Mar 2023 05:42:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DC0E26B0075; Tue, 28 Mar 2023 05:42:30 -0400 (EDT) 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 C7CC56B0072 for ; Tue, 28 Mar 2023 05:42:30 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 93FD3ABC8C for ; Tue, 28 Mar 2023 09:42:30 +0000 (UTC) X-FDA: 80617816860.02.83F4505 Received: from mail1.bemta37.messagelabs.com (mail1.bemta37.messagelabs.com [85.158.142.112]) by imf07.hostedemail.com (Postfix) with ESMTP id 270444000E for ; Tue, 28 Mar 2023 09:42:27 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=fujitsu.com header.s=170520fj header.b=Pa1LIuGf; spf=pass (imf07.hostedemail.com: domain of ruansy.fnst@fujitsu.com designates 85.158.142.112 as permitted sender) smtp.mailfrom=ruansy.fnst@fujitsu.com; dmarc=pass (policy=none) header.from=fujitsu.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1679996548; 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=NWTW4/kpXmg0Rl6jB3nA+9P+up6W+4F1Qd6JkH4PPnc=; b=Uie9ip4PiyVOoCcINHyaJi4yZe4jaNlnFFpfd+btmVUYu6w8krYSLAZ+O9U756RW5UKdnF dH+SXmC1TUnZzt4rblejJafXaEmq0CV3svbM/GIwR39v4lS6TXUJ9EwWO2q0KPIHikymHg LN4cCzwItlUIvOYcKJX6QAASsbNEEjM= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=fujitsu.com header.s=170520fj header.b=Pa1LIuGf; spf=pass (imf07.hostedemail.com: domain of ruansy.fnst@fujitsu.com designates 85.158.142.112 as permitted sender) smtp.mailfrom=ruansy.fnst@fujitsu.com; dmarc=pass (policy=none) header.from=fujitsu.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1679996548; a=rsa-sha256; cv=none; b=wNAzyPM+25v+DaFT4NxuCuNO8FMY7q5VxW+8yuENQgZbAWL93jyX/poOfXMbjXqVGGu/ru AXR4RxCm0C4124YJevek0ovJw2eTmJmquJxoyeEtHDjkG3XlShj5Wi31empxJV43dioSD1 UvxPgTcm764UMA8xAouLHOJDdcqBHm0= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fujitsu.com; s=170520fj; t=1679996545; i=@fujitsu.com; bh=NWTW4/kpXmg0Rl6jB3nA+9P+up6W+4F1Qd6JkH4PPnc=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Pa1LIuGfl6OXsOtMCyUaQCxmL78UatAYsSbK+3EIFk7IW6ZANlkmrmBfnxjze2UqK yn2/iBx8P0yBQmqyNSzIXtE33FygpkrY+JyIYEblVU2Yev0pjkAm5lPsFM1ETyrw0N EM/NHy9HltswQjb+YakmIR/7EhvU4YOjyczLbBGok956x3mTCWpDIipcnce9m8Ay69 j5KWa4h05fivetAJH6B+CR4JfYhmHCuuKFILcUlSzpKWODW5HW0C268OIwUkqx5Zf5 58Tf1mz9ImOHnycKJ2CDrM6giwmHSbhY1e0OGPfPaIRMB0mt8ERi8NnOmxhohJqQdW 8pCQkPO08JGzA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprNKsWRWlGSWpSXmKPExsViZ8ORpNuwTSn FYNIpWYs569ewWUyfeoHR4vITPovZ05uZLPbsPclicW/Nf1aLXX92sFus/PGH1eL3jzlsDpwe m1doeSze85LJY9OqTjaPTZ8msXucmPGbxePF5pmMHmcWHGH3+LxJLoAjijUzLym/IoE148idb taCtXwV7e1LGRsY/3N3MXJxCAlsZJT4fOccE4SzhEni0uyrbBDOMUaJZafPsncxcnKwCehIXF jwlxXEFhEolNiz9B0LiM0sUCHRuOgfM4gtLOAsMWvFO7AaFgFViV339oDZvEDxaVs2gNkSAgo SUx6+B6vnFHCRePulBcjmAFrmLHGt2x6iXFDi5MwnUOMlJA6+eMEM0aokcfHrHagxQGunH2KC sNUkrp7bxDyBUXAWkvZZSNoXMDKtYjQvTi0qSy3SNTTRSyrKTM8oyU3MzNFLrNJN1Est1c3LL yrJ0DXUSywv1kstLtYrrsxNzknRy0st2cQIjKeU4sTjOxhf9f3VO8QoycGkJMrbz6mYIsSXlJ 9SmZFYnBFfVJqTWnyIUYaDQ0mCV2WLUoqQYFFqempFWmYOMLZh0hIcPEoivNdWA6V5iwsSc4s z0yFSpxh1OdY2HNjLLMSSl5+XKiXOm74VqEgApCijNA9uBCzNXGKUlRLmZWRgYBDiKUgtys0s QZV/xSjOwagkzBu4GWgKT2ZeCdymV0BHMAEd8a1AAeSIkkSElFQDk++Wjc03Ze8/TnfafT59b 0XR5gtr104NM66esGWmoar2vrt339js3pwSEiQRm6dTe+X6mjP+P0Tkd8/fwv+xrpzNyTBF9N icLV2fmk5umRe7UbfKh8cy/aN2a+GnFfIz/81n5F/dZBRcZnNkrk3ZpeDV++NNIrvPd87oKNr 26a4Lm51tS9qqQl/z8jMbfkRtY427YMPqn6OdI1Y1WehfXXNyJNei1a/Tq17ck5zsb/l2jSHn 5b3yzZvmzz28OnbblwyDxd7/xKqO8PqU7/7s+z7XrKJ1UcqpKqHGp97vvryLK3/NqmiveMBAR OXcmY9Xp0fHTVrsE6mp7Wy6OyJ6yje11p0veXz+2K25bsZxSomlOCPRUIu5qDgRAAs+n0iuAw AA X-Env-Sender: ruansy.fnst@fujitsu.com X-Msg-Ref: server-16.tower-732.messagelabs.com!1679996544!272759!1 X-Originating-IP: [62.60.8.98] X-SYMC-ESS-Client-Auth: outbound-route-from=pass X-StarScan-Received: X-StarScan-Version: 9.104.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12672 invoked from network); 28 Mar 2023 09:42:24 -0000 Received: from unknown (HELO n03ukasimr03.n03.fujitsu.local) (62.60.8.98) by server-16.tower-732.messagelabs.com with ECDHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 28 Mar 2023 09:42:24 -0000 Received: from n03ukasimr03.n03.fujitsu.local (localhost [127.0.0.1]) by n03ukasimr03.n03.fujitsu.local (Postfix) with ESMTP id C774E1B0; Tue, 28 Mar 2023 10:42:23 +0100 (BST) Received: from R01UKEXCASM121.r01.fujitsu.local (R01UKEXCASM121 [10.183.43.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by n03ukasimr03.n03.fujitsu.local (Postfix) with ESMTPS id BBD3B1AF; Tue, 28 Mar 2023 10:42:23 +0100 (BST) Received: from 692d629b0116.g08.fujitsu.local (10.167.234.230) by R01UKEXCASM121.r01.fujitsu.local (10.183.43.173) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Tue, 28 Mar 2023 10:42:20 +0100 From: Shiyang Ruan To: , , , CC: , , , , Subject: [PATCH v11 1/2] xfs: fix the calculation of length and end Date: Tue, 28 Mar 2023 09:41:45 +0000 Message-ID: <1679996506-2-2-git-send-email-ruansy.fnst@fujitsu.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1679996506-2-1-git-send-email-ruansy.fnst@fujitsu.com> References: <1679996506-2-1-git-send-email-ruansy.fnst@fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.167.234.230] X-ClientProxiedBy: G08CNEXCHPEKD07.g08.fujitsu.local (10.167.33.80) To R01UKEXCASM121.r01.fujitsu.local (10.183.43.173) X-Virus-Scanned: ClamAV using ClamSMTP X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 270444000E X-Stat-Signature: way7ru3twbzgytmwoimn5snhqwiwj4ey X-HE-Tag: 1679996547-247983 X-HE-Meta: U2FsdGVkX19O2MpR5zmMfZtg+dBt+lRnWdM+m7dKAbFPyKjIYx4La6JldeiBBNoOv/q8jcABaKxxiMWW2FENdr5JFptsRdv8O+oFzT5hqAWIpS+JvHGZe4EGOUeHSKfa1d605pd3GlghAapI4XO9PSjBr2wc/bFLwzNYmtQMFeSimsBzBst9WNeGfLXvSkIMkCySHqvavvDOemx9LUIRP8hcKDgkEE2YklW0+W4Vw6few71CXFNgqeeXyvOA92iYo3chmj6j7CTQzoe58ZODPUESUKZtxv9jtsz/Vtbeb+sqZSPiqpOIpJ/BYMkpKf8YOwVho8FoFjnlyrO7UYJ3DiGvMp+z8zXmimd3KZkowDhNGAbZv7/gEoDBvK+UQZYj6KqT+laddXT3WaM98kd7Q3VJZc987mGaDwO7bZbHx99RAHRIMYKZA4k4Uoi7tyzEEUue68DHlTqCMKGRpu6oWYmalc/53PBfORE9aMSgDvI6QAk1KTyLz635NcWNkRM1jnXI7wpS1aI90efvisY/DjjL71RU66NFL6zRlJuI/dKP1aNI3i1vTyRofjjjwcT1g7e2vxbuqTqX6j1XL0fdz/Ovi6zSTrfpxRORat/uyHd9IfVQSmoc68VgrOMmM02k1dlejt8XdU5vahb8PCnKUoSIoo1bgUTwXlCmInEcInlSreDuaD94f6WGUqMGPvDJW6nn/h5j7Y/Q01dt0HMfRpkenfWCEtHNcmQqiMxtqFArK2MwCEHrwr+nZFomO8m0i4yBRAaYd3slNvcGoQTG+ixjXqeQtXA1cdrLHbBJyz5vd99b/wtz5Be3UfIEbuFooT4mb3uu7B7YeEVuzgsbiv8BWl+LljAMmFdVIncHxpGUC6np01yOfvwN1q3T/7WkU9MXu8QEnEmXDBnN2EHi/yjwhWJ/FnAnX1PsetJBR2MxfNoupzM+qMnH7s3hpdwdfiYDG80HbmUEceZckkV G8w9lN3B KDKY9Y1oY/vwtIQDhQ1BZbGS3tdsWJxFfyfmxkVZBsi65NRGVP0bCzfihEDBr4mcA7TwoG9PRmW1LpoI0ASF1nus1C101K4dYuPtKDpjihinyiy9FpXOxHpzFc8sdNPS18gbkIkvIDEspnPv3M4td7TekUN9TBjv/plO4f4GKp7E2FN04g+psPKVsydWiuow9ZcHAL3I/CZKXzkCeGJ1sSWOP5qk+JvKudgOx09/QSU78H3Eq7SQaMvMIpMvkOmOXt6PVdZ0Ep95fZRHadf2VvdeL590P+j8vC9SNdm/cSi6WJN8hSvzYSAbxB/AvpjfshRLPjUvRGv2EvTtfJqoyxjq9mA== 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: The end should be start + length - 1. Also fix the calculation of the length when seeking for intersection of notify range and device. Signed-off-by: Shiyang Ruan Reviewed-by: Darrick J. Wong --- fs/xfs/xfs_notify_failure.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fs/xfs/xfs_notify_failure.c b/fs/xfs/xfs_notify_failure.c index c4078d0ec108..1e2eddb8f90f 100644 --- a/fs/xfs/xfs_notify_failure.c +++ b/fs/xfs/xfs_notify_failure.c @@ -61,7 +61,7 @@ xfs_failure_pgcnt( end_notify = notify->startblock + notify->blockcount; end_cross = min(end_rec, end_notify); - return XFS_FSB_TO_B(mp, end_cross - start_cross) >> PAGE_SHIFT; + return XFS_FSB_TO_B(mp, end_cross - start_cross + 1) >> PAGE_SHIFT; } static int @@ -114,7 +114,7 @@ xfs_dax_notify_ddev_failure( int error = 0; xfs_fsblock_t fsbno = XFS_DADDR_TO_FSB(mp, daddr); xfs_agnumber_t agno = XFS_FSB_TO_AGNO(mp, fsbno); - xfs_fsblock_t end_fsbno = XFS_DADDR_TO_FSB(mp, daddr + bblen); + xfs_fsblock_t end_fsbno = XFS_DADDR_TO_FSB(mp, daddr + bblen - 1); xfs_agnumber_t end_agno = XFS_FSB_TO_AGNO(mp, end_fsbno); error = xfs_trans_alloc_empty(mp, &tp); @@ -210,7 +210,7 @@ xfs_dax_notify_failure( ddev_end = ddev_start + bdev_nr_bytes(mp->m_ddev_targp->bt_bdev) - 1; /* Ignore the range out of filesystem area */ - if (offset + len < ddev_start) + if (offset + len - 1 < ddev_start) return -ENXIO; if (offset > ddev_end) return -ENXIO; @@ -222,8 +222,8 @@ xfs_dax_notify_failure( len -= ddev_start - offset; offset = 0; } - if (offset + len > ddev_end) - len -= ddev_end - offset; + if (offset + len - 1 > ddev_end) + len = ddev_end - offset + 1; return xfs_dax_notify_ddev_failure(mp, BTOBB(offset), BTOBB(len), mf_flags); -- 2.39.2