From patchwork Wed Apr 5 10:38:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Price X-Patchwork-Id: 79553 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp202178vqo; Wed, 5 Apr 2023 03:42:03 -0700 (PDT) X-Google-Smtp-Source: AKy350Z0QH4gRC0H/dr06VyFNxSYl/axSc/iRULoD2cfEOw/JUpg0ptoH2Awi5XpScMUzauznb7U X-Received: by 2002:a05:6a20:659c:b0:da:c40:8dc with SMTP id p28-20020a056a20659c00b000da0c4008dcmr5163391pzh.6.1680691323279; Wed, 05 Apr 2023 03:42:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680691323; cv=none; d=google.com; s=arc-20160816; b=JvnQ60mfuPgHz4/poJOibHyJZ5DEhLBr3Pi1CqBHtRiWNVynvelDVuEKptos2wqB+z Gb0rOVurtCl/FM+hXRV2tdD7lpAGbHD3qVjqad7uKPdn4ImAtAUEsRuHmqyTFZC76wTz ftaQUStzeaXbmH/Sgj4Bsb3t0yvmr3BW6C2Sayn5RNC+wtrbpm4tbc/D85TENlIFSfhc xl2o5hzyGv6+bmXqSGKdnkYeGWnwJQCerbnp8sHPARsJlg4rsvWdTmvXz2Vdbgr6CJvi GQ0bonP4M4ESAYCdRGjkZChyFb9PtJbE3UaXgi5xNIPGYbm0o7vXn9X0X3sPsBoQ5dem zyHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=kf+DC2iBMOnhFzcpVswFAc+ozqOC5H7vXXkswxjm1+c=; b=YUUoSLCmFG2/dVhn4gX81cUICy34lvHykkrOPZ4+A8gvBDxb9nFyG66l2dZ+FGuaaL 9yP80zJHiULEuBhrf3hID7JKzEPePFaq60GeGmnm2So6dK3lb37C7fEW2WZ5UjWAUBTo +rgzMMVrk2fc3aaae3PTSqlpDpp9IhmFYRzpujQpvfKrPWRmAnWHIgz6fN/4czIAUwMm GStviGOnMmw7raGWTL8jmEMxCA0HvkItoxFC81z94ZYvK3hkDazat51L6I2M45VhQgkT Vj6/syOO/Yks+nhXELscenz4wYNP4YRhR7Mc1W/T4JpIU/eZma9NR/Mfx4SBeLx7DFAD PNRA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w12-20020a170902e88c00b0019a96849d6dsi12562346plg.605.2023.04.05.03.41.48; Wed, 05 Apr 2023 03:42:03 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237632AbjDEKij (ORCPT + 99 others); Wed, 5 Apr 2023 06:38:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47604 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230093AbjDEKii (ORCPT ); Wed, 5 Apr 2023 06:38:38 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id B252349F9; Wed, 5 Apr 2023 03:38:36 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id A73451684; Wed, 5 Apr 2023 03:39:20 -0700 (PDT) Received: from e122027.arm.com (unknown [10.57.94.33]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 684223F73F; Wed, 5 Apr 2023 03:38:34 -0700 (PDT) From: Steven Price To: Andrew Morton Cc: Steven Price , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Jason Gunthorpe , Thomas Hellstrom , Christoph Hellwig , kernel test robot Subject: [PATCH v2] smaps: Fix defined but not used smaps_shmem_walk_ops Date: Wed, 5 Apr 2023 11:38:19 +0100 Message-Id: <20230405103819.151246-1-steven.price@arm.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.3 required=5.0 tests=RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1762332585022084338?= X-GMAIL-MSGID: =?utf-8?q?1762332585022084338?= When !CONFIG_SHMEM smaps_shmem_walk_ops is defined but not used, triggering a compiler warning. To avoid the warning remove the #ifdef around the usage. This has no effect because shmem_mapping() is a stub returning false when !CONFIG_SHMEM so the code will be compiled out, however we now need to also provide a stub for shmem_swap_usage(). Fixes: 7b86ac3371b7 ("pagewalk: separate function pointers from iterator data") Reported-by: kernel test robot Link: https://lore.kernel.org/oe-kbuild-all/202304031749.UiyJpxzF-lkp@intel.com/ Signed-off-by: Steven Price Reviewed-by: Jason Gunthorpe --- I've implemented Jason's suggestion of removing the #ifdef around the usage and prodiving a stub for shmem_swap_usage() instead. fs/proc/task_mmu.c | 3 +-- include/linux/shmem_fs.h | 7 +++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index 6a96e1713fd5..cb49479acd2e 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -782,7 +782,6 @@ static void smap_gather_stats(struct vm_area_struct *vma, if (start >= vma->vm_end) return; -#ifdef CONFIG_SHMEM if (vma->vm_file && shmem_mapping(vma->vm_file->f_mapping)) { /* * For shared or readonly shmem mappings we know that all @@ -803,7 +802,7 @@ static void smap_gather_stats(struct vm_area_struct *vma, ops = &smaps_shmem_walk_ops; } } -#endif + /* mmap_lock is held in m_start */ if (!start) walk_page_vma(vma, ops, mss); diff --git a/include/linux/shmem_fs.h b/include/linux/shmem_fs.h index 103d1000a5a2..762c37b32bd4 100644 --- a/include/linux/shmem_fs.h +++ b/include/linux/shmem_fs.h @@ -94,7 +94,14 @@ int shmem_unuse(unsigned int type); extern bool shmem_is_huge(struct inode *inode, pgoff_t index, bool shmem_huge_force, struct mm_struct *mm, unsigned long vm_flags); +#ifdef CONFIG_SHMEM extern unsigned long shmem_swap_usage(struct vm_area_struct *vma); +#else +static inline unsigned long shmem_swap_usage(struct vm_area_struct *vma) +{ + return 0; +} +#endif extern unsigned long shmem_partial_swap_usage(struct address_space *mapping, pgoff_t start, pgoff_t end);