From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C246716CD2B for ; Fri, 9 Aug 2024 23:06:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.179 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723244792; cv=none; b=geQ+5Qy9POkHXvxV8vTSMNl3iShZGpOGweYUg0ciy5WAQkCBPbC5YHDOYakT212qvGJPH4cwmx3xNVHm85O0EElCMK4bMmjxaCJlrfxg65m6BmXQNygtpT5QJr4OLc1sK4tMPChPaMKK8g9yvT/RZrG3UzPSXVh+eIoMbvztDwQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723244792; c=relaxed/simple; bh=bZwx8Awwb4wvIVQy1/czHFUPIfNr4eP4NZCskia242k=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=nALN+4CT0KXB4ZY2g+8EFy8PmScSe4Vgscc7nThi8/D4mqVCxb4kILpEc33PAM6IJYig2RzCO/JXDfpeTBPMRl5gCS31ljlsgnhdvmLq0WIO5oGzowXZjJtFiY6Mus7x6jjMXgp/m4m5MEcv1ojhzyT0dBDT62I1GubpowMOjKw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=fromorbit.com; spf=pass smtp.mailfrom=fromorbit.com; dkim=pass (2048-bit key) header.d=fromorbit-com.20230601.gappssmtp.com header.i=@fromorbit-com.20230601.gappssmtp.com header.b=0sAAqdaV; arc=none smtp.client-ip=209.85.210.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=fromorbit.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=fromorbit.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=fromorbit-com.20230601.gappssmtp.com header.i=@fromorbit-com.20230601.gappssmtp.com header.b="0sAAqdaV" Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-7104f93a20eso2207423b3a.1 for ; Fri, 09 Aug 2024 16:06:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fromorbit-com.20230601.gappssmtp.com; s=20230601; t=1723244790; x=1723849590; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=qLXIcRQfqVWPyILBS4NCRfPx9XX6KjuIPWCqoJLoWeA=; b=0sAAqdaVpPO3iyjm2HzGDbw8C/23AthllCIdx8Mdw2GRf2bU7a8k0o1b633V6zL7Va s5TqNmnLg4ZsVYMtSAv3KhWXrVq+hiAAZb4Bm88Cewgq/9ChimCJd6ZMQQt3qSu6jFDZ 7Yp64wlH/vF6hxzlP5puvWqMlus4RLgLnCIjmSRLnYLYpeLI1wTdeenS41IVLSeQmI+c FtfMVSkmIK2Xod85tY8oMe9MDj4yvitIdCIACP9yrfHCJ1VWRo+jg3Cu2QwbUQMbWEcc ujW/dFCiLheNJrkvz+dHchK0XfhRnxJWle5iM2GlD9PwfBS7OMzLl4cFSGJsB85gF0+B 7+6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723244790; x=1723849590; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=qLXIcRQfqVWPyILBS4NCRfPx9XX6KjuIPWCqoJLoWeA=; b=ZKzrYd/fplqzmRLDEEEHwf/oWrR8T+BHMg+Mu4DYsk/mmH4+DBffk99bTb5Bjob6bS 5JTOE0xywYJfArG1F0D0dKrWRfMA5PZGlX3U7hZFYFLOucukXNhp2maisOWlv/hNs4CE iWdRN+3SsvHpWZawkueo5q0jybf1kLgGBi2fgyXiuFhHMWVjuqprHb6WDbc5+qKWSh+R jgeLJt3oC0KhOgTyrU50Nvh+cX2ajLE/aFpn9yRPj3sMJ0Coq7KCah2Z3tikKvLj7tPJ kknCoAh8+JZICzZZ+cmSa/GZdimtPmzqGo8Tx9+WT5H2fwqAaL7KkX/p43miWK+tVGfY LH+A== X-Forwarded-Encrypted: i=1; AJvYcCWFzEXwHH1A6ixfKIGLVKUwb9ZMzF/yNI1xlp3TBrWgUoDGiVYUDU5BszAd0tk2AkrJPOnASdtq3xGjtshRG6VNVFEWEZoWBXK/89QX9O8= X-Gm-Message-State: AOJu0YxeHt4lqN1z+tpcV/uKhdJyoqlCkRKWDvsdT8urE6H505ihLSIZ 4Nado54A1XeYUQgkqjwUgwU0AnA1xnzCK7YzTIP6kDReivU9Dp0hIxVbBiZ7J2nu5EkB62ETs2s Z X-Google-Smtp-Source: AGHT+IEUU8G/DVGE6NlsSYImmjk9rN+qyR0QXuoHxE6GCaGPWCZFRMYYJIt81OTDQfegBeHuVGXukw== X-Received: by 2002:a05:6a00:2d97:b0:705:a450:a993 with SMTP id d2e1a72fcca58-710dc762037mr3670855b3a.17.1723244789985; Fri, 09 Aug 2024 16:06:29 -0700 (PDT) Received: from dread.disaster.area (pa49-181-47-239.pa.nsw.optusnet.com.au. [49.181.47.239]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-710e5ab79casm258567b3a.199.2024.08.09.16.06.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Aug 2024 16:06:29 -0700 (PDT) Received: from dave by dread.disaster.area with local (Exim 4.96) (envelope-from ) id 1scYgk-00BQOS-1c; Sat, 10 Aug 2024 09:06:26 +1000 Date: Sat, 10 Aug 2024 09:06:26 +1000 From: Dave Chinner To: Josef Bacik Cc: kernel-team@fb.com, linux-fsdevel@vger.kernel.org, jack@suse.cz, amir73il@gmail.com, brauner@kernel.org, linux-xfs@vger.kernel.org, gfs2@lists.linux.dev, linux-bcachefs@vger.kernel.org Subject: Re: [PATCH v3 16/16] xfs: add pre-content fsnotify hook for write faults Message-ID: References: <89eb3a19d19c9b4bc19b6edbc708a8a33a911516.1723228772.git.josef@toxicpanda.com> Precedence: bulk X-Mailing-List: linux-bcachefs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <89eb3a19d19c9b4bc19b6edbc708a8a33a911516.1723228772.git.josef@toxicpanda.com> On Fri, Aug 09, 2024 at 02:44:24PM -0400, Josef Bacik wrote: > xfs has it's own handling for write faults, so we need to add the > pre-content fsnotify hook for this case. Reads go through filemap_fault > so they're handled properly there. > > Signed-off-by: Josef Bacik > --- > fs/xfs/xfs_file.c | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c > index 4cdc54dc9686..a00436dd29d1 100644 > --- a/fs/xfs/xfs_file.c > +++ b/fs/xfs/xfs_file.c > @@ -1328,8 +1328,13 @@ __xfs_filemap_fault( > > trace_xfs_filemap_fault(XFS_I(inode), order, write_fault); > > - if (write_fault) > - return xfs_write_fault(vmf, order); > + if (write_fault) { > + vm_fault_t ret = filemap_maybe_emit_fsnotify_event(vmf); > + if (unlikely(ret)) > + return ret; > + xfs_write_fault(vmf, order); > + } > + > if (IS_DAX(inode)) > return xfs_dax_read_fault(vmf, order); > return filemap_fault(vmf); Looks good now. Acked-by: Dave Chinner -- Dave Chinner david@fromorbit.com