From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Dumazet Subject: [PATCH v2] iommu/vt-d: add NUMA awareness to intel_alloc_coherent() Date: Wed, 31 Jan 2018 22:33:59 -0800 Message-ID: <1517466839.3715.115.camel@gmail.com> References: <1517438756.3715.108.camel@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1517438756.3715.108.camel-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org To: linux-kernel Cc: Benjamin Serebrin , netdev , Eric Dumazet , iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org, David Woodhouse List-Id: iommu@lists.linux-foundation.org RnJvbTogRXJpYyBEdW1hemV0IDxlZHVtYXpldEBnb29nbGUuY29tPgoKU29tZSBkZXZpY2VzIChs aWtlIG1seDQpIHRyeSBoYXJkIHRvIGFsbG9jYXRlIG1lbW9yeSBvbiBzZWxlY3RlZApOVU1BIG5v ZGUsIGJ1dCBpdCB0dXJucyBvdXQgaW50ZWxfYWxsb2NfY29oZXJlbnQoKSBpcyBub3QgTlVNQQph d2FyZSB5ZXQuCgpOb3RlIHRoYXQgZG1hX2dlbmVyaWNfYWxsb2NfY29oZXJlbnQoKSBpbiBhcmNo L3g4Ni9rZXJuZWwvcGNpLWRtYS5jCmdldHMgdGhpcyByaWdodC4KClNpZ25lZC1vZmYtYnk6IEVy aWMgRHVtYXpldCA8ZWR1bWF6ZXRAZ29vZ2xlLmNvbT4KQ2M6IEJlbmphbWluIFNlcmVicmluIDxz ZXJlYnJpbkBnb29nbGUuY29tPgpDYzogRGF2aWQgV29vZGhvdXNlIDxkd213MkBpbmZyYWRlYWQu b3JnPgpDYzogSm9lcmcgUm9lZGVsIDxqb3JvQDhieXRlcy5vcmc+Ci0tLQp2Mjogbm8gZmFsbGJh Y2sgdG8gYWxsb2NfcGFnZXMoKSwgdGhpcyBpcyBub3QgbmVlZGVkIGFuZCBtaWdodCBldmVuCmh1 cnQgaW4gT09NIGNhc2VzLgoKwqBkcml2ZXJzL2lvbW11L2ludGVsLWlvbW11LmMgfMKgwqDCoMKg MiArLQrCoDEgZmlsZSBjaGFuZ2VkLCAxIGluc2VydGlvbigrKSwgMSBkZWxldGlvbigtKQoKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvaW9tbXUvaW50ZWwtaW9tbXUuYyBiL2RyaXZlcnMvaW9tbXUvaW50 ZWwtaW9tbXUuYwppbmRleCBhMTM3M2NmMzQzMjY5NDU1ODA4ZjY2YWQxOGRjMGEyZmI3YWE3M2Yy Li4zYzUzODQ2NmE5OGJkYjhmZmZkY2E2ODg0NjJiMTM1MGQ1MzY3OTFiIDEwMDY0NAotLS0gYS9k cml2ZXJzL2lvbW11L2ludGVsLWlvbW11LmMKKysrIGIvZHJpdmVycy9pb21tdS9pbnRlbC1pb21t dS5jCkBAIC0zNzM1LDcgKzM3MzUsNyBAQCBzdGF0aWMgdm9pZCAqaW50ZWxfYWxsb2NfY29oZXJl bnQoc3RydWN0IGRldmljZSAqZGV2LCBzaXplX3Qgc2l6ZSwKIAl9CiAKIAlpZiAoIXBhZ2UpCi0J CXBhZ2UgPSBhbGxvY19wYWdlcyhmbGFncywgb3JkZXIpOworCQlwYWdlID0gYWxsb2NfcGFnZXNf bm9kZShkZXZfdG9fbm9kZShkZXYpLCBmbGFncywgb3JkZXIpOwogCWlmICghcGFnZSkKIAkJcmV0 dXJuIE5VTEw7CiAJbWVtc2V0KHBhZ2VfYWRkcmVzcyhwYWdlKSwgMCwgc2l6ZSk7CgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwppb21tdSBtYWlsaW5nIGxp c3QKaW9tbXVAbGlzdHMubGludXgtZm91bmRhdGlvbi5vcmcKaHR0cHM6Ly9saXN0cy5saW51eGZv dW5kYXRpb24ub3JnL21haWxtYW4vbGlzdGluZm8vaW9tbXU= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751707AbeBAGeF (ORCPT ); Thu, 1 Feb 2018 01:34:05 -0500 Received: from mail-io0-f195.google.com ([209.85.223.195]:38565 "EHLO mail-io0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751635AbeBAGeD (ORCPT ); Thu, 1 Feb 2018 01:34:03 -0500 X-Google-Smtp-Source: AH8x225elyyCrhHMCJ948qsMYvNNtn1ikmzo6qR9AuO98PnSWkPhcEfbTgK5H60lkFqT+LWoaVHUDw== Message-ID: <1517466839.3715.115.camel@gmail.com> Subject: [PATCH v2] iommu/vt-d: add NUMA awareness to intel_alloc_coherent() From: Eric Dumazet To: linux-kernel Cc: Benjamin Serebrin , David Woodhouse , Joerg Roedel , iommu@lists.linux-foundation.org, netdev , Eric Dumazet Date: Wed, 31 Jan 2018 22:33:59 -0800 In-Reply-To: <1517438756.3715.108.camel@gmail.com> References: <1517438756.3715.108.camel@gmail.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.22.6-1+deb9u1 Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Eric Dumazet Some devices (like mlx4) try hard to allocate memory on selected NUMA node, but it turns out intel_alloc_coherent() is not NUMA aware yet. Note that dma_generic_alloc_coherent() in arch/x86/kernel/pci-dma.c gets this right. Signed-off-by: Eric Dumazet Cc: Benjamin Serebrin Cc: David Woodhouse Cc: Joerg Roedel --- v2: no fallback to alloc_pages(), this is not needed and might even hurt in OOM cases.  drivers/iommu/intel-iommu.c |    2 +-  1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index a1373cf343269455808f66ad18dc0a2fb7aa73f2..3c538466a98bdb8fffdca688462b1350d536791b 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -3735,7 +3735,7 @@ static void *intel_alloc_coherent(struct device *dev, size_t size, } if (!page) - page = alloc_pages(flags, order); + page = alloc_pages_node(dev_to_node(dev), flags, order); if (!page) return NULL; memset(page_address(page), 0, size);