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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4D611C48260 for ; Fri, 16 Feb 2024 06:03:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C4AE38D0001; Fri, 16 Feb 2024 01:03:20 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BFA206B008A; Fri, 16 Feb 2024 01:03:20 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A74068D0001; Fri, 16 Feb 2024 01:03:20 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 91C266B0089 for ; Fri, 16 Feb 2024 01:03:20 -0500 (EST) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 63D5EA0052 for ; Fri, 16 Feb 2024 06:03:20 +0000 (UTC) X-FDA: 81796624560.10.D038DC0 Received: from mail-yw1-f173.google.com (mail-yw1-f173.google.com [209.85.128.173]) by imf20.hostedemail.com (Postfix) with ESMTP id 9755F1C0022 for ; Fri, 16 Feb 2024 06:03:18 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=k9lnjFAv; spf=pass (imf20.hostedemail.com: domain of hughd@google.com designates 209.85.128.173 as permitted sender) smtp.mailfrom=hughd@google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1708063398; a=rsa-sha256; cv=none; b=HNEGrokmKYlkCNRA7sME53TCluxFYalrN/xGoApyab/he0Qa1HwJpgHVMwWljWyHgg2ig/ +ItyL+6neWficgV8maYi9Khu7GH5xrG9TTRRhCaGLbjBoBMFNSZIMzZuCRkLFKZ4edut2+ 6B0MCr+RKNhVhos5OEjzemt0QUeg1NU= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=k9lnjFAv; spf=pass (imf20.hostedemail.com: domain of hughd@google.com designates 209.85.128.173 as permitted sender) smtp.mailfrom=hughd@google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1708063398; 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=HMM56hZb1Vm6K9SjE4SgV0BStCtli5nOUVFVj7yPx9M=; b=ZMbQmZryC7Y9iCfmpeeVTBZY/z4fXdxzgUqd8CISRvT8W1GZArDmp6sPeUkqtXhaPgMx7g TBSAn4KL2F+QqSAef8kj1qRVAYbyUR6UhIjzGPccXlif9T5dtd/XM9BftYoaWG/2KcxfKh 7ph7qDkXf/qbH2Qy0V0Bf7qa9XUD5Tc= Received: by mail-yw1-f173.google.com with SMTP id 00721157ae682-60495209415so17062987b3.3 for ; Thu, 15 Feb 2024 22:03:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1708063397; x=1708668197; 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=HMM56hZb1Vm6K9SjE4SgV0BStCtli5nOUVFVj7yPx9M=; b=k9lnjFAvT2bJm6+ClymwVnPQv6uxBs7sxLFiRn8TA2unaabN2fnUOyhFbZ/HqnjFWC XfYwr0cfVBm+QtJCugz23LzS1NN+7JGm0ejiD/tx54TuM2DLXGNaDlTLCIpwYyH1gB2E wzOjz+1gDAIyasnqWrGFo9ttw6rKBCkl7bsMEMTyOlWexBJ40KIpFMTi2cPG3ySaOjyz sLob6t2oYte8kiCOXL5OHUyNWXqLHsZGfr4hdtQTNfg8LuaXxefihe6sFCEDv9nVr7+q MS5uV6A4DxoqZgnBjMy7D+KBQpPcAuJeiFJz8E0GR28ZBiFp/PjIraHcvTXaPfLANUyD h8yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708063397; x=1708668197; 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=HMM56hZb1Vm6K9SjE4SgV0BStCtli5nOUVFVj7yPx9M=; b=k9l0Y2V1f7SUO9/DyHRSLBx4F6gGVD061JZbfBnmlCWOqV5VUH7mr33yjnsHYB/hcA AW4pKfTPfAtpjAKR+Xr5D8NEztlqZ9hh5/tiRUKbsj1Zag5ROAKlHBH62bniIxT9N2W6 p8wKGxfz//5XIyNjNw6b+p8diEvq4rP+rkK6FR41QPF2HqSjFxqC2GFL3T5N3kxIA3Cn lw0upHEB8mrKW9mTSbbw1fXlbVVhlyN7tIQSwtmURDjz3kRblQF77bU0N7slVkwEMGf7 QCSJI20YooqwwS5wHtAaQYFxIpHejckVNy8UAi9ORXT/1i5MVCx6Xh3NhAPOGDp8bUH/ xqSw== X-Forwarded-Encrypted: i=1; AJvYcCUO6vi4Mke4+2gq/55TDJyoMW8yBpiapiE7bHQMw/V2+LdGGD1mm/DCLZZVpGZxwYkjNCQiA6NfGeeln9ctONb7ob0= X-Gm-Message-State: AOJu0YxA9hfh/jI92BslXlyvUx0p1UCe/k8qQWPA9LG8aCIDjFkDkuVa vYxo8D5Y33ELk1IOEyWcRkkg+nbHV5TGu47938nZb0BPSxA7Fg8nsY0HjKzs/Q== X-Google-Smtp-Source: AGHT+IHSLIRCwJ8Aj5LZC9Dr5T3twlSj69RXjK+SmfejRJBCpGGWorVjZHS1LUFkcBz05UbD0yPBRA== X-Received: by 2002:a0d:d944:0:b0:5ff:5232:8aa1 with SMTP id b65-20020a0dd944000000b005ff52328aa1mr4514949ywe.21.1708063397364; Thu, 15 Feb 2024 22:03:17 -0800 (PST) Received: from darker.attlocal.net (172-10-233-147.lightspeed.sntcca.sbcglobal.net. [172.10.233.147]) by smtp.gmail.com with ESMTPSA id d12-20020a0ddb0c000000b006078c48a26csm221324ywe.25.2024.02.15.22.03.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Feb 2024 22:03:16 -0800 (PST) Date: Thu, 15 Feb 2024 22:03:05 -0800 (PST) From: Hugh Dickins To: Christoph Hellwig cc: Chandan Babu R , "Darrick J. Wong" , Hugh Dickins , Andrew Morton , Hui Su , Vlastimil Babka , linux-xfs@vger.kernel.org, linux-mm@kvack.org, Matthew Wilcox Subject: Re: [PATCH 02/20] shmem: move shmem_mapping out of line In-Reply-To: <20240129143502.189370-3-hch@lst.de> Message-ID: <44242679-720b-f55e-c0f8-db5bf919931f@google.com> References: <20240129143502.189370-1-hch@lst.de> <20240129143502.189370-3-hch@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 9755F1C0022 X-Stat-Signature: 4hanqspfosd8ta9w6uk7g7qss6rjnkq8 X-Rspam-User: X-HE-Tag: 1708063398-571111 X-HE-Meta: U2FsdGVkX1+M697yhyESmEwc6O6inlOEeqA3LbUmJ+eSqgsfhhHqelkvKJJw2svy7TkWNype+FoWKZLxdwXCFlxH8hO++CRFQLFp2xjR8S1Hu377Vvn4YIKTwwdGzKkWy5z2fwNjZT8dGV+SogJpsb1yE67b1f4FZOapdflocLXIsaZrILwPLQMVbfit1v0KgZ+uOjM2oXOkN7U9Zm8FFSATro9vUrawkH1ybeetrf5+V6XUJjKxqpv3H6/iHm/5Mxd0hVXIBWA05otIqfuigdMY7bbVRBySs00N0Q8oyRLz2sGYRmU/kmO1PBsDKhLO16uDddEazjloCf5iUC3SnhpTpvBBVwE7mlwj4V1KTFMcc2cWaxgersaicbiMZPLEsNvmURrisSfBMCjSWkmbh5e4Lf8wfYHyExV0HGoAlC8G0XauMF6qU11T8VkQh/klIXLTpV50sp7oUihCEV0lS90YJ1odCnURI45nclsB0mCJDDFCM/hRYPyiQyVO5vOGYSqq+ShQlIDcriePAN7fS/X/Hvns+CBqH6FeSkcOxL3nTFw9OJ9GbUrelbAsmsOHJebaApQakO+3aVPLnZs6zBPCrN6CNeNNvzpTOZ0SRQT4jC7qizkSgA3DgSVEFOSIp1zTc2Jhkxr9iGeSVGwzc+yu/ujzLVI+6573AvNCIUWFErS+ZFfVuskGEmvVavielzQlR1TVJ3nZbjjBqBDUhB4sKLBuGThQRlJ2nMOIvT1Ak2VqByS/MeNE2PN91q1iQqqO7n78F9YhmB/6QLykE5YsVypIN+NfsiNM4kWDgpOKu4j3frPiM6JCJVpS3OPQ3XUtsydqjkR3Ah7SQyFPMbTsRD3fNJC4Is9V0vBxIvFDCNQHuNeZa10OUxl83hG6mNCyqjdvlSpCSHc8kgROSOtbsRoDEviATLzRf6xLB9c7E22211ZoLQaYq1w3IssYU8xxypxa+ND6aFN/P1K B3VpuE9R IU1xsEk2El29s/0vsXwbwNYUD2w1BeWl8bsxFvB5zy2rsn8aMiER0o7c4IRZ+DnbjPrt2DC2zsTYKOUE0CNJyT9YoDbkxfDUZj7j4eVIofTt5LgJA2ia3GElM1waX7tBezhR/lbSStaVDt9Z06VZPEt6FDCuvZhULKxZNOIgmltLk/bffb4DuzQClJgqikwMKkfi+gxN40SDpo23cE2AQzTHRkgRd0m03D/OF5y1tsMACiichhr31qnzIxBpEcAvB+v7gZ9kpQ2ziCEhGW5omfAl5+N+wF/mtkkbrImcGk/j9yRKe6Ky/06vUAkxfZCConoJI7IX1SEehYKaBgeLwIqIBW7OpZcdEOF/YLY9s9/aMvFcY5SoyHdjFDKvGvW8EEpoVc4RFqWrUMMoCvO3AdpYthliewSRoalcgofjLoukuLly/niLm7V+RsMhSLsQTs0KXuEwgwDYLVX+EUrdckKNWoA== 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: List-Subscribe: List-Unsubscribe: On Mon, 29 Jan 2024, Christoph Hellwig wrote: > shmem_aops really should not be exported to the world. Move > shmem_mapping and export it as internal for the one semi-legitimate > modular user in udmabuf. > > Signed-off-by: Christoph Hellwig > Reviewed-by: Matthew Wilcox (Oracle) I'm okay with this change, but let's be polite and Cc the author of the change which this reverts - v5.11's commit 30e6a51dbb05 ("mm/shmem.c: make shmem_mapping() inline"). Interesting to notice that commit did EXPORT_SYMBOL(shmem_aops), whereas shmem_mapping() had not been exported before; you're now exporting it _GPL(), like other examples in mm/shmem.c: agreed. Hugh > --- > include/linux/shmem_fs.h | 6 +----- > mm/shmem.c | 11 ++++++++--- > 2 files changed, 9 insertions(+), 8 deletions(-) > > diff --git a/include/linux/shmem_fs.h b/include/linux/shmem_fs.h > index 2caa6b86106aa3..6b96a87e4bc80a 100644 > --- a/include/linux/shmem_fs.h > +++ b/include/linux/shmem_fs.h > @@ -97,11 +97,7 @@ extern unsigned long shmem_get_unmapped_area(struct file *, unsigned long addr, > unsigned long len, unsigned long pgoff, unsigned long flags); > extern int shmem_lock(struct file *file, int lock, struct ucounts *ucounts); > #ifdef CONFIG_SHMEM > -extern const struct address_space_operations shmem_aops; > -static inline bool shmem_mapping(struct address_space *mapping) > -{ > - return mapping->a_ops == &shmem_aops; > -} > +bool shmem_mapping(struct address_space *mapping); > #else > static inline bool shmem_mapping(struct address_space *mapping) > { > diff --git a/mm/shmem.c b/mm/shmem.c > index d7c84ff621860b..f607b0cab7e4e2 100644 > --- a/mm/shmem.c > +++ b/mm/shmem.c > @@ -254,7 +254,7 @@ static void shmem_inode_unacct_blocks(struct inode *inode, long pages) > } > > static const struct super_operations shmem_ops; > -const struct address_space_operations shmem_aops; > +static const struct address_space_operations shmem_aops; > static const struct file_operations shmem_file_operations; > static const struct inode_operations shmem_inode_operations; > static const struct inode_operations shmem_dir_inode_operations; > @@ -263,6 +263,12 @@ static const struct vm_operations_struct shmem_vm_ops; > static const struct vm_operations_struct shmem_anon_vm_ops; > static struct file_system_type shmem_fs_type; > > +bool shmem_mapping(struct address_space *mapping) > +{ > + return mapping->a_ops == &shmem_aops; > +} > +EXPORT_SYMBOL_GPL(shmem_mapping); > + > bool vma_is_anon_shmem(struct vm_area_struct *vma) > { > return vma->vm_ops == &shmem_anon_vm_ops; > @@ -4466,7 +4472,7 @@ static int shmem_error_remove_folio(struct address_space *mapping, > return 0; > } > > -const struct address_space_operations shmem_aops = { > +static const struct address_space_operations shmem_aops = { > .writepage = shmem_writepage, > .dirty_folio = noop_dirty_folio, > #ifdef CONFIG_TMPFS > @@ -4478,7 +4484,6 @@ const struct address_space_operations shmem_aops = { > #endif > .error_remove_folio = shmem_error_remove_folio, > }; > -EXPORT_SYMBOL(shmem_aops); > > static const struct file_operations shmem_file_operations = { > .mmap = shmem_mmap, > -- > 2.39.2 > >