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 56FEFC76195 for ; Wed, 22 Mar 2023 18:57:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B63916B0075; Wed, 22 Mar 2023 14:57:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AEC536B0078; Wed, 22 Mar 2023 14:57:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 93FF76B007B; Wed, 22 Mar 2023 14:57:14 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 8658B6B0075 for ; Wed, 22 Mar 2023 14:57:14 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 47F0D140575 for ; Wed, 22 Mar 2023 18:57:14 +0000 (UTC) X-FDA: 80597441988.11.C70B488 Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by imf24.hostedemail.com (Postfix) with ESMTP id 7571818000F for ; Wed, 22 Mar 2023 18:57:12 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=X5rLPjH2; spf=pass (imf24.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.128.48 as permitted sender) smtp.mailfrom=lstoakes@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1679511432; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=CnqbASwlTwT+hpjobkOVo9MU5RGxoqqRsLFO5z2uP7A=; b=JkbfA8UVR5x4Q3EbitIGoSldiYHGqu8bvlp/IFrM3SmFa5aJjQEiv/JH365j2YV3kRV1AB jLSNOdooGHKahTjXV8o9EChtRV7Np6PP3cglWorVIJJFH3hIDXxbbhRRap5mjTp57Vpn6e tOB10QiKuWVEp0pmpRf+e2ZCPNfXLcs= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=X5rLPjH2; spf=pass (imf24.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.128.48 as permitted sender) smtp.mailfrom=lstoakes@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1679511432; a=rsa-sha256; cv=none; b=w+A/KCA/KlXxmQ8JficRhn8g9aMLSWrY+RKO6d2isYvMjOUHwKv6uGkuxCRwJZFiAYIU9t PHsUVjL6OF4kfezu0Mj+kbNWzwxp4GzRaEusv1qbtH+6L37zbMAF5GcZzYHyniPGQKnHpU 3jQhvKRLa2TmxEJl3oXaHQoZJqiB/JY= Received: by mail-wm1-f48.google.com with SMTP id bi18-20020a05600c3d9200b003ee7b53fd72so432247wmb.2 for ; Wed, 22 Mar 2023 11:57:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679511430; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=CnqbASwlTwT+hpjobkOVo9MU5RGxoqqRsLFO5z2uP7A=; b=X5rLPjH26RWLUUeLBu1hISlyzQSMr+PgXho7dojo9U9tdfKws5wILXd6kKzml0qaYE 6UAxUEgaYTZl7w1y+ma2wJl1xqHyAhy4CMtQZOoqAinLm47gNH20SbSdZCtQ9/e8LXpI IZpPPGJ/wFlT7ktyodLSZ+9szWbYnaNZGwrfpWXKGs/Yd0ER4CyIbUEIC1MFgZ/FH329 8lxyNsOYVpzfl98WTWbwg8hqf/SfSzxR7KUkKxPLRMDUXJOhoyMS0qicmwa+6FxqC5Nv zTGnpbotv7uW1d+2Bf/OaXkcjJ6C+DuhSpDxHTCoxb87dqZ+BIBtPz9c2sUD/T+P3eD0 6BMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679511430; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CnqbASwlTwT+hpjobkOVo9MU5RGxoqqRsLFO5z2uP7A=; b=MbVIgi6xb/j4amx0KDn6cTqs21Do9a6QcMsVjVTde1mw5OC3OoZDEqLT0SPimQhRsE UamMcJSF2DhilA7s209a+ijSJZ+G6Ot1ItFWNnj/DDZSklYu6w4g3v5Gh2SGRc6NXZkr TtiPgF/+AMuDx50IfiZL0iZ64HdvudwskKqT3K/LYAeQXZQaOgOnv7ucR0SVVTICiKr1 myCMHHbILXuFQ0sUkBbSY0CVbL0+9joA30V+bGMny+mBgeRnz52B+ucGyvGflAr08CtS dW0piv0wWap8mErYgQzKbX8QxVZpPYhFQDx9BfCe4DqEHXM8gQSCRafLasFVk6YYxBBk qKPA== X-Gm-Message-State: AO0yUKV5hbp2+CF6xHi67TFNsJa+oS/0/hDbuQYjyN0sCBnEEJ9iTc25 ynIpn2YD09qAwQ+YNNRfGguV0h+7fdQ= X-Google-Smtp-Source: AK7set/n64mRjHxz4lSrAhbmMssYQn82xbffRdm3X/oFSDrc32ZrutEg3lOrHUgbv6XEsd9uya2Ygg== X-Received: by 2002:a05:600c:218d:b0:3eb:a4e:a2b2 with SMTP id e13-20020a05600c218d00b003eb0a4ea2b2mr463420wme.4.1679511430687; Wed, 22 Mar 2023 11:57:10 -0700 (PDT) Received: from lucifer.home ([2a00:23c5:dc8c:8701:1663:9a35:5a7b:1d76]) by smtp.googlemail.com with ESMTPSA id j21-20020a05600c42d500b003ee581f37a9sm3181241wme.10.2023.03.22.11.57.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Mar 2023 11:57:10 -0700 (PDT) From: Lorenzo Stoakes To: linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, Andrew Morton Cc: Baoquan He , Uladzislau Rezki , Matthew Wilcox , David Hildenbrand , Liu Shixin , Jiri Olsa , Jens Axboe , Alexander Viro , Lorenzo Stoakes Subject: [PATCH v7 2/4] fs/proc/kcore: convert read_kcore() to read_kcore_iter() Date: Wed, 22 Mar 2023 18:57:02 +0000 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: ab8t7ync9q49bwkyti53i3g7zc3erkuo X-Rspamd-Queue-Id: 7571818000F X-HE-Tag: 1679511432-544341 X-HE-Meta: U2FsdGVkX19XscV0vc2pivf9cqrJ+rSzKIK5b5B3GocVK8WIPtjxu4Xv3lABlZlGjz31xHKtVEToaVtQeQyiqYr/mD9sPFfoOCkyg7LeqETtxvAkdFdeCHJy+8jh6M1BSKuHLY9izF5H2jlHvIpNOPoFX+2THdcbPiMC7gCvhdmLLzZkYBW9eYC29e4b6OJul5aKURel0zFjSHPFixCHxkPI0bTXjDXL8fCS4oHw3jHnjAFSig0+8Oqjrj0l0dieBiBc2Tqq/TB9z81A3FwsqkW9VoGWNsVt0c6X7/bLLUU4h+OFzcinUYSE8ifnGqJhJXKgqbrQNYiGFw+gZhe4aGlOhnR2gImfAPQi2tQsv+thqsGSzET6pMOZ0/8czIwjHQpOxFFou/3O06LU5H1C3aS0t51oG7xwZJJSQmGd00xeHUQlUsAlKpysqh6I/4m/S/ZXoIs8rUOLwIl8f0KejltS99R8W802uH7tqBD26BTH2tez/wQ3IqIpUV7LJK3CQ6YhhDf9pb05sLksYoKJ7YgU3doE0PiiH2bT6l+LnWi+BKgCAcYsCUMiVXl6p/n6Loy9QxA7I0Z1XLhcUvTL9OwGEdYPLijPUudHVo7XChW7bHOd8IjlIOanYnLVs5oiXtCYgVT17ddR7Jvg9A9d1cqxGtdKqofKqNzLzC4nGE3Jp3Nz/XrmjlqYNPC6J3RWb3m7+eCTCAjejjkHa4On8i6sSRwIyc840NvCs8a11kaSMdfhQ9721juKztfthTjYTxy+Sp5U0O3a1GFtn9OYPADYK3LmgdlqFs88myeoMc0/IYufMkdMwXgF9nhLIv+Ly4cVPGwQqPZl8IF6j1dw3zDVfOUhDrFfLy336Y75eNrfp51RYbRvD6YZRyOG9rV6DN7i3BbRLIk6Ln6HqNB8BXYosdiiJZUUKm2MSNqkvnq5YZ3o+/xfXzHcd/IknA/q7a/Xw5paUugrisi9EwD /6sZG5v7 bJVzaJvbf/IaAvhp8HdZOHiC8t2p8GEYsFjJjsHYVBqaodDD0wG2YOgvZY7cI8oXwOIkQA7KGrBe31WEk3cgQjRLaI1sqebtWwNcuVTyBmhicjlD67aYolYVeH4x73bW3vYrqxSxSRH2DzdJUSA+P7Vvl+aTQ+iohfD/yXEiBFaFqMOrwDh3VgVcEEBNf0eUNKkux9uCtPkpWq827vUPZcGgPpCpMtOB8o+R68XLijv7Ci/G3Z9l9GoDQdzsGDUTrorNiqEg5pvNDCv3V89J33EuUU5wnMzSafTE45ElEd2YNmTJqzHzJV4fEeP5/ZfORp/Oa3HQF0z1ZmyBk6z/0LicYybl+tiN1qUbO9bLv6lDQjIhomFr2IFhcgcor7L0QlaC/opyV7piMn0y/2NQztGwwY5CTqTjQ6mqpdqt3o25xAhrz6gvFV0cNnTpePWVLq91vWBOEuxk7EAg42kDWx5STaigMdlf9VI2DRo1NmV3hkOmNDUktFaw4fVA0VRF+6hn2oR7B939SYSq2GHdhhYMZvkbgVF0lIh1blf8EpS68WB4WeyJdspl8gH3txpEBeHeyRxGjeNQqiL2G7GzYUJJ+4RzINyqbxOcLbXDtNwCiw+c= 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: For the time being we still use a bounce buffer for vread(), however in the next patch we will convert this to interact directly with the iterator and eliminate the bounce buffer altogether. Signed-off-by: Lorenzo Stoakes Reviewed-by: David Hildenbrand --- fs/proc/kcore.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c index 556f310d6aa4..08b795fd80b4 100644 --- a/fs/proc/kcore.c +++ b/fs/proc/kcore.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include @@ -308,9 +308,12 @@ static void append_kcore_note(char *notes, size_t *i, const char *name, } static ssize_t -read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos) +read_kcore_iter(struct kiocb *iocb, struct iov_iter *iter) { + struct file *file = iocb->ki_filp; char *buf = file->private_data; + loff_t *fpos = &iocb->ki_pos; + size_t phdrs_offset, notes_offset, data_offset; size_t page_offline_frozen = 1; size_t phdrs_len, notes_len; @@ -318,6 +321,7 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos) size_t tsz; int nphdr; unsigned long start; + size_t buflen = iov_iter_count(iter); size_t orig_buflen = buflen; int ret = 0; @@ -356,12 +360,11 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos) }; tsz = min_t(size_t, buflen, sizeof(struct elfhdr) - *fpos); - if (copy_to_user(buffer, (char *)&ehdr + *fpos, tsz)) { + if (copy_to_iter((char *)&ehdr + *fpos, tsz, iter) != tsz) { ret = -EFAULT; goto out; } - buffer += tsz; buflen -= tsz; *fpos += tsz; } @@ -398,15 +401,14 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos) } tsz = min_t(size_t, buflen, phdrs_offset + phdrs_len - *fpos); - if (copy_to_user(buffer, (char *)phdrs + *fpos - phdrs_offset, - tsz)) { + if (copy_to_iter((char *)phdrs + *fpos - phdrs_offset, tsz, + iter) != tsz) { kfree(phdrs); ret = -EFAULT; goto out; } kfree(phdrs); - buffer += tsz; buflen -= tsz; *fpos += tsz; } @@ -448,14 +450,13 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos) min(vmcoreinfo_size, notes_len - i)); tsz = min_t(size_t, buflen, notes_offset + notes_len - *fpos); - if (copy_to_user(buffer, notes + *fpos - notes_offset, tsz)) { + if (copy_to_iter(notes + *fpos - notes_offset, tsz, iter) != tsz) { kfree(notes); ret = -EFAULT; goto out; } kfree(notes); - buffer += tsz; buflen -= tsz; *fpos += tsz; } @@ -497,7 +498,7 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos) } if (!m) { - if (clear_user(buffer, tsz)) { + if (iov_iter_zero(tsz, iter) != tsz) { ret = -EFAULT; goto out; } @@ -508,14 +509,14 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos) case KCORE_VMALLOC: vread(buf, (char *)start, tsz); /* we have to zero-fill user buffer even if no read */ - if (copy_to_user(buffer, buf, tsz)) { + if (copy_to_iter(buf, tsz, iter) != tsz) { ret = -EFAULT; goto out; } break; case KCORE_USER: /* User page is handled prior to normal kernel page: */ - if (copy_to_user(buffer, (char *)start, tsz)) { + if (copy_to_iter((char *)start, tsz, iter) != tsz) { ret = -EFAULT; goto out; } @@ -531,7 +532,7 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos) */ if (!page || PageOffline(page) || is_page_hwpoison(page) || !pfn_is_ram(pfn)) { - if (clear_user(buffer, tsz)) { + if (iov_iter_zero(tsz, iter) != tsz) { ret = -EFAULT; goto out; } @@ -541,17 +542,17 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos) case KCORE_VMEMMAP: case KCORE_TEXT: /* - * We use _copy_to_user() to bypass usermode hardening + * We use _copy_to_iter() to bypass usermode hardening * which would otherwise prevent this operation. */ - if (_copy_to_user(buffer, (char *)start, tsz)) { + if (_copy_to_iter((char *)start, tsz, iter) != tsz) { ret = -EFAULT; goto out; } break; default: pr_warn_once("Unhandled KCORE type: %d\n", m->type); - if (clear_user(buffer, tsz)) { + if (iov_iter_zero(tsz, iter) != tsz) { ret = -EFAULT; goto out; } @@ -559,7 +560,6 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos) skip: buflen -= tsz; *fpos += tsz; - buffer += tsz; start += tsz; tsz = (buflen > PAGE_SIZE ? PAGE_SIZE : buflen); } @@ -603,7 +603,7 @@ static int release_kcore(struct inode *inode, struct file *file) } static const struct proc_ops kcore_proc_ops = { - .proc_read = read_kcore, + .proc_read_iter = read_kcore_iter, .proc_open = open_kcore, .proc_release = release_kcore, .proc_lseek = default_llseek, -- 2.39.2