Message ID | 20230403111255.141623-1-steven.price@arm.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2224647vqo; Mon, 3 Apr 2023 04:23:54 -0700 (PDT) X-Google-Smtp-Source: AKy350Y1NI+uZT9c8gaJOSjx1tNgd/LDMHcWTCUmQ18I8pV1YulWBeGbtL8oUtR2igX0ClgWUquI X-Received: by 2002:a17:90b:164e:b0:233:f98a:8513 with SMTP id il14-20020a17090b164e00b00233f98a8513mr41335705pjb.8.1680521033874; Mon, 03 Apr 2023 04:23:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680521033; cv=none; d=google.com; s=arc-20160816; b=yCu6TJPCzAvFc57cj5tLu8UWfgCSTS5Flz4nofTslvmI+YEiZQ7qIHgfAAAStxVlGo xXVFt06swr5Dx+k8RaeSMnYHatsvnz8733N8OGbdO9JtrWiqbk09gTxkHRMeaLRQSOPh GDf/wqyKg4d41faGVAWJ7nvt3vb2BjZJCuJFAT/bBxB1kadVaIC8fAVbAra9xBE381YZ TtCufgmpaGnkmEPDoxP6DgmgBGgq4VduWbatFYnXSahSU75wV/IDBBdo19rG+d9krqf5 kVu/IDEhECnkzhNcJOshhj/iwGjfPB8+AzmF3mIYOWPoiXAuKJeLFutJ4NGjm5tzWn0N kA9g== 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=JO++HXyDykjJNOu2DTNF0k0quuNYLszICDRUwqX19xk=; b=bq/Kf1uBlItQIS1m8UMWQn1Qv9TdotpCLkdgQwZrXiGrvudhx6cazlFbm0gwEO23hA Q/D+TJ/oKIsF0c4FPoMBdl4ZInXLVTMEoEQK5g1hYQH3sMhIjjNyc7RuLHqIBYQMdQMC +tKHrGePH3yVtewmd6aYdxwb6zJAPeqrFRZUzQ70zL9qEh6xBKANsBsfSCzUg0tigAPi qlapZyqxgr1C1nqdOyqxX2jHJ7Ixfa2XQR8r7tdWBzpStfwJC1LoFH/jhifk09OtRM2l XrKkGXGcradp8EIc98avfws3xA5knovGmJJeNXybM0XE+SZEaqoBPCsoezgHKaSMEm9J uB/A== 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 gl3-20020a17090b120300b002307345bf7bsi10183387pjb.23.2023.04.03.04.23.41; Mon, 03 Apr 2023 04:23:53 -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 S232326AbjDCLOB (ORCPT <rfc822;zwp10758@gmail.com> + 99 others); Mon, 3 Apr 2023 07:14:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37024 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232329AbjDCLNr (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Mon, 3 Apr 2023 07:13:47 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 190281A95E; Mon, 3 Apr 2023 04:13:19 -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 6EE3F1063; Mon, 3 Apr 2023 04:14:01 -0700 (PDT) Received: from e122027.arm.com (unknown [10.57.57.191]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 33EB73F6C4; Mon, 3 Apr 2023 04:13:15 -0700 (PDT) From: Steven Price <steven.price@arm.com> To: Andrew Morton <akpm@linux-foundation.org> Cc: Steven Price <steven.price@arm.com>, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Jason Gunthorpe <jgg@ziepe.ca>, Thomas Hellstrom <thellstrom@vmware.com>, Christoph Hellwig <hch@lst.de>, kernel test robot <lkp@intel.com> Subject: [PATCH] smaps: Fix defined but not used smaps_shmem_walk_ops Date: Mon, 3 Apr 2023 12:12:55 +0100 Message-Id: <20230403111255.141623-1-steven.price@arm.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1762154023811129577?= X-GMAIL-MSGID: =?utf-8?q?1762154023811129577?= |
Series |
smaps: Fix defined but not used smaps_shmem_walk_ops
|
|
Commit Message
Steven Price
April 3, 2023, 11:12 a.m. UTC
When !CONFIG_SHMEM smaps_shmem_walk_ops is defined but not used,
triggering a compiler warning. Surround the definition with an #ifdef to
keep the compiler happy.
Fixes: 7b86ac3371b7 ("pagewalk: separate function pointers from iterator data")
Reported-by: kernel test robot <lkp@intel.com>
Link: https://lore.kernel.org/oe-kbuild-all/202304031749.UiyJpxzF-lkp@intel.com/
Signed-off-by: Steven Price <steven.price@arm.com>
---
fs/proc/task_mmu.c | 2 ++
1 file changed, 2 insertions(+)
Comments
On Mon, Apr 03, 2023 at 12:12:55PM +0100, Steven Price wrote: > When !CONFIG_SHMEM smaps_shmem_walk_ops is defined but not used, > triggering a compiler warning. Surround the definition with an #ifdef to > keep the compiler happy. > > Fixes: 7b86ac3371b7 ("pagewalk: separate function pointers from iterator data") > Reported-by: kernel test robot <lkp@intel.com> > Link: https://lore.kernel.org/oe-kbuild-all/202304031749.UiyJpxzF-lkp@intel.com/ > Signed-off-by: Steven Price <steven.price@arm.com> > --- > fs/proc/task_mmu.c | 2 ++ > 1 file changed, 2 insertions(+) I think it would be better to enclose the definition of shmem_swap_usage() in its header with a stub like shmem_mapping and remove the ifdef completely. shmem_mapping() is already compile time false. #ifdef CONFIG_SHMEM if (vma->vm_file && shmem_mapping(vma->vm_file->f_mapping)) { /* * For shared or readonly shmem mappings we know that all * swapped out pages belong to the shmem object, and we can * obtain the swap value much more efficiently. For private * writable mappings, we might have COW pages that are * not affected by the parent swapped out pages of the shmem * object, so we have to distinguish them during the page walk. * Unless we know that the shmem object (or the part mapped by * our VMA) has no swapped out pages at all. */ unsigned long shmem_swapped = shmem_swap_usage(vma); if (!start && (!shmem_swapped || (vma->vm_flags & VM_SHARED) || !(vma->vm_flags & VM_WRITE))) { mss->swap += shmem_swapped; } else { ops = &smaps_shmem_walk_ops; } } #endif Jason
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index 6a96e1713fd5..3d4f8859dac1 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -761,11 +761,13 @@ static const struct mm_walk_ops smaps_walk_ops = { .hugetlb_entry = smaps_hugetlb_range, }; +#ifdef CONFIG_SHMEM static const struct mm_walk_ops smaps_shmem_walk_ops = { .pmd_entry = smaps_pte_range, .hugetlb_entry = smaps_hugetlb_range, .pte_hole = smaps_pte_hole, }; +#endif /* * Gather mem stats from @vma with the indicated beginning