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 X-Spam-Level: X-Spam-Status: No, score=-13.0 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7D1D4C433E6 for ; Fri, 17 Jul 2020 09:35:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5D1AC20717 for ; Fri, 17 Jul 2020 09:35:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726715AbgGQJfh (ORCPT ); Fri, 17 Jul 2020 05:35:37 -0400 Received: from out30-57.freemail.mail.aliyun.com ([115.124.30.57]:55161 "EHLO out30-57.freemail.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725932AbgGQJfg (ORCPT ); Fri, 17 Jul 2020 05:35:36 -0400 X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R191e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e04426;MF=shile.zhang@linux.alibaba.com;NM=1;PH=DS;RN=6;SR=0;TI=SMTPD_---0U3-7-os_1594978521; Received: from e18g09479.et15sqa.tbsite.net(mailfrom:shile.zhang@linux.alibaba.com fp:SMTPD_---0U3-7-os_1594978521) by smtp.aliyun-inc.com(127.0.0.1); Fri, 17 Jul 2020 17:35:33 +0800 From: Shile Zhang To: "Michael S . Tsirkin" , Jason Wang Cc: virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org, Shile Zhang , Jiang Liu Subject: [PATCH] virtio_ring: use alloc_pages_node for NUMA-aware allocation Date: Fri, 17 Jul 2020 17:35:04 +0800 Message-Id: <20200717093504.47794-1-shile.zhang@linux.alibaba.com> X-Mailer: git-send-email 2.24.0.rc2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use alloc_pages_node() allocate memory for vring queue with proper NUMA affinity. Suggested-by: Jiang Liu Signed-off-by: Shile Zhang --- drivers/virtio/virtio_ring.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c index 58b96baa8d48..ded82880281a 100644 --- a/drivers/virtio/virtio_ring.c +++ b/drivers/virtio/virtio_ring.c @@ -276,9 +276,11 @@ static void *vring_alloc_queue(struct virtio_device *vdev, size_t size, return dma_alloc_coherent(vdev->dev.parent, size, dma_handle, flag); } else { - void *queue = alloc_pages_exact(PAGE_ALIGN(size), flag); - - if (queue) { + void *queue = NULL; + struct page *page = alloc_pages_node(dev_to_node(&vdev->dev.parent), + flag, get_order(size)); + if (page) { + queue = page_address(page); phys_addr_t phys_addr = virt_to_phys(queue); *dma_handle = (dma_addr_t)phys_addr; @@ -308,7 +310,7 @@ static void vring_free_queue(struct virtio_device *vdev, size_t size, if (vring_use_dma_api(vdev)) dma_free_coherent(vdev->dev.parent, size, queue, dma_handle); else - free_pages_exact(queue, PAGE_ALIGN(size)); + free_pages((unsigned long)queue, get_order(size)); } /* -- 2.24.0.rc2