From patchwork Sun Aug 26 16:25:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 10576301 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A32295A4 for ; Sun, 26 Aug 2018 16:23:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A0E7129571 for ; Sun, 26 Aug 2018 16:23:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 95760298B3; Sun, 26 Aug 2018 16:23:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3870429571 for ; Sun, 26 Aug 2018 16:23:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726920AbeHZUGi (ORCPT ); Sun, 26 Aug 2018 16:06:38 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:42614 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726611AbeHZUGi (ORCPT ); Sun, 26 Aug 2018 16:06:38 -0400 Received: by mail-wr1-f67.google.com with SMTP id v17-v6so11403497wrr.9; Sun, 26 Aug 2018 09:23:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=mC8k9PndJ9Y8/DP8pJKF/M6bORTuNZDwQ+wm6Xey3MY=; b=WPfW5OXZAZUm4k/KIaED5uEWUvKwZ8sTA37JXwtzTf4HT4hpnYJ5Jt65dx1EzWp3Ie DNwRPr5BuR7GIqcl0k9IE+j51Zt55mtVeb5xndSzl2ZOytQrvBtl7NqGUpjQiig/0IYC caTk8TjTH6mZdoVJVBhmhuRbxHVspuNIV58kyicgT1uJv8Q/ywvJkCyaMiAA4xwrnhxn eYmp9BoGepj5YrTCJpQVkdq29hIfZsZ9OsMvY1GQCmob1VbWWwHkMHtDsysNJkLFWh06 7UooUK24Ibt8iyu/AcixiUlkiCBCw/pXSfG2WyH19NoTmRnKZUc/fmr1SZEbHqbXWS/m t2YA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=mC8k9PndJ9Y8/DP8pJKF/M6bORTuNZDwQ+wm6Xey3MY=; b=Fn8/HOJwTZ1mca2/fwxTWka5GLzZRJrcOEk/vLIWGUjee9/55lXVjFDO9/ObGP5NtH xLB/TNT1d+KvCJtVJZoLUsEbhG0YFy9KX6PbLPMxDR2E/NbZB7+Ij80x8YIewwLnN8Kp LwcwL6LR7EHocUDa0j9F20flTzzilhj2OqQbfLGjmw/mM7vy9G2yMkbMgF3/ymYvbCDT fKWFJWKNua28Ts8SHi8SZy5Y795ypISBZwMU35Ogx1gbJzlp+Z5lZJAS4OFW+SnKrVL9 8SMk3AVmSFK8QNdIWU3U9HXvI4ViKjECbZWs7l7jShnmIYS3KazY1caq0UGM3przxKuv 4gcA== X-Gm-Message-State: APzg51BrwFyPMeqtRLXRB2olAfb+jpIowbGOo/kjby1yJQ56iRWgpl9p 1/gcQAYjUWP/yneJXY/j2MYx8DYS X-Google-Smtp-Source: ANB0Vdb0kAQe7ob5hynyOQlZzYq7fjP3ikPmBS3MYzFhJGLIppw+iSF9QjIl5QYtYhEjT+gbVQ3kPA== X-Received: by 2002:adf:f0c8:: with SMTP id x8-v6mr6773476wro.49.1535300617344; Sun, 26 Aug 2018 09:23:37 -0700 (PDT) Received: from localhost.localdomain (bzq-166-168-31-246.red.bezeqint.net. [31.168.166.246]) by smtp.gmail.com with ESMTPSA id o33-v6sm27559238wrf.11.2018.08.26.09.23.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 26 Aug 2018 09:23:36 -0700 (PDT) From: Amir Goldstein To: Miklos Szeredi Cc: Al Viro , Dave Chinner , linux-unionfs@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH v2 5/6] vfs: fix fadvise64 syscall on an overlayfs file Date: Sun, 26 Aug 2018 19:25:16 +0300 Message-Id: <1535300717-26686-6-git-send-email-amir73il@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1535300717-26686-1-git-send-email-amir73il@gmail.com> References: <1535300717-26686-1-git-send-email-amir73il@gmail.com> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP For an overlayfs file/inode, gage io is operating on the real underlying file, so the readahead hints set by fadvise64() should also be set on the real underlying file to take affect. Fixes: d1d04ef8572b ("ovl: stack file ops") Signed-off-by: Amir Goldstein --- mm/fadvise.c | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/mm/fadvise.c b/mm/fadvise.c index 2d8376e3c640..d5528343ce77 100644 --- a/mm/fadvise.c +++ b/mm/fadvise.c @@ -30,6 +30,7 @@ int ksys_fadvise64_64(int fd, loff_t offset, loff_t len, int advice) { struct fd f = fdget(fd); + struct file *file; struct inode *inode; struct address_space *mapping; struct backing_dev_info *bdi; @@ -42,13 +43,18 @@ int ksys_fadvise64_64(int fd, loff_t offset, loff_t len, int advice) if (!f.file) return -EBADF; - inode = file_inode(f.file); + /* + * XXX: We need to use file_real() for overlayfs stacked file because + * readahead will be operating on the real underlying file/inode. + */ + file = file_real(f.file); + inode = file_inode(file); if (S_ISFIFO(inode->i_mode)) { ret = -ESPIPE; goto out; } - mapping = f.file->f_mapping; + mapping = file->f_mapping; if (!mapping || len < 0) { ret = -EINVAL; goto out; @@ -85,21 +91,21 @@ int ksys_fadvise64_64(int fd, loff_t offset, loff_t len, int advice) switch (advice) { case POSIX_FADV_NORMAL: - f.file->f_ra.ra_pages = bdi->ra_pages; - spin_lock(&f.file->f_lock); - f.file->f_mode &= ~FMODE_RANDOM; - spin_unlock(&f.file->f_lock); + file->f_ra.ra_pages = bdi->ra_pages; + spin_lock(&file->f_lock); + file->f_mode &= ~FMODE_RANDOM; + spin_unlock(&file->f_lock); break; case POSIX_FADV_RANDOM: - spin_lock(&f.file->f_lock); - f.file->f_mode |= FMODE_RANDOM; - spin_unlock(&f.file->f_lock); + spin_lock(&file->f_lock); + file->f_mode |= FMODE_RANDOM; + spin_unlock(&file->f_lock); break; case POSIX_FADV_SEQUENTIAL: - f.file->f_ra.ra_pages = bdi->ra_pages * 2; - spin_lock(&f.file->f_lock); - f.file->f_mode &= ~FMODE_RANDOM; - spin_unlock(&f.file->f_lock); + file->f_ra.ra_pages = bdi->ra_pages * 2; + spin_lock(&file->f_lock); + file->f_mode &= ~FMODE_RANDOM; + spin_unlock(&file->f_lock); break; case POSIX_FADV_WILLNEED: /* First and last PARTIAL page! */ @@ -115,7 +121,7 @@ int ksys_fadvise64_64(int fd, loff_t offset, loff_t len, int advice) * Ignore return value because fadvise() shall return * success even if filesystem can't retrieve a hint, */ - force_page_cache_readahead(mapping, f.file, start_index, + force_page_cache_readahead(mapping, file, start_index, nrpages); break; case POSIX_FADV_NOREUSE: