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 7436CECAAD3 for ; Wed, 14 Sep 2022 18:13:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D75458D0002; Wed, 14 Sep 2022 14:13:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D24188D0001; Wed, 14 Sep 2022 14:13:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C13E38D0002; Wed, 14 Sep 2022 14:13:30 -0400 (EDT) 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 B3A758D0001 for ; Wed, 14 Sep 2022 14:13:30 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 924461C5D77 for ; Wed, 14 Sep 2022 18:13:30 +0000 (UTC) X-FDA: 79911488580.16.F8D407E Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf03.hostedemail.com (Postfix) with ESMTP id 30A082008C for ; Wed, 14 Sep 2022 18:13:30 +0000 (UTC) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 7EF1E616B3; Wed, 14 Sep 2022 18:13:29 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DEA34C433C1; Wed, 14 Sep 2022 18:13:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1663179208; bh=fWStAdSjgQT2wzPc1VHO70yNyePHm2Nb0E7V5N5FSA8=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=naODD2dxg+E/B4DF1PVygYLC2VuSoJvnovugNGZjiiYVTZ31ytQwa6EiYcy37dsSs 9SlTC6Y7Hmo710amps4MJEqK3yelsXR8K3flkiqmIUdeWqIC39M4LHdzV50MvHadWT D4H8z3f9gTtqLu2Ikpg0VJVyB68zGioMLlIVr3XsHU7XdnrlfIik6x1htvPPU18zzx 11g5Yd+JTvj+hmOcRwdpinwt4zPlVxIVa983dOFYXdnn0YAaBXMa5DTLz2Z5/pls4x 73aSfB4TTTnQo+hLJe0UY6PzIUK8Ic12/gTEnW4KRW9GDs7bcKlzkvuSIN4++WIsmC HUFRDGgXGfDEA== Date: Wed, 14 Sep 2022 11:13:28 -0700 From: "Darrick J. Wong" To: Shiyang Ruan Cc: linux-kernel@vger.kernel.org, linux-xfs@vger.kernel.org, nvdimm@lists.linux.dev, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, dan.j.williams@intel.com, david@fromorbit.com, hch@infradead.org, jane.chu@oracle.com Subject: Re: [PATCH 1/3] xfs: fix the calculation of length and end Message-ID: References: <9e9521a4-6e07-e226-2814-b78a2451656b@fujitsu.com> <1662114961-66-1-git-send-email-ruansy.fnst@fujitsu.com> <1662114961-66-2-git-send-email-ruansy.fnst@fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1662114961-66-2-git-send-email-ruansy.fnst@fujitsu.com> ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1663179210; a=rsa-sha256; cv=none; b=pEF0BHiLHvJCCitxOIIEy3+p9JUA6k1GIG87zUMSiOp0oppiBlR/Cjn6NoSKXZJeZqIKJ3 mDBaaXhdqlkwNYnqhbXCjeJwH3mPZLsMFEwtuoTuykpFv93WywXU29/FSlOhCaUZi/ioVQ khwT+liq0WAH7/sDaoGV73mikhk9gvs= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=naODD2dx; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf03.hostedemail.com: domain of djwong@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=djwong@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1663179210; 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=ZJ/pCtA+9Wlk71xo0RBB5ii7377zCkiuV8KSGtuzZo8=; b=7E32wcZ9nRHlNoToE74G6HXqf4NET/g+YY3Xq8Pbl/eI5uuD2Sdg2xvFLaeQGKsjSKBBg5 3BsZqCzIfFFeCxjfYRERuf2DUvE43OA1nUU9g2fb34UDhRH2WCl091Zhr7yGzQGe7JrGNu 51KqgD3XXVidnCpjySKKChz+QrEFC+A= X-Rspam-User: X-Rspamd-Queue-Id: 30A082008C X-Rspamd-Server: rspam05 X-Stat-Signature: ndr6mxoeowhi3mf1fzxmngruzsmn4w3g Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=naODD2dx; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf03.hostedemail.com: domain of djwong@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=djwong@kernel.org X-HE-Tag: 1663179210-284806 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: On Fri, Sep 02, 2022 at 10:35:59AM +0000, Shiyang Ruan wrote: > 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 Looks correct to me, Reviewed-by: Darrick J. Wong --D > --- > fs/xfs/xfs_notify_failure.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/fs/xfs/xfs_notify_failure.c b/fs/xfs/xfs_notify_failure.c > index c4078d0ec108..3830f908e215 100644 > --- a/fs/xfs/xfs_notify_failure.c > +++ b/fs/xfs/xfs_notify_failure.c > @@ -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 -= offset + len - 1 - ddev_end; > > return xfs_dax_notify_ddev_failure(mp, BTOBB(offset), BTOBB(len), > mf_flags); > -- > 2.37.2 >