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 460D1C77B73 for ; Tue, 2 May 2023 20:24:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B9C5A6B0071; Tue, 2 May 2023 16:24:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B4D0A6B0072; Tue, 2 May 2023 16:24:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A3C8F6B0074; Tue, 2 May 2023 16:24:50 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from mail-yb1-f180.google.com (mail-yb1-f180.google.com [209.85.219.180]) by kanga.kvack.org (Postfix) with ESMTP id 801C56B0071 for ; Tue, 2 May 2023 16:24:50 -0400 (EDT) Received: by mail-yb1-f180.google.com with SMTP id 3f1490d57ef6-b9a6ab9ede3so6109500276.2 for ; Tue, 02 May 2023 13:24:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1683059090; x=1685651090; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=rocmb1807rrqmHexWgUhMdukatSY3k3dt0DBoDYQQ84=; b=MU+gfSqaJcZXaDLvILYPcen+DJlOMwNmFrBFbKRSovZHxrvdwaG8OD3LLS//dpin/v VbPxpiE8cU1T7vAtmTF6dYeGjFpACQQOGybH9aHKcC5v1qu8tP75Rjq53IDWmffZjJrr tKsDUFpXswHNSV7LNAYl9HashXePGs8/8q+rr+D9/JqV7QS7JaaLeNaw5z/oiHChIdRk UE4s9//C6tXLhlQyVF3+Z1jXTOQHY1Ua2URA+4E6vRPa6Kxru/WjNmMPKUxKaXgwJiRm sq3XUJ1lzzhLAW3l6HbWMcyldde6rUUvXKLuFkUxWSDQY/iFYdWKz2F0FVyb5kq4I/a/ JBwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683059090; x=1685651090; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rocmb1807rrqmHexWgUhMdukatSY3k3dt0DBoDYQQ84=; b=WCTPLP9VTbDI5gLi6nQAgSrKFvhtnaYvkQwFnVCmm32q8QBO63WSNfmPP7eG8aSUWG JHYMgcjk3tVp2tbqfC/qCLnKXTA2Y9qxk9AnkNTiXh9iu42FfqHnrq9DjrCE68kbmWVR v3KcyeOeDIhAijMGuSz/qIReJq/xrNBPCl9nfWk+hQ/WeP4zJkTT/6h2aBTXhTokw3Lx qpD7YY8KOQ0Nx3O1d1qV/+BbP8oPTpMSsgUNg5FSuowjEVZigSfHmQf/2dCYX9dJYby1 CnAp4iNt5B6azEQk9LuzLk3JcPkcLkLjM2QWRSsLkFlCpK97Hbdy5vFf/hREep9JbnaB Aq3g== X-Gm-Message-State: AC+VfDySpHp6tXkl8ShCIArZqJ4W1eyx1oImJXyzXCSyPhFUGq40yLRr dlp0HAMbyisXNB2pAOrKu3l/pRdDF2GIEgTN0XsT0w== X-Google-Smtp-Source: ACHHUZ498EUoOwRRn2rdDuuuK5krmC/as1ueUrWM+kQJuCKq0a3B5NsZWZU/qAtq+dCO/VPCb+cyeEH8kNx+l9uLzbE= X-Received: by 2002:a25:588:0:b0:b87:d47e:9bcb with SMTP id 130-20020a250588000000b00b87d47e9bcbmr17713528ybf.42.1683059089603; Tue, 02 May 2023 13:24:49 -0700 (PDT) MIME-Version: 1.0 References: <20230501165450.15352-1-surenb@google.com> <20230501165450.15352-20-surenb@google.com> <20230502175052.43814202@meshulam.tesarici.cz> <20230502220909.3f55ae41@meshulam.tesarici.cz> In-Reply-To: <20230502220909.3f55ae41@meshulam.tesarici.cz> From: Suren Baghdasaryan Date: Tue, 2 May 2023 13:24:37 -0700 Message-ID: Subject: Re: [PATCH 19/40] change alloc_pages name in dma_map_ops to avoid name conflicts To: =?UTF-8?B?UGV0ciBUZXNhxZnDrWs=?= Cc: akpm@linux-foundation.org, kent.overstreet@linux.dev, mhocko@suse.com, vbabka@suse.cz, hannes@cmpxchg.org, roman.gushchin@linux.dev, mgorman@suse.de, dave@stgolabs.net, willy@infradead.org, liam.howlett@oracle.com, corbet@lwn.net, void@manifault.com, peterz@infradead.org, juri.lelli@redhat.com, ldufour@linux.ibm.com, catalin.marinas@arm.com, will@kernel.org, arnd@arndb.de, tglx@linutronix.de, mingo@redhat.com, dave.hansen@linux.intel.com, x86@kernel.org, peterx@redhat.com, david@redhat.com, axboe@kernel.dk, mcgrof@kernel.org, masahiroy@kernel.org, nathan@kernel.org, dennis@kernel.org, tj@kernel.org, muchun.song@linux.dev, rppt@kernel.org, paulmck@kernel.org, pasha.tatashin@soleen.com, yosryahmed@google.com, yuzhao@google.com, dhowells@redhat.com, hughd@google.com, andreyknvl@gmail.com, keescook@chromium.org, ndesaulniers@google.com, gregkh@linuxfoundation.org, ebiggers@google.com, ytcoode@gmail.com, vincent.guittot@linaro.org, dietmar.eggemann@arm.com, rostedt@goodmis.org, bsegall@google.com, bristot@redhat.com, vschneid@redhat.com, cl@linux.com, penberg@kernel.org, iamjoonsoo.kim@lge.com, 42.hyeyoo@gmail.com, glider@google.com, elver@google.com, dvyukov@google.com, shakeelb@google.com, songmuchun@bytedance.com, jbaron@akamai.com, rientjes@google.com, minchan@google.com, kaleshsingh@google.com, kernel-team@android.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, iommu@lists.linux.dev, linux-arch@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-modules@vger.kernel.org, kasan-dev@googlegroups.com, cgroups@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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: On Tue, May 2, 2023 at 1:09=E2=80=AFPM Petr Tesa=C5=99=C3=ADk wrote: > > On Tue, 2 May 2023 11:38:49 -0700 > Suren Baghdasaryan wrote: > > > On Tue, May 2, 2023 at 8:50=E2=80=AFAM Petr Tesa=C5=99=C3=ADk wrote: > > > > > > On Mon, 1 May 2023 09:54:29 -0700 > > > Suren Baghdasaryan wrote: > > > > > > > After redefining alloc_pages, all uses of that name are being repla= ced. > > > > Change the conflicting names to prevent preprocessor from replacing= them > > > > when it's not intended. > > > > > > > > Signed-off-by: Suren Baghdasaryan > > > > --- > > > > arch/x86/kernel/amd_gart_64.c | 2 +- > > > > drivers/iommu/dma-iommu.c | 2 +- > > > > drivers/xen/grant-dma-ops.c | 2 +- > > > > drivers/xen/swiotlb-xen.c | 2 +- > > > > include/linux/dma-map-ops.h | 2 +- > > > > kernel/dma/mapping.c | 4 ++-- > > > > 6 files changed, 7 insertions(+), 7 deletions(-) > > > > > > > > diff --git a/arch/x86/kernel/amd_gart_64.c b/arch/x86/kernel/amd_ga= rt_64.c > > > > index 56a917df410d..842a0ec5eaa9 100644 > > > > --- a/arch/x86/kernel/amd_gart_64.c > > > > +++ b/arch/x86/kernel/amd_gart_64.c > > > > @@ -676,7 +676,7 @@ static const struct dma_map_ops gart_dma_ops = =3D { > > > > .get_sgtable =3D dma_common_get_sgtable, > > > > .dma_supported =3D dma_direct_supported, > > > > .get_required_mask =3D dma_direct_get_required_m= ask, > > > > - .alloc_pages =3D dma_direct_alloc_pages, > > > > + .alloc_pages_op =3D dma_direct_alloc_pages, > > > > .free_pages =3D dma_direct_free_pages, > > > > }; > > > > > > > > diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c > > > > index 7a9f0b0bddbd..76a9d5ca4eee 100644 > > > > --- a/drivers/iommu/dma-iommu.c > > > > +++ b/drivers/iommu/dma-iommu.c > > > > @@ -1556,7 +1556,7 @@ static const struct dma_map_ops iommu_dma_ops= =3D { > > > > .flags =3D DMA_F_PCI_P2PDMA_SUPPORTED, > > > > .alloc =3D iommu_dma_alloc, > > > > .free =3D iommu_dma_free, > > > > - .alloc_pages =3D dma_common_alloc_pages, > > > > + .alloc_pages_op =3D dma_common_alloc_pages, > > > > .free_pages =3D dma_common_free_pages, > > > > .alloc_noncontiguous =3D iommu_dma_alloc_noncontiguous, > > > > .free_noncontiguous =3D iommu_dma_free_noncontiguous, > > > > diff --git a/drivers/xen/grant-dma-ops.c b/drivers/xen/grant-dma-op= s.c > > > > index 9784a77fa3c9..6c7d984f164d 100644 > > > > --- a/drivers/xen/grant-dma-ops.c > > > > +++ b/drivers/xen/grant-dma-ops.c > > > > @@ -282,7 +282,7 @@ static int xen_grant_dma_supported(struct devic= e *dev, u64 mask) > > > > static const struct dma_map_ops xen_grant_dma_ops =3D { > > > > .alloc =3D xen_grant_dma_alloc, > > > > .free =3D xen_grant_dma_free, > > > > - .alloc_pages =3D xen_grant_dma_alloc_pages, > > > > + .alloc_pages_op =3D xen_grant_dma_alloc_pages, > > > > .free_pages =3D xen_grant_dma_free_pages, > > > > .mmap =3D dma_common_mmap, > > > > .get_sgtable =3D dma_common_get_sgtable, > > > > diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c > > > > index 67aa74d20162..5ab2616153f0 100644 > > > > --- a/drivers/xen/swiotlb-xen.c > > > > +++ b/drivers/xen/swiotlb-xen.c > > > > @@ -403,6 +403,6 @@ const struct dma_map_ops xen_swiotlb_dma_ops = =3D { > > > > .dma_supported =3D xen_swiotlb_dma_supported, > > > > .mmap =3D dma_common_mmap, > > > > .get_sgtable =3D dma_common_get_sgtable, > > > > - .alloc_pages =3D dma_common_alloc_pages, > > > > + .alloc_pages_op =3D dma_common_alloc_pages, > > > > .free_pages =3D dma_common_free_pages, > > > > }; > > > > diff --git a/include/linux/dma-map-ops.h b/include/linux/dma-map-op= s.h > > > > index 31f114f486c4..d741940dcb3b 100644 > > > > --- a/include/linux/dma-map-ops.h > > > > +++ b/include/linux/dma-map-ops.h > > > > @@ -27,7 +27,7 @@ struct dma_map_ops { > > > > unsigned long attrs); > > > > void (*free)(struct device *dev, size_t size, void *vaddr, > > > > dma_addr_t dma_handle, unsigned long attrs); > > > > - struct page *(*alloc_pages)(struct device *dev, size_t size, > > > > + struct page *(*alloc_pages_op)(struct device *dev, size_t siz= e, > > > > dma_addr_t *dma_handle, enum dma_data_directi= on dir, > > > > gfp_t gfp); > > > > void (*free_pages)(struct device *dev, size_t size, struct pa= ge *vaddr, > > > > diff --git a/kernel/dma/mapping.c b/kernel/dma/mapping.c > > > > index 9a4db5cce600..fc42930af14b 100644 > > > > --- a/kernel/dma/mapping.c > > > > +++ b/kernel/dma/mapping.c > > > > @@ -570,9 +570,9 @@ static struct page *__dma_alloc_pages(struct de= vice *dev, size_t size, > > > > size =3D PAGE_ALIGN(size); > > > > if (dma_alloc_direct(dev, ops)) > > > > return dma_direct_alloc_pages(dev, size, dma_handle, = dir, gfp); > > > > - if (!ops->alloc_pages) > > > > + if (!ops->alloc_pages_op) > > > > return NULL; > > > > - return ops->alloc_pages(dev, size, dma_handle, dir, gfp); > > > > + return ops->alloc_pages_op(dev, size, dma_handle, dir, gfp); > > > > } > > > > > > > > struct page *dma_alloc_pages(struct device *dev, size_t size, > > > > > > I'm not impressed. This patch increases churn for code which does not > > > (directly) benefit from the change, and that for limitations in your > > > tooling? > > > > > > Why not just rename the conflicting uses in your local tree, but then > > > remove the rename from the final patch series? > > > > With alloc_pages function becoming a macro, the preprocessor ends up > > replacing all instances of that name, even when it's not used as a > > function. That what necessitates this change. If there is a way to > > work around this issue without changing all alloc_pages() calls in the > > source base I would love to learn it but I'm not quite clear about > > your suggestion and if it solves the issue. Could you please provide > > more details? > > Ah, right, I admit I did not quite understand why this change is > needed. However, this is exactly what I don't like about preprocessor > macros. Each macro effectively adds a new keyword to the language. > > I believe everything can be solved with inline functions. What exactly > does not work if you rename alloc_pages() to e.g. alloc_pages_caller() > and then add an alloc_pages() inline function which calls > alloc_pages_caller() with _RET_IP_ as a parameter? I don't think that would work because we need to inject the codetag at the file/line of the actual allocation call. If we pass _REP_IT_ then we would have to lookup the codetag associated with that _RET_IP_ which results in additional runtime overhead. > > Petr T > > -- > To unsubscribe from this group and stop receiving emails from it, send an= email to kernel-team+unsubscribe@android.com. >