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 AAAA1C369D5 for ; Sat, 26 Apr 2025 02:08:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7A3296B000A; Fri, 25 Apr 2025 22:07:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 74F3C6B000C; Fri, 25 Apr 2025 22:07:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5F0586B000D; Fri, 25 Apr 2025 22:07:59 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 44FE86B000A for ; Fri, 25 Apr 2025 22:07:59 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id B9EF5C6473 for ; Sat, 26 Apr 2025 02:07:59 +0000 (UTC) X-FDA: 83374559478.25.6592667 Received: from mail-pl1-f226.google.com (mail-pl1-f226.google.com [209.85.214.226]) by imf05.hostedemail.com (Postfix) with ESMTP id AB5C3100007 for ; Sat, 26 Apr 2025 02:07:57 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=purestorage.com header.s=google2022 header.b=Cg65L+L1; dmarc=pass (policy=reject) header.from=purestorage.com; spf=pass (imf05.hostedemail.com: domain of csander@purestorage.com designates 209.85.214.226 as permitted sender) smtp.mailfrom=csander@purestorage.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1745633277; a=rsa-sha256; cv=none; b=DF+yqf94TG4WvW+qv/uCtmzx/DBQhW//jNG8YDvh0PZkMwu2gEPnKCyHbkCbgx3rAtT4vZ DijQz24Lvg9ERFBus9JbBGAefF5fMm1n4HlXRDyaso6/ta7CKNgwqsRr1FT9jhs02ovgoU t8IHiYpw0+TjEPWwdqAGgT7AEPiYRFw= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=purestorage.com header.s=google2022 header.b=Cg65L+L1; dmarc=pass (policy=reject) header.from=purestorage.com; spf=pass (imf05.hostedemail.com: domain of csander@purestorage.com designates 209.85.214.226 as permitted sender) smtp.mailfrom=csander@purestorage.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1745633277; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Z70/ocLe9ndcQrFKMiE0tdyuA0H8cSwf3KgSSnH+OZY=; b=Taxg8jmvuN4AAauRUv06ZV/Te0kvczS6zRyNKYP/+iAvvlOFvrOsqsRvRBHI2e622i5qtQ PIRLr1aW4Tp439XXZvOUMrs9S8LswfKRwigWvtv/lN5h/dbNZ/kj++g4HB/6CUXYzdH5YE 8f3ishWN2NCYBB4ORNdK/jlcj2qhUho= Received: by mail-pl1-f226.google.com with SMTP id d9443c01a7336-2240ff0bd6eso5506305ad.0 for ; Fri, 25 Apr 2025 19:07:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1745633276; x=1746238076; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Z70/ocLe9ndcQrFKMiE0tdyuA0H8cSwf3KgSSnH+OZY=; b=Cg65L+L1cqxfqhtubJAw2giEN0eKQQ2sMTj2aOYEPabMs3z4SUZJrUx+o0As0i7wN6 zX29b9vQv1VxG/HoC8ifkQLAybb4tObIK0Bii3EgO5K/iDFYHAcbk2TyYwh1++5Zlk0e ulr7pU2yF56MuFLcGqJCUJYzf6FWz0gz7C8yMYYFsGvyfygGG2rKCt/tPlFMf5/BiU+V se5ZNbMseb5J0sylBoocwiBKePjl0PqngzYN/TXxiKhdpmSKzCUQORrq9sE5rbkknTOn 17Ve5TDz6JtbgDQvAZBpQkrHbpAUwYToLb07yHoX/pbhTmcOVcuf+KvzocIxnzNXgjRr 2pXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745633276; x=1746238076; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Z70/ocLe9ndcQrFKMiE0tdyuA0H8cSwf3KgSSnH+OZY=; b=TPJx0MInsds7KfMb9bsR//BxyrodOI25HmRcZoQ6rwQEUBn8IkPbFfCfSChQv7mJT8 h1Du3bS+uhptOUPkGhMw7jiUfLHbJa+SXFvCsYny9eemVC+heHsrCv+h5r0jRLBp7Rzb uCjadG958B2orHRG4eW+D166YbxLNKo/FzTiAKoLwXn9JbrOaJBY224BZDZSOsVA2Sxz ccIupIRGsUM/bW5g0U91tlrXbditpwmdk6thHAaLyfpO+1GuJyaAMwdSISqeQnc++px2 Yn9qAX/7cOO1aagaCEDvOkVwHyUKg4/XlO4gocLje3MUEYkApSiFERx634wHWLNdTqce NbLw== X-Forwarded-Encrypted: i=1; AJvYcCWck6SRWlxYDutEdgWeaSmXHjc7VDEOFIb7W3Xfo9DO//S1DqPa685dbLhagh/kVxCaUAma8EXvmA==@kvack.org X-Gm-Message-State: AOJu0YwamLGpt9Ftz1gNTv2RKm5skoMNbFrX0OoilXcOtNGQdhe4+ezk 8kr3BQixsFJvDK5Dhk62fEcAphhBeiiY2ihws84GzRcDPTND6cpkfcMYMZzFSxxODYM0z25O8eD WMkXxddIN46jHHVKbedRdY9pXSO8LXXbLrMgrZNDGBuI7pytu X-Gm-Gg: ASbGnctndKvqHh/oFGDquUjoBpB83oOY5M4bGRiUvgyTzfCclQF/Dhdg7PN8tjjK305 UQ7hQhoPR4D7g3ouO9E4etGoZ01laTJtkNTlz8BQfyVU5fVvT1lLDfdki0KQ5GEDk42Z1QNggh4 vTzFPLkgJrzPA4a81KgoLsLnWzif+DvjnsO6DRUucObNm/jAUdEG/bk5rfXPS9JC/lQ2sY4PCqV ADrLkxBw3fupXH+BkzmQOUGg2qDYFOrhqgGVql+VZJYSZbWe8qO0pGQWbgJlOf3LEzVJ7qDlf/J 6hSvTtNZ8eUQjIcz6nPxm+IpCNLVkA== X-Google-Smtp-Source: AGHT+IEulsOmKO4sgUil3cqmh9Xg2ydaQ8ijeOqIsJOY/rWdqDrzJZvwB2xMFq9zFifYJhH8Z0JN0UgN+RXx X-Received: by 2002:a17:902:d590:b0:21f:3e2d:7d43 with SMTP id d9443c01a7336-22dbf73b05dmr23686325ad.13.1745633276515; Fri, 25 Apr 2025 19:07:56 -0700 (PDT) Received: from c7-smtp-2023.dev.purestorage.com ([2620:125:9017:12:36:3:5:0]) by smtp-relay.gmail.com with ESMTPS id d9443c01a7336-22db4f4523csm2250405ad.69.2025.04.25.19.07.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Apr 2025 19:07:56 -0700 (PDT) X-Relaying-Domain: purestorage.com Received: from dev-csander.dev.purestorage.com (dev-csander.dev.purestorage.com [10.7.70.37]) by c7-smtp-2023.dev.purestorage.com (Postfix) with ESMTP id D32F7340231; Fri, 25 Apr 2025 20:07:55 -0600 (MDT) Received: by dev-csander.dev.purestorage.com (Postfix, from userid 1557716354) id D0AABE41C66; Fri, 25 Apr 2025 20:07:55 -0600 (MDT) From: Caleb Sander Mateos To: Keith Busch , Jens Axboe , Christoph Hellwig , Sagi Grimberg , Andrew Morton Cc: Kanchan Joshi , linux-nvme@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Caleb Sander Mateos Subject: [PATCH v6 1/3] dmapool: add NUMA affinity support Date: Fri, 25 Apr 2025 20:06:34 -0600 Message-ID: <20250426020636.34355-2-csander@purestorage.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250426020636.34355-1-csander@purestorage.com> References: <20250426020636.34355-1-csander@purestorage.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: AB5C3100007 X-Stat-Signature: rqfwuwz9inse8uip36uawm5x4cuuwc8c X-Rspam-User: X-HE-Tag: 1745633277-1395 X-HE-Meta: U2FsdGVkX1/xwEhm66NiEVFHG+q/WnGvBdDRmEUrVaODUjGQxdMWBJxH4H7sEyrAtM+pa3mY+bXnN7BIXBNc4NNRj+0+lheIT3d6ueEqBvhzkT2OeyS9rJQC1RnEp56Zx2RkKGSNCp1WlnWI/aF8HAjH3WrJuM5vF2fVMMb+Fe/9yw1Km1mn/tAsfxA9l08nsYjDkKWs5LEec/6bpaxFIQZo7+OdZZ4Egh7qyx5fRvd5cS12p2RK5OcuQdBtxZ9SzLbTkx4NEH8G4rf5/KE/BOALuYV4MTPAbmAhAzqfpqCYkmzamoGLzp2nAjlzlH53Xd0toAzj9R2HRTFnT6iWt7eWAWtBWB1kas5Xm0LQfpaJOHYsetagBqX2doXiLwwDQ0jJ/6sZfz3bnVOTkVTNcE9XFK9D+qUtFhrwAJ3fSkurNpow6LuFhHb4XScdg4qDCQDQ1d9L05i9/Krg5afhGr+PYGtSOEL+esS7q+XMHok8FFarHjwikfEVk77EolT+KxEaGnpdGDFvmMvUWKKABhTxiBFiHaokMZ/5HfQf7rLsz1E0Bwu0k1r7EpXrIe2VKSKhRDDk1QQxqEFzJqLRY6QjghganGvXZOzzWQdo4N7BwmJC+7kxp9gD+usbWfxtpl32rIwWjH7zKxLzysO2wB2KDZfyaHlnC7ebAON09WzUdixJv8rVRO1teuxge4y8oNnTfnX9roeX6c1AifaI21ck96/c1/UIRIhql9zOsJRgHSwktrjC6b7oeUBtENJEBXTfMie4vbSsWekqr4mAly4S/KQu2mT0iFWMBFxbcdv23V48JatZiuCs981LXbwYRpcgz+6duA4TQb4RANKTtKNEvo/smxJEdDHqfb6KLCrqq5NAbf5nTUzmb3ZS+XWQXhs3Xt3CkzteYAg1rbFG8ao1pDSWd4lJw4aUp8L5gTP0mWY2ccsHN2OVSsTVNRGiDAuE6rdoci9C6ePCkca XW5KjSS9 hs+8escQgq3Pb6zhRvbxkgroYpBvT3UIX3s826HXKTJhcSQzUvQ4ou/98mJQHSqF4n6e5c6jIgLoPV7e2VQiA7zEZcCfqfsko+vPzcGlp8pGBMHJuxKg4jWIxVOTCNniCV0SYuaAw0At/sXZPG8mb04SSBxH4byE1waFj/yxIEqRpsJJQESwHLf1kxzGSqvBFlb/z0QMt7dXrOkyrD9SyZkQQfWJ2S4y0Vahp3HoZdc3lI9GwHmhA0Ua0c7AYjREcjN4WnZRdPJkk0SIkclhEN8MqhgUH1EiPJhMZS1QVQdHpZ8st4+vmrBXlx5z7d5YxBkP/bpo4Hrpg2u8Gv3fLVWAbj8QhWLrTsTpXFaOP9FBC+i5D4t3xUBxIuROH/tyWJ9WF 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: From: Keith Busch Introduce dma_pool_create_node(), like dma_pool_create() but taking an additional NUMA node argument. Allocate struct dma_pool on the desired node, and store the node on dma_pool for allocating struct dma_page. Make dma_pool_create() an alias for dma_pool_create_node() with node set to NUMA_NO_NODE. Signed-off-by: Keith Busch Signed-off-by: Caleb Sander Mateos Reviewed-by: Jens Axboe Reviewed-by: Sagi Grimberg --- include/linux/dmapool.h | 17 +++++++++++++---- mm/dmapool.c | 16 ++++++++++------ 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/include/linux/dmapool.h b/include/linux/dmapool.h index f632ecfb4238..bbf1833a24f7 100644 --- a/include/linux/dmapool.h +++ b/include/linux/dmapool.h @@ -9,19 +9,20 @@ */ #ifndef LINUX_DMAPOOL_H #define LINUX_DMAPOOL_H +#include #include #include struct device; #ifdef CONFIG_HAS_DMA -struct dma_pool *dma_pool_create(const char *name, struct device *dev, - size_t size, size_t align, size_t allocation); +struct dma_pool *dma_pool_create_node(const char *name, struct device *dev, + size_t size, size_t align, size_t boundary, int node); void dma_pool_destroy(struct dma_pool *pool); void *dma_pool_alloc(struct dma_pool *pool, gfp_t mem_flags, dma_addr_t *handle); @@ -33,12 +34,13 @@ void dma_pool_free(struct dma_pool *pool, void *vaddr, dma_addr_t addr); struct dma_pool *dmam_pool_create(const char *name, struct device *dev, size_t size, size_t align, size_t allocation); void dmam_pool_destroy(struct dma_pool *pool); #else /* !CONFIG_HAS_DMA */ -static inline struct dma_pool *dma_pool_create(const char *name, - struct device *dev, size_t size, size_t align, size_t allocation) +static inline struct dma_pool *dma_pool_create_node(const char *name, + struct device *dev, size_t size, size_t align, size_t boundary, + int node) { return NULL; } static inline void dma_pool_destroy(struct dma_pool *pool) { } static inline void *dma_pool_alloc(struct dma_pool *pool, gfp_t mem_flags, dma_addr_t *handle) { return NULL; } static inline void dma_pool_free(struct dma_pool *pool, void *vaddr, @@ -47,10 +49,17 @@ static inline struct dma_pool *dmam_pool_create(const char *name, struct device *dev, size_t size, size_t align, size_t allocation) { return NULL; } static inline void dmam_pool_destroy(struct dma_pool *pool) { } #endif /* !CONFIG_HAS_DMA */ +static inline struct dma_pool *dma_pool_create(const char *name, + struct device *dev, size_t size, size_t align, size_t boundary) +{ + return dma_pool_create_node(name, dev, size, align, boundary, + NUMA_NO_NODE); +} + static inline void *dma_pool_zalloc(struct dma_pool *pool, gfp_t mem_flags, dma_addr_t *handle) { return dma_pool_alloc(pool, mem_flags | __GFP_ZERO, handle); } diff --git a/mm/dmapool.c b/mm/dmapool.c index f0bfc6c490f4..4de531542814 100644 --- a/mm/dmapool.c +++ b/mm/dmapool.c @@ -54,10 +54,11 @@ struct dma_pool { /* the pool */ size_t nr_pages; struct device *dev; unsigned int size; unsigned int allocation; unsigned int boundary; + int node; char name[32]; struct list_head pools; }; struct dma_page { /* cacheable header for 'allocation' bytes */ @@ -197,16 +198,17 @@ static void pool_block_push(struct dma_pool *pool, struct dma_block *block, pool->next_block = block; } /** - * dma_pool_create - Creates a pool of consistent memory blocks, for dma. + * dma_pool_create_node - Creates a pool of consistent memory blocks, for dma. * @name: name of pool, for diagnostics * @dev: device that will be doing the DMA * @size: size of the blocks in this pool. * @align: alignment requirement for blocks; must be a power of two * @boundary: returned blocks won't cross this power of two boundary + * @node: optional NUMA node to allocate structs 'dma_pool' and 'dma_page' on * Context: not in_interrupt() * * Given one of these pools, dma_pool_alloc() * may be used to allocate memory. Such memory will all have "consistent" * DMA mappings, accessible by the device and its driver without using @@ -219,12 +221,13 @@ static void pool_block_push(struct dma_pool *pool, struct dma_block *block, * boundaries of 4KBytes. * * Return: a dma allocation pool with the requested characteristics, or * %NULL if one can't be created. */ -struct dma_pool *dma_pool_create(const char *name, struct device *dev, - size_t size, size_t align, size_t boundary) +struct dma_pool *dma_pool_create_node(const char *name, struct device *dev, + size_t size, size_t align, size_t boundary, + int node) { struct dma_pool *retval; size_t allocation; bool empty; @@ -249,11 +252,11 @@ struct dma_pool *dma_pool_create(const char *name, struct device *dev, else if ((boundary < size) || (boundary & (boundary - 1))) return NULL; boundary = min(boundary, allocation); - retval = kzalloc(sizeof(*retval), GFP_KERNEL); + retval = kzalloc_node(sizeof(*retval), GFP_KERNEL, node); if (!retval) return retval; strscpy(retval->name, name, sizeof(retval->name)); @@ -262,10 +265,11 @@ struct dma_pool *dma_pool_create(const char *name, struct device *dev, INIT_LIST_HEAD(&retval->page_list); spin_lock_init(&retval->lock); retval->size = size; retval->boundary = boundary; retval->allocation = allocation; + retval->node = node; INIT_LIST_HEAD(&retval->pools); /* * pools_lock ensures that the ->dma_pools list does not get corrupted. * pools_reg_lock ensures that there is not a race between @@ -293,11 +297,11 @@ struct dma_pool *dma_pool_create(const char *name, struct device *dev, } } mutex_unlock(&pools_reg_lock); return retval; } -EXPORT_SYMBOL(dma_pool_create); +EXPORT_SYMBOL(dma_pool_create_node); static void pool_initialise_page(struct dma_pool *pool, struct dma_page *page) { unsigned int next_boundary = pool->boundary, offset = 0; struct dma_block *block, *first = NULL, *last = NULL; @@ -333,11 +337,11 @@ static void pool_initialise_page(struct dma_pool *pool, struct dma_page *page) static struct dma_page *pool_alloc_page(struct dma_pool *pool, gfp_t mem_flags) { struct dma_page *page; - page = kmalloc(sizeof(*page), mem_flags); + page = kmalloc_node(sizeof(*page), mem_flags, pool->node); if (!page) return NULL; page->vaddr = dma_alloc_coherent(pool->dev, pool->allocation, &page->dma, mem_flags); -- 2.45.2