From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id E0157C6379F for ; Wed, 15 Feb 2023 12:00:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5B2116B0074; Wed, 15 Feb 2023 07:00:49 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 53B316B0075; Wed, 15 Feb 2023 07:00:49 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2EFD26B0078; Wed, 15 Feb 2023 07:00:49 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 184496B0074 for ; Wed, 15 Feb 2023 07:00:49 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id C9EA3A15C4 for ; Wed, 15 Feb 2023 12:00:48 +0000 (UTC) X-FDA: 80469384576.22.0AEB247 Received: from mail-ed1-f50.google.com (mail-ed1-f50.google.com [209.85.208.50]) by imf14.hostedemail.com (Postfix) with ESMTP id 79760100002 for ; Wed, 15 Feb 2023 12:00:46 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=linaro.org header.s=google header.b=DPicoMrc; spf=pass (imf14.hostedemail.com: domain of konrad.dybcio@linaro.org designates 209.85.208.50 as permitted sender) smtp.mailfrom=konrad.dybcio@linaro.org; dmarc=pass (policy=none) header.from=linaro.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1676462446; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=CTdIxWofoZbrNI+0T5uLIfywbnnYI1faqI99lTcvgD4=; b=WIZQE6+f9MLvG/Bio9dYrxNdBsEu53Ydpi71IrlLoy9x4Y7vnBf4EsXpRl2QkUZAxWh/OT 77LiJY3fjZApt3Ksl6ig48isEBU4MNmx2jQIlW1A1+5FEW+HyHpMLaEoYuMC+zFVszEvhR 4Yl3OdrjeccYJ1VUiUF8HkXWB9U5zKM= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=linaro.org header.s=google header.b=DPicoMrc; spf=pass (imf14.hostedemail.com: domain of konrad.dybcio@linaro.org designates 209.85.208.50 as permitted sender) smtp.mailfrom=konrad.dybcio@linaro.org; dmarc=pass (policy=none) header.from=linaro.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1676462446; a=rsa-sha256; cv=none; b=ZXbMPm/8AAjlGmNzlCroU1O7RVmurWdGdSCXkEGRb3hxniddY7Dd1uU6E7eLGx60iDrGAX dyMkah/AB9aAr7HL/GoU+ISkWh1RcKiH9XO0VgiV2XoZoqGIlQo8VaDGNJgoF82IhelnM4 99RouZyBvlQbLMbUOQOzLs1nNL+NzzM= Received: by mail-ed1-f50.google.com with SMTP id s11so13970276edd.10 for ; Wed, 15 Feb 2023 04:00:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=CTdIxWofoZbrNI+0T5uLIfywbnnYI1faqI99lTcvgD4=; b=DPicoMrchplmMVruPuhN53nBF3IEotLq2L0p8YcPJQ/0AhVREKehl4KLdc0YoUq0I6 NvKJ2gKHd8Gw7UWHAIIsgLMBdwJyAez/8/bqIo/2lCe9Nb/2JXiQhOZ3iIgJgDFwIWij piXl5UgaHibBzS/wSK2geYlTyiHZbKnOGSBGuZgLG5pzX9QxpD38KQgkRBF8j7cNBoWx JSOQLarV6h92oB3j4J0q7X3dH4XcGSAP8PgHMgG6p9NB+wuKkCbLzta/Avvx+MLgyfZv Uh6RmRfo3OiAwRm4U3D3XIK76pCRL/0GMLimRRuOeDYN+P4XN8YpkW/XTRWkzHyJltCo O46Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CTdIxWofoZbrNI+0T5uLIfywbnnYI1faqI99lTcvgD4=; b=5Jpdgpn/T/I/3VHhiMYz62pAtW174pHXPO6JHlH2Vhk72RHOTxwPmcmoRNYdcStSeM NDqezSevDIVikFCSiHZ1czgHXkhkEG9VTiCsF3yqWwbnttGLzcSqHfY1fkg/QjVDgDWr t4BI9hxM8+XZJn/NE2XUz8DJjRKkpcEXNPPkmxiKI506K/8wpOsILUDqExBuIO3jWF4y WmnQVxjaL/nXKHHWtlkyj6Y9ZPWLjjN039XXlkNe/FctpJjyJd2jF8kE6Joae/GpU8hc s0k8toQ0ox8ycenomMZ95lLH06/rOC4I1XsbZGX/CnbKyY3xA1o7bCCycdKG+9CvjSQQ LbJg== X-Gm-Message-State: AO0yUKX1vS+LjDZs2D6i0v0W7JQmXk+Ya8ogf5Gk3MXXZK0rpbY2EAe0 6bb2Q+1aMbefBdXYOL2iFY2S9A== X-Google-Smtp-Source: AK7set+hCDLUEnIdvXW6KZUjw70YbZYedf6amBYRgn/9tgsiKw/kn/BqszQM6Js3Oo3miu4VimUPLg== X-Received: by 2002:a50:ec85:0:b0:4ad:66b:84a6 with SMTP id e5-20020a50ec85000000b004ad066b84a6mr1654860edr.13.1676462445119; Wed, 15 Feb 2023 04:00:45 -0800 (PST) Received: from [192.168.1.101] (abxh117.neoplus.adsl.tpnet.pl. [83.9.1.117]) by smtp.gmail.com with ESMTPSA id h2-20020a056402094200b004acb42134c4sm7001477edz.70.2023.02.15.04.00.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Feb 2023 04:00:44 -0800 (PST) From: Konrad Dybcio Date: Wed, 15 Feb 2023 13:00:39 +0100 Subject: [PATCH 2/2] Revert "splice: Do splice read from a buffered file without using ITER_PIPE" MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20230215-topic-next-20230214-revert-v1-2-c58cd87b9086@linaro.org> References: <20230215-topic-next-20230214-revert-v1-0-c58cd87b9086@linaro.org> In-Reply-To: <20230215-topic-next-20230214-revert-v1-0-c58cd87b9086@linaro.org> To: Alexander Viro , Steve French , Paulo Alcantara , Ronnie Sahlberg , Shyam Prasad N , Tom Talpey , "Matthew Wilcox (Oracle)" , Andrew Morton Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-cifs@vger.kernel.org, samba-technical@lists.samba.org, linux-mm@kvack.org, Konrad Dybcio X-Mailer: b4 0.12.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1676462440; l=5678; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=GhZqoVotGOrdGVVTlpDSlth0cBTnSieaqw2vZSOgwMg=; b=kNOAlZxm146sX4RVEP1agu2t6Duxj4iwCjq2UwEUESRutNpNxNhcL8oQbqfeiw57PyJEeXzT37Oe coVqbCJODCzECjLMISdgy6cJo3Khk2+tqwAcR/SUcXvaAedyrvLB X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 79760100002 X-Stat-Signature: bypi3o4wfnxnemri6yr5ywims4f7jq7k X-HE-Tag: 1676462446-718293 X-HE-Meta: U2FsdGVkX18kXuf2JoV+uvIxYyEil4TvcFgcUkedEz0ZbGE+p2qlHEGN7jn7LdOkRXjkAY+blriXwUcCBAPaC8C0TOKWpCAekm3hrcepWY7tUQc6iOAo1u5FEncPzMLeM9q1zJnpb3d7SnDUsKRgZ4/9dNweVdbo5zezD9iBx4O3AYIjhaX+EIDYyJw0ouwki2856+HGrlIYXTqvs5Y38FL+VxZJvHPSOiGkGSAUKd4GPEVJClYfeuYGGWcbM7tSR592it7Xo3vC9fzy9wcqK1jkeTsnxPpzMt1+feM9ofLSPTzGeAJLtwApOAUIRQTUQywkrU7U+QYJL3nDsl/59B/l96vNpBQgLQcnqOvHfq/Gp0AtOeXZRmjVVLf39WgaW+3xvih19px9HaJpT9ceoUCM9GrgO0VTAvWtlMOasVdwe4+m3Jd+wesCp2IWZL556oAdOGfK7TTkM0bBp3xGUCHgVTbxeBsZ4xp/iex3ff5Mbsf4/azCGvZ3bux2lCCgNkmssPmHknXpbQq/7zwlG+SwLa4PluRGPrMdAMQN6xPTye2/n5ItfHq6IRpqyhfe37yzO5CP7Pm0x7KgBTbnhbz77ogoTGT4SGkfQHKcDWlQ4naDjY9CCSnBVyzwFRGl+cOrk/C+yBA3pzCbh2iE3IL3Cn9iF75dFcNcaOFLd7yjr+azDWJa5D+e1UcfOt7hyO5d8Q6Utpym3ei/Fspx0ICNpkHuW9ONfvYJclZS7JQauwhZl1SkbMHGr5roOQlll3CeFs2YHjpeXkNj+BXW8nOL6hktsuJRRDmbCIVaDXv+z2U5/cLv3hi3tx/qKPWLXJfSeAGkLGpC8q3De0FAGLbEprnFFXmHMZpA+TUBnvf+cohYRWfoktJ7ffigQJ85GOEJ+JazyIT/C1WKRnor+/9/AMBUtb84kXh651pwrDIpvFUOwChwMY1HHaNwL/zyIfRQ9sfVLSVTukdt1pR +2qxuxRC 5gsleV7wXFtKmItFZsY6ASwY1g2g4HVgCkfLykf57KJ18tTo7Mm58YZOF0qq6Lc7aBEqofSeci9fz0GAuOvsb0YQ2gcQfZ7ETx0XK7u/eHnwk83e7+vPJo1giswir2uwWNf0OjdQZzpNebmb7GD3H5TcmN/xfmGvICJkaYHrtAMOXKk5pn7U0h0mYETWHstCnSz6mSrif8DO5ibeb7hfrg4F9icBZQ4Wd5Z0Yx+kQVry736+Ug4TwQeQx8yvQ9oE7GPi3YehLCM/EagnEO69OlNbY4AdyWN43hMMVwlMHTEuQ4jR7w6UiRSwB7OxjMOecTkQOKvACtg3P/cPO152W6auYG+aDWbbZQF2NrZKOtOFo9BDrb0d/CqOnwlz5AUPCGAZPCIUm3BKmyo/7avOrE/Xd7vTSFfWFPV/5EHjN4xpKiCboE7h4nHNWk4n6v6ugt4uvRrOL1mvsuJAmCvGBHYQuPg== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: next-20230213 introduced commit d9722a475711 ("splice: Do splice read from a buffered file without using ITER_PIPE") which broke booting on any Qualcomm ARM64 device I grabbed, dereferencing a null pointer in generic_filesplice_read+0xf8/x598. Revert it to make the devices bootable again. This reverts commit d9722a47571104f7fa1eeb5ec59044d3607c6070. Signed-off-by: Konrad Dybcio --- fs/splice.c | 159 +++++++++--------------------------------------------------- 1 file changed, 24 insertions(+), 135 deletions(-) diff --git a/fs/splice.c b/fs/splice.c index fa82dfee1ed0..10b258250868 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include @@ -378,135 +377,6 @@ static ssize_t generic_file_direct_splice_read(struct file *in, loff_t *ppos, return ret; } -/* - * Splice subpages from a folio into a pipe. - */ -static size_t splice_folio_into_pipe(struct pipe_inode_info *pipe, - struct folio *folio, - loff_t fpos, size_t size) -{ - struct page *page; - size_t spliced = 0, offset = offset_in_folio(folio, fpos); - - page = folio_page(folio, offset / PAGE_SIZE); - size = min(size, folio_size(folio) - offset); - offset %= PAGE_SIZE; - - while (spliced < size && - !pipe_full(pipe->head, pipe->tail, pipe->max_usage)) { - struct pipe_buffer *buf = &pipe->bufs[pipe->head & (pipe->ring_size - 1)]; - size_t part = min_t(size_t, PAGE_SIZE - offset, size - spliced); - - *buf = (struct pipe_buffer) { - .ops = &page_cache_pipe_buf_ops, - .page = page, - .offset = offset, - .len = part, - }; - folio_get(folio); - pipe->head++; - page++; - spliced += part; - offset = 0; - } - - return spliced; -} - -/* - * Splice folios from the pagecache of a buffered (ie. non-O_DIRECT) file into - * a pipe. - */ -static ssize_t generic_file_buffered_splice_read(struct file *in, loff_t *ppos, - struct pipe_inode_info *pipe, - size_t len, - unsigned int flags) -{ - struct folio_batch fbatch; - size_t total_spliced = 0, used, npages; - loff_t isize, end_offset; - bool writably_mapped; - int i, error = 0; - - struct kiocb iocb = { - .ki_filp = in, - .ki_pos = *ppos, - }; - - /* Work out how much data we can actually add into the pipe */ - used = pipe_occupancy(pipe->head, pipe->tail); - npages = max_t(ssize_t, pipe->max_usage - used, 0); - len = min_t(size_t, len, npages * PAGE_SIZE); - - folio_batch_init(&fbatch); - - do { - cond_resched(); - - if (*ppos >= i_size_read(file_inode(in))) - break; - - iocb.ki_pos = *ppos; - error = filemap_get_pages(&iocb, len, &fbatch, true); - if (error < 0) - break; - - /* - * i_size must be checked after we know the pages are Uptodate. - * - * Checking i_size after the check allows us to calculate - * the correct value for "nr", which means the zero-filled - * part of the page is not copied back to userspace (unless - * another truncate extends the file - this is desired though). - */ - isize = i_size_read(file_inode(in)); - if (unlikely(*ppos >= isize)) - break; - end_offset = min_t(loff_t, isize, *ppos + len); - - /* - * Once we start copying data, we don't want to be touching any - * cachelines that might be contended: - */ - writably_mapped = mapping_writably_mapped(in->f_mapping); - - for (i = 0; i < folio_batch_count(&fbatch); i++) { - struct folio *folio = fbatch.folios[i]; - size_t n; - - if (folio_pos(folio) >= end_offset) - goto out; - folio_mark_accessed(folio); - - /* - * If users can be writing to this folio using arbitrary - * virtual addresses, take care of potential aliasing - * before reading the folio on the kernel side. - */ - if (writably_mapped) - flush_dcache_folio(folio); - - n = splice_folio_into_pipe(pipe, folio, *ppos, len); - if (!n) - goto out; - len -= n; - total_spliced += n; - *ppos += n; - in->f_ra.prev_pos = *ppos; - if (pipe_full(pipe->head, pipe->tail, pipe->max_usage)) - goto out; - } - - folio_batch_release(&fbatch); - } while (len); - -out: - folio_batch_release(&fbatch); - file_accessed(in); - - return total_spliced ? total_spliced : error; -} - /** * generic_file_splice_read - splice data from file to a pipe * @in: file to splice from @@ -524,13 +394,32 @@ ssize_t generic_file_splice_read(struct file *in, loff_t *ppos, struct pipe_inode_info *pipe, size_t len, unsigned int flags) { - if (unlikely(*ppos >= file_inode(in)->i_sb->s_maxbytes)) - return 0; - if (unlikely(!len)) - return 0; + struct iov_iter to; + struct kiocb kiocb; + int ret; + if (in->f_flags & O_DIRECT) return generic_file_direct_splice_read(in, ppos, pipe, len, flags); - return generic_file_buffered_splice_read(in, ppos, pipe, len, flags); + + iov_iter_pipe(&to, ITER_DEST, pipe, len); + init_sync_kiocb(&kiocb, in); + kiocb.ki_pos = *ppos; + ret = call_read_iter(in, &kiocb, &to); + if (ret > 0) { + *ppos = kiocb.ki_pos; + file_accessed(in); + } else if (ret < 0) { + /* free what was emitted */ + pipe_discard_from(pipe, to.start_head); + /* + * callers of ->splice_read() expect -EAGAIN on + * "can't put anything in there", rather than -EFAULT. + */ + if (ret == -EFAULT) + ret = -EAGAIN; + } + + return ret; } EXPORT_SYMBOL(generic_file_splice_read); -- 2.39.1