From patchwork Mon Sep 25 08:22:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hugh Dickins X-Patchwork-Id: 13397476 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 B2B16CE7A8C for ; Mon, 25 Sep 2023 08:22:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 528DD8D000F; Mon, 25 Sep 2023 04:22:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4D8DB8D0001; Mon, 25 Sep 2023 04:22:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3A1518D000F; Mon, 25 Sep 2023 04:22:34 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 290208D0001 for ; Mon, 25 Sep 2023 04:22:34 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id E0B0640ADD for ; Mon, 25 Sep 2023 08:22:33 +0000 (UTC) X-FDA: 81274428186.22.4911F44 Received: from mail-yb1-f178.google.com (mail-yb1-f178.google.com [209.85.219.178]) by imf28.hostedemail.com (Postfix) with ESMTP id 270C2C0008 for ; Mon, 25 Sep 2023 08:22:31 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=VEIsj9f7; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf28.hostedemail.com: domain of hughd@google.com designates 209.85.219.178 as permitted sender) smtp.mailfrom=hughd@google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1695630152; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=4sZK+xCuT0P0uH5eP+c4/6boHa42doWBfySEpYJVCK8=; b=6lfaOeQYIovaMry2eZkvXX1dpz0dsXPGj2X0MWkfr2QJz5sVhbQTtVn7rw5XY/OqGv6UmJ FFIumPtJK49mokuGwIWhzsDhHTDhxywbD1n2MrFxycYWPK/CL5qidTyo2IKSlXegdYlNFr vcUeNx9rY/KdKrQ2+CD0VL8733Bcg+8= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=VEIsj9f7; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf28.hostedemail.com: domain of hughd@google.com designates 209.85.219.178 as permitted sender) smtp.mailfrom=hughd@google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1695630152; a=rsa-sha256; cv=none; b=vStqa1IgUGIxZtDaCVudxzEh5wh228Yc9M/HtESWmSdPfLUZdmsorrjHejxDPpCGPvUWEI eh2NRZh1i7ZcOmr549s9gXNwFHqi9nq/MHxQu2nLDsONW69jjUdm11TFhrR5BcyxMvY06D y9X6FVysrUncwC8tLS5IwWc9ejSiqYg= Received: by mail-yb1-f178.google.com with SMTP id 3f1490d57ef6-d8168d08bebso6621689276.0 for ; Mon, 25 Sep 2023 01:22:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1695630151; x=1696234951; darn=kvack.org; h=mime-version:references:message-id:in-reply-to:subject:cc:to:from :date:from:to:cc:subject:date:message-id:reply-to; bh=4sZK+xCuT0P0uH5eP+c4/6boHa42doWBfySEpYJVCK8=; b=VEIsj9f7sjEvo+2IuDEu/Dt78roJxoQA/2CJN09FL+PKlmFKBvuY9VH92e6wqzoua5 fF1l+t4TiTSmuu1t8EGfvSPLkDaEdBDA/OIXV0Al5my/2x19r5lTuDfiErRDNakxSNB4 uHLe8EvMagCtmF2EtwIZ3pNkZLY8KiSmRz4LQM+fSgAMl7QP7eM4ZAx5ptndcfV4W0Dh H7ODHZwkCkPmYZ9hqe+ULUkJdA0nFHpa//f4XIATCEwdY/xdBDfd4bNTVeD3P/goDoEp YacYmEEa4lbxhInIF00YUjWvZCyRag5ekr/V6EiaflqX5XtDR/A+yXwiaJnXBRdAnpC7 1zYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695630151; x=1696234951; h=mime-version:references:message-id:in-reply-to:subject:cc:to:from :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=4sZK+xCuT0P0uH5eP+c4/6boHa42doWBfySEpYJVCK8=; b=EX793p2T2xSbwpQw7ba/zxKCbLYP7nwbAbucNc6BYYOvLymaffSbXAXas5ftjfX//S TxzhIXyKq6C+hmUAQw0hP6bHMjihBvYuw/MdshU9olCLbIXBHCDAnKQ6oJZvqq+SswfO 5zGECJuz6Go1V4ns/6vWBWIYNVSWLuK9aPosJK/lQjf+eNsNn2jTKjPWFZZEul5QmUzN LXyXWFc4RsK10/T9pQk1+pO9LcwzKmj7Tw32QNKy8Mi3annTs9/vQeCzIxhvbd63vTA7 XWXsoT9XkgX91mK0x0YWq7KOPz7A/n1U1RjiE/mhhng49u8CLa/deFI5dO4bP91Jhvs2 MWAg== X-Gm-Message-State: AOJu0YzSyinX4wlQwTdTGvJumEY50WgUuiJH2dJ8zFpU0qbcRWdKWuhK R71ij+0wrMDveZMBN2m0jUVWsQ== X-Google-Smtp-Source: AGHT+IEwv44FcIamrq7TyieXIPq5bY4OaPs0D1yBi6vYNp4KwxZNNaUgHfeQiKSegaaLKY4KIVfLOQ== X-Received: by 2002:a25:6942:0:b0:d7b:9580:240c with SMTP id e63-20020a256942000000b00d7b9580240cmr6055638ybc.47.1695630151093; Mon, 25 Sep 2023 01:22:31 -0700 (PDT) Received: from ripple.attlocal.net (172-10-233-147.lightspeed.sntcca.sbcglobal.net. [172.10.233.147]) by smtp.gmail.com with ESMTPSA id n80-20020a25da53000000b00d217e46d25csm2127705ybf.4.2023.09.25.01.22.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Sep 2023 01:22:30 -0700 (PDT) Date: Mon, 25 Sep 2023 01:22:27 -0700 (PDT) From: Hugh Dickins X-X-Sender: hugh@ripple.attlocal.net To: Andrew Morton cc: Andi Kleen , Christoph Lameter , Matthew Wilcox , Mike Kravetz , David Hildenbrand , Suren Baghdasaryan , Yang Shi , Sidhartha Kumar , Vishal Moola , Kefeng Wang , Greg Kroah-Hartman , Tejun Heo , Mel Gorman , Michal Hocko , linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 02/12] kernfs: drop shared NUMA mempolicy hooks In-Reply-To: <2d872cef-7787-a7ca-10e-9d45a64c80b4@google.com> Message-ID: References: <2d872cef-7787-a7ca-10e-9d45a64c80b4@google.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 270C2C0008 X-Stat-Signature: 765ctm7g398xeyiofktp49aefa736sn1 X-HE-Tag: 1695630151-225688 X-HE-Meta: U2FsdGVkX1+h1ba5uY+3H5BG87zvOM8sGvB75FwkuZr8fYGzcznbmmu/LlvL+WIMi1bxNq+eMa4QjsMs2ZXmad95RKYUESU1kYYD37v2e977pU7LkL4EJipC3KnCoWcztD/yFGF1/7F/XZSbcULjBb2pFIqC+97IMLpnulEsaJGGe1H7Zu+oGmVAZax4WRi1BDi2YvFmZ7lSwhm2ZxvQ137HJ37XWeiN2n9dZALt+NyBbKhwkUq0TMOXt+j9Pi5uCuTzNJiVkjkcpyqYomGYgq3LkXKnpcJT1cWDiBbgEJSX5JXgtj1cOy0EcBAoRbFc26uPPeTD5T5Uv1X9eyLbnHQ8+NEWscJAfTz/G7r7lxU9sfZ5y3bzcWA2JNVw4mL/zKhh4xjpaliSt2/eCK7wXA8SUuOSiX959ML7bxt90CoYGV29rVAIYrT3P1bDH+7gHgWwm3dYgHN8l/iFe0e3bYiE5Re2KFzy0FkK847OUDAYGJm/JYY9BKcAxeZsIwPjPto/6iOXPGbUolKK4OvGLLklMGaaQi4yJajHHGo+dPZlDCDUG+I0xOsmGom7EtRdRid2PWoDcglPiqwJgJxWgpLnay7qyxlWOMBMmv5Jv2AsNUbFJvDyzzzbn7PkZRxO9V5Uq6ap8AS+Md4dalqqL3YKzc0fe2NDqs29cyFWY0As+CjyJWI2RUsV1vUA/UHEydAr9E9YkTpB5XTBo9J8AMTjE2DARmAtOTjlMvrADX4SRuY6JgrusPJQWIAQEm+BQShQr3wF5hlnzfQYGyqYlJPmVyGFzO1wceyZ5fs9EjPJ4AgM/SdS9628FELLzP0fb0t46zm7JNnXPhLywuZyi1sHTJCHrqsXQYnoiTlwl1AE76XFGkRRUt9M1E4riSS7cE4tMlEWQHhv/e+YZIWJpMop950j+XWC3VOyclroNAho0g+CcvJ9SLYtsK2rP1aQTDRIV58dQR4hISEfv3q CDs1fk2o Vs/ie7vntJDQ4LViUezhqwTxi7U8c1QqPlrESrC17Ff7KSDFKbvK09uhgPGJzgrbYVXIIZVCq1Ghy3hC2zU5iXbg9rT9x0Pf48DjnIyKfOk/6vMCxCPwUA6PMQkzqz55SAagbUWSlUMbQNonrorgNPO1qDHn/hEzlridzWFrEKmhvlo92n8/Q59R3K6xhOfHaVotp8nsc6UyEgusyojGHB9JdgZswS5z9CQov5DhYSXGDB3VATWCgXK9H4WZpe2XWq7ykp4qfpzRoz2BgAd48eYMGlOwgxgUiG8bvsp/Xo9Jveecn7/rp1o8QOybqJ/stiQTWwl8LUpjB83Esyog2dflDFxB7/qvU3XSv2EoTEmkHz135psOxRZQlVqcUE6FiCSZ9DIWfdcJUVZz6eT7N/WFk+3Lf8rYwNrMhh0XNHp70sW6mK5YsO3PMaJO5/+FyPURRpJ/CRvu3Kvo= 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: It seems strange that kernfs should be an outlier with a set_policy and get_policy in its kernfs_vm_ops. Ah, it dates back to v2.6.30's commit 095160aee954 ("sysfs: fix some bin_vm_ops errors"), when I had crashed on powerpc's pci_mmap_legacy_page_range() fallback to shmem_zero_setup(). Well, that was commendably thorough, to give sysfs-bin a set_policy and get_policy, just to avoid the way it was coded resulting in EINVAL from mmap when CONFIG_NUMA; but somehow feels a bit over-the-top to me now. It's easier to say that nobody should expect to manage a shmem object's shared NUMA mempolicy via some kernfs backdoor to that object: delete that code (and there's no longer an EINVAL from mmap in the NUMA case). This then leaves set_policy/get_policy as implemented only by shmem - though importantly also by SysV SHM, which has to interface with shmem which implements them, and with SHM_HUGETLB which does not. Signed-off-by: Hugh Dickins Reviewed-by: Matthew Wilcox (Oracle) --- fs/kernfs/file.c | 49 ------------------------------------------------ 1 file changed, 49 deletions(-) diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c index 180906c36f51..aaa76410e550 100644 --- a/fs/kernfs/file.c +++ b/fs/kernfs/file.c @@ -429,60 +429,11 @@ static int kernfs_vma_access(struct vm_area_struct *vma, unsigned long addr, return ret; } -#ifdef CONFIG_NUMA -static int kernfs_vma_set_policy(struct vm_area_struct *vma, - struct mempolicy *new) -{ - struct file *file = vma->vm_file; - struct kernfs_open_file *of = kernfs_of(file); - int ret; - - if (!of->vm_ops) - return 0; - - if (!kernfs_get_active(of->kn)) - return -EINVAL; - - ret = 0; - if (of->vm_ops->set_policy) - ret = of->vm_ops->set_policy(vma, new); - - kernfs_put_active(of->kn); - return ret; -} - -static struct mempolicy *kernfs_vma_get_policy(struct vm_area_struct *vma, - unsigned long addr) -{ - struct file *file = vma->vm_file; - struct kernfs_open_file *of = kernfs_of(file); - struct mempolicy *pol; - - if (!of->vm_ops) - return vma->vm_policy; - - if (!kernfs_get_active(of->kn)) - return vma->vm_policy; - - pol = vma->vm_policy; - if (of->vm_ops->get_policy) - pol = of->vm_ops->get_policy(vma, addr); - - kernfs_put_active(of->kn); - return pol; -} - -#endif - static const struct vm_operations_struct kernfs_vm_ops = { .open = kernfs_vma_open, .fault = kernfs_vma_fault, .page_mkwrite = kernfs_vma_page_mkwrite, .access = kernfs_vma_access, -#ifdef CONFIG_NUMA - .set_policy = kernfs_vma_set_policy, - .get_policy = kernfs_vma_get_policy, -#endif }; static int kernfs_fop_mmap(struct file *file, struct vm_area_struct *vma)