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 X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 55901C433B4 for ; Thu, 29 Apr 2021 10:04:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1448761453 for ; Thu, 29 Apr 2021 10:04:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240233AbhD2KEr (ORCPT ); Thu, 29 Apr 2021 06:04:47 -0400 Received: from mx-out.tlen.pl ([193.222.135.142]:18261 "EHLO mx-out.tlen.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238046AbhD2KEq (ORCPT ); Thu, 29 Apr 2021 06:04:46 -0400 Received: (wp-smtpd smtp.tlen.pl 2600 invoked from network); 29 Apr 2021 12:03:57 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=o2.pl; s=1024a; t=1619690637; bh=ygjEkLzoy67+HxQNC9nOx8jeF7wnqzCRlbT0WkJJcS0=; h=From:To:Cc:Subject; b=LwnqmiX7PrqVlTiTLaln3sNLKzPHxAoBMfDfjpqcaAMxJ5ohyrsw3DnoM1wLq+eY5 aQOYMDULeavXLpYMW4gUdOgWNyRT5PawV/Vew4vEXM34ldBjZRCsad5zcJiuiSmiGm 7HADcyoA+REJDht35wiOTPeMFkXQqa5x1iTCqhS8= Received: from 89-64-46-199.dynamic.chello.pl (HELO localhost.localdomain) (arek_koz@o2.pl@[89.64.46.199]) (envelope-sender ) by smtp.tlen.pl (WP-SMTPD) with ECDHE-RSA-AES256-GCM-SHA384 encrypted SMTP for ; 29 Apr 2021 12:03:57 +0200 From: "Arkadiusz Kozdra (Arusekk)" To: Linus Torvalds Cc: Christoph Hellwig , Linux Kernel Mailing List , linux-fsdevel@vger.kernel.org, "Arkadiusz Kozdra (Arusekk)" , Alexey Dobriyan , Al Viro , Greg Kroah-Hartman Subject: [PATCH v2] proc: Use seq_read_iter for /proc/*/maps Date: Thu, 29 Apr 2021 12:05:08 +0200 Message-Id: <20210429100508.18502-1-arek_koz@o2.pl> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-WP-MailID: d2a92516f227032653df43168bef5a51 X-WP-AV: skaner antywirusowy Poczty o2 X-WP-SPAM: NO 0000000 [AcNU] Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org Since seq_read_iter looks mature enough to be used for /proc//maps, re-allow applications to perform zero-copy data forwarding from it. Some executable-inspecting tools rely on patching entry point instructions with minimal machine code that uses sendfile to read /proc/self/maps to stdout. The sendfile call allows them to do it faster and without excessive allocations. This is inspired by the series by Cristoph Hellwig (linked). Changes since v1: only change proc_pid_maps_operations Link: https://lore.kernel.org/lkml/20201104082738.1054792-1-hch@lst.de/ Fixes: 36e2c7421f02 ("fs: don't allow splice read/write without explicit ops") Cc: Alexey Dobriyan Cc: Al Viro Cc: Greg Kroah-Hartman Cc: Christoph Hellwig Signed-off-by: Arkadiusz Kozdra (Arusekk) --- fs/proc/task_mmu.c | 3 ++- fs/proc/task_nommu.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index e862cab69583..06282294ddb8 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -351,7 +351,8 @@ static int pid_maps_open(struct inode *inode, struct file *file) const struct file_operations proc_pid_maps_operations = { .open = pid_maps_open, - .read = seq_read, + .read_iter = seq_read_iter, + .splice_read = generic_file_splice_read, .llseek = seq_lseek, .release = proc_map_release, }; diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c index a6d21fc0033c..e55e79fd0175 100644 --- a/fs/proc/task_nommu.c +++ b/fs/proc/task_nommu.c @@ -295,7 +295,8 @@ static int pid_maps_open(struct inode *inode, struct file *file) const struct file_operations proc_pid_maps_operations = { .open = pid_maps_open, - .read = seq_read, + .read_iter = seq_read_iter, + .splice_read = generic_file_splice_read, .llseek = seq_lseek, .release = map_release, }; -- 2.31.1