From: Greg Kroah-Hartman gregkh@linuxfoundation.org

This reverts commit 3a156abd24346a3188eb7e88cf86386a409e0d02 which is commit 0558f33c06bb910e2879e355192227a8e8f0219d upstream.

John writes: This patch was one of a series from Jason to fix this WARN issue, below:

https://lore.kernel.org/linux-scsi/8f6e3763-2b04-23e8-f1ec-8ed3c58f55d3@huaw...

I'm doubtful that it should be taken in isolation. Maybe 1 or 2 other patches are required.

The WARN was really annoying, so we could spend a bit of time to test a backport of what is strictly required. Let us know.

Cc: Jason Yan yanaijie@huawei.com CC: John Garry john.garry@huawei.com CC: Johannes Thumshirn jthumshirn@suse.de CC: Ewan Milne emilne@redhat.com CC: Christoph Hellwig hch@lst.de CC: Tomas Henzl thenzl@redhat.com CC: Dan Williams dan.j.williams@intel.com Cc: Hannes Reinecke hare@suse.com Cc: Martin K. Petersen martin.petersen@oracle.com Cc: Sasha Levin sashal@kernel.org Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org --- drivers/scsi/libsas/sas_ata.c | 1 + drivers/scsi/libsas/sas_discover.c | 32 ++++++++++++++------------------ drivers/scsi/libsas/sas_expander.c | 8 +++++--- drivers/scsi/libsas/sas_internal.h | 1 - drivers/scsi/libsas/sas_port.c | 3 --- include/scsi/libsas.h | 3 ++- include/scsi/scsi_transport_sas.h | 1 - 7 files changed, 22 insertions(+), 27 deletions(-)

--- a/drivers/scsi/libsas/sas_ata.c +++ b/drivers/scsi/libsas/sas_ata.c @@ -730,6 +730,7 @@ int sas_discover_sata(struct domain_devi if (res) return res;

+ sas_discover_event(dev->port, DISCE_PROBE); return 0; }

--- a/drivers/scsi/libsas/sas_discover.c +++ b/drivers/scsi/libsas/sas_discover.c @@ -221,9 +221,13 @@ void sas_notify_lldd_dev_gone(struct dom } }

-static void sas_probe_devices(struct asd_sas_port *port) +static void sas_probe_devices(struct work_struct *work) { struct domain_device *dev, *n; + struct sas_discovery_event *ev = to_sas_discovery_event(work); + struct asd_sas_port *port = ev->port; + + clear_bit(DISCE_PROBE, &port->disc.pending);

/* devices must be domain members before link recovery and probe */ list_for_each_entry(dev, &port->disco_list, disco_list_node) { @@ -299,6 +303,7 @@ int sas_discover_end_dev(struct domain_d res = sas_notify_lldd_dev_found(dev); if (res) return res; + sas_discover_event(dev->port, DISCE_PROBE);

return 0; } @@ -357,9 +362,13 @@ static void sas_unregister_common_dev(st sas_put_device(dev); }

-void sas_destruct_devices(struct asd_sas_port *port) +static void sas_destruct_devices(struct work_struct *work) { struct domain_device *dev, *n; + struct sas_discovery_event *ev = to_sas_discovery_event(work); + struct asd_sas_port *port = ev->port; + + clear_bit(DISCE_DESTRUCT, &port->disc.pending);

list_for_each_entry_safe(dev, n, &port->destroy_list, disco_list_node) { list_del_init(&dev->disco_list_node); @@ -370,16 +379,6 @@ void sas_destruct_devices(struct asd_sas } }

-static void sas_destruct_ports(struct asd_sas_port *port) -{ - struct sas_port *sas_port, *p; - - list_for_each_entry_safe(sas_port, p, &port->sas_port_del_list, del_list) { - list_del_init(&sas_port->del_list); - sas_port_delete(sas_port); - } -} - void sas_unregister_dev(struct asd_sas_port *port, struct domain_device *dev) { if (!test_bit(SAS_DEV_DESTROY, &dev->state) && @@ -394,6 +393,7 @@ void sas_unregister_dev(struct asd_sas_p if (!test_and_set_bit(SAS_DEV_DESTROY, &dev->state)) { sas_rphy_unlink(dev->rphy); list_move_tail(&dev->disco_list_node, &port->destroy_list); + sas_discover_event(dev->port, DISCE_DESTRUCT); } }

@@ -499,8 +499,6 @@ static void sas_discover_domain(struct w port->port_dev = NULL; }

- sas_probe_devices(port); - SAS_DPRINTK("DONE DISCOVERY on port %d, pid:%d, result:%d\n", port->id, task_pid_nr(current), error); } @@ -534,10 +532,6 @@ static void sas_revalidate_domain(struct port->id, task_pid_nr(current), res); out: mutex_unlock(&ha->disco_mutex); - - sas_destruct_devices(port); - sas_destruct_ports(port); - sas_probe_devices(port); }

/* ---------- Events ---------- */ @@ -593,8 +587,10 @@ void sas_init_disc(struct sas_discovery static const work_func_t sas_event_fns[DISC_NUM_EVENTS] = { [DISCE_DISCOVER_DOMAIN] = sas_discover_domain, [DISCE_REVALIDATE_DOMAIN] = sas_revalidate_domain, + [DISCE_PROBE] = sas_probe_devices, [DISCE_SUSPEND] = sas_suspend_devices, [DISCE_RESUME] = sas_resume_devices, + [DISCE_DESTRUCT] = sas_destruct_devices, };

disc->pending = 0; --- a/drivers/scsi/libsas/sas_expander.c +++ b/drivers/scsi/libsas/sas_expander.c @@ -1946,8 +1946,7 @@ static void sas_unregister_devs_sas_addr sas_port_delete_phy(phy->port, phy->phy); sas_device_set_phy(found, phy->port); if (phy->port->num_phys == 0) - list_add_tail(&phy->port->del_list, - &parent->port->sas_port_del_list); + sas_port_delete(phy->port); phy->port = NULL; } } @@ -2157,7 +2156,7 @@ int sas_ex_revalidate_domain(struct doma struct domain_device *dev = NULL;

res = sas_find_bcast_dev(port_dev, &dev); - if (res == 0 && dev) { + while (res == 0 && dev) { struct expander_device *ex = &dev->ex_dev; int i = 0, phy_id;

@@ -2169,6 +2168,9 @@ int sas_ex_revalidate_domain(struct doma res = sas_rediscover(dev, phy_id); i = phy_id + 1; } while (i < ex->num_phys); + + dev = NULL; + res = sas_find_bcast_dev(port_dev, &dev); } return res; } --- a/drivers/scsi/libsas/sas_internal.h +++ b/drivers/scsi/libsas/sas_internal.h @@ -98,7 +98,6 @@ int sas_try_ata_reset(struct asd_sas_phy void sas_hae_reset(struct work_struct *work);

void sas_free_device(struct kref *kref); -void sas_destruct_devices(struct asd_sas_port *port);

#ifdef CONFIG_SCSI_SAS_HOST_SMP extern void sas_smp_host_handler(struct bsg_job *job, struct Scsi_Host *shost); --- a/drivers/scsi/libsas/sas_port.c +++ b/drivers/scsi/libsas/sas_port.c @@ -66,7 +66,6 @@ static void sas_resume_port(struct asd_s rc = sas_notify_lldd_dev_found(dev); if (rc) { sas_unregister_dev(port, dev); - sas_destruct_devices(port); continue; }

@@ -220,7 +219,6 @@ void sas_deform_port(struct asd_sas_phy

if (port->num_phys == 1) { sas_unregister_domain_devices(port, gone); - sas_destruct_devices(port); sas_port_delete(port->port); port->port = NULL; } else { @@ -325,7 +323,6 @@ static void sas_init_port(struct asd_sas INIT_LIST_HEAD(&port->dev_list); INIT_LIST_HEAD(&port->disco_list); INIT_LIST_HEAD(&port->destroy_list); - INIT_LIST_HEAD(&port->sas_port_del_list); spin_lock_init(&port->phy_list_lock); INIT_LIST_HEAD(&port->phy_list); port->ha = sas_ha; --- a/include/scsi/libsas.h +++ b/include/scsi/libsas.h @@ -87,8 +87,10 @@ enum discover_event { DISCE_DISCOVER_DOMAIN = 0U, DISCE_REVALIDATE_DOMAIN = 1, DISCE_PORT_GONE = 2, + DISCE_PROBE = 3, DISCE_SUSPEND = 4, DISCE_RESUME = 5, + DISCE_DESTRUCT = 6, DISC_NUM_EVENTS = 7, };

@@ -267,7 +269,6 @@ struct asd_sas_port { struct list_head dev_list; struct list_head disco_list; struct list_head destroy_list; - struct list_head sas_port_del_list; enum sas_linkrate linkrate;

struct sas_work work; --- a/include/scsi/scsi_transport_sas.h +++ b/include/scsi/scsi_transport_sas.h @@ -156,7 +156,6 @@ struct sas_port {

struct mutex phy_list_mutex; struct list_head phy_list; - struct list_head del_list; /* libsas only */ };

#define dev_to_sas_port(d) \

From: Grygorii Strashko grygorii.strashko@ti.com

commit aa54ea903abb02303bf55855fb51e3fcee135d70 upstream.

Fix build error for the case: defined(CONFIG_SMP) && !defined(CONFIG_CPU_V6)

config: keystone_defconfig

CC arch/arm/kernel/signal.o In file included from ../include/linux/random.h:14, from ../arch/arm/kernel/signal.c:8: ../arch/arm/include/asm/percpu.h: In function ‘__my_cpu_offset’: ../arch/arm/include/asm/percpu.h:29:34: error: ‘current_stack_pointer’ undeclared (first use in this function); did you mean ‘user_stack_pointer’? : "Q" (*(const unsigned long *)current_stack_pointer)); ^~~~~~~~~~~~~~~~~~~~~ user_stack_pointer

Fixes: f227e3ec3b5c ("random32: update the net random state on interrupt and activity") Signed-off-by: Grygorii Strashko grygorii.strashko@ti.com Signed-off-by: Linus Torvalds torvalds@linux-foundation.org Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org

--- arch/arm/include/asm/percpu.h | 2 ++ 1 file changed, 2 insertions(+)

--- a/arch/arm/include/asm/percpu.h +++ b/arch/arm/include/asm/percpu.h @@ -16,6 +16,8 @@ #ifndef _ASM_ARM_PERCPU_H_ #define _ASM_ARM_PERCPU_H_

+#include <asm/thread_info.h> + /* * Same as asm-generic/percpu.h, except that we store the per cpu offset * in the TPIDRPRW. TPIDRPRW only exists on V6K and V7

From: Linus Torvalds torvalds@linux-foundation.org

commit 83bdc7275e6206f560d247be856bceba3e1ed8f2 upstream.

It turns out that the plugin right now ends up being really unhappy about the change from 'static' to 'extern' storage that happened in commit f227e3ec3b5c ("random32: update the net random state on interrupt and activity").

This is probably a trivial fix for the latent_entropy plugin, but for now, just remove net_rand_state from the list of things the plugin worries about.

Reported-by: Stephen Rothwell sfr@canb.auug.org.au Cc: Emese Revfy re.emese@gmail.com Cc: Kees Cook keescook@chromium.org Cc: Willy Tarreau w@1wt.eu Signed-off-by: Linus Torvalds torvalds@linux-foundation.org Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org

--- include/linux/random.h | 2 +- lib/random32.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

--- a/include/linux/random.h +++ b/include/linux/random.h @@ -117,7 +117,7 @@ struct rnd_state { __u32 s1, s2, s3, s4; };

-DECLARE_PER_CPU(struct rnd_state, net_rand_state) __latent_entropy; +DECLARE_PER_CPU(struct rnd_state, net_rand_state);

u32 prandom_u32_state(struct rnd_state *state); void prandom_bytes_state(struct rnd_state *state, void *buf, size_t nbytes); --- a/lib/random32.c +++ b/lib/random32.c @@ -48,7 +48,7 @@ static inline void prandom_state_selftes } #endif

-DEFINE_PER_CPU(struct rnd_state, net_rand_state) __latent_entropy; +DEFINE_PER_CPU(struct rnd_state, net_rand_state);

/** * prandom_u32_state - seeded pseudo-random number generator.

From: Jiang Ying jiangying8582@126.com

This patch is used to fix ext4 direct I/O read error when the read size is not aligned with block size.

Then, I will use a test to explain the error.

(1) Make a file that is not aligned with block size: $dd if=/dev/zero of=./test.jar bs=1000 count=3

(2) I wrote a source file named "direct_io_read_file.c" as following:

#include <stdio.h> #include <stdlib.h> #include <unistd.h> #include <sys/file.h> #include <sys/types.h> #include <sys/stat.h> #include <string.h> #define BUF_SIZE 1024

int main() { int fd; int ret;

unsigned char *buf; ret = posix_memalign((void **)&buf, 512, BUF_SIZE); if (ret) { perror("posix_memalign failed"); exit(1); } fd = open("./test.jar", O_RDONLY | O_DIRECT, 0755); if (fd < 0){ perror("open ./test.jar failed"); exit(1); }

do { ret = read(fd, buf, BUF_SIZE); printf("ret=%d\n",ret); if (ret < 0) { perror("write test.jar failed"); } } while (ret > 0);

free(buf); close(fd); }

(3) Compile the source file: $gcc direct_io_read_file.c -D_GNU_SOURCE

(4) Run the test program: $./a.out

The result is as following: ret=1024 ret=1024 ret=952 ret=-1 write test.jar failed: Invalid argument.

I have tested this program on XFS filesystem, XFS does not have this problem, because XFS use iomap_dio_rw() to do direct I/O read. And the comparing between read offset and file size is done in iomap_dio_rw(), the code is as following:

if (pos < size) { retval = filemap_write_and_wait_range(mapping, pos, pos + iov_length(iov, nr_segs) - 1);

if (!retval) { retval = mapping->a_ops->direct_IO(READ, iocb, iov, pos, nr_segs); } ... }

...only when "pos < size", direct I/O can be done, or 0 will be return.

I have tested the fix patch on Ext4, it is up to the mustard of EINVAL in man2(read) as following: #include <unistd.h> ssize_t read(int fd, void *buf, size_t count);

EINVAL fd is attached to an object which is unsuitable for reading; or the file was opened with the O_DIRECT flag, and either the address specified in buf, the value specified in count, or the current file offset is not suitably aligned.

So I think this patch can be applied to fix ext4 direct I/O error.

However Ext4 introduces direct I/O read using iomap infrastructure on kernel 5.5, the patch is commit <b1b4705d54ab> ("ext4: introduce direct I/O read using iomap infrastructure"), then Ext4 will be the same as XFS, they all use iomap_dio_rw() to do direct I/O read. So this problem does not exist on kernel 5.5 for Ext4.

From above description, we can see this problem exists on all the kernel

versions between kernel 3.14 and kernel 5.4. It will cause the Applications to fail to read. For example, when the search service downloads a new full index file, the search engine is loading the previous index file and is processing the search request, it can not use buffer io that may squeeze the previous index file in use from pagecache, so the serch service must use direct I/O read.

Please apply this patch on these kernel versions, or please use the method on kernel 5.5 to fix this problem.

Fixes: 9fe55eea7e4b ("Fix race when checking i_size on direct i/o read") Reviewed-by: Jan Kara jack@suse.cz Co-developed-by: Wang Long wanglong19@meituan.com Signed-off-by: Wang Long wanglong19@meituan.com Signed-off-by: Jiang Ying jiangying8582@126.com Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org

--- fs/ext4/inode.c | 5 +++++ 1 file changed, 5 insertions(+)

--- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -3794,6 +3794,11 @@ static ssize_t ext4_direct_IO_read(struc struct inode *inode = mapping->host; size_t count = iov_iter_count(iter); ssize_t ret; + loff_t offset = iocb->ki_pos; + loff_t size = i_size_read(inode); + + if (offset >= size) + return 0;

/* * Shared inode_lock is enough for us - it protects against concurrent