2022-03-01 22:35:58 +08:00
|
|
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
|
|
/* Network filesystem high-level buffered read support.
|
|
|
|
*
|
|
|
|
* Copyright (C) 2021 Red Hat, Inc. All Rights Reserved.
|
|
|
|
* Written by David Howells (dhowells@redhat.com)
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/export.h>
|
|
|
|
#include <linux/task_io_accounting_ops.h>
|
|
|
|
#include "internal.h"
|
|
|
|
|
2024-07-02 07:40:22 +08:00
|
|
|
static void netfs_cache_expand_readahead(struct netfs_io_request *rreq,
|
|
|
|
unsigned long long *_start,
|
|
|
|
unsigned long long *_len,
|
|
|
|
unsigned long long i_size)
|
netfs: Fix handling of USE_PGPRIV2 and WRITE_TO_CACHE flags
The NETFS_RREQ_USE_PGPRIV2 and NETFS_RREQ_WRITE_TO_CACHE flags aren't used
correctly. The problem is that we try to set them up in the request
initialisation, but we the cache may be in the process of setting up still,
and so the state may not be correct. Further, we secondarily sample the
cache state and make contradictory decisions later.
The issue arises because we set up the cache resources, which allows the
cache's ->prepare_read() to switch on NETFS_SREQ_COPY_TO_CACHE - which
triggers cache writing even if we didn't set the flags when allocating.
Fix this in the following way:
(1) Drop NETFS_ICTX_USE_PGPRIV2 and instead set NETFS_RREQ_USE_PGPRIV2 in
->init_request() rather than trying to juggle that in
netfs_alloc_request().
(2) Repurpose NETFS_RREQ_USE_PGPRIV2 to merely indicate that if caching is
to be done, then PG_private_2 is to be used rather than only setting
it if we decide to cache and then having netfs_rreq_unlock_folios()
set the non-PG_private_2 writeback-to-cache if it wasn't set.
(3) Split netfs_rreq_unlock_folios() into two functions, one of which
contains the deprecated code for using PG_private_2 to avoid
accidentally doing the writeback path - and always use it if
USE_PGPRIV2 is set.
(4) As NETFS_ICTX_USE_PGPRIV2 is removed, make netfs_write_begin() always
wait for PG_private_2. This function is deprecated and only used by
ceph anyway, and so label it so.
(5) Drop the NETFS_RREQ_WRITE_TO_CACHE flag and use
fscache_operation_valid() on the cache_resources instead. This has
the advantage of picking up the result of netfs_begin_cache_read() and
fscache_begin_write_operation() - which are called after the object is
initialised and will wait for the cache to come to a usable state.
Just reverting ae678317b95e[1] isn't a sufficient fix, so this need to be
applied on top of that. Without this as well, things like:
rcu: INFO: rcu_sched detected expedited stalls on CPUs/tasks: {
and:
WARNING: CPU: 13 PID: 3621 at fs/ceph/caps.c:3386
may happen, along with some UAFs due to PG_private_2 not getting used to
wait on writeback completion.
Fixes: 2ff1e97587f4 ("netfs: Replace PG_fscache by setting folio->private and marking dirty")
Reported-by: Max Kellermann <max.kellermann@ionos.com>
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Ilya Dryomov <idryomov@gmail.com>
cc: Xiubo Li <xiubli@redhat.com>
cc: Hristo Venev <hristo@venev.name>
cc: Jeff Layton <jlayton@kernel.org>
cc: Matthew Wilcox <willy@infradead.org>
cc: ceph-devel@vger.kernel.org
cc: netfs@lists.linux.dev
cc: linux-fsdevel@vger.kernel.org
cc: linux-mm@kvack.org
Link: https://lore.kernel.org/r/3575457.1722355300@warthog.procyon.org.uk/ [1]
Link: https://lore.kernel.org/r/1173209.1723152682@warthog.procyon.org.uk
Signed-off-by: Christian Brauner <brauner@kernel.org>
2024-08-08 02:38:46 +08:00
|
|
|
{
|
2024-07-02 07:40:22 +08:00
|
|
|
struct netfs_cache_resources *cres = &rreq->cache_resources;
|
netfs: Fix handling of USE_PGPRIV2 and WRITE_TO_CACHE flags
The NETFS_RREQ_USE_PGPRIV2 and NETFS_RREQ_WRITE_TO_CACHE flags aren't used
correctly. The problem is that we try to set them up in the request
initialisation, but we the cache may be in the process of setting up still,
and so the state may not be correct. Further, we secondarily sample the
cache state and make contradictory decisions later.
The issue arises because we set up the cache resources, which allows the
cache's ->prepare_read() to switch on NETFS_SREQ_COPY_TO_CACHE - which
triggers cache writing even if we didn't set the flags when allocating.
Fix this in the following way:
(1) Drop NETFS_ICTX_USE_PGPRIV2 and instead set NETFS_RREQ_USE_PGPRIV2 in
->init_request() rather than trying to juggle that in
netfs_alloc_request().
(2) Repurpose NETFS_RREQ_USE_PGPRIV2 to merely indicate that if caching is
to be done, then PG_private_2 is to be used rather than only setting
it if we decide to cache and then having netfs_rreq_unlock_folios()
set the non-PG_private_2 writeback-to-cache if it wasn't set.
(3) Split netfs_rreq_unlock_folios() into two functions, one of which
contains the deprecated code for using PG_private_2 to avoid
accidentally doing the writeback path - and always use it if
USE_PGPRIV2 is set.
(4) As NETFS_ICTX_USE_PGPRIV2 is removed, make netfs_write_begin() always
wait for PG_private_2. This function is deprecated and only used by
ceph anyway, and so label it so.
(5) Drop the NETFS_RREQ_WRITE_TO_CACHE flag and use
fscache_operation_valid() on the cache_resources instead. This has
the advantage of picking up the result of netfs_begin_cache_read() and
fscache_begin_write_operation() - which are called after the object is
initialised and will wait for the cache to come to a usable state.
Just reverting ae678317b95e[1] isn't a sufficient fix, so this need to be
applied on top of that. Without this as well, things like:
rcu: INFO: rcu_sched detected expedited stalls on CPUs/tasks: {
and:
WARNING: CPU: 13 PID: 3621 at fs/ceph/caps.c:3386
may happen, along with some UAFs due to PG_private_2 not getting used to
wait on writeback completion.
Fixes: 2ff1e97587f4 ("netfs: Replace PG_fscache by setting folio->private and marking dirty")
Reported-by: Max Kellermann <max.kellermann@ionos.com>
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Ilya Dryomov <idryomov@gmail.com>
cc: Xiubo Li <xiubli@redhat.com>
cc: Hristo Venev <hristo@venev.name>
cc: Jeff Layton <jlayton@kernel.org>
cc: Matthew Wilcox <willy@infradead.org>
cc: ceph-devel@vger.kernel.org
cc: netfs@lists.linux.dev
cc: linux-fsdevel@vger.kernel.org
cc: linux-mm@kvack.org
Link: https://lore.kernel.org/r/3575457.1722355300@warthog.procyon.org.uk/ [1]
Link: https://lore.kernel.org/r/1173209.1723152682@warthog.procyon.org.uk
Signed-off-by: Christian Brauner <brauner@kernel.org>
2024-08-08 02:38:46 +08:00
|
|
|
|
2024-07-02 07:40:22 +08:00
|
|
|
if (cres->ops && cres->ops->expand_readahead)
|
|
|
|
cres->ops->expand_readahead(cres, _start, _len, i_size);
|
|
|
|
}
|
netfs: Fix handling of USE_PGPRIV2 and WRITE_TO_CACHE flags
The NETFS_RREQ_USE_PGPRIV2 and NETFS_RREQ_WRITE_TO_CACHE flags aren't used
correctly. The problem is that we try to set them up in the request
initialisation, but we the cache may be in the process of setting up still,
and so the state may not be correct. Further, we secondarily sample the
cache state and make contradictory decisions later.
The issue arises because we set up the cache resources, which allows the
cache's ->prepare_read() to switch on NETFS_SREQ_COPY_TO_CACHE - which
triggers cache writing even if we didn't set the flags when allocating.
Fix this in the following way:
(1) Drop NETFS_ICTX_USE_PGPRIV2 and instead set NETFS_RREQ_USE_PGPRIV2 in
->init_request() rather than trying to juggle that in
netfs_alloc_request().
(2) Repurpose NETFS_RREQ_USE_PGPRIV2 to merely indicate that if caching is
to be done, then PG_private_2 is to be used rather than only setting
it if we decide to cache and then having netfs_rreq_unlock_folios()
set the non-PG_private_2 writeback-to-cache if it wasn't set.
(3) Split netfs_rreq_unlock_folios() into two functions, one of which
contains the deprecated code for using PG_private_2 to avoid
accidentally doing the writeback path - and always use it if
USE_PGPRIV2 is set.
(4) As NETFS_ICTX_USE_PGPRIV2 is removed, make netfs_write_begin() always
wait for PG_private_2. This function is deprecated and only used by
ceph anyway, and so label it so.
(5) Drop the NETFS_RREQ_WRITE_TO_CACHE flag and use
fscache_operation_valid() on the cache_resources instead. This has
the advantage of picking up the result of netfs_begin_cache_read() and
fscache_begin_write_operation() - which are called after the object is
initialised and will wait for the cache to come to a usable state.
Just reverting ae678317b95e[1] isn't a sufficient fix, so this need to be
applied on top of that. Without this as well, things like:
rcu: INFO: rcu_sched detected expedited stalls on CPUs/tasks: {
and:
WARNING: CPU: 13 PID: 3621 at fs/ceph/caps.c:3386
may happen, along with some UAFs due to PG_private_2 not getting used to
wait on writeback completion.
Fixes: 2ff1e97587f4 ("netfs: Replace PG_fscache by setting folio->private and marking dirty")
Reported-by: Max Kellermann <max.kellermann@ionos.com>
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Ilya Dryomov <idryomov@gmail.com>
cc: Xiubo Li <xiubli@redhat.com>
cc: Hristo Venev <hristo@venev.name>
cc: Jeff Layton <jlayton@kernel.org>
cc: Matthew Wilcox <willy@infradead.org>
cc: ceph-devel@vger.kernel.org
cc: netfs@lists.linux.dev
cc: linux-fsdevel@vger.kernel.org
cc: linux-mm@kvack.org
Link: https://lore.kernel.org/r/3575457.1722355300@warthog.procyon.org.uk/ [1]
Link: https://lore.kernel.org/r/1173209.1723152682@warthog.procyon.org.uk
Signed-off-by: Christian Brauner <brauner@kernel.org>
2024-08-08 02:38:46 +08:00
|
|
|
|
2024-07-02 07:40:22 +08:00
|
|
|
static void netfs_rreq_expand(struct netfs_io_request *rreq,
|
|
|
|
struct readahead_control *ractl)
|
|
|
|
{
|
|
|
|
/* Give the cache a chance to change the request parameters. The
|
|
|
|
* resultant request must contain the original region.
|
netfs: Fix handling of USE_PGPRIV2 and WRITE_TO_CACHE flags
The NETFS_RREQ_USE_PGPRIV2 and NETFS_RREQ_WRITE_TO_CACHE flags aren't used
correctly. The problem is that we try to set them up in the request
initialisation, but we the cache may be in the process of setting up still,
and so the state may not be correct. Further, we secondarily sample the
cache state and make contradictory decisions later.
The issue arises because we set up the cache resources, which allows the
cache's ->prepare_read() to switch on NETFS_SREQ_COPY_TO_CACHE - which
triggers cache writing even if we didn't set the flags when allocating.
Fix this in the following way:
(1) Drop NETFS_ICTX_USE_PGPRIV2 and instead set NETFS_RREQ_USE_PGPRIV2 in
->init_request() rather than trying to juggle that in
netfs_alloc_request().
(2) Repurpose NETFS_RREQ_USE_PGPRIV2 to merely indicate that if caching is
to be done, then PG_private_2 is to be used rather than only setting
it if we decide to cache and then having netfs_rreq_unlock_folios()
set the non-PG_private_2 writeback-to-cache if it wasn't set.
(3) Split netfs_rreq_unlock_folios() into two functions, one of which
contains the deprecated code for using PG_private_2 to avoid
accidentally doing the writeback path - and always use it if
USE_PGPRIV2 is set.
(4) As NETFS_ICTX_USE_PGPRIV2 is removed, make netfs_write_begin() always
wait for PG_private_2. This function is deprecated and only used by
ceph anyway, and so label it so.
(5) Drop the NETFS_RREQ_WRITE_TO_CACHE flag and use
fscache_operation_valid() on the cache_resources instead. This has
the advantage of picking up the result of netfs_begin_cache_read() and
fscache_begin_write_operation() - which are called after the object is
initialised and will wait for the cache to come to a usable state.
Just reverting ae678317b95e[1] isn't a sufficient fix, so this need to be
applied on top of that. Without this as well, things like:
rcu: INFO: rcu_sched detected expedited stalls on CPUs/tasks: {
and:
WARNING: CPU: 13 PID: 3621 at fs/ceph/caps.c:3386
may happen, along with some UAFs due to PG_private_2 not getting used to
wait on writeback completion.
Fixes: 2ff1e97587f4 ("netfs: Replace PG_fscache by setting folio->private and marking dirty")
Reported-by: Max Kellermann <max.kellermann@ionos.com>
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Ilya Dryomov <idryomov@gmail.com>
cc: Xiubo Li <xiubli@redhat.com>
cc: Hristo Venev <hristo@venev.name>
cc: Jeff Layton <jlayton@kernel.org>
cc: Matthew Wilcox <willy@infradead.org>
cc: ceph-devel@vger.kernel.org
cc: netfs@lists.linux.dev
cc: linux-fsdevel@vger.kernel.org
cc: linux-mm@kvack.org
Link: https://lore.kernel.org/r/3575457.1722355300@warthog.procyon.org.uk/ [1]
Link: https://lore.kernel.org/r/1173209.1723152682@warthog.procyon.org.uk
Signed-off-by: Christian Brauner <brauner@kernel.org>
2024-08-08 02:38:46 +08:00
|
|
|
*/
|
2024-07-02 07:40:22 +08:00
|
|
|
netfs_cache_expand_readahead(rreq, &rreq->start, &rreq->len, rreq->i_size);
|
netfs: Fix handling of USE_PGPRIV2 and WRITE_TO_CACHE flags
The NETFS_RREQ_USE_PGPRIV2 and NETFS_RREQ_WRITE_TO_CACHE flags aren't used
correctly. The problem is that we try to set them up in the request
initialisation, but we the cache may be in the process of setting up still,
and so the state may not be correct. Further, we secondarily sample the
cache state and make contradictory decisions later.
The issue arises because we set up the cache resources, which allows the
cache's ->prepare_read() to switch on NETFS_SREQ_COPY_TO_CACHE - which
triggers cache writing even if we didn't set the flags when allocating.
Fix this in the following way:
(1) Drop NETFS_ICTX_USE_PGPRIV2 and instead set NETFS_RREQ_USE_PGPRIV2 in
->init_request() rather than trying to juggle that in
netfs_alloc_request().
(2) Repurpose NETFS_RREQ_USE_PGPRIV2 to merely indicate that if caching is
to be done, then PG_private_2 is to be used rather than only setting
it if we decide to cache and then having netfs_rreq_unlock_folios()
set the non-PG_private_2 writeback-to-cache if it wasn't set.
(3) Split netfs_rreq_unlock_folios() into two functions, one of which
contains the deprecated code for using PG_private_2 to avoid
accidentally doing the writeback path - and always use it if
USE_PGPRIV2 is set.
(4) As NETFS_ICTX_USE_PGPRIV2 is removed, make netfs_write_begin() always
wait for PG_private_2. This function is deprecated and only used by
ceph anyway, and so label it so.
(5) Drop the NETFS_RREQ_WRITE_TO_CACHE flag and use
fscache_operation_valid() on the cache_resources instead. This has
the advantage of picking up the result of netfs_begin_cache_read() and
fscache_begin_write_operation() - which are called after the object is
initialised and will wait for the cache to come to a usable state.
Just reverting ae678317b95e[1] isn't a sufficient fix, so this need to be
applied on top of that. Without this as well, things like:
rcu: INFO: rcu_sched detected expedited stalls on CPUs/tasks: {
and:
WARNING: CPU: 13 PID: 3621 at fs/ceph/caps.c:3386
may happen, along with some UAFs due to PG_private_2 not getting used to
wait on writeback completion.
Fixes: 2ff1e97587f4 ("netfs: Replace PG_fscache by setting folio->private and marking dirty")
Reported-by: Max Kellermann <max.kellermann@ionos.com>
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Ilya Dryomov <idryomov@gmail.com>
cc: Xiubo Li <xiubli@redhat.com>
cc: Hristo Venev <hristo@venev.name>
cc: Jeff Layton <jlayton@kernel.org>
cc: Matthew Wilcox <willy@infradead.org>
cc: ceph-devel@vger.kernel.org
cc: netfs@lists.linux.dev
cc: linux-fsdevel@vger.kernel.org
cc: linux-mm@kvack.org
Link: https://lore.kernel.org/r/3575457.1722355300@warthog.procyon.org.uk/ [1]
Link: https://lore.kernel.org/r/1173209.1723152682@warthog.procyon.org.uk
Signed-off-by: Christian Brauner <brauner@kernel.org>
2024-08-08 02:38:46 +08:00
|
|
|
|
2024-07-02 07:40:22 +08:00
|
|
|
/* Give the netfs a chance to change the request parameters. The
|
|
|
|
* resultant request must contain the original region.
|
|
|
|
*/
|
|
|
|
if (rreq->netfs_ops->expand_readahead)
|
|
|
|
rreq->netfs_ops->expand_readahead(rreq);
|
netfs: Fix handling of USE_PGPRIV2 and WRITE_TO_CACHE flags
The NETFS_RREQ_USE_PGPRIV2 and NETFS_RREQ_WRITE_TO_CACHE flags aren't used
correctly. The problem is that we try to set them up in the request
initialisation, but we the cache may be in the process of setting up still,
and so the state may not be correct. Further, we secondarily sample the
cache state and make contradictory decisions later.
The issue arises because we set up the cache resources, which allows the
cache's ->prepare_read() to switch on NETFS_SREQ_COPY_TO_CACHE - which
triggers cache writing even if we didn't set the flags when allocating.
Fix this in the following way:
(1) Drop NETFS_ICTX_USE_PGPRIV2 and instead set NETFS_RREQ_USE_PGPRIV2 in
->init_request() rather than trying to juggle that in
netfs_alloc_request().
(2) Repurpose NETFS_RREQ_USE_PGPRIV2 to merely indicate that if caching is
to be done, then PG_private_2 is to be used rather than only setting
it if we decide to cache and then having netfs_rreq_unlock_folios()
set the non-PG_private_2 writeback-to-cache if it wasn't set.
(3) Split netfs_rreq_unlock_folios() into two functions, one of which
contains the deprecated code for using PG_private_2 to avoid
accidentally doing the writeback path - and always use it if
USE_PGPRIV2 is set.
(4) As NETFS_ICTX_USE_PGPRIV2 is removed, make netfs_write_begin() always
wait for PG_private_2. This function is deprecated and only used by
ceph anyway, and so label it so.
(5) Drop the NETFS_RREQ_WRITE_TO_CACHE flag and use
fscache_operation_valid() on the cache_resources instead. This has
the advantage of picking up the result of netfs_begin_cache_read() and
fscache_begin_write_operation() - which are called after the object is
initialised and will wait for the cache to come to a usable state.
Just reverting ae678317b95e[1] isn't a sufficient fix, so this need to be
applied on top of that. Without this as well, things like:
rcu: INFO: rcu_sched detected expedited stalls on CPUs/tasks: {
and:
WARNING: CPU: 13 PID: 3621 at fs/ceph/caps.c:3386
may happen, along with some UAFs due to PG_private_2 not getting used to
wait on writeback completion.
Fixes: 2ff1e97587f4 ("netfs: Replace PG_fscache by setting folio->private and marking dirty")
Reported-by: Max Kellermann <max.kellermann@ionos.com>
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Ilya Dryomov <idryomov@gmail.com>
cc: Xiubo Li <xiubli@redhat.com>
cc: Hristo Venev <hristo@venev.name>
cc: Jeff Layton <jlayton@kernel.org>
cc: Matthew Wilcox <willy@infradead.org>
cc: ceph-devel@vger.kernel.org
cc: netfs@lists.linux.dev
cc: linux-fsdevel@vger.kernel.org
cc: linux-mm@kvack.org
Link: https://lore.kernel.org/r/3575457.1722355300@warthog.procyon.org.uk/ [1]
Link: https://lore.kernel.org/r/1173209.1723152682@warthog.procyon.org.uk
Signed-off-by: Christian Brauner <brauner@kernel.org>
2024-08-08 02:38:46 +08:00
|
|
|
|
2024-07-02 07:40:22 +08:00
|
|
|
/* Expand the request if the cache wants it to start earlier. Note
|
|
|
|
* that the expansion may get further extended if the VM wishes to
|
|
|
|
* insert THPs and the preferred start and/or end wind up in the middle
|
|
|
|
* of THPs.
|
|
|
|
*
|
|
|
|
* If this is the case, however, the THP size should be an integer
|
|
|
|
* multiple of the cache granule size, so we get a whole number of
|
|
|
|
* granules to deal with.
|
|
|
|
*/
|
|
|
|
if (rreq->start != readahead_pos(ractl) ||
|
|
|
|
rreq->len != readahead_length(ractl)) {
|
|
|
|
readahead_expand(ractl, rreq->start, rreq->len);
|
|
|
|
rreq->start = readahead_pos(ractl);
|
|
|
|
rreq->len = readahead_length(ractl);
|
netfs: Fix handling of USE_PGPRIV2 and WRITE_TO_CACHE flags
The NETFS_RREQ_USE_PGPRIV2 and NETFS_RREQ_WRITE_TO_CACHE flags aren't used
correctly. The problem is that we try to set them up in the request
initialisation, but we the cache may be in the process of setting up still,
and so the state may not be correct. Further, we secondarily sample the
cache state and make contradictory decisions later.
The issue arises because we set up the cache resources, which allows the
cache's ->prepare_read() to switch on NETFS_SREQ_COPY_TO_CACHE - which
triggers cache writing even if we didn't set the flags when allocating.
Fix this in the following way:
(1) Drop NETFS_ICTX_USE_PGPRIV2 and instead set NETFS_RREQ_USE_PGPRIV2 in
->init_request() rather than trying to juggle that in
netfs_alloc_request().
(2) Repurpose NETFS_RREQ_USE_PGPRIV2 to merely indicate that if caching is
to be done, then PG_private_2 is to be used rather than only setting
it if we decide to cache and then having netfs_rreq_unlock_folios()
set the non-PG_private_2 writeback-to-cache if it wasn't set.
(3) Split netfs_rreq_unlock_folios() into two functions, one of which
contains the deprecated code for using PG_private_2 to avoid
accidentally doing the writeback path - and always use it if
USE_PGPRIV2 is set.
(4) As NETFS_ICTX_USE_PGPRIV2 is removed, make netfs_write_begin() always
wait for PG_private_2. This function is deprecated and only used by
ceph anyway, and so label it so.
(5) Drop the NETFS_RREQ_WRITE_TO_CACHE flag and use
fscache_operation_valid() on the cache_resources instead. This has
the advantage of picking up the result of netfs_begin_cache_read() and
fscache_begin_write_operation() - which are called after the object is
initialised and will wait for the cache to come to a usable state.
Just reverting ae678317b95e[1] isn't a sufficient fix, so this need to be
applied on top of that. Without this as well, things like:
rcu: INFO: rcu_sched detected expedited stalls on CPUs/tasks: {
and:
WARNING: CPU: 13 PID: 3621 at fs/ceph/caps.c:3386
may happen, along with some UAFs due to PG_private_2 not getting used to
wait on writeback completion.
Fixes: 2ff1e97587f4 ("netfs: Replace PG_fscache by setting folio->private and marking dirty")
Reported-by: Max Kellermann <max.kellermann@ionos.com>
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Ilya Dryomov <idryomov@gmail.com>
cc: Xiubo Li <xiubli@redhat.com>
cc: Hristo Venev <hristo@venev.name>
cc: Jeff Layton <jlayton@kernel.org>
cc: Matthew Wilcox <willy@infradead.org>
cc: ceph-devel@vger.kernel.org
cc: netfs@lists.linux.dev
cc: linux-fsdevel@vger.kernel.org
cc: linux-mm@kvack.org
Link: https://lore.kernel.org/r/3575457.1722355300@warthog.procyon.org.uk/ [1]
Link: https://lore.kernel.org/r/1173209.1723152682@warthog.procyon.org.uk
Signed-off-by: Christian Brauner <brauner@kernel.org>
2024-08-08 02:38:46 +08:00
|
|
|
|
2024-07-02 07:40:22 +08:00
|
|
|
trace_netfs_read(rreq, readahead_pos(ractl), readahead_length(ractl),
|
|
|
|
netfs_read_trace_expanded);
|
|
|
|
}
|
|
|
|
}
|
netfs: Fix handling of USE_PGPRIV2 and WRITE_TO_CACHE flags
The NETFS_RREQ_USE_PGPRIV2 and NETFS_RREQ_WRITE_TO_CACHE flags aren't used
correctly. The problem is that we try to set them up in the request
initialisation, but we the cache may be in the process of setting up still,
and so the state may not be correct. Further, we secondarily sample the
cache state and make contradictory decisions later.
The issue arises because we set up the cache resources, which allows the
cache's ->prepare_read() to switch on NETFS_SREQ_COPY_TO_CACHE - which
triggers cache writing even if we didn't set the flags when allocating.
Fix this in the following way:
(1) Drop NETFS_ICTX_USE_PGPRIV2 and instead set NETFS_RREQ_USE_PGPRIV2 in
->init_request() rather than trying to juggle that in
netfs_alloc_request().
(2) Repurpose NETFS_RREQ_USE_PGPRIV2 to merely indicate that if caching is
to be done, then PG_private_2 is to be used rather than only setting
it if we decide to cache and then having netfs_rreq_unlock_folios()
set the non-PG_private_2 writeback-to-cache if it wasn't set.
(3) Split netfs_rreq_unlock_folios() into two functions, one of which
contains the deprecated code for using PG_private_2 to avoid
accidentally doing the writeback path - and always use it if
USE_PGPRIV2 is set.
(4) As NETFS_ICTX_USE_PGPRIV2 is removed, make netfs_write_begin() always
wait for PG_private_2. This function is deprecated and only used by
ceph anyway, and so label it so.
(5) Drop the NETFS_RREQ_WRITE_TO_CACHE flag and use
fscache_operation_valid() on the cache_resources instead. This has
the advantage of picking up the result of netfs_begin_cache_read() and
fscache_begin_write_operation() - which are called after the object is
initialised and will wait for the cache to come to a usable state.
Just reverting ae678317b95e[1] isn't a sufficient fix, so this need to be
applied on top of that. Without this as well, things like:
rcu: INFO: rcu_sched detected expedited stalls on CPUs/tasks: {
and:
WARNING: CPU: 13 PID: 3621 at fs/ceph/caps.c:3386
may happen, along with some UAFs due to PG_private_2 not getting used to
wait on writeback completion.
Fixes: 2ff1e97587f4 ("netfs: Replace PG_fscache by setting folio->private and marking dirty")
Reported-by: Max Kellermann <max.kellermann@ionos.com>
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Ilya Dryomov <idryomov@gmail.com>
cc: Xiubo Li <xiubli@redhat.com>
cc: Hristo Venev <hristo@venev.name>
cc: Jeff Layton <jlayton@kernel.org>
cc: Matthew Wilcox <willy@infradead.org>
cc: ceph-devel@vger.kernel.org
cc: netfs@lists.linux.dev
cc: linux-fsdevel@vger.kernel.org
cc: linux-mm@kvack.org
Link: https://lore.kernel.org/r/3575457.1722355300@warthog.procyon.org.uk/ [1]
Link: https://lore.kernel.org/r/1173209.1723152682@warthog.procyon.org.uk
Signed-off-by: Christian Brauner <brauner@kernel.org>
2024-08-08 02:38:46 +08:00
|
|
|
|
2024-07-02 07:40:22 +08:00
|
|
|
/*
|
|
|
|
* Begin an operation, and fetch the stored zero point value from the cookie if
|
|
|
|
* available.
|
|
|
|
*/
|
|
|
|
static int netfs_begin_cache_read(struct netfs_io_request *rreq, struct netfs_inode *ctx)
|
|
|
|
{
|
|
|
|
return fscache_begin_read_operation(&rreq->cache_resources, netfs_i_cookie(ctx));
|
|
|
|
}
|
netfs: Fix handling of USE_PGPRIV2 and WRITE_TO_CACHE flags
The NETFS_RREQ_USE_PGPRIV2 and NETFS_RREQ_WRITE_TO_CACHE flags aren't used
correctly. The problem is that we try to set them up in the request
initialisation, but we the cache may be in the process of setting up still,
and so the state may not be correct. Further, we secondarily sample the
cache state and make contradictory decisions later.
The issue arises because we set up the cache resources, which allows the
cache's ->prepare_read() to switch on NETFS_SREQ_COPY_TO_CACHE - which
triggers cache writing even if we didn't set the flags when allocating.
Fix this in the following way:
(1) Drop NETFS_ICTX_USE_PGPRIV2 and instead set NETFS_RREQ_USE_PGPRIV2 in
->init_request() rather than trying to juggle that in
netfs_alloc_request().
(2) Repurpose NETFS_RREQ_USE_PGPRIV2 to merely indicate that if caching is
to be done, then PG_private_2 is to be used rather than only setting
it if we decide to cache and then having netfs_rreq_unlock_folios()
set the non-PG_private_2 writeback-to-cache if it wasn't set.
(3) Split netfs_rreq_unlock_folios() into two functions, one of which
contains the deprecated code for using PG_private_2 to avoid
accidentally doing the writeback path - and always use it if
USE_PGPRIV2 is set.
(4) As NETFS_ICTX_USE_PGPRIV2 is removed, make netfs_write_begin() always
wait for PG_private_2. This function is deprecated and only used by
ceph anyway, and so label it so.
(5) Drop the NETFS_RREQ_WRITE_TO_CACHE flag and use
fscache_operation_valid() on the cache_resources instead. This has
the advantage of picking up the result of netfs_begin_cache_read() and
fscache_begin_write_operation() - which are called after the object is
initialised and will wait for the cache to come to a usable state.
Just reverting ae678317b95e[1] isn't a sufficient fix, so this need to be
applied on top of that. Without this as well, things like:
rcu: INFO: rcu_sched detected expedited stalls on CPUs/tasks: {
and:
WARNING: CPU: 13 PID: 3621 at fs/ceph/caps.c:3386
may happen, along with some UAFs due to PG_private_2 not getting used to
wait on writeback completion.
Fixes: 2ff1e97587f4 ("netfs: Replace PG_fscache by setting folio->private and marking dirty")
Reported-by: Max Kellermann <max.kellermann@ionos.com>
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Ilya Dryomov <idryomov@gmail.com>
cc: Xiubo Li <xiubli@redhat.com>
cc: Hristo Venev <hristo@venev.name>
cc: Jeff Layton <jlayton@kernel.org>
cc: Matthew Wilcox <willy@infradead.org>
cc: ceph-devel@vger.kernel.org
cc: netfs@lists.linux.dev
cc: linux-fsdevel@vger.kernel.org
cc: linux-mm@kvack.org
Link: https://lore.kernel.org/r/3575457.1722355300@warthog.procyon.org.uk/ [1]
Link: https://lore.kernel.org/r/1173209.1723152682@warthog.procyon.org.uk
Signed-off-by: Christian Brauner <brauner@kernel.org>
2024-08-08 02:38:46 +08:00
|
|
|
|
2024-07-02 07:40:22 +08:00
|
|
|
/*
|
|
|
|
* Decant the list of folios to read into a rolling buffer.
|
|
|
|
*/
|
|
|
|
static size_t netfs_load_buffer_from_ra(struct netfs_io_request *rreq,
|
2024-10-04 22:33:58 +08:00
|
|
|
struct folio_queue *folioq,
|
|
|
|
struct folio_batch *put_batch)
|
2024-07-02 07:40:22 +08:00
|
|
|
{
|
|
|
|
unsigned int order, nr;
|
|
|
|
size_t size = 0;
|
|
|
|
|
|
|
|
nr = __readahead_batch(rreq->ractl, (struct page **)folioq->vec.folios,
|
|
|
|
ARRAY_SIZE(folioq->vec.folios));
|
|
|
|
folioq->vec.nr = nr;
|
|
|
|
for (int i = 0; i < nr; i++) {
|
|
|
|
struct folio *folio = folioq_folio(folioq, i);
|
|
|
|
|
|
|
|
trace_netfs_folio(folio, netfs_folio_trace_read);
|
|
|
|
order = folio_order(folio);
|
|
|
|
folioq->orders[i] = order;
|
|
|
|
size += PAGE_SIZE << order;
|
2024-10-04 22:33:58 +08:00
|
|
|
|
|
|
|
if (!folio_batch_add(put_batch, folio))
|
|
|
|
folio_batch_release(put_batch);
|
2024-07-02 07:40:22 +08:00
|
|
|
}
|
netfs: Fix handling of USE_PGPRIV2 and WRITE_TO_CACHE flags
The NETFS_RREQ_USE_PGPRIV2 and NETFS_RREQ_WRITE_TO_CACHE flags aren't used
correctly. The problem is that we try to set them up in the request
initialisation, but we the cache may be in the process of setting up still,
and so the state may not be correct. Further, we secondarily sample the
cache state and make contradictory decisions later.
The issue arises because we set up the cache resources, which allows the
cache's ->prepare_read() to switch on NETFS_SREQ_COPY_TO_CACHE - which
triggers cache writing even if we didn't set the flags when allocating.
Fix this in the following way:
(1) Drop NETFS_ICTX_USE_PGPRIV2 and instead set NETFS_RREQ_USE_PGPRIV2 in
->init_request() rather than trying to juggle that in
netfs_alloc_request().
(2) Repurpose NETFS_RREQ_USE_PGPRIV2 to merely indicate that if caching is
to be done, then PG_private_2 is to be used rather than only setting
it if we decide to cache and then having netfs_rreq_unlock_folios()
set the non-PG_private_2 writeback-to-cache if it wasn't set.
(3) Split netfs_rreq_unlock_folios() into two functions, one of which
contains the deprecated code for using PG_private_2 to avoid
accidentally doing the writeback path - and always use it if
USE_PGPRIV2 is set.
(4) As NETFS_ICTX_USE_PGPRIV2 is removed, make netfs_write_begin() always
wait for PG_private_2. This function is deprecated and only used by
ceph anyway, and so label it so.
(5) Drop the NETFS_RREQ_WRITE_TO_CACHE flag and use
fscache_operation_valid() on the cache_resources instead. This has
the advantage of picking up the result of netfs_begin_cache_read() and
fscache_begin_write_operation() - which are called after the object is
initialised and will wait for the cache to come to a usable state.
Just reverting ae678317b95e[1] isn't a sufficient fix, so this need to be
applied on top of that. Without this as well, things like:
rcu: INFO: rcu_sched detected expedited stalls on CPUs/tasks: {
and:
WARNING: CPU: 13 PID: 3621 at fs/ceph/caps.c:3386
may happen, along with some UAFs due to PG_private_2 not getting used to
wait on writeback completion.
Fixes: 2ff1e97587f4 ("netfs: Replace PG_fscache by setting folio->private and marking dirty")
Reported-by: Max Kellermann <max.kellermann@ionos.com>
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Ilya Dryomov <idryomov@gmail.com>
cc: Xiubo Li <xiubli@redhat.com>
cc: Hristo Venev <hristo@venev.name>
cc: Jeff Layton <jlayton@kernel.org>
cc: Matthew Wilcox <willy@infradead.org>
cc: ceph-devel@vger.kernel.org
cc: netfs@lists.linux.dev
cc: linux-fsdevel@vger.kernel.org
cc: linux-mm@kvack.org
Link: https://lore.kernel.org/r/3575457.1722355300@warthog.procyon.org.uk/ [1]
Link: https://lore.kernel.org/r/1173209.1723152682@warthog.procyon.org.uk
Signed-off-by: Christian Brauner <brauner@kernel.org>
2024-08-08 02:38:46 +08:00
|
|
|
|
2024-07-02 07:40:22 +08:00
|
|
|
for (int i = nr; i < folioq_nr_slots(folioq); i++)
|
|
|
|
folioq_clear(folioq, i);
|
netfs: Fix handling of USE_PGPRIV2 and WRITE_TO_CACHE flags
The NETFS_RREQ_USE_PGPRIV2 and NETFS_RREQ_WRITE_TO_CACHE flags aren't used
correctly. The problem is that we try to set them up in the request
initialisation, but we the cache may be in the process of setting up still,
and so the state may not be correct. Further, we secondarily sample the
cache state and make contradictory decisions later.
The issue arises because we set up the cache resources, which allows the
cache's ->prepare_read() to switch on NETFS_SREQ_COPY_TO_CACHE - which
triggers cache writing even if we didn't set the flags when allocating.
Fix this in the following way:
(1) Drop NETFS_ICTX_USE_PGPRIV2 and instead set NETFS_RREQ_USE_PGPRIV2 in
->init_request() rather than trying to juggle that in
netfs_alloc_request().
(2) Repurpose NETFS_RREQ_USE_PGPRIV2 to merely indicate that if caching is
to be done, then PG_private_2 is to be used rather than only setting
it if we decide to cache and then having netfs_rreq_unlock_folios()
set the non-PG_private_2 writeback-to-cache if it wasn't set.
(3) Split netfs_rreq_unlock_folios() into two functions, one of which
contains the deprecated code for using PG_private_2 to avoid
accidentally doing the writeback path - and always use it if
USE_PGPRIV2 is set.
(4) As NETFS_ICTX_USE_PGPRIV2 is removed, make netfs_write_begin() always
wait for PG_private_2. This function is deprecated and only used by
ceph anyway, and so label it so.
(5) Drop the NETFS_RREQ_WRITE_TO_CACHE flag and use
fscache_operation_valid() on the cache_resources instead. This has
the advantage of picking up the result of netfs_begin_cache_read() and
fscache_begin_write_operation() - which are called after the object is
initialised and will wait for the cache to come to a usable state.
Just reverting ae678317b95e[1] isn't a sufficient fix, so this need to be
applied on top of that. Without this as well, things like:
rcu: INFO: rcu_sched detected expedited stalls on CPUs/tasks: {
and:
WARNING: CPU: 13 PID: 3621 at fs/ceph/caps.c:3386
may happen, along with some UAFs due to PG_private_2 not getting used to
wait on writeback completion.
Fixes: 2ff1e97587f4 ("netfs: Replace PG_fscache by setting folio->private and marking dirty")
Reported-by: Max Kellermann <max.kellermann@ionos.com>
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Ilya Dryomov <idryomov@gmail.com>
cc: Xiubo Li <xiubli@redhat.com>
cc: Hristo Venev <hristo@venev.name>
cc: Jeff Layton <jlayton@kernel.org>
cc: Matthew Wilcox <willy@infradead.org>
cc: ceph-devel@vger.kernel.org
cc: netfs@lists.linux.dev
cc: linux-fsdevel@vger.kernel.org
cc: linux-mm@kvack.org
Link: https://lore.kernel.org/r/3575457.1722355300@warthog.procyon.org.uk/ [1]
Link: https://lore.kernel.org/r/1173209.1723152682@warthog.procyon.org.uk
Signed-off-by: Christian Brauner <brauner@kernel.org>
2024-08-08 02:38:46 +08:00
|
|
|
|
2024-07-02 07:40:22 +08:00
|
|
|
return size;
|
|
|
|
}
|
netfs: Fix handling of USE_PGPRIV2 and WRITE_TO_CACHE flags
The NETFS_RREQ_USE_PGPRIV2 and NETFS_RREQ_WRITE_TO_CACHE flags aren't used
correctly. The problem is that we try to set them up in the request
initialisation, but we the cache may be in the process of setting up still,
and so the state may not be correct. Further, we secondarily sample the
cache state and make contradictory decisions later.
The issue arises because we set up the cache resources, which allows the
cache's ->prepare_read() to switch on NETFS_SREQ_COPY_TO_CACHE - which
triggers cache writing even if we didn't set the flags when allocating.
Fix this in the following way:
(1) Drop NETFS_ICTX_USE_PGPRIV2 and instead set NETFS_RREQ_USE_PGPRIV2 in
->init_request() rather than trying to juggle that in
netfs_alloc_request().
(2) Repurpose NETFS_RREQ_USE_PGPRIV2 to merely indicate that if caching is
to be done, then PG_private_2 is to be used rather than only setting
it if we decide to cache and then having netfs_rreq_unlock_folios()
set the non-PG_private_2 writeback-to-cache if it wasn't set.
(3) Split netfs_rreq_unlock_folios() into two functions, one of which
contains the deprecated code for using PG_private_2 to avoid
accidentally doing the writeback path - and always use it if
USE_PGPRIV2 is set.
(4) As NETFS_ICTX_USE_PGPRIV2 is removed, make netfs_write_begin() always
wait for PG_private_2. This function is deprecated and only used by
ceph anyway, and so label it so.
(5) Drop the NETFS_RREQ_WRITE_TO_CACHE flag and use
fscache_operation_valid() on the cache_resources instead. This has
the advantage of picking up the result of netfs_begin_cache_read() and
fscache_begin_write_operation() - which are called after the object is
initialised and will wait for the cache to come to a usable state.
Just reverting ae678317b95e[1] isn't a sufficient fix, so this need to be
applied on top of that. Without this as well, things like:
rcu: INFO: rcu_sched detected expedited stalls on CPUs/tasks: {
and:
WARNING: CPU: 13 PID: 3621 at fs/ceph/caps.c:3386
may happen, along with some UAFs due to PG_private_2 not getting used to
wait on writeback completion.
Fixes: 2ff1e97587f4 ("netfs: Replace PG_fscache by setting folio->private and marking dirty")
Reported-by: Max Kellermann <max.kellermann@ionos.com>
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Ilya Dryomov <idryomov@gmail.com>
cc: Xiubo Li <xiubli@redhat.com>
cc: Hristo Venev <hristo@venev.name>
cc: Jeff Layton <jlayton@kernel.org>
cc: Matthew Wilcox <willy@infradead.org>
cc: ceph-devel@vger.kernel.org
cc: netfs@lists.linux.dev
cc: linux-fsdevel@vger.kernel.org
cc: linux-mm@kvack.org
Link: https://lore.kernel.org/r/3575457.1722355300@warthog.procyon.org.uk/ [1]
Link: https://lore.kernel.org/r/1173209.1723152682@warthog.procyon.org.uk
Signed-off-by: Christian Brauner <brauner@kernel.org>
2024-08-08 02:38:46 +08:00
|
|
|
|
2024-07-02 07:40:22 +08:00
|
|
|
/*
|
|
|
|
* netfs_prepare_read_iterator - Prepare the subreq iterator for I/O
|
|
|
|
* @subreq: The subrequest to be set up
|
|
|
|
*
|
|
|
|
* Prepare the I/O iterator representing the read buffer on a subrequest for
|
|
|
|
* the filesystem to use for I/O (it can be passed directly to a socket). This
|
|
|
|
* is intended to be called from the ->issue_read() method once the filesystem
|
|
|
|
* has trimmed the request to the size it wants.
|
|
|
|
*
|
|
|
|
* Returns the limited size if successful and -ENOMEM if insufficient memory
|
|
|
|
* available.
|
|
|
|
*
|
|
|
|
* [!] NOTE: This must be run in the same thread as ->issue_read() was called
|
|
|
|
* in as we access the readahead_control struct.
|
|
|
|
*/
|
|
|
|
static ssize_t netfs_prepare_read_iterator(struct netfs_io_subrequest *subreq)
|
|
|
|
{
|
|
|
|
struct netfs_io_request *rreq = subreq->rreq;
|
|
|
|
size_t rsize = subreq->len;
|
|
|
|
|
|
|
|
if (subreq->source == NETFS_DOWNLOAD_FROM_SERVER)
|
|
|
|
rsize = umin(rsize, rreq->io_streams[0].sreq_max_len);
|
|
|
|
|
|
|
|
if (rreq->ractl) {
|
|
|
|
/* If we don't have sufficient folios in the rolling buffer,
|
|
|
|
* extract a folioq's worth from the readahead region at a time
|
|
|
|
* into the buffer. Note that this acquires a ref on each page
|
|
|
|
* that we will need to release later - but we don't want to do
|
|
|
|
* that until after we've started the I/O.
|
|
|
|
*/
|
2024-10-04 22:33:58 +08:00
|
|
|
struct folio_batch put_batch;
|
|
|
|
|
|
|
|
folio_batch_init(&put_batch);
|
2024-07-02 07:40:22 +08:00
|
|
|
while (rreq->submitted < subreq->start + rsize) {
|
|
|
|
struct folio_queue *tail = rreq->buffer_tail, *new;
|
|
|
|
size_t added;
|
|
|
|
|
|
|
|
new = kmalloc(sizeof(*new), GFP_NOFS);
|
|
|
|
if (!new)
|
|
|
|
return -ENOMEM;
|
|
|
|
netfs_stat(&netfs_n_folioq);
|
|
|
|
folioq_init(new);
|
|
|
|
new->prev = tail;
|
|
|
|
tail->next = new;
|
|
|
|
rreq->buffer_tail = new;
|
2024-10-04 22:33:58 +08:00
|
|
|
added = netfs_load_buffer_from_ra(rreq, new, &put_batch);
|
2024-07-02 07:40:22 +08:00
|
|
|
rreq->iter.count += added;
|
|
|
|
rreq->submitted += added;
|
|
|
|
}
|
2024-10-04 22:33:58 +08:00
|
|
|
folio_batch_release(&put_batch);
|
2024-07-02 07:40:22 +08:00
|
|
|
}
|
netfs: Fix handling of USE_PGPRIV2 and WRITE_TO_CACHE flags
The NETFS_RREQ_USE_PGPRIV2 and NETFS_RREQ_WRITE_TO_CACHE flags aren't used
correctly. The problem is that we try to set them up in the request
initialisation, but we the cache may be in the process of setting up still,
and so the state may not be correct. Further, we secondarily sample the
cache state and make contradictory decisions later.
The issue arises because we set up the cache resources, which allows the
cache's ->prepare_read() to switch on NETFS_SREQ_COPY_TO_CACHE - which
triggers cache writing even if we didn't set the flags when allocating.
Fix this in the following way:
(1) Drop NETFS_ICTX_USE_PGPRIV2 and instead set NETFS_RREQ_USE_PGPRIV2 in
->init_request() rather than trying to juggle that in
netfs_alloc_request().
(2) Repurpose NETFS_RREQ_USE_PGPRIV2 to merely indicate that if caching is
to be done, then PG_private_2 is to be used rather than only setting
it if we decide to cache and then having netfs_rreq_unlock_folios()
set the non-PG_private_2 writeback-to-cache if it wasn't set.
(3) Split netfs_rreq_unlock_folios() into two functions, one of which
contains the deprecated code for using PG_private_2 to avoid
accidentally doing the writeback path - and always use it if
USE_PGPRIV2 is set.
(4) As NETFS_ICTX_USE_PGPRIV2 is removed, make netfs_write_begin() always
wait for PG_private_2. This function is deprecated and only used by
ceph anyway, and so label it so.
(5) Drop the NETFS_RREQ_WRITE_TO_CACHE flag and use
fscache_operation_valid() on the cache_resources instead. This has
the advantage of picking up the result of netfs_begin_cache_read() and
fscache_begin_write_operation() - which are called after the object is
initialised and will wait for the cache to come to a usable state.
Just reverting ae678317b95e[1] isn't a sufficient fix, so this need to be
applied on top of that. Without this as well, things like:
rcu: INFO: rcu_sched detected expedited stalls on CPUs/tasks: {
and:
WARNING: CPU: 13 PID: 3621 at fs/ceph/caps.c:3386
may happen, along with some UAFs due to PG_private_2 not getting used to
wait on writeback completion.
Fixes: 2ff1e97587f4 ("netfs: Replace PG_fscache by setting folio->private and marking dirty")
Reported-by: Max Kellermann <max.kellermann@ionos.com>
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Ilya Dryomov <idryomov@gmail.com>
cc: Xiubo Li <xiubli@redhat.com>
cc: Hristo Venev <hristo@venev.name>
cc: Jeff Layton <jlayton@kernel.org>
cc: Matthew Wilcox <willy@infradead.org>
cc: ceph-devel@vger.kernel.org
cc: netfs@lists.linux.dev
cc: linux-fsdevel@vger.kernel.org
cc: linux-mm@kvack.org
Link: https://lore.kernel.org/r/3575457.1722355300@warthog.procyon.org.uk/ [1]
Link: https://lore.kernel.org/r/1173209.1723152682@warthog.procyon.org.uk
Signed-off-by: Christian Brauner <brauner@kernel.org>
2024-08-08 02:38:46 +08:00
|
|
|
|
2024-07-02 07:40:22 +08:00
|
|
|
subreq->len = rsize;
|
|
|
|
if (unlikely(rreq->io_streams[0].sreq_max_segs)) {
|
|
|
|
size_t limit = netfs_limit_iter(&rreq->iter, 0, rsize,
|
|
|
|
rreq->io_streams[0].sreq_max_segs);
|
netfs: Fix handling of USE_PGPRIV2 and WRITE_TO_CACHE flags
The NETFS_RREQ_USE_PGPRIV2 and NETFS_RREQ_WRITE_TO_CACHE flags aren't used
correctly. The problem is that we try to set them up in the request
initialisation, but we the cache may be in the process of setting up still,
and so the state may not be correct. Further, we secondarily sample the
cache state and make contradictory decisions later.
The issue arises because we set up the cache resources, which allows the
cache's ->prepare_read() to switch on NETFS_SREQ_COPY_TO_CACHE - which
triggers cache writing even if we didn't set the flags when allocating.
Fix this in the following way:
(1) Drop NETFS_ICTX_USE_PGPRIV2 and instead set NETFS_RREQ_USE_PGPRIV2 in
->init_request() rather than trying to juggle that in
netfs_alloc_request().
(2) Repurpose NETFS_RREQ_USE_PGPRIV2 to merely indicate that if caching is
to be done, then PG_private_2 is to be used rather than only setting
it if we decide to cache and then having netfs_rreq_unlock_folios()
set the non-PG_private_2 writeback-to-cache if it wasn't set.
(3) Split netfs_rreq_unlock_folios() into two functions, one of which
contains the deprecated code for using PG_private_2 to avoid
accidentally doing the writeback path - and always use it if
USE_PGPRIV2 is set.
(4) As NETFS_ICTX_USE_PGPRIV2 is removed, make netfs_write_begin() always
wait for PG_private_2. This function is deprecated and only used by
ceph anyway, and so label it so.
(5) Drop the NETFS_RREQ_WRITE_TO_CACHE flag and use
fscache_operation_valid() on the cache_resources instead. This has
the advantage of picking up the result of netfs_begin_cache_read() and
fscache_begin_write_operation() - which are called after the object is
initialised and will wait for the cache to come to a usable state.
Just reverting ae678317b95e[1] isn't a sufficient fix, so this need to be
applied on top of that. Without this as well, things like:
rcu: INFO: rcu_sched detected expedited stalls on CPUs/tasks: {
and:
WARNING: CPU: 13 PID: 3621 at fs/ceph/caps.c:3386
may happen, along with some UAFs due to PG_private_2 not getting used to
wait on writeback completion.
Fixes: 2ff1e97587f4 ("netfs: Replace PG_fscache by setting folio->private and marking dirty")
Reported-by: Max Kellermann <max.kellermann@ionos.com>
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Ilya Dryomov <idryomov@gmail.com>
cc: Xiubo Li <xiubli@redhat.com>
cc: Hristo Venev <hristo@venev.name>
cc: Jeff Layton <jlayton@kernel.org>
cc: Matthew Wilcox <willy@infradead.org>
cc: ceph-devel@vger.kernel.org
cc: netfs@lists.linux.dev
cc: linux-fsdevel@vger.kernel.org
cc: linux-mm@kvack.org
Link: https://lore.kernel.org/r/3575457.1722355300@warthog.procyon.org.uk/ [1]
Link: https://lore.kernel.org/r/1173209.1723152682@warthog.procyon.org.uk
Signed-off-by: Christian Brauner <brauner@kernel.org>
2024-08-08 02:38:46 +08:00
|
|
|
|
2024-07-02 07:40:22 +08:00
|
|
|
if (limit < rsize) {
|
|
|
|
subreq->len = limit;
|
|
|
|
trace_netfs_sreq(subreq, netfs_sreq_trace_limited);
|
netfs: Fix handling of USE_PGPRIV2 and WRITE_TO_CACHE flags
The NETFS_RREQ_USE_PGPRIV2 and NETFS_RREQ_WRITE_TO_CACHE flags aren't used
correctly. The problem is that we try to set them up in the request
initialisation, but we the cache may be in the process of setting up still,
and so the state may not be correct. Further, we secondarily sample the
cache state and make contradictory decisions later.
The issue arises because we set up the cache resources, which allows the
cache's ->prepare_read() to switch on NETFS_SREQ_COPY_TO_CACHE - which
triggers cache writing even if we didn't set the flags when allocating.
Fix this in the following way:
(1) Drop NETFS_ICTX_USE_PGPRIV2 and instead set NETFS_RREQ_USE_PGPRIV2 in
->init_request() rather than trying to juggle that in
netfs_alloc_request().
(2) Repurpose NETFS_RREQ_USE_PGPRIV2 to merely indicate that if caching is
to be done, then PG_private_2 is to be used rather than only setting
it if we decide to cache and then having netfs_rreq_unlock_folios()
set the non-PG_private_2 writeback-to-cache if it wasn't set.
(3) Split netfs_rreq_unlock_folios() into two functions, one of which
contains the deprecated code for using PG_private_2 to avoid
accidentally doing the writeback path - and always use it if
USE_PGPRIV2 is set.
(4) As NETFS_ICTX_USE_PGPRIV2 is removed, make netfs_write_begin() always
wait for PG_private_2. This function is deprecated and only used by
ceph anyway, and so label it so.
(5) Drop the NETFS_RREQ_WRITE_TO_CACHE flag and use
fscache_operation_valid() on the cache_resources instead. This has
the advantage of picking up the result of netfs_begin_cache_read() and
fscache_begin_write_operation() - which are called after the object is
initialised and will wait for the cache to come to a usable state.
Just reverting ae678317b95e[1] isn't a sufficient fix, so this need to be
applied on top of that. Without this as well, things like:
rcu: INFO: rcu_sched detected expedited stalls on CPUs/tasks: {
and:
WARNING: CPU: 13 PID: 3621 at fs/ceph/caps.c:3386
may happen, along with some UAFs due to PG_private_2 not getting used to
wait on writeback completion.
Fixes: 2ff1e97587f4 ("netfs: Replace PG_fscache by setting folio->private and marking dirty")
Reported-by: Max Kellermann <max.kellermann@ionos.com>
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Ilya Dryomov <idryomov@gmail.com>
cc: Xiubo Li <xiubli@redhat.com>
cc: Hristo Venev <hristo@venev.name>
cc: Jeff Layton <jlayton@kernel.org>
cc: Matthew Wilcox <willy@infradead.org>
cc: ceph-devel@vger.kernel.org
cc: netfs@lists.linux.dev
cc: linux-fsdevel@vger.kernel.org
cc: linux-mm@kvack.org
Link: https://lore.kernel.org/r/3575457.1722355300@warthog.procyon.org.uk/ [1]
Link: https://lore.kernel.org/r/1173209.1723152682@warthog.procyon.org.uk
Signed-off-by: Christian Brauner <brauner@kernel.org>
2024-08-08 02:38:46 +08:00
|
|
|
}
|
2024-07-02 07:40:22 +08:00
|
|
|
}
|
netfs: Fix handling of USE_PGPRIV2 and WRITE_TO_CACHE flags
The NETFS_RREQ_USE_PGPRIV2 and NETFS_RREQ_WRITE_TO_CACHE flags aren't used
correctly. The problem is that we try to set them up in the request
initialisation, but we the cache may be in the process of setting up still,
and so the state may not be correct. Further, we secondarily sample the
cache state and make contradictory decisions later.
The issue arises because we set up the cache resources, which allows the
cache's ->prepare_read() to switch on NETFS_SREQ_COPY_TO_CACHE - which
triggers cache writing even if we didn't set the flags when allocating.
Fix this in the following way:
(1) Drop NETFS_ICTX_USE_PGPRIV2 and instead set NETFS_RREQ_USE_PGPRIV2 in
->init_request() rather than trying to juggle that in
netfs_alloc_request().
(2) Repurpose NETFS_RREQ_USE_PGPRIV2 to merely indicate that if caching is
to be done, then PG_private_2 is to be used rather than only setting
it if we decide to cache and then having netfs_rreq_unlock_folios()
set the non-PG_private_2 writeback-to-cache if it wasn't set.
(3) Split netfs_rreq_unlock_folios() into two functions, one of which
contains the deprecated code for using PG_private_2 to avoid
accidentally doing the writeback path - and always use it if
USE_PGPRIV2 is set.
(4) As NETFS_ICTX_USE_PGPRIV2 is removed, make netfs_write_begin() always
wait for PG_private_2. This function is deprecated and only used by
ceph anyway, and so label it so.
(5) Drop the NETFS_RREQ_WRITE_TO_CACHE flag and use
fscache_operation_valid() on the cache_resources instead. This has
the advantage of picking up the result of netfs_begin_cache_read() and
fscache_begin_write_operation() - which are called after the object is
initialised and will wait for the cache to come to a usable state.
Just reverting ae678317b95e[1] isn't a sufficient fix, so this need to be
applied on top of that. Without this as well, things like:
rcu: INFO: rcu_sched detected expedited stalls on CPUs/tasks: {
and:
WARNING: CPU: 13 PID: 3621 at fs/ceph/caps.c:3386
may happen, along with some UAFs due to PG_private_2 not getting used to
wait on writeback completion.
Fixes: 2ff1e97587f4 ("netfs: Replace PG_fscache by setting folio->private and marking dirty")
Reported-by: Max Kellermann <max.kellermann@ionos.com>
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Ilya Dryomov <idryomov@gmail.com>
cc: Xiubo Li <xiubli@redhat.com>
cc: Hristo Venev <hristo@venev.name>
cc: Jeff Layton <jlayton@kernel.org>
cc: Matthew Wilcox <willy@infradead.org>
cc: ceph-devel@vger.kernel.org
cc: netfs@lists.linux.dev
cc: linux-fsdevel@vger.kernel.org
cc: linux-mm@kvack.org
Link: https://lore.kernel.org/r/3575457.1722355300@warthog.procyon.org.uk/ [1]
Link: https://lore.kernel.org/r/1173209.1723152682@warthog.procyon.org.uk
Signed-off-by: Christian Brauner <brauner@kernel.org>
2024-08-08 02:38:46 +08:00
|
|
|
|
2024-07-02 07:40:22 +08:00
|
|
|
subreq->io_iter = rreq->iter;
|
netfs: Fix handling of USE_PGPRIV2 and WRITE_TO_CACHE flags
The NETFS_RREQ_USE_PGPRIV2 and NETFS_RREQ_WRITE_TO_CACHE flags aren't used
correctly. The problem is that we try to set them up in the request
initialisation, but we the cache may be in the process of setting up still,
and so the state may not be correct. Further, we secondarily sample the
cache state and make contradictory decisions later.
The issue arises because we set up the cache resources, which allows the
cache's ->prepare_read() to switch on NETFS_SREQ_COPY_TO_CACHE - which
triggers cache writing even if we didn't set the flags when allocating.
Fix this in the following way:
(1) Drop NETFS_ICTX_USE_PGPRIV2 and instead set NETFS_RREQ_USE_PGPRIV2 in
->init_request() rather than trying to juggle that in
netfs_alloc_request().
(2) Repurpose NETFS_RREQ_USE_PGPRIV2 to merely indicate that if caching is
to be done, then PG_private_2 is to be used rather than only setting
it if we decide to cache and then having netfs_rreq_unlock_folios()
set the non-PG_private_2 writeback-to-cache if it wasn't set.
(3) Split netfs_rreq_unlock_folios() into two functions, one of which
contains the deprecated code for using PG_private_2 to avoid
accidentally doing the writeback path - and always use it if
USE_PGPRIV2 is set.
(4) As NETFS_ICTX_USE_PGPRIV2 is removed, make netfs_write_begin() always
wait for PG_private_2. This function is deprecated and only used by
ceph anyway, and so label it so.
(5) Drop the NETFS_RREQ_WRITE_TO_CACHE flag and use
fscache_operation_valid() on the cache_resources instead. This has
the advantage of picking up the result of netfs_begin_cache_read() and
fscache_begin_write_operation() - which are called after the object is
initialised and will wait for the cache to come to a usable state.
Just reverting ae678317b95e[1] isn't a sufficient fix, so this need to be
applied on top of that. Without this as well, things like:
rcu: INFO: rcu_sched detected expedited stalls on CPUs/tasks: {
and:
WARNING: CPU: 13 PID: 3621 at fs/ceph/caps.c:3386
may happen, along with some UAFs due to PG_private_2 not getting used to
wait on writeback completion.
Fixes: 2ff1e97587f4 ("netfs: Replace PG_fscache by setting folio->private and marking dirty")
Reported-by: Max Kellermann <max.kellermann@ionos.com>
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Ilya Dryomov <idryomov@gmail.com>
cc: Xiubo Li <xiubli@redhat.com>
cc: Hristo Venev <hristo@venev.name>
cc: Jeff Layton <jlayton@kernel.org>
cc: Matthew Wilcox <willy@infradead.org>
cc: ceph-devel@vger.kernel.org
cc: netfs@lists.linux.dev
cc: linux-fsdevel@vger.kernel.org
cc: linux-mm@kvack.org
Link: https://lore.kernel.org/r/3575457.1722355300@warthog.procyon.org.uk/ [1]
Link: https://lore.kernel.org/r/1173209.1723152682@warthog.procyon.org.uk
Signed-off-by: Christian Brauner <brauner@kernel.org>
2024-08-08 02:38:46 +08:00
|
|
|
|
2024-07-02 07:40:22 +08:00
|
|
|
if (iov_iter_is_folioq(&subreq->io_iter)) {
|
|
|
|
if (subreq->io_iter.folioq_slot >= folioq_nr_slots(subreq->io_iter.folioq)) {
|
|
|
|
subreq->io_iter.folioq = subreq->io_iter.folioq->next;
|
|
|
|
subreq->io_iter.folioq_slot = 0;
|
netfs: Fix handling of USE_PGPRIV2 and WRITE_TO_CACHE flags
The NETFS_RREQ_USE_PGPRIV2 and NETFS_RREQ_WRITE_TO_CACHE flags aren't used
correctly. The problem is that we try to set them up in the request
initialisation, but we the cache may be in the process of setting up still,
and so the state may not be correct. Further, we secondarily sample the
cache state and make contradictory decisions later.
The issue arises because we set up the cache resources, which allows the
cache's ->prepare_read() to switch on NETFS_SREQ_COPY_TO_CACHE - which
triggers cache writing even if we didn't set the flags when allocating.
Fix this in the following way:
(1) Drop NETFS_ICTX_USE_PGPRIV2 and instead set NETFS_RREQ_USE_PGPRIV2 in
->init_request() rather than trying to juggle that in
netfs_alloc_request().
(2) Repurpose NETFS_RREQ_USE_PGPRIV2 to merely indicate that if caching is
to be done, then PG_private_2 is to be used rather than only setting
it if we decide to cache and then having netfs_rreq_unlock_folios()
set the non-PG_private_2 writeback-to-cache if it wasn't set.
(3) Split netfs_rreq_unlock_folios() into two functions, one of which
contains the deprecated code for using PG_private_2 to avoid
accidentally doing the writeback path - and always use it if
USE_PGPRIV2 is set.
(4) As NETFS_ICTX_USE_PGPRIV2 is removed, make netfs_write_begin() always
wait for PG_private_2. This function is deprecated and only used by
ceph anyway, and so label it so.
(5) Drop the NETFS_RREQ_WRITE_TO_CACHE flag and use
fscache_operation_valid() on the cache_resources instead. This has
the advantage of picking up the result of netfs_begin_cache_read() and
fscache_begin_write_operation() - which are called after the object is
initialised and will wait for the cache to come to a usable state.
Just reverting ae678317b95e[1] isn't a sufficient fix, so this need to be
applied on top of that. Without this as well, things like:
rcu: INFO: rcu_sched detected expedited stalls on CPUs/tasks: {
and:
WARNING: CPU: 13 PID: 3621 at fs/ceph/caps.c:3386
may happen, along with some UAFs due to PG_private_2 not getting used to
wait on writeback completion.
Fixes: 2ff1e97587f4 ("netfs: Replace PG_fscache by setting folio->private and marking dirty")
Reported-by: Max Kellermann <max.kellermann@ionos.com>
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Ilya Dryomov <idryomov@gmail.com>
cc: Xiubo Li <xiubli@redhat.com>
cc: Hristo Venev <hristo@venev.name>
cc: Jeff Layton <jlayton@kernel.org>
cc: Matthew Wilcox <willy@infradead.org>
cc: ceph-devel@vger.kernel.org
cc: netfs@lists.linux.dev
cc: linux-fsdevel@vger.kernel.org
cc: linux-mm@kvack.org
Link: https://lore.kernel.org/r/3575457.1722355300@warthog.procyon.org.uk/ [1]
Link: https://lore.kernel.org/r/1173209.1723152682@warthog.procyon.org.uk
Signed-off-by: Christian Brauner <brauner@kernel.org>
2024-08-08 02:38:46 +08:00
|
|
|
}
|
2024-07-02 07:40:22 +08:00
|
|
|
subreq->curr_folioq = (struct folio_queue *)subreq->io_iter.folioq;
|
|
|
|
subreq->curr_folioq_slot = subreq->io_iter.folioq_slot;
|
|
|
|
subreq->curr_folio_order = subreq->curr_folioq->orders[subreq->curr_folioq_slot];
|
netfs: Fix handling of USE_PGPRIV2 and WRITE_TO_CACHE flags
The NETFS_RREQ_USE_PGPRIV2 and NETFS_RREQ_WRITE_TO_CACHE flags aren't used
correctly. The problem is that we try to set them up in the request
initialisation, but we the cache may be in the process of setting up still,
and so the state may not be correct. Further, we secondarily sample the
cache state and make contradictory decisions later.
The issue arises because we set up the cache resources, which allows the
cache's ->prepare_read() to switch on NETFS_SREQ_COPY_TO_CACHE - which
triggers cache writing even if we didn't set the flags when allocating.
Fix this in the following way:
(1) Drop NETFS_ICTX_USE_PGPRIV2 and instead set NETFS_RREQ_USE_PGPRIV2 in
->init_request() rather than trying to juggle that in
netfs_alloc_request().
(2) Repurpose NETFS_RREQ_USE_PGPRIV2 to merely indicate that if caching is
to be done, then PG_private_2 is to be used rather than only setting
it if we decide to cache and then having netfs_rreq_unlock_folios()
set the non-PG_private_2 writeback-to-cache if it wasn't set.
(3) Split netfs_rreq_unlock_folios() into two functions, one of which
contains the deprecated code for using PG_private_2 to avoid
accidentally doing the writeback path - and always use it if
USE_PGPRIV2 is set.
(4) As NETFS_ICTX_USE_PGPRIV2 is removed, make netfs_write_begin() always
wait for PG_private_2. This function is deprecated and only used by
ceph anyway, and so label it so.
(5) Drop the NETFS_RREQ_WRITE_TO_CACHE flag and use
fscache_operation_valid() on the cache_resources instead. This has
the advantage of picking up the result of netfs_begin_cache_read() and
fscache_begin_write_operation() - which are called after the object is
initialised and will wait for the cache to come to a usable state.
Just reverting ae678317b95e[1] isn't a sufficient fix, so this need to be
applied on top of that. Without this as well, things like:
rcu: INFO: rcu_sched detected expedited stalls on CPUs/tasks: {
and:
WARNING: CPU: 13 PID: 3621 at fs/ceph/caps.c:3386
may happen, along with some UAFs due to PG_private_2 not getting used to
wait on writeback completion.
Fixes: 2ff1e97587f4 ("netfs: Replace PG_fscache by setting folio->private and marking dirty")
Reported-by: Max Kellermann <max.kellermann@ionos.com>
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Ilya Dryomov <idryomov@gmail.com>
cc: Xiubo Li <xiubli@redhat.com>
cc: Hristo Venev <hristo@venev.name>
cc: Jeff Layton <jlayton@kernel.org>
cc: Matthew Wilcox <willy@infradead.org>
cc: ceph-devel@vger.kernel.org
cc: netfs@lists.linux.dev
cc: linux-fsdevel@vger.kernel.org
cc: linux-mm@kvack.org
Link: https://lore.kernel.org/r/3575457.1722355300@warthog.procyon.org.uk/ [1]
Link: https://lore.kernel.org/r/1173209.1723152682@warthog.procyon.org.uk
Signed-off-by: Christian Brauner <brauner@kernel.org>
2024-08-08 02:38:46 +08:00
|
|
|
}
|
2024-07-02 07:40:22 +08:00
|
|
|
|
|
|
|
iov_iter_truncate(&subreq->io_iter, subreq->len);
|
|
|
|
iov_iter_advance(&rreq->iter, subreq->len);
|
|
|
|
return subreq->len;
|
netfs: Fix handling of USE_PGPRIV2 and WRITE_TO_CACHE flags
The NETFS_RREQ_USE_PGPRIV2 and NETFS_RREQ_WRITE_TO_CACHE flags aren't used
correctly. The problem is that we try to set them up in the request
initialisation, but we the cache may be in the process of setting up still,
and so the state may not be correct. Further, we secondarily sample the
cache state and make contradictory decisions later.
The issue arises because we set up the cache resources, which allows the
cache's ->prepare_read() to switch on NETFS_SREQ_COPY_TO_CACHE - which
triggers cache writing even if we didn't set the flags when allocating.
Fix this in the following way:
(1) Drop NETFS_ICTX_USE_PGPRIV2 and instead set NETFS_RREQ_USE_PGPRIV2 in
->init_request() rather than trying to juggle that in
netfs_alloc_request().
(2) Repurpose NETFS_RREQ_USE_PGPRIV2 to merely indicate that if caching is
to be done, then PG_private_2 is to be used rather than only setting
it if we decide to cache and then having netfs_rreq_unlock_folios()
set the non-PG_private_2 writeback-to-cache if it wasn't set.
(3) Split netfs_rreq_unlock_folios() into two functions, one of which
contains the deprecated code for using PG_private_2 to avoid
accidentally doing the writeback path - and always use it if
USE_PGPRIV2 is set.
(4) As NETFS_ICTX_USE_PGPRIV2 is removed, make netfs_write_begin() always
wait for PG_private_2. This function is deprecated and only used by
ceph anyway, and so label it so.
(5) Drop the NETFS_RREQ_WRITE_TO_CACHE flag and use
fscache_operation_valid() on the cache_resources instead. This has
the advantage of picking up the result of netfs_begin_cache_read() and
fscache_begin_write_operation() - which are called after the object is
initialised and will wait for the cache to come to a usable state.
Just reverting ae678317b95e[1] isn't a sufficient fix, so this need to be
applied on top of that. Without this as well, things like:
rcu: INFO: rcu_sched detected expedited stalls on CPUs/tasks: {
and:
WARNING: CPU: 13 PID: 3621 at fs/ceph/caps.c:3386
may happen, along with some UAFs due to PG_private_2 not getting used to
wait on writeback completion.
Fixes: 2ff1e97587f4 ("netfs: Replace PG_fscache by setting folio->private and marking dirty")
Reported-by: Max Kellermann <max.kellermann@ionos.com>
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Ilya Dryomov <idryomov@gmail.com>
cc: Xiubo Li <xiubli@redhat.com>
cc: Hristo Venev <hristo@venev.name>
cc: Jeff Layton <jlayton@kernel.org>
cc: Matthew Wilcox <willy@infradead.org>
cc: ceph-devel@vger.kernel.org
cc: netfs@lists.linux.dev
cc: linux-fsdevel@vger.kernel.org
cc: linux-mm@kvack.org
Link: https://lore.kernel.org/r/3575457.1722355300@warthog.procyon.org.uk/ [1]
Link: https://lore.kernel.org/r/1173209.1723152682@warthog.procyon.org.uk
Signed-off-by: Christian Brauner <brauner@kernel.org>
2024-08-08 02:38:46 +08:00
|
|
|
}
|
|
|
|
|
2024-07-02 07:40:22 +08:00
|
|
|
static enum netfs_io_source netfs_cache_prepare_read(struct netfs_io_request *rreq,
|
|
|
|
struct netfs_io_subrequest *subreq,
|
|
|
|
loff_t i_size)
|
2022-03-01 22:35:58 +08:00
|
|
|
{
|
2024-07-02 07:40:22 +08:00
|
|
|
struct netfs_cache_resources *cres = &rreq->cache_resources;
|
2022-03-01 22:35:58 +08:00
|
|
|
|
2024-07-02 07:40:22 +08:00
|
|
|
if (!cres->ops)
|
|
|
|
return NETFS_DOWNLOAD_FROM_SERVER;
|
|
|
|
return cres->ops->prepare_read(subreq, i_size);
|
|
|
|
}
|
2022-03-01 22:35:58 +08:00
|
|
|
|
2024-07-02 07:40:22 +08:00
|
|
|
static void netfs_cache_read_terminated(void *priv, ssize_t transferred_or_error,
|
|
|
|
bool was_async)
|
|
|
|
{
|
|
|
|
struct netfs_io_subrequest *subreq = priv;
|
2022-03-01 22:35:58 +08:00
|
|
|
|
2024-07-02 07:40:22 +08:00
|
|
|
if (transferred_or_error < 0) {
|
|
|
|
netfs_read_subreq_terminated(subreq, transferred_or_error, was_async);
|
|
|
|
return;
|
netfs: Fix handling of USE_PGPRIV2 and WRITE_TO_CACHE flags
The NETFS_RREQ_USE_PGPRIV2 and NETFS_RREQ_WRITE_TO_CACHE flags aren't used
correctly. The problem is that we try to set them up in the request
initialisation, but we the cache may be in the process of setting up still,
and so the state may not be correct. Further, we secondarily sample the
cache state and make contradictory decisions later.
The issue arises because we set up the cache resources, which allows the
cache's ->prepare_read() to switch on NETFS_SREQ_COPY_TO_CACHE - which
triggers cache writing even if we didn't set the flags when allocating.
Fix this in the following way:
(1) Drop NETFS_ICTX_USE_PGPRIV2 and instead set NETFS_RREQ_USE_PGPRIV2 in
->init_request() rather than trying to juggle that in
netfs_alloc_request().
(2) Repurpose NETFS_RREQ_USE_PGPRIV2 to merely indicate that if caching is
to be done, then PG_private_2 is to be used rather than only setting
it if we decide to cache and then having netfs_rreq_unlock_folios()
set the non-PG_private_2 writeback-to-cache if it wasn't set.
(3) Split netfs_rreq_unlock_folios() into two functions, one of which
contains the deprecated code for using PG_private_2 to avoid
accidentally doing the writeback path - and always use it if
USE_PGPRIV2 is set.
(4) As NETFS_ICTX_USE_PGPRIV2 is removed, make netfs_write_begin() always
wait for PG_private_2. This function is deprecated and only used by
ceph anyway, and so label it so.
(5) Drop the NETFS_RREQ_WRITE_TO_CACHE flag and use
fscache_operation_valid() on the cache_resources instead. This has
the advantage of picking up the result of netfs_begin_cache_read() and
fscache_begin_write_operation() - which are called after the object is
initialised and will wait for the cache to come to a usable state.
Just reverting ae678317b95e[1] isn't a sufficient fix, so this need to be
applied on top of that. Without this as well, things like:
rcu: INFO: rcu_sched detected expedited stalls on CPUs/tasks: {
and:
WARNING: CPU: 13 PID: 3621 at fs/ceph/caps.c:3386
may happen, along with some UAFs due to PG_private_2 not getting used to
wait on writeback completion.
Fixes: 2ff1e97587f4 ("netfs: Replace PG_fscache by setting folio->private and marking dirty")
Reported-by: Max Kellermann <max.kellermann@ionos.com>
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Ilya Dryomov <idryomov@gmail.com>
cc: Xiubo Li <xiubli@redhat.com>
cc: Hristo Venev <hristo@venev.name>
cc: Jeff Layton <jlayton@kernel.org>
cc: Matthew Wilcox <willy@infradead.org>
cc: ceph-devel@vger.kernel.org
cc: netfs@lists.linux.dev
cc: linux-fsdevel@vger.kernel.org
cc: linux-mm@kvack.org
Link: https://lore.kernel.org/r/3575457.1722355300@warthog.procyon.org.uk/ [1]
Link: https://lore.kernel.org/r/1173209.1723152682@warthog.procyon.org.uk
Signed-off-by: Christian Brauner <brauner@kernel.org>
2024-08-08 02:38:46 +08:00
|
|
|
}
|
|
|
|
|
2024-07-02 07:40:22 +08:00
|
|
|
if (transferred_or_error > 0)
|
|
|
|
subreq->transferred += transferred_or_error;
|
|
|
|
netfs_read_subreq_terminated(subreq, 0, was_async);
|
|
|
|
}
|
2022-03-01 22:35:58 +08:00
|
|
|
|
2024-07-02 07:40:22 +08:00
|
|
|
/*
|
|
|
|
* Issue a read against the cache.
|
|
|
|
* - Eats the caller's ref on subreq.
|
|
|
|
*/
|
|
|
|
static void netfs_read_cache_to_pagecache(struct netfs_io_request *rreq,
|
|
|
|
struct netfs_io_subrequest *subreq)
|
|
|
|
{
|
|
|
|
struct netfs_cache_resources *cres = &rreq->cache_resources;
|
2022-03-01 22:35:58 +08:00
|
|
|
|
2024-07-02 07:40:22 +08:00
|
|
|
netfs_stat(&netfs_n_rh_read);
|
|
|
|
cres->ops->read(cres, subreq->start, &subreq->io_iter, NETFS_READ_HOLE_IGNORE,
|
|
|
|
netfs_cache_read_terminated, subreq);
|
|
|
|
}
|
2022-11-04 00:08:14 +08:00
|
|
|
|
2024-07-02 07:40:22 +08:00
|
|
|
/*
|
|
|
|
* Perform a read to the pagecache from a series of sources of different types,
|
|
|
|
* slicing up the region to be read according to available cache blocks and
|
|
|
|
* network rsize.
|
|
|
|
*/
|
|
|
|
static void netfs_read_to_pagecache(struct netfs_io_request *rreq)
|
|
|
|
{
|
|
|
|
struct netfs_inode *ictx = netfs_inode(rreq->inode);
|
|
|
|
unsigned long long start = rreq->start;
|
|
|
|
ssize_t size = rreq->len;
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
atomic_inc(&rreq->nr_outstanding);
|
|
|
|
|
|
|
|
do {
|
|
|
|
struct netfs_io_subrequest *subreq;
|
|
|
|
enum netfs_io_source source = NETFS_DOWNLOAD_FROM_SERVER;
|
|
|
|
ssize_t slice;
|
|
|
|
|
|
|
|
subreq = netfs_alloc_subrequest(rreq);
|
|
|
|
if (!subreq) {
|
|
|
|
ret = -ENOMEM;
|
|
|
|
break;
|
|
|
|
}
|
2022-11-04 00:08:14 +08:00
|
|
|
|
2024-07-02 07:40:22 +08:00
|
|
|
subreq->start = start;
|
|
|
|
subreq->len = size;
|
|
|
|
|
|
|
|
atomic_inc(&rreq->nr_outstanding);
|
|
|
|
spin_lock_bh(&rreq->lock);
|
|
|
|
list_add_tail(&subreq->rreq_link, &rreq->subrequests);
|
|
|
|
subreq->prev_donated = rreq->prev_donated;
|
|
|
|
rreq->prev_donated = 0;
|
|
|
|
trace_netfs_sreq(subreq, netfs_sreq_trace_added);
|
|
|
|
spin_unlock_bh(&rreq->lock);
|
|
|
|
|
|
|
|
source = netfs_cache_prepare_read(rreq, subreq, rreq->i_size);
|
|
|
|
subreq->source = source;
|
|
|
|
if (source == NETFS_DOWNLOAD_FROM_SERVER) {
|
|
|
|
unsigned long long zp = umin(ictx->zero_point, rreq->i_size);
|
|
|
|
size_t len = subreq->len;
|
|
|
|
|
|
|
|
if (subreq->start >= zp) {
|
|
|
|
subreq->source = source = NETFS_FILL_WITH_ZEROES;
|
|
|
|
goto fill_with_zeroes;
|
|
|
|
}
|
2022-11-04 23:36:49 +08:00
|
|
|
|
2024-07-02 07:40:22 +08:00
|
|
|
if (len > zp - subreq->start)
|
|
|
|
len = zp - subreq->start;
|
|
|
|
if (len == 0) {
|
|
|
|
pr_err("ZERO-LEN READ: R=%08x[%x] l=%zx/%zx s=%llx z=%llx i=%llx",
|
|
|
|
rreq->debug_id, subreq->debug_index,
|
|
|
|
subreq->len, size,
|
|
|
|
subreq->start, ictx->zero_point, rreq->i_size);
|
2022-03-01 22:35:58 +08:00
|
|
|
break;
|
|
|
|
}
|
2024-07-02 07:40:22 +08:00
|
|
|
subreq->len = len;
|
|
|
|
|
|
|
|
netfs_stat(&netfs_n_rh_download);
|
|
|
|
if (rreq->netfs_ops->prepare_read) {
|
|
|
|
ret = rreq->netfs_ops->prepare_read(subreq);
|
|
|
|
if (ret < 0) {
|
|
|
|
atomic_dec(&rreq->nr_outstanding);
|
|
|
|
netfs_put_subrequest(subreq, false,
|
|
|
|
netfs_sreq_trace_put_cancel);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
trace_netfs_sreq(subreq, netfs_sreq_trace_prepare);
|
|
|
|
}
|
netfs: Fix handling of USE_PGPRIV2 and WRITE_TO_CACHE flags
The NETFS_RREQ_USE_PGPRIV2 and NETFS_RREQ_WRITE_TO_CACHE flags aren't used
correctly. The problem is that we try to set them up in the request
initialisation, but we the cache may be in the process of setting up still,
and so the state may not be correct. Further, we secondarily sample the
cache state and make contradictory decisions later.
The issue arises because we set up the cache resources, which allows the
cache's ->prepare_read() to switch on NETFS_SREQ_COPY_TO_CACHE - which
triggers cache writing even if we didn't set the flags when allocating.
Fix this in the following way:
(1) Drop NETFS_ICTX_USE_PGPRIV2 and instead set NETFS_RREQ_USE_PGPRIV2 in
->init_request() rather than trying to juggle that in
netfs_alloc_request().
(2) Repurpose NETFS_RREQ_USE_PGPRIV2 to merely indicate that if caching is
to be done, then PG_private_2 is to be used rather than only setting
it if we decide to cache and then having netfs_rreq_unlock_folios()
set the non-PG_private_2 writeback-to-cache if it wasn't set.
(3) Split netfs_rreq_unlock_folios() into two functions, one of which
contains the deprecated code for using PG_private_2 to avoid
accidentally doing the writeback path - and always use it if
USE_PGPRIV2 is set.
(4) As NETFS_ICTX_USE_PGPRIV2 is removed, make netfs_write_begin() always
wait for PG_private_2. This function is deprecated and only used by
ceph anyway, and so label it so.
(5) Drop the NETFS_RREQ_WRITE_TO_CACHE flag and use
fscache_operation_valid() on the cache_resources instead. This has
the advantage of picking up the result of netfs_begin_cache_read() and
fscache_begin_write_operation() - which are called after the object is
initialised and will wait for the cache to come to a usable state.
Just reverting ae678317b95e[1] isn't a sufficient fix, so this need to be
applied on top of that. Without this as well, things like:
rcu: INFO: rcu_sched detected expedited stalls on CPUs/tasks: {
and:
WARNING: CPU: 13 PID: 3621 at fs/ceph/caps.c:3386
may happen, along with some UAFs due to PG_private_2 not getting used to
wait on writeback completion.
Fixes: 2ff1e97587f4 ("netfs: Replace PG_fscache by setting folio->private and marking dirty")
Reported-by: Max Kellermann <max.kellermann@ionos.com>
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Ilya Dryomov <idryomov@gmail.com>
cc: Xiubo Li <xiubli@redhat.com>
cc: Hristo Venev <hristo@venev.name>
cc: Jeff Layton <jlayton@kernel.org>
cc: Matthew Wilcox <willy@infradead.org>
cc: ceph-devel@vger.kernel.org
cc: netfs@lists.linux.dev
cc: linux-fsdevel@vger.kernel.org
cc: linux-mm@kvack.org
Link: https://lore.kernel.org/r/3575457.1722355300@warthog.procyon.org.uk/ [1]
Link: https://lore.kernel.org/r/1173209.1723152682@warthog.procyon.org.uk
Signed-off-by: Christian Brauner <brauner@kernel.org>
2024-08-08 02:38:46 +08:00
|
|
|
|
2024-07-02 07:40:22 +08:00
|
|
|
slice = netfs_prepare_read_iterator(subreq);
|
|
|
|
if (slice < 0) {
|
|
|
|
atomic_dec(&rreq->nr_outstanding);
|
|
|
|
netfs_put_subrequest(subreq, false, netfs_sreq_trace_put_cancel);
|
|
|
|
ret = slice;
|
2022-03-01 22:35:58 +08:00
|
|
|
break;
|
|
|
|
}
|
2022-11-04 23:36:49 +08:00
|
|
|
|
2024-07-02 07:40:22 +08:00
|
|
|
rreq->netfs_ops->issue_read(subreq);
|
|
|
|
goto done;
|
2022-03-01 22:35:58 +08:00
|
|
|
}
|
|
|
|
|
2024-07-02 07:40:22 +08:00
|
|
|
fill_with_zeroes:
|
|
|
|
if (source == NETFS_FILL_WITH_ZEROES) {
|
|
|
|
subreq->source = NETFS_FILL_WITH_ZEROES;
|
|
|
|
trace_netfs_sreq(subreq, netfs_sreq_trace_submit);
|
|
|
|
netfs_stat(&netfs_n_rh_zero);
|
|
|
|
slice = netfs_prepare_read_iterator(subreq);
|
|
|
|
__set_bit(NETFS_SREQ_CLEAR_TAIL, &subreq->flags);
|
|
|
|
netfs_read_subreq_terminated(subreq, 0, false);
|
|
|
|
goto done;
|
2022-03-01 22:35:58 +08:00
|
|
|
}
|
|
|
|
|
2024-07-02 07:40:22 +08:00
|
|
|
if (source == NETFS_READ_FROM_CACHE) {
|
|
|
|
trace_netfs_sreq(subreq, netfs_sreq_trace_submit);
|
|
|
|
slice = netfs_prepare_read_iterator(subreq);
|
|
|
|
netfs_read_cache_to_pagecache(rreq, subreq);
|
|
|
|
goto done;
|
2022-03-01 22:35:58 +08:00
|
|
|
}
|
|
|
|
|
2024-07-02 07:40:22 +08:00
|
|
|
pr_err("Unexpected read source %u\n", source);
|
|
|
|
WARN_ON_ONCE(1);
|
|
|
|
break;
|
2022-03-01 22:35:58 +08:00
|
|
|
|
2024-07-02 07:40:22 +08:00
|
|
|
done:
|
|
|
|
size -= slice;
|
|
|
|
start += slice;
|
|
|
|
cond_resched();
|
|
|
|
} while (size > 0);
|
2022-03-01 22:35:58 +08:00
|
|
|
|
2024-07-02 07:40:22 +08:00
|
|
|
if (atomic_dec_and_test(&rreq->nr_outstanding))
|
|
|
|
netfs_rreq_terminated(rreq, false);
|
|
|
|
|
|
|
|
/* Defer error return as we may need to wait for outstanding I/O. */
|
|
|
|
cmpxchg(&rreq->error, 0, ret);
|
2022-03-01 22:35:58 +08:00
|
|
|
}
|
|
|
|
|
2024-07-02 07:40:22 +08:00
|
|
|
/*
|
|
|
|
* Wait for the read operation to complete, successfully or otherwise.
|
|
|
|
*/
|
|
|
|
static int netfs_wait_for_read(struct netfs_io_request *rreq)
|
2022-03-01 22:35:58 +08:00
|
|
|
{
|
2024-07-02 07:40:22 +08:00
|
|
|
int ret;
|
2022-03-01 22:35:58 +08:00
|
|
|
|
2024-07-02 07:40:22 +08:00
|
|
|
trace_netfs_rreq(rreq, netfs_rreq_trace_wait_ip);
|
|
|
|
wait_on_bit(&rreq->flags, NETFS_RREQ_IN_PROGRESS, TASK_UNINTERRUPTIBLE);
|
|
|
|
ret = rreq->error;
|
|
|
|
if (ret == 0 && rreq->submitted < rreq->len) {
|
|
|
|
trace_netfs_failure(rreq, NULL, ret, netfs_fail_short_read);
|
|
|
|
ret = -EIO;
|
|
|
|
}
|
2022-03-01 22:35:58 +08:00
|
|
|
|
2024-07-02 07:40:22 +08:00
|
|
|
return ret;
|
|
|
|
}
|
2022-03-01 22:35:58 +08:00
|
|
|
|
2024-07-02 07:40:22 +08:00
|
|
|
/*
|
|
|
|
* Set up the initial folioq of buffer folios in the rolling buffer and set the
|
|
|
|
* iterator to refer to it.
|
|
|
|
*/
|
|
|
|
static int netfs_prime_buffer(struct netfs_io_request *rreq)
|
|
|
|
{
|
|
|
|
struct folio_queue *folioq;
|
2024-10-04 22:33:58 +08:00
|
|
|
struct folio_batch put_batch;
|
2024-07-02 07:40:22 +08:00
|
|
|
size_t added;
|
|
|
|
|
|
|
|
folioq = kmalloc(sizeof(*folioq), GFP_KERNEL);
|
|
|
|
if (!folioq)
|
|
|
|
return -ENOMEM;
|
|
|
|
netfs_stat(&netfs_n_folioq);
|
|
|
|
folioq_init(folioq);
|
|
|
|
rreq->buffer = folioq;
|
|
|
|
rreq->buffer_tail = folioq;
|
|
|
|
rreq->submitted = rreq->start;
|
|
|
|
iov_iter_folio_queue(&rreq->iter, ITER_DEST, folioq, 0, 0, 0);
|
|
|
|
|
2024-10-04 22:33:58 +08:00
|
|
|
folio_batch_init(&put_batch);
|
|
|
|
added = netfs_load_buffer_from_ra(rreq, folioq, &put_batch);
|
|
|
|
folio_batch_release(&put_batch);
|
2024-07-02 07:40:22 +08:00
|
|
|
rreq->iter.count += added;
|
|
|
|
rreq->submitted += added;
|
|
|
|
return 0;
|
2022-03-01 22:35:58 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* netfs_readahead - Helper to manage a read request
|
|
|
|
* @ractl: The description of the readahead request
|
|
|
|
*
|
|
|
|
* Fulfil a readahead request by drawing data from the cache if possible, or
|
|
|
|
* the netfs if not. Space beyond the EOF is zero-filled. Multiple I/O
|
|
|
|
* requests from different sources will get munged together. If necessary, the
|
|
|
|
* readahead window can be expanded in either direction to a more convenient
|
|
|
|
* alighment for RPC efficiency or to make storage in the cache feasible.
|
|
|
|
*
|
|
|
|
* The calling netfs must initialise a netfs context contiguous to the vfs
|
|
|
|
* inode before calling this.
|
|
|
|
*
|
|
|
|
* This is usable whether or not caching is enabled.
|
|
|
|
*/
|
|
|
|
void netfs_readahead(struct readahead_control *ractl)
|
|
|
|
{
|
|
|
|
struct netfs_io_request *rreq;
|
2024-07-02 07:40:22 +08:00
|
|
|
struct netfs_inode *ictx = netfs_inode(ractl->mapping->host);
|
|
|
|
unsigned long long start = readahead_pos(ractl);
|
|
|
|
size_t size = readahead_length(ractl);
|
2022-03-01 22:35:58 +08:00
|
|
|
int ret;
|
|
|
|
|
2024-07-02 07:40:22 +08:00
|
|
|
rreq = netfs_alloc_request(ractl->mapping, ractl->file, start, size,
|
2022-03-01 22:35:58 +08:00
|
|
|
NETFS_READAHEAD);
|
|
|
|
if (IS_ERR(rreq))
|
|
|
|
return;
|
|
|
|
|
2024-07-02 07:40:22 +08:00
|
|
|
ret = netfs_begin_cache_read(rreq, ictx);
|
2023-11-21 01:09:47 +08:00
|
|
|
if (ret == -ENOMEM || ret == -EINTR || ret == -ERESTARTSYS)
|
|
|
|
goto cleanup_free;
|
2022-03-01 22:35:58 +08:00
|
|
|
|
|
|
|
netfs_stat(&netfs_n_rh_readahead);
|
|
|
|
trace_netfs_read(rreq, readahead_pos(ractl), readahead_length(ractl),
|
|
|
|
netfs_read_trace_readahead);
|
|
|
|
|
|
|
|
netfs_rreq_expand(rreq, ractl);
|
|
|
|
|
2024-07-02 07:40:22 +08:00
|
|
|
rreq->ractl = ractl;
|
|
|
|
if (netfs_prime_buffer(rreq) < 0)
|
|
|
|
goto cleanup_free;
|
|
|
|
netfs_read_to_pagecache(rreq);
|
2023-09-27 00:42:26 +08:00
|
|
|
|
2024-07-02 07:40:22 +08:00
|
|
|
netfs_put_request(rreq, true, netfs_rreq_trace_put_return);
|
2022-03-01 22:35:58 +08:00
|
|
|
return;
|
|
|
|
|
|
|
|
cleanup_free:
|
|
|
|
netfs_put_request(rreq, false, netfs_rreq_trace_put_failed);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(netfs_readahead);
|
|
|
|
|
2024-07-02 07:40:22 +08:00
|
|
|
/*
|
|
|
|
* Create a rolling buffer with a single occupying folio.
|
|
|
|
*/
|
|
|
|
static int netfs_create_singular_buffer(struct netfs_io_request *rreq, struct folio *folio)
|
|
|
|
{
|
|
|
|
struct folio_queue *folioq;
|
|
|
|
|
|
|
|
folioq = kmalloc(sizeof(*folioq), GFP_KERNEL);
|
|
|
|
if (!folioq)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
netfs_stat(&netfs_n_folioq);
|
|
|
|
folioq_init(folioq);
|
|
|
|
folioq_append(folioq, folio);
|
|
|
|
BUG_ON(folioq_folio(folioq, 0) != folio);
|
|
|
|
BUG_ON(folioq_folio_order(folioq, 0) != folio_order(folio));
|
|
|
|
rreq->buffer = folioq;
|
|
|
|
rreq->buffer_tail = folioq;
|
|
|
|
rreq->submitted = rreq->start + rreq->len;
|
|
|
|
iov_iter_folio_queue(&rreq->iter, ITER_DEST, folioq, 0, 0, rreq->len);
|
|
|
|
rreq->ractl = (struct readahead_control *)1UL;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Read into gaps in a folio partially filled by a streaming write.
|
|
|
|
*/
|
|
|
|
static int netfs_read_gaps(struct file *file, struct folio *folio)
|
|
|
|
{
|
|
|
|
struct netfs_io_request *rreq;
|
|
|
|
struct address_space *mapping = folio->mapping;
|
|
|
|
struct netfs_folio *finfo = netfs_folio_info(folio);
|
|
|
|
struct netfs_inode *ctx = netfs_inode(mapping->host);
|
|
|
|
struct folio *sink = NULL;
|
|
|
|
struct bio_vec *bvec;
|
|
|
|
unsigned int from = finfo->dirty_offset;
|
|
|
|
unsigned int to = from + finfo->dirty_len;
|
|
|
|
unsigned int off = 0, i = 0;
|
|
|
|
size_t flen = folio_size(folio);
|
|
|
|
size_t nr_bvec = flen / PAGE_SIZE + 2;
|
|
|
|
size_t part;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
_enter("%lx", folio->index);
|
|
|
|
|
|
|
|
rreq = netfs_alloc_request(mapping, file, folio_pos(folio), flen, NETFS_READ_GAPS);
|
|
|
|
if (IS_ERR(rreq)) {
|
|
|
|
ret = PTR_ERR(rreq);
|
|
|
|
goto alloc_error;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = netfs_begin_cache_read(rreq, ctx);
|
|
|
|
if (ret == -ENOMEM || ret == -EINTR || ret == -ERESTARTSYS)
|
|
|
|
goto discard;
|
|
|
|
|
|
|
|
netfs_stat(&netfs_n_rh_read_folio);
|
|
|
|
trace_netfs_read(rreq, rreq->start, rreq->len, netfs_read_trace_read_gaps);
|
|
|
|
|
|
|
|
/* Fiddle the buffer so that a gap at the beginning and/or a gap at the
|
|
|
|
* end get copied to, but the middle is discarded.
|
|
|
|
*/
|
|
|
|
ret = -ENOMEM;
|
|
|
|
bvec = kmalloc_array(nr_bvec, sizeof(*bvec), GFP_KERNEL);
|
|
|
|
if (!bvec)
|
|
|
|
goto discard;
|
|
|
|
|
|
|
|
sink = folio_alloc(GFP_KERNEL, 0);
|
|
|
|
if (!sink) {
|
|
|
|
kfree(bvec);
|
|
|
|
goto discard;
|
|
|
|
}
|
|
|
|
|
|
|
|
trace_netfs_folio(folio, netfs_folio_trace_read_gaps);
|
|
|
|
|
|
|
|
rreq->direct_bv = bvec;
|
|
|
|
rreq->direct_bv_count = nr_bvec;
|
|
|
|
if (from > 0) {
|
|
|
|
bvec_set_folio(&bvec[i++], folio, from, 0);
|
|
|
|
off = from;
|
|
|
|
}
|
|
|
|
while (off < to) {
|
|
|
|
part = min_t(size_t, to - off, PAGE_SIZE);
|
|
|
|
bvec_set_folio(&bvec[i++], sink, part, 0);
|
|
|
|
off += part;
|
|
|
|
}
|
|
|
|
if (to < flen)
|
|
|
|
bvec_set_folio(&bvec[i++], folio, flen - to, to);
|
|
|
|
iov_iter_bvec(&rreq->iter, ITER_DEST, bvec, i, rreq->len);
|
|
|
|
rreq->submitted = rreq->start + flen;
|
|
|
|
|
|
|
|
netfs_read_to_pagecache(rreq);
|
|
|
|
|
|
|
|
if (sink)
|
|
|
|
folio_put(sink);
|
|
|
|
|
|
|
|
ret = netfs_wait_for_read(rreq);
|
|
|
|
if (ret == 0) {
|
|
|
|
flush_dcache_folio(folio);
|
|
|
|
folio_mark_uptodate(folio);
|
|
|
|
}
|
|
|
|
folio_unlock(folio);
|
|
|
|
netfs_put_request(rreq, false, netfs_rreq_trace_put_return);
|
|
|
|
return ret < 0 ? ret : 0;
|
|
|
|
|
|
|
|
discard:
|
|
|
|
netfs_put_request(rreq, false, netfs_rreq_trace_put_discard);
|
|
|
|
alloc_error:
|
|
|
|
folio_unlock(folio);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2022-03-01 22:35:58 +08:00
|
|
|
/**
|
2022-04-29 20:49:28 +08:00
|
|
|
* netfs_read_folio - Helper to manage a read_folio request
|
2022-03-01 22:35:58 +08:00
|
|
|
* @file: The file to read from
|
2022-04-29 20:49:28 +08:00
|
|
|
* @folio: The folio to read
|
2022-03-01 22:35:58 +08:00
|
|
|
*
|
2022-04-29 20:49:28 +08:00
|
|
|
* Fulfil a read_folio request by drawing data from the cache if
|
|
|
|
* possible, or the netfs if not. Space beyond the EOF is zero-filled.
|
|
|
|
* Multiple I/O requests from different sources will get munged together.
|
2022-03-01 22:35:58 +08:00
|
|
|
*
|
|
|
|
* The calling netfs must initialise a netfs context contiguous to the vfs
|
|
|
|
* inode before calling this.
|
|
|
|
*
|
|
|
|
* This is usable whether or not caching is enabled.
|
|
|
|
*/
|
2022-04-29 20:49:28 +08:00
|
|
|
int netfs_read_folio(struct file *file, struct folio *folio)
|
2022-03-01 22:35:58 +08:00
|
|
|
{
|
2024-01-10 01:17:36 +08:00
|
|
|
struct address_space *mapping = folio->mapping;
|
2022-03-01 22:35:58 +08:00
|
|
|
struct netfs_io_request *rreq;
|
netfs: Fix gcc-12 warning by embedding vfs inode in netfs_i_context
While randstruct was satisfied with using an open-coded "void *" offset
cast for the netfs_i_context <-> inode casting, __builtin_object_size() as
used by FORTIFY_SOURCE was not as easily fooled. This was causing the
following complaint[1] from gcc v12:
In file included from include/linux/string.h:253,
from include/linux/ceph/ceph_debug.h:7,
from fs/ceph/inode.c:2:
In function 'fortify_memset_chk',
inlined from 'netfs_i_context_init' at include/linux/netfs.h:326:2,
inlined from 'ceph_alloc_inode' at fs/ceph/inode.c:463:2:
include/linux/fortify-string.h:242:25: warning: call to '__write_overflow_field' declared with attribute warning: detected write beyond size of field (1st parameter); maybe use struct_group()? [-Wattribute-warning]
242 | __write_overflow_field(p_size_field, size);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Fix this by embedding a struct inode into struct netfs_i_context (which
should perhaps be renamed to struct netfs_inode). The struct inode
vfs_inode fields are then removed from the 9p, afs, ceph and cifs inode
structs and vfs_inode is then simply changed to "netfs.inode" in those
filesystems.
Further, rename netfs_i_context to netfs_inode, get rid of the
netfs_inode() function that converted a netfs_i_context pointer to an
inode pointer (that can now be done with &ctx->inode) and rename the
netfs_i_context() function to netfs_inode() (which is now a wrapper
around container_of()).
Most of the changes were done with:
perl -p -i -e 's/vfs_inode/netfs.inode/'g \
`git grep -l 'vfs_inode' -- fs/{9p,afs,ceph,cifs}/*.[ch]`
Kees suggested doing it with a pair structure[2] and a special
declarator to insert that into the network filesystem's inode
wrapper[3], but I think it's cleaner to embed it - and then it doesn't
matter if struct randomisation reorders things.
Dave Chinner suggested using a filesystem-specific VFS_I() function in
each filesystem to convert that filesystem's own inode wrapper struct
into the VFS inode struct[4].
Version #2:
- Fix a couple of missed name changes due to a disabled cifs option.
- Rename nfs_i_context to nfs_inode
- Use "netfs" instead of "nic" as the member name in per-fs inode wrapper
structs.
[ This also undoes commit 507160f46c55 ("netfs: gcc-12: temporarily
disable '-Wattribute-warning' for now") that is no longer needed ]
Fixes: bc899ee1c898 ("netfs: Add a netfs inode context")
Reported-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: David Howells <dhowells@redhat.com>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Reviewed-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Xiubo Li <xiubli@redhat.com>
cc: Jonathan Corbet <corbet@lwn.net>
cc: Eric Van Hensbergen <ericvh@gmail.com>
cc: Latchesar Ionkov <lucho@ionkov.net>
cc: Dominique Martinet <asmadeus@codewreck.org>
cc: Christian Schoenebeck <linux_oss@crudebyte.com>
cc: Marc Dionne <marc.dionne@auristor.com>
cc: Ilya Dryomov <idryomov@gmail.com>
cc: Steve French <smfrench@gmail.com>
cc: William Kucharski <william.kucharski@oracle.com>
cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>
cc: Dave Chinner <david@fromorbit.com>
cc: linux-doc@vger.kernel.org
cc: v9fs-developer@lists.sourceforge.net
cc: linux-afs@lists.infradead.org
cc: ceph-devel@vger.kernel.org
cc: linux-cifs@vger.kernel.org
cc: samba-technical@lists.samba.org
cc: linux-fsdevel@vger.kernel.org
cc: linux-hardening@vger.kernel.org
Link: https://lore.kernel.org/r/d2ad3a3d7bdd794c6efb562d2f2b655fb67756b9.camel@kernel.org/ [1]
Link: https://lore.kernel.org/r/20220517210230.864239-1-keescook@chromium.org/ [2]
Link: https://lore.kernel.org/r/20220518202212.2322058-1-keescook@chromium.org/ [3]
Link: https://lore.kernel.org/r/20220524101205.GI2306852@dread.disaster.area/ [4]
Link: https://lore.kernel.org/r/165296786831.3591209.12111293034669289733.stgit@warthog.procyon.org.uk/ # v1
Link: https://lore.kernel.org/r/165305805651.4094995.7763502506786714216.stgit@warthog.procyon.org.uk # v2
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2022-06-10 04:46:04 +08:00
|
|
|
struct netfs_inode *ctx = netfs_inode(mapping->host);
|
2022-03-01 22:35:58 +08:00
|
|
|
int ret;
|
|
|
|
|
2024-07-02 07:40:22 +08:00
|
|
|
if (folio_test_dirty(folio)) {
|
|
|
|
trace_netfs_folio(folio, netfs_folio_trace_read_gaps);
|
|
|
|
return netfs_read_gaps(file, folio);
|
|
|
|
}
|
|
|
|
|
2024-07-19 04:07:32 +08:00
|
|
|
_enter("%lx", folio->index);
|
2022-03-01 22:35:58 +08:00
|
|
|
|
|
|
|
rreq = netfs_alloc_request(mapping, file,
|
2024-05-22 01:58:48 +08:00
|
|
|
folio_pos(folio), folio_size(folio),
|
2022-03-01 22:35:58 +08:00
|
|
|
NETFS_READPAGE);
|
|
|
|
if (IS_ERR(rreq)) {
|
|
|
|
ret = PTR_ERR(rreq);
|
|
|
|
goto alloc_error;
|
|
|
|
}
|
|
|
|
|
2023-11-21 01:09:47 +08:00
|
|
|
ret = netfs_begin_cache_read(rreq, ctx);
|
|
|
|
if (ret == -ENOMEM || ret == -EINTR || ret == -ERESTARTSYS)
|
|
|
|
goto discard;
|
2022-03-01 22:35:58 +08:00
|
|
|
|
2024-03-26 16:48:44 +08:00
|
|
|
netfs_stat(&netfs_n_rh_read_folio);
|
2022-03-01 22:35:58 +08:00
|
|
|
trace_netfs_read(rreq, rreq->start, rreq->len, netfs_read_trace_readpage);
|
2023-09-27 00:42:26 +08:00
|
|
|
|
|
|
|
/* Set up the output buffer */
|
2024-07-02 07:40:22 +08:00
|
|
|
ret = netfs_create_singular_buffer(rreq, folio);
|
|
|
|
if (ret < 0)
|
|
|
|
goto discard;
|
2023-09-27 00:42:26 +08:00
|
|
|
|
2024-07-02 07:40:22 +08:00
|
|
|
netfs_read_to_pagecache(rreq);
|
|
|
|
ret = netfs_wait_for_read(rreq);
|
2023-10-04 23:15:48 +08:00
|
|
|
netfs_put_request(rreq, false, netfs_rreq_trace_put_return);
|
2023-10-02 19:51:19 +08:00
|
|
|
return ret < 0 ? ret : 0;
|
2022-03-01 22:35:58 +08:00
|
|
|
|
|
|
|
discard:
|
|
|
|
netfs_put_request(rreq, false, netfs_rreq_trace_put_discard);
|
|
|
|
alloc_error:
|
|
|
|
folio_unlock(folio);
|
|
|
|
return ret;
|
|
|
|
}
|
2022-04-29 20:49:28 +08:00
|
|
|
EXPORT_SYMBOL(netfs_read_folio);
|
2022-03-01 22:35:58 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Prepare a folio for writing without reading first
|
|
|
|
* @folio: The folio being prepared
|
|
|
|
* @pos: starting position for the write
|
|
|
|
* @len: length of write
|
|
|
|
* @always_fill: T if the folio should always be completely filled/cleared
|
|
|
|
*
|
|
|
|
* In some cases, write_begin doesn't need to read at all:
|
|
|
|
* - full folio write
|
|
|
|
* - write that lies in a folio that is completely beyond EOF
|
|
|
|
* - write that covers the folio from start to EOF or beyond it
|
|
|
|
*
|
|
|
|
* If any of these criteria are met, then zero out the unwritten parts
|
|
|
|
* of the folio and return true. Otherwise, return false.
|
|
|
|
*/
|
|
|
|
static bool netfs_skip_folio_read(struct folio *folio, loff_t pos, size_t len,
|
|
|
|
bool always_fill)
|
|
|
|
{
|
|
|
|
struct inode *inode = folio_inode(folio);
|
|
|
|
loff_t i_size = i_size_read(inode);
|
|
|
|
size_t offset = offset_in_folio(folio, pos);
|
|
|
|
size_t plen = folio_size(folio);
|
|
|
|
|
|
|
|
if (unlikely(always_fill)) {
|
|
|
|
if (pos - offset + len <= i_size)
|
|
|
|
return false; /* Page entirely before EOF */
|
|
|
|
zero_user_segment(&folio->page, 0, plen);
|
|
|
|
folio_mark_uptodate(folio);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Full folio write */
|
|
|
|
if (offset == 0 && len >= plen)
|
|
|
|
return true;
|
|
|
|
|
|
|
|
/* Page entirely beyond the end of the file */
|
|
|
|
if (pos - offset >= i_size)
|
|
|
|
goto zero_out;
|
|
|
|
|
|
|
|
/* Write that covers from the start of the folio to EOF or beyond */
|
|
|
|
if (offset == 0 && (pos + len) >= i_size)
|
|
|
|
goto zero_out;
|
|
|
|
|
|
|
|
return false;
|
|
|
|
zero_out:
|
|
|
|
zero_user_segments(&folio->page, 0, offset, offset + len, plen);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
netfs: Fix handling of USE_PGPRIV2 and WRITE_TO_CACHE flags
The NETFS_RREQ_USE_PGPRIV2 and NETFS_RREQ_WRITE_TO_CACHE flags aren't used
correctly. The problem is that we try to set them up in the request
initialisation, but we the cache may be in the process of setting up still,
and so the state may not be correct. Further, we secondarily sample the
cache state and make contradictory decisions later.
The issue arises because we set up the cache resources, which allows the
cache's ->prepare_read() to switch on NETFS_SREQ_COPY_TO_CACHE - which
triggers cache writing even if we didn't set the flags when allocating.
Fix this in the following way:
(1) Drop NETFS_ICTX_USE_PGPRIV2 and instead set NETFS_RREQ_USE_PGPRIV2 in
->init_request() rather than trying to juggle that in
netfs_alloc_request().
(2) Repurpose NETFS_RREQ_USE_PGPRIV2 to merely indicate that if caching is
to be done, then PG_private_2 is to be used rather than only setting
it if we decide to cache and then having netfs_rreq_unlock_folios()
set the non-PG_private_2 writeback-to-cache if it wasn't set.
(3) Split netfs_rreq_unlock_folios() into two functions, one of which
contains the deprecated code for using PG_private_2 to avoid
accidentally doing the writeback path - and always use it if
USE_PGPRIV2 is set.
(4) As NETFS_ICTX_USE_PGPRIV2 is removed, make netfs_write_begin() always
wait for PG_private_2. This function is deprecated and only used by
ceph anyway, and so label it so.
(5) Drop the NETFS_RREQ_WRITE_TO_CACHE flag and use
fscache_operation_valid() on the cache_resources instead. This has
the advantage of picking up the result of netfs_begin_cache_read() and
fscache_begin_write_operation() - which are called after the object is
initialised and will wait for the cache to come to a usable state.
Just reverting ae678317b95e[1] isn't a sufficient fix, so this need to be
applied on top of that. Without this as well, things like:
rcu: INFO: rcu_sched detected expedited stalls on CPUs/tasks: {
and:
WARNING: CPU: 13 PID: 3621 at fs/ceph/caps.c:3386
may happen, along with some UAFs due to PG_private_2 not getting used to
wait on writeback completion.
Fixes: 2ff1e97587f4 ("netfs: Replace PG_fscache by setting folio->private and marking dirty")
Reported-by: Max Kellermann <max.kellermann@ionos.com>
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Ilya Dryomov <idryomov@gmail.com>
cc: Xiubo Li <xiubli@redhat.com>
cc: Hristo Venev <hristo@venev.name>
cc: Jeff Layton <jlayton@kernel.org>
cc: Matthew Wilcox <willy@infradead.org>
cc: ceph-devel@vger.kernel.org
cc: netfs@lists.linux.dev
cc: linux-fsdevel@vger.kernel.org
cc: linux-mm@kvack.org
Link: https://lore.kernel.org/r/3575457.1722355300@warthog.procyon.org.uk/ [1]
Link: https://lore.kernel.org/r/1173209.1723152682@warthog.procyon.org.uk
Signed-off-by: Christian Brauner <brauner@kernel.org>
2024-08-08 02:38:46 +08:00
|
|
|
* netfs_write_begin - Helper to prepare for writing [DEPRECATED]
|
2022-06-10 06:04:01 +08:00
|
|
|
* @ctx: The netfs context
|
2022-03-01 22:35:58 +08:00
|
|
|
* @file: The file to read from
|
|
|
|
* @mapping: The mapping to read from
|
|
|
|
* @pos: File position at which the write will begin
|
|
|
|
* @len: The length of the write (may extend beyond the end of the folio chosen)
|
|
|
|
* @_folio: Where to put the resultant folio
|
|
|
|
* @_fsdata: Place for the netfs to store a cookie
|
|
|
|
*
|
|
|
|
* Pre-read data for a write-begin request by drawing data from the cache if
|
|
|
|
* possible, or the netfs if not. Space beyond the EOF is zero-filled.
|
2024-07-02 07:40:22 +08:00
|
|
|
* Multiple I/O requests from different sources will get munged together.
|
2022-03-01 22:35:58 +08:00
|
|
|
*
|
|
|
|
* The calling netfs must provide a table of operations, only one of which,
|
2024-07-02 07:40:22 +08:00
|
|
|
* issue_read, is mandatory.
|
2022-03-01 22:35:58 +08:00
|
|
|
*
|
|
|
|
* The check_write_begin() operation can be provided to check for and flush
|
|
|
|
* conflicting writes once the folio is grabbed and locked. It is passed a
|
|
|
|
* pointer to the fsdata cookie that gets returned to the VM to be passed to
|
|
|
|
* write_end. It is permitted to sleep. It should return 0 if the request
|
2022-07-11 12:11:21 +08:00
|
|
|
* should go ahead or it may return an error. It may also unlock and put the
|
|
|
|
* folio, provided it sets ``*foliop`` to NULL, in which case a return of 0
|
|
|
|
* will cause the folio to be re-got and the process to be retried.
|
2022-03-01 22:35:58 +08:00
|
|
|
*
|
|
|
|
* The calling netfs must initialise a netfs context contiguous to the vfs
|
|
|
|
* inode before calling this.
|
|
|
|
*
|
|
|
|
* This is usable whether or not caching is enabled.
|
netfs: Fix handling of USE_PGPRIV2 and WRITE_TO_CACHE flags
The NETFS_RREQ_USE_PGPRIV2 and NETFS_RREQ_WRITE_TO_CACHE flags aren't used
correctly. The problem is that we try to set them up in the request
initialisation, but we the cache may be in the process of setting up still,
and so the state may not be correct. Further, we secondarily sample the
cache state and make contradictory decisions later.
The issue arises because we set up the cache resources, which allows the
cache's ->prepare_read() to switch on NETFS_SREQ_COPY_TO_CACHE - which
triggers cache writing even if we didn't set the flags when allocating.
Fix this in the following way:
(1) Drop NETFS_ICTX_USE_PGPRIV2 and instead set NETFS_RREQ_USE_PGPRIV2 in
->init_request() rather than trying to juggle that in
netfs_alloc_request().
(2) Repurpose NETFS_RREQ_USE_PGPRIV2 to merely indicate that if caching is
to be done, then PG_private_2 is to be used rather than only setting
it if we decide to cache and then having netfs_rreq_unlock_folios()
set the non-PG_private_2 writeback-to-cache if it wasn't set.
(3) Split netfs_rreq_unlock_folios() into two functions, one of which
contains the deprecated code for using PG_private_2 to avoid
accidentally doing the writeback path - and always use it if
USE_PGPRIV2 is set.
(4) As NETFS_ICTX_USE_PGPRIV2 is removed, make netfs_write_begin() always
wait for PG_private_2. This function is deprecated and only used by
ceph anyway, and so label it so.
(5) Drop the NETFS_RREQ_WRITE_TO_CACHE flag and use
fscache_operation_valid() on the cache_resources instead. This has
the advantage of picking up the result of netfs_begin_cache_read() and
fscache_begin_write_operation() - which are called after the object is
initialised and will wait for the cache to come to a usable state.
Just reverting ae678317b95e[1] isn't a sufficient fix, so this need to be
applied on top of that. Without this as well, things like:
rcu: INFO: rcu_sched detected expedited stalls on CPUs/tasks: {
and:
WARNING: CPU: 13 PID: 3621 at fs/ceph/caps.c:3386
may happen, along with some UAFs due to PG_private_2 not getting used to
wait on writeback completion.
Fixes: 2ff1e97587f4 ("netfs: Replace PG_fscache by setting folio->private and marking dirty")
Reported-by: Max Kellermann <max.kellermann@ionos.com>
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Ilya Dryomov <idryomov@gmail.com>
cc: Xiubo Li <xiubli@redhat.com>
cc: Hristo Venev <hristo@venev.name>
cc: Jeff Layton <jlayton@kernel.org>
cc: Matthew Wilcox <willy@infradead.org>
cc: ceph-devel@vger.kernel.org
cc: netfs@lists.linux.dev
cc: linux-fsdevel@vger.kernel.org
cc: linux-mm@kvack.org
Link: https://lore.kernel.org/r/3575457.1722355300@warthog.procyon.org.uk/ [1]
Link: https://lore.kernel.org/r/1173209.1723152682@warthog.procyon.org.uk
Signed-off-by: Christian Brauner <brauner@kernel.org>
2024-08-08 02:38:46 +08:00
|
|
|
*
|
|
|
|
* Note that this should be considered deprecated and netfs_perform_write()
|
|
|
|
* used instead.
|
2022-03-01 22:35:58 +08:00
|
|
|
*/
|
2022-06-10 06:04:01 +08:00
|
|
|
int netfs_write_begin(struct netfs_inode *ctx,
|
|
|
|
struct file *file, struct address_space *mapping,
|
2022-02-22 23:47:09 +08:00
|
|
|
loff_t pos, unsigned int len, struct folio **_folio,
|
|
|
|
void **_fsdata)
|
2022-03-01 22:35:58 +08:00
|
|
|
{
|
|
|
|
struct netfs_io_request *rreq;
|
|
|
|
struct folio *folio;
|
|
|
|
pgoff_t index = pos >> PAGE_SHIFT;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
retry:
|
2023-03-25 02:01:01 +08:00
|
|
|
folio = __filemap_get_folio(mapping, index, FGP_WRITEBEGIN,
|
2022-03-01 22:35:58 +08:00
|
|
|
mapping_gfp_mask(mapping));
|
2023-03-07 22:34:10 +08:00
|
|
|
if (IS_ERR(folio))
|
|
|
|
return PTR_ERR(folio);
|
2022-03-01 22:35:58 +08:00
|
|
|
|
|
|
|
if (ctx->ops->check_write_begin) {
|
|
|
|
/* Allow the netfs (eg. ceph) to flush conflicts. */
|
2022-07-11 12:11:21 +08:00
|
|
|
ret = ctx->ops->check_write_begin(file, pos, len, &folio, _fsdata);
|
2022-03-01 22:35:58 +08:00
|
|
|
if (ret < 0) {
|
|
|
|
trace_netfs_failure(NULL, NULL, ret, netfs_fail_check_write_begin);
|
|
|
|
goto error;
|
|
|
|
}
|
2022-07-11 12:11:21 +08:00
|
|
|
if (!folio)
|
|
|
|
goto retry;
|
2022-03-01 22:35:58 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
if (folio_test_uptodate(folio))
|
|
|
|
goto have_folio;
|
|
|
|
|
|
|
|
/* If the page is beyond the EOF, we want to clear it - unless it's
|
|
|
|
* within the cache granule containing the EOF, in which case we need
|
|
|
|
* to preload the granule.
|
|
|
|
*/
|
|
|
|
if (!netfs_is_cache_enabled(ctx) &&
|
|
|
|
netfs_skip_folio_read(folio, pos, len, false)) {
|
|
|
|
netfs_stat(&netfs_n_rh_write_zskip);
|
2024-07-31 00:01:40 +08:00
|
|
|
goto have_folio_no_wait;
|
2022-03-01 22:35:58 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
rreq = netfs_alloc_request(mapping, file,
|
2024-05-22 01:58:48 +08:00
|
|
|
folio_pos(folio), folio_size(folio),
|
2022-03-01 22:35:58 +08:00
|
|
|
NETFS_READ_FOR_WRITE);
|
|
|
|
if (IS_ERR(rreq)) {
|
|
|
|
ret = PTR_ERR(rreq);
|
|
|
|
goto error;
|
|
|
|
}
|
2024-01-10 01:17:36 +08:00
|
|
|
rreq->no_unlock_folio = folio->index;
|
2022-03-01 22:35:58 +08:00
|
|
|
__set_bit(NETFS_RREQ_NO_UNLOCK_FOLIO, &rreq->flags);
|
|
|
|
|
2023-11-21 01:09:47 +08:00
|
|
|
ret = netfs_begin_cache_read(rreq, ctx);
|
|
|
|
if (ret == -ENOMEM || ret == -EINTR || ret == -ERESTARTSYS)
|
|
|
|
goto error_put;
|
2022-03-01 22:35:58 +08:00
|
|
|
|
|
|
|
netfs_stat(&netfs_n_rh_write_begin);
|
|
|
|
trace_netfs_read(rreq, pos, len, netfs_read_trace_write_begin);
|
|
|
|
|
2023-09-27 00:42:26 +08:00
|
|
|
/* Set up the output buffer */
|
2024-07-02 07:40:22 +08:00
|
|
|
ret = netfs_create_singular_buffer(rreq, folio);
|
|
|
|
if (ret < 0)
|
|
|
|
goto error_put;
|
2022-03-01 22:35:58 +08:00
|
|
|
|
2024-07-02 07:40:22 +08:00
|
|
|
netfs_read_to_pagecache(rreq);
|
|
|
|
ret = netfs_wait_for_read(rreq);
|
2022-03-01 22:35:58 +08:00
|
|
|
if (ret < 0)
|
|
|
|
goto error;
|
2023-10-04 23:15:48 +08:00
|
|
|
netfs_put_request(rreq, false, netfs_rreq_trace_put_return);
|
2022-03-01 22:35:58 +08:00
|
|
|
|
|
|
|
have_folio:
|
netfs: Fix handling of USE_PGPRIV2 and WRITE_TO_CACHE flags
The NETFS_RREQ_USE_PGPRIV2 and NETFS_RREQ_WRITE_TO_CACHE flags aren't used
correctly. The problem is that we try to set them up in the request
initialisation, but we the cache may be in the process of setting up still,
and so the state may not be correct. Further, we secondarily sample the
cache state and make contradictory decisions later.
The issue arises because we set up the cache resources, which allows the
cache's ->prepare_read() to switch on NETFS_SREQ_COPY_TO_CACHE - which
triggers cache writing even if we didn't set the flags when allocating.
Fix this in the following way:
(1) Drop NETFS_ICTX_USE_PGPRIV2 and instead set NETFS_RREQ_USE_PGPRIV2 in
->init_request() rather than trying to juggle that in
netfs_alloc_request().
(2) Repurpose NETFS_RREQ_USE_PGPRIV2 to merely indicate that if caching is
to be done, then PG_private_2 is to be used rather than only setting
it if we decide to cache and then having netfs_rreq_unlock_folios()
set the non-PG_private_2 writeback-to-cache if it wasn't set.
(3) Split netfs_rreq_unlock_folios() into two functions, one of which
contains the deprecated code for using PG_private_2 to avoid
accidentally doing the writeback path - and always use it if
USE_PGPRIV2 is set.
(4) As NETFS_ICTX_USE_PGPRIV2 is removed, make netfs_write_begin() always
wait for PG_private_2. This function is deprecated and only used by
ceph anyway, and so label it so.
(5) Drop the NETFS_RREQ_WRITE_TO_CACHE flag and use
fscache_operation_valid() on the cache_resources instead. This has
the advantage of picking up the result of netfs_begin_cache_read() and
fscache_begin_write_operation() - which are called after the object is
initialised and will wait for the cache to come to a usable state.
Just reverting ae678317b95e[1] isn't a sufficient fix, so this need to be
applied on top of that. Without this as well, things like:
rcu: INFO: rcu_sched detected expedited stalls on CPUs/tasks: {
and:
WARNING: CPU: 13 PID: 3621 at fs/ceph/caps.c:3386
may happen, along with some UAFs due to PG_private_2 not getting used to
wait on writeback completion.
Fixes: 2ff1e97587f4 ("netfs: Replace PG_fscache by setting folio->private and marking dirty")
Reported-by: Max Kellermann <max.kellermann@ionos.com>
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Ilya Dryomov <idryomov@gmail.com>
cc: Xiubo Li <xiubli@redhat.com>
cc: Hristo Venev <hristo@venev.name>
cc: Jeff Layton <jlayton@kernel.org>
cc: Matthew Wilcox <willy@infradead.org>
cc: ceph-devel@vger.kernel.org
cc: netfs@lists.linux.dev
cc: linux-fsdevel@vger.kernel.org
cc: linux-mm@kvack.org
Link: https://lore.kernel.org/r/3575457.1722355300@warthog.procyon.org.uk/ [1]
Link: https://lore.kernel.org/r/1173209.1723152682@warthog.procyon.org.uk
Signed-off-by: Christian Brauner <brauner@kernel.org>
2024-08-08 02:38:46 +08:00
|
|
|
ret = folio_wait_private_2_killable(folio);
|
|
|
|
if (ret < 0)
|
|
|
|
goto error;
|
2024-07-31 00:01:40 +08:00
|
|
|
have_folio_no_wait:
|
2022-03-01 22:35:58 +08:00
|
|
|
*_folio = folio;
|
2024-07-19 04:07:32 +08:00
|
|
|
_leave(" = 0");
|
2022-03-01 22:35:58 +08:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
error_put:
|
|
|
|
netfs_put_request(rreq, false, netfs_rreq_trace_put_failed);
|
|
|
|
error:
|
2022-07-11 12:11:21 +08:00
|
|
|
if (folio) {
|
|
|
|
folio_unlock(folio);
|
|
|
|
folio_put(folio);
|
|
|
|
}
|
2024-07-19 04:07:32 +08:00
|
|
|
_leave(" = %d", ret);
|
2022-03-01 22:35:58 +08:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(netfs_write_begin);
|
2021-06-17 20:09:21 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Preload the data into a page we're proposing to write into.
|
|
|
|
*/
|
|
|
|
int netfs_prefetch_for_write(struct file *file, struct folio *folio,
|
|
|
|
size_t offset, size_t len)
|
|
|
|
{
|
|
|
|
struct netfs_io_request *rreq;
|
2024-01-10 01:17:36 +08:00
|
|
|
struct address_space *mapping = folio->mapping;
|
2021-06-17 20:09:21 +08:00
|
|
|
struct netfs_inode *ctx = netfs_inode(mapping->host);
|
|
|
|
unsigned long long start = folio_pos(folio);
|
|
|
|
size_t flen = folio_size(folio);
|
|
|
|
int ret;
|
|
|
|
|
2024-07-19 04:07:32 +08:00
|
|
|
_enter("%zx @%llx", flen, start);
|
2021-06-17 20:09:21 +08:00
|
|
|
|
|
|
|
ret = -ENOMEM;
|
|
|
|
|
|
|
|
rreq = netfs_alloc_request(mapping, file, start, flen,
|
|
|
|
NETFS_READ_FOR_WRITE);
|
|
|
|
if (IS_ERR(rreq)) {
|
|
|
|
ret = PTR_ERR(rreq);
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
2024-01-10 01:17:36 +08:00
|
|
|
rreq->no_unlock_folio = folio->index;
|
2021-06-17 20:09:21 +08:00
|
|
|
__set_bit(NETFS_RREQ_NO_UNLOCK_FOLIO, &rreq->flags);
|
|
|
|
ret = netfs_begin_cache_read(rreq, ctx);
|
|
|
|
if (ret == -ENOMEM || ret == -EINTR || ret == -ERESTARTSYS)
|
|
|
|
goto error_put;
|
|
|
|
|
|
|
|
netfs_stat(&netfs_n_rh_write_begin);
|
|
|
|
trace_netfs_read(rreq, start, flen, netfs_read_trace_prefetch_for_write);
|
|
|
|
|
|
|
|
/* Set up the output buffer */
|
2024-07-02 07:40:22 +08:00
|
|
|
ret = netfs_create_singular_buffer(rreq, folio);
|
|
|
|
if (ret < 0)
|
|
|
|
goto error_put;
|
2021-06-17 20:09:21 +08:00
|
|
|
|
2024-07-02 07:40:22 +08:00
|
|
|
folioq_mark2(rreq->buffer, 0);
|
|
|
|
netfs_read_to_pagecache(rreq);
|
|
|
|
ret = netfs_wait_for_read(rreq);
|
2021-06-17 20:09:21 +08:00
|
|
|
netfs_put_request(rreq, false, netfs_rreq_trace_put_return);
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
error_put:
|
|
|
|
netfs_put_request(rreq, false, netfs_rreq_trace_put_discard);
|
|
|
|
error:
|
2024-07-19 04:07:32 +08:00
|
|
|
_leave(" = %d", ret);
|
2021-06-17 20:09:21 +08:00
|
|
|
return ret;
|
|
|
|
}
|
2023-10-11 16:29:43 +08:00
|
|
|
|
|
|
|
/**
|
|
|
|
* netfs_buffered_read_iter - Filesystem buffered I/O read routine
|
|
|
|
* @iocb: kernel I/O control block
|
|
|
|
* @iter: destination for the data read
|
|
|
|
*
|
|
|
|
* This is the ->read_iter() routine for all filesystems that can use the page
|
|
|
|
* cache directly.
|
|
|
|
*
|
|
|
|
* The IOCB_NOWAIT flag in iocb->ki_flags indicates that -EAGAIN shall be
|
|
|
|
* returned when no data can be read without waiting for I/O requests to
|
|
|
|
* complete; it doesn't prevent readahead.
|
|
|
|
*
|
|
|
|
* The IOCB_NOIO flag in iocb->ki_flags indicates that no new I/O requests
|
|
|
|
* shall be made for the read or for readahead. When no data can be read,
|
|
|
|
* -EAGAIN shall be returned. When readahead would be triggered, a partial,
|
|
|
|
* possibly empty read shall be returned.
|
|
|
|
*
|
|
|
|
* Return:
|
|
|
|
* * number of bytes copied, even for partial reads
|
|
|
|
* * negative error code (or 0 if IOCB_NOIO) if nothing was read
|
|
|
|
*/
|
|
|
|
ssize_t netfs_buffered_read_iter(struct kiocb *iocb, struct iov_iter *iter)
|
|
|
|
{
|
|
|
|
struct inode *inode = file_inode(iocb->ki_filp);
|
|
|
|
struct netfs_inode *ictx = netfs_inode(inode);
|
|
|
|
ssize_t ret;
|
|
|
|
|
|
|
|
if (WARN_ON_ONCE((iocb->ki_flags & IOCB_DIRECT) ||
|
|
|
|
test_bit(NETFS_ICTX_UNBUFFERED, &ictx->flags)))
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
ret = netfs_start_io_read(inode);
|
|
|
|
if (ret == 0) {
|
|
|
|
ret = filemap_read(iocb, iter, 0);
|
|
|
|
netfs_end_io_read(inode);
|
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(netfs_buffered_read_iter);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* netfs_file_read_iter - Generic filesystem read routine
|
|
|
|
* @iocb: kernel I/O control block
|
|
|
|
* @iter: destination for the data read
|
|
|
|
*
|
|
|
|
* This is the ->read_iter() routine for all filesystems that can use the page
|
|
|
|
* cache directly.
|
|
|
|
*
|
|
|
|
* The IOCB_NOWAIT flag in iocb->ki_flags indicates that -EAGAIN shall be
|
|
|
|
* returned when no data can be read without waiting for I/O requests to
|
|
|
|
* complete; it doesn't prevent readahead.
|
|
|
|
*
|
|
|
|
* The IOCB_NOIO flag in iocb->ki_flags indicates that no new I/O requests
|
|
|
|
* shall be made for the read or for readahead. When no data can be read,
|
|
|
|
* -EAGAIN shall be returned. When readahead would be triggered, a partial,
|
|
|
|
* possibly empty read shall be returned.
|
|
|
|
*
|
|
|
|
* Return:
|
|
|
|
* * number of bytes copied, even for partial reads
|
|
|
|
* * negative error code (or 0 if IOCB_NOIO) if nothing was read
|
|
|
|
*/
|
|
|
|
ssize_t netfs_file_read_iter(struct kiocb *iocb, struct iov_iter *iter)
|
|
|
|
{
|
|
|
|
struct netfs_inode *ictx = netfs_inode(iocb->ki_filp->f_mapping->host);
|
|
|
|
|
|
|
|
if ((iocb->ki_flags & IOCB_DIRECT) ||
|
|
|
|
test_bit(NETFS_ICTX_UNBUFFERED, &ictx->flags))
|
|
|
|
return netfs_unbuffered_read_iter(iocb, iter);
|
|
|
|
|
|
|
|
return netfs_buffered_read_iter(iocb, iter);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(netfs_file_read_iter);
|