From patchwork Wed Oct 16 14:43:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacob Martin X-Patchwork-Id: 1998101 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XTDHr1JfFz1xv6 for ; Thu, 17 Oct 2024 01:44:07 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1t15Fm-0005hm-M7; Wed, 16 Oct 2024 14:43:58 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1t15Fk-0005h6-27 for kernel-team@lists.ubuntu.com; Wed, 16 Oct 2024 14:43:56 +0000 Received: from mail-io1-f71.google.com (mail-io1-f71.google.com [209.85.166.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id DDCA93F2B8 for ; Wed, 16 Oct 2024 14:43:55 +0000 (UTC) Received: by mail-io1-f71.google.com with SMTP id ca18e2360f4ac-835439ecbd3so585124739f.1 for ; Wed, 16 Oct 2024 07:43:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729089835; x=1729694635; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/cPlNYgYVT3qrpzDG3hhVooMNfDpoXGUyMvRbMn4MCs=; b=Kqh8iAtdXN+cIsCOh0q0ng98DyDP1lI8k+lYUxAvyldlc8UL5U2a8JV8pcPruk1aZF TvdeHJpppmCUqJpC1CgXxKcW0ikDi8MA31TJmbHsMvcg8EBBHaZyiE9dkeQ2MMVVp3bp VcyYbCR0JwBIAmv1x8USX/o4KebUTCkxQwQCGQl2IbFLaxCh3tanmC39N0xaJmxQONvl 2ISoYoRTaPK0gGQyRClSLbvsDFousLW1Aeu8TGWMRXQk07ut9qffc4nM1Fih0/QQt6W7 KUX3Wsm8JK9udpo7Aj2XtAGVJEOy9kmve7jXkmvn9ljxkuu1KdX9j1vLNKSaLydIaWB0 9YRw== X-Gm-Message-State: AOJu0Yz/P4tGnUwsVWe9nNyZ3AxoEchwDiwWUV1ouwLwl5W19bkTi4ey tjsVI45cEHkoj7UMSh97JXecYfgB5OqK1+M4nkC0Kyzd8h9JazCJ1qiFHcYr3drzWzgwIreHxJM LBPTJiCyFvsaeoIj2WpWEz130d1uSxuS3xvcK1ILP8Y/3Q5lyoZ3JweLWW0vlMbQNl5xWEpQmxx StaMOJyhRT4Q== X-Received: by 2002:a05:6602:6089:b0:835:3a11:7946 with SMTP id ca18e2360f4ac-83a9441a3bemr554084439f.4.1729089834789; Wed, 16 Oct 2024 07:43:54 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGML9P4AHegztKnDAWQRRvB+8o/zzIh8cftpc4mPSPjKsmk2ZYRmgVJey8KSVFlks4tPiiuAg== X-Received: by 2002:a05:6602:6089:b0:835:3a11:7946 with SMTP id ca18e2360f4ac-83a9441a3bemr554081539f.4.1729089834410; Wed, 16 Oct 2024 07:43:54 -0700 (PDT) Received: from localhost ([2601:441:8201:e8ff:574d:d195:6f49:7c30]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4dbec963450sm827797173.12.2024.10.16.07.43.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Oct 2024 07:43:54 -0700 (PDT) From: Jacob Martin To: kernel-team@lists.ubuntu.com Subject: [SRU][N:nvidia][PATCH v2 1/8] net: mana: Enable MANA driver on ARM64 with 4K page size Date: Wed, 16 Oct 2024 09:43:44 -0500 Message-ID: <20241016144352.177011-2-jacob.martin@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241016144352.177011-1-jacob.martin@canonical.com> References: <20241016144352.177011-1-jacob.martin@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Haiyang Zhang BugLink: https://bugs.launchpad.net/bugs/2084598 Change the Kconfig dependency, so this driver can be built and run on ARM64 with 4K page size. 16/64K page sizes are not supported yet. Signed-off-by: Haiyang Zhang Link: https://lore.kernel.org/r/1715632141-8089-1-git-send-email-haiyangz@microsoft.com Signed-off-by: Jakub Kicinski (cherry picked from commit 40a1d11fc670ac03c5dc2e5a9724b330e74f38b0) Signed-off-by: John Cabaj Acked-by: Tim Gardner Acked-by: Paolo Pisati Signed-off-by: John Cabaj (cherry picked from commit 775969387fec7d04adcc705b656ee5a4396a0579 noble:linux-azure/master-next) Signed-off-by: Jacob Martin --- drivers/net/ethernet/microsoft/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/microsoft/Kconfig b/drivers/net/ethernet/microsoft/Kconfig index 01eb7445ead9..286f0d5697a1 100644 --- a/drivers/net/ethernet/microsoft/Kconfig +++ b/drivers/net/ethernet/microsoft/Kconfig @@ -17,7 +17,8 @@ if NET_VENDOR_MICROSOFT config MICROSOFT_MANA tristate "Microsoft Azure Network Adapter (MANA) support" - depends on PCI_MSI && X86_64 + depends on PCI_MSI + depends on X86_64 || (ARM64 && !CPU_BIG_ENDIAN && ARM64_4K_PAGES) depends on PCI_HYPERV select AUXILIARY_BUS select PAGE_POOL From patchwork Wed Oct 16 14:43:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacob Martin X-Patchwork-Id: 1998104 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XTDHr1RfDz1xw2 for ; Thu, 17 Oct 2024 01:44:07 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1t15Fm-0005hw-QQ; Wed, 16 Oct 2024 14:43:58 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1t15Fl-0005hJ-HA for kernel-team@lists.ubuntu.com; Wed, 16 Oct 2024 14:43:57 +0000 Received: from mail-io1-f72.google.com (mail-io1-f72.google.com [209.85.166.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 4ED683F2D4 for ; Wed, 16 Oct 2024 14:43:57 +0000 (UTC) Received: by mail-io1-f72.google.com with SMTP id ca18e2360f4ac-83aaca0efc6so18500239f.0 for ; Wed, 16 Oct 2024 07:43:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729089836; x=1729694636; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=trqdGng9D3WdW8siCRel8KsvblorCrohAwgIjdxzkFs=; b=GkRKznUOyluvvAXRlKK3PZE+v7S13c02ujex2Be5c6A5dMUo+u2B4u9K1Br4CoG65Q gOs+W3MQD8rC/mL69IMWijW2YGQIt3VUVQNK5zxHUEuYTzYFrEmXfAFZmXiLQxLBYxGr R8VldSY0VJM4Y9CZp4U//Ro2Hn9la6DUMMobo9+8fhNL7hRaFVSFxFB2VGQ6j5z0Vfh3 bc97Hi+HeO8n55b0kfHc8gf3CKBJUa0eDSR2X+SPyBMdRm086I2MgAIVprKL2kM/l39i CGMjD6OJkzDNg+Wjcch5sDeFV2GYuioLoaEXrPy9Dat+Kvp3nEdoHcWoonn272/rQ5pn HSBw== X-Gm-Message-State: AOJu0YzjXpjqh9s2aFQ77z6L7Z+OWofK1H4WNrE+Y6lhbZ6e154N4oko buVjP6IpJte33dEzNhChPWbz8aXdZosGzU8csb46Zi7iP+pwpNJ6MnsKY3POsPrvPGYSr2DedQD mYAc0ElRX1jOeT9fanGTeDXbhSwvWa54bjEJgZI8MtySw4C+EUPGDguGZzr4L1vb4L+tAgDhpMd LHuoBsKNQQOQ== X-Received: by 2002:a05:6602:26d4:b0:835:359b:8a07 with SMTP id ca18e2360f4ac-83a94736b94mr536696239f.16.1729089836042; Wed, 16 Oct 2024 07:43:56 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHxLImL95DiYRxlb5fFeiVqWAqdcUh95K+RYs+F3jcoJwjZvr1Q4iKHYRH1bbvY6/b43vT7gA== X-Received: by 2002:a05:6602:26d4:b0:835:359b:8a07 with SMTP id ca18e2360f4ac-83a94736b94mr536693239f.16.1729089835565; Wed, 16 Oct 2024 07:43:55 -0700 (PDT) Received: from localhost ([2601:441:8201:e8ff:574d:d195:6f49:7c30]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4dbec965bbesm825625173.33.2024.10.16.07.43.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Oct 2024 07:43:55 -0700 (PDT) From: Jacob Martin To: kernel-team@lists.ubuntu.com Subject: [SRU][N:nvidia][PATCH v2 2/8] net: mana: Add support for page sizes other than 4KB on ARM64 Date: Wed, 16 Oct 2024 09:43:45 -0500 Message-ID: <20241016144352.177011-3-jacob.martin@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241016144352.177011-1-jacob.martin@canonical.com> References: <20241016144352.177011-1-jacob.martin@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Haiyang Zhang BugLink: https://bugs.launchpad.net/bugs/2084598 As defined by the MANA Hardware spec, the queue size for DMA is 4KB minimal, and power of 2. And, the HWC queue size has to be exactly 4KB. To support page sizes other than 4KB on ARM64, define the minimal queue size as a macro separately from the PAGE_SIZE, which we always assumed it to be 4KB before supporting ARM64. Also, add MANA specific macros and update code related to size alignment, DMA region calculations, etc. Signed-off-by: Haiyang Zhang Reviewed-by: Michael Kelley Link: https://lore.kernel.org/r/1718655446-6576-1-git-send-email-haiyangz@microsoft.com Signed-off-by: Jakub Kicinski (cherry picked from commit 382d1741b5b2feffef7942dd074206372afe1a96) Signed-off-by: John Cabaj Acked-by: Marcelo Henrique Cerri Acked-by: Thibault Ferrante Signed-off-by: John Cabaj (cherry picked from commit 4191de20636ee76151172bf5c88bf0cdb1bafc05 noble:linux-azure/master-next) Signed-off-by: Jacob Martin --- drivers/net/ethernet/microsoft/Kconfig | 2 +- drivers/net/ethernet/microsoft/mana/gdma_main.c | 10 +++++----- drivers/net/ethernet/microsoft/mana/hw_channel.c | 14 +++++++------- drivers/net/ethernet/microsoft/mana/mana_en.c | 8 ++++---- drivers/net/ethernet/microsoft/mana/shm_channel.c | 13 +++++++------ include/net/mana/gdma.h | 10 +++++++++- include/net/mana/mana.h | 3 ++- 7 files changed, 35 insertions(+), 25 deletions(-) diff --git a/drivers/net/ethernet/microsoft/Kconfig b/drivers/net/ethernet/microsoft/Kconfig index 286f0d5697a1..901fbffbf718 100644 --- a/drivers/net/ethernet/microsoft/Kconfig +++ b/drivers/net/ethernet/microsoft/Kconfig @@ -18,7 +18,7 @@ if NET_VENDOR_MICROSOFT config MICROSOFT_MANA tristate "Microsoft Azure Network Adapter (MANA) support" depends on PCI_MSI - depends on X86_64 || (ARM64 && !CPU_BIG_ENDIAN && ARM64_4K_PAGES) + depends on X86_64 || (ARM64 && !CPU_BIG_ENDIAN) depends on PCI_HYPERV select AUXILIARY_BUS select PAGE_POOL diff --git a/drivers/net/ethernet/microsoft/mana/gdma_main.c b/drivers/net/ethernet/microsoft/mana/gdma_main.c index d33b27214539..482b2eb18002 100644 --- a/drivers/net/ethernet/microsoft/mana/gdma_main.c +++ b/drivers/net/ethernet/microsoft/mana/gdma_main.c @@ -182,7 +182,7 @@ int mana_gd_alloc_memory(struct gdma_context *gc, unsigned int length, dma_addr_t dma_handle; void *buf; - if (length < PAGE_SIZE || !is_power_of_2(length)) + if (length < MANA_PAGE_SIZE || !is_power_of_2(length)) return -EINVAL; gmi->dev = gc->dev; @@ -717,7 +717,7 @@ EXPORT_SYMBOL_NS(mana_gd_destroy_dma_region, NET_MANA); static int mana_gd_create_dma_region(struct gdma_dev *gd, struct gdma_mem_info *gmi) { - unsigned int num_page = gmi->length / PAGE_SIZE; + unsigned int num_page = gmi->length / MANA_PAGE_SIZE; struct gdma_create_dma_region_req *req = NULL; struct gdma_create_dma_region_resp resp = {}; struct gdma_context *gc = gd->gdma_context; @@ -727,10 +727,10 @@ static int mana_gd_create_dma_region(struct gdma_dev *gd, int err; int i; - if (length < PAGE_SIZE || !is_power_of_2(length)) + if (length < MANA_PAGE_SIZE || !is_power_of_2(length)) return -EINVAL; - if (offset_in_page(gmi->virt_addr) != 0) + if (!MANA_PAGE_ALIGNED(gmi->virt_addr)) return -EINVAL; hwc = gc->hwc.driver_data; @@ -751,7 +751,7 @@ static int mana_gd_create_dma_region(struct gdma_dev *gd, req->page_addr_list_len = num_page; for (i = 0; i < num_page; i++) - req->page_addr_list[i] = gmi->dma_handle + i * PAGE_SIZE; + req->page_addr_list[i] = gmi->dma_handle + i * MANA_PAGE_SIZE; err = mana_gd_send_request(gc, req_msg_size, req, sizeof(resp), &resp); if (err) diff --git a/drivers/net/ethernet/microsoft/mana/hw_channel.c b/drivers/net/ethernet/microsoft/mana/hw_channel.c index ca814fe8a775..4dd43ac5a3cb 100644 --- a/drivers/net/ethernet/microsoft/mana/hw_channel.c +++ b/drivers/net/ethernet/microsoft/mana/hw_channel.c @@ -361,12 +361,12 @@ static int mana_hwc_create_cq(struct hw_channel_context *hwc, u16 q_depth, int err; eq_size = roundup_pow_of_two(GDMA_EQE_SIZE * q_depth); - if (eq_size < MINIMUM_SUPPORTED_PAGE_SIZE) - eq_size = MINIMUM_SUPPORTED_PAGE_SIZE; + if (eq_size < MANA_MIN_QSIZE) + eq_size = MANA_MIN_QSIZE; cq_size = roundup_pow_of_two(GDMA_CQE_SIZE * q_depth); - if (cq_size < MINIMUM_SUPPORTED_PAGE_SIZE) - cq_size = MINIMUM_SUPPORTED_PAGE_SIZE; + if (cq_size < MANA_MIN_QSIZE) + cq_size = MANA_MIN_QSIZE; hwc_cq = kzalloc(sizeof(*hwc_cq), GFP_KERNEL); if (!hwc_cq) @@ -428,7 +428,7 @@ static int mana_hwc_alloc_dma_buf(struct hw_channel_context *hwc, u16 q_depth, dma_buf->num_reqs = q_depth; - buf_size = PAGE_ALIGN(q_depth * max_msg_size); + buf_size = MANA_PAGE_ALIGN(q_depth * max_msg_size); gmi = &dma_buf->mem_info; err = mana_gd_alloc_memory(gc, buf_size, gmi); @@ -496,8 +496,8 @@ static int mana_hwc_create_wq(struct hw_channel_context *hwc, else queue_size = roundup_pow_of_two(GDMA_MAX_SQE_SIZE * q_depth); - if (queue_size < MINIMUM_SUPPORTED_PAGE_SIZE) - queue_size = MINIMUM_SUPPORTED_PAGE_SIZE; + if (queue_size < MANA_MIN_QSIZE) + queue_size = MANA_MIN_QSIZE; hwc_wq = kzalloc(sizeof(*hwc_wq), GFP_KERNEL); if (!hwc_wq) diff --git a/drivers/net/ethernet/microsoft/mana/mana_en.c b/drivers/net/ethernet/microsoft/mana/mana_en.c index 191d50ba646d..7ae5abf54016 100644 --- a/drivers/net/ethernet/microsoft/mana/mana_en.c +++ b/drivers/net/ethernet/microsoft/mana/mana_en.c @@ -1891,10 +1891,10 @@ static int mana_create_txq(struct mana_port_context *apc, * to prevent overflow. */ txq_size = MAX_SEND_BUFFERS_PER_QUEUE * 32; - BUILD_BUG_ON(!PAGE_ALIGNED(txq_size)); + BUILD_BUG_ON(!MANA_PAGE_ALIGNED(txq_size)); cq_size = MAX_SEND_BUFFERS_PER_QUEUE * COMP_ENTRY_SIZE; - cq_size = PAGE_ALIGN(cq_size); + cq_size = MANA_PAGE_ALIGN(cq_size); gc = gd->gdma_context; @@ -2191,8 +2191,8 @@ static struct mana_rxq *mana_create_rxq(struct mana_port_context *apc, if (err) goto out; - rq_size = PAGE_ALIGN(rq_size); - cq_size = PAGE_ALIGN(cq_size); + rq_size = MANA_PAGE_ALIGN(rq_size); + cq_size = MANA_PAGE_ALIGN(cq_size); /* Create RQ */ memset(&spec, 0, sizeof(spec)); diff --git a/drivers/net/ethernet/microsoft/mana/shm_channel.c b/drivers/net/ethernet/microsoft/mana/shm_channel.c index 5553af9c8085..0f1679ebad96 100644 --- a/drivers/net/ethernet/microsoft/mana/shm_channel.c +++ b/drivers/net/ethernet/microsoft/mana/shm_channel.c @@ -6,6 +6,7 @@ #include #include +#include #include #define PAGE_FRAME_L48_WIDTH_BYTES 6 @@ -155,8 +156,8 @@ int mana_smc_setup_hwc(struct shm_channel *sc, bool reset_vf, u64 eq_addr, return err; } - if (!PAGE_ALIGNED(eq_addr) || !PAGE_ALIGNED(cq_addr) || - !PAGE_ALIGNED(rq_addr) || !PAGE_ALIGNED(sq_addr)) + if (!MANA_PAGE_ALIGNED(eq_addr) || !MANA_PAGE_ALIGNED(cq_addr) || + !MANA_PAGE_ALIGNED(rq_addr) || !MANA_PAGE_ALIGNED(sq_addr)) return -EINVAL; if ((eq_msix_index & VECTOR_MASK) != eq_msix_index) @@ -183,7 +184,7 @@ int mana_smc_setup_hwc(struct shm_channel *sc, bool reset_vf, u64 eq_addr, /* EQ addr: low 48 bits of frame address */ shmem = (u64 *)ptr; - frame_addr = PHYS_PFN(eq_addr); + frame_addr = MANA_PFN(eq_addr); *shmem = frame_addr & PAGE_FRAME_L48_MASK; all_addr_h4bits |= (frame_addr >> PAGE_FRAME_L48_WIDTH_BITS) << (frame_addr_seq++ * PAGE_FRAME_H4_WIDTH_BITS); @@ -191,7 +192,7 @@ int mana_smc_setup_hwc(struct shm_channel *sc, bool reset_vf, u64 eq_addr, /* CQ addr: low 48 bits of frame address */ shmem = (u64 *)ptr; - frame_addr = PHYS_PFN(cq_addr); + frame_addr = MANA_PFN(cq_addr); *shmem = frame_addr & PAGE_FRAME_L48_MASK; all_addr_h4bits |= (frame_addr >> PAGE_FRAME_L48_WIDTH_BITS) << (frame_addr_seq++ * PAGE_FRAME_H4_WIDTH_BITS); @@ -199,7 +200,7 @@ int mana_smc_setup_hwc(struct shm_channel *sc, bool reset_vf, u64 eq_addr, /* RQ addr: low 48 bits of frame address */ shmem = (u64 *)ptr; - frame_addr = PHYS_PFN(rq_addr); + frame_addr = MANA_PFN(rq_addr); *shmem = frame_addr & PAGE_FRAME_L48_MASK; all_addr_h4bits |= (frame_addr >> PAGE_FRAME_L48_WIDTH_BITS) << (frame_addr_seq++ * PAGE_FRAME_H4_WIDTH_BITS); @@ -207,7 +208,7 @@ int mana_smc_setup_hwc(struct shm_channel *sc, bool reset_vf, u64 eq_addr, /* SQ addr: low 48 bits of frame address */ shmem = (u64 *)ptr; - frame_addr = PHYS_PFN(sq_addr); + frame_addr = MANA_PFN(sq_addr); *shmem = frame_addr & PAGE_FRAME_L48_MASK; all_addr_h4bits |= (frame_addr >> PAGE_FRAME_L48_WIDTH_BITS) << (frame_addr_seq++ * PAGE_FRAME_H4_WIDTH_BITS); diff --git a/include/net/mana/gdma.h b/include/net/mana/gdma.h index 27684135bb4d..35507588a14d 100644 --- a/include/net/mana/gdma.h +++ b/include/net/mana/gdma.h @@ -224,7 +224,15 @@ struct gdma_dev { struct auxiliary_device *adev; }; -#define MINIMUM_SUPPORTED_PAGE_SIZE PAGE_SIZE +/* MANA_PAGE_SIZE is the DMA unit */ +#define MANA_PAGE_SHIFT 12 +#define MANA_PAGE_SIZE BIT(MANA_PAGE_SHIFT) +#define MANA_PAGE_ALIGN(x) ALIGN((x), MANA_PAGE_SIZE) +#define MANA_PAGE_ALIGNED(addr) IS_ALIGNED((unsigned long)(addr), MANA_PAGE_SIZE) +#define MANA_PFN(a) ((a) >> MANA_PAGE_SHIFT) + +/* Required by HW */ +#define MANA_MIN_QSIZE MANA_PAGE_SIZE #define GDMA_CQE_SIZE 64 #define GDMA_EQE_SIZE 16 diff --git a/include/net/mana/mana.h b/include/net/mana/mana.h index 4eeedf14711b..50a4342d5179 100644 --- a/include/net/mana/mana.h +++ b/include/net/mana/mana.h @@ -42,7 +42,8 @@ enum TRI_STATE { #define MAX_SEND_BUFFERS_PER_QUEUE 256 -#define EQ_SIZE (8 * PAGE_SIZE) +#define EQ_SIZE (8 * MANA_PAGE_SIZE) + #define LOG2_EQ_THROTTLE 3 #define MAX_PORTS_IN_MANA_DEV 256 From patchwork Wed Oct 16 14:43:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacob Martin X-Patchwork-Id: 1998103 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XTDHr2LSCz1xw6 for ; Thu, 17 Oct 2024 01:44:08 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1t15Fo-0005jJ-5d; Wed, 16 Oct 2024 14:44:00 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1t15Fm-0005hg-Hl for kernel-team@lists.ubuntu.com; Wed, 16 Oct 2024 14:43:58 +0000 Received: from mail-il1-f198.google.com (mail-il1-f198.google.com [209.85.166.198]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 61FAE3F2D4 for ; Wed, 16 Oct 2024 14:43:58 +0000 (UTC) Received: by mail-il1-f198.google.com with SMTP id e9e14a558f8ab-3a3b2aee1a3so51491655ab.1 for ; Wed, 16 Oct 2024 07:43:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729089837; x=1729694637; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=J+bmTsvZSopJSOHvsdEUCbDXLX+d62X42QNOukCU1T4=; b=Sw9cbyheczD1p3zVLaPCmCEhJrhCQWPQrarnM9UfzdSj2rjXvNpm17e5o7Ho1gmfOD Z+dagdIZWeRNemwj8+EgtbjZYrXrPPWTPrEIJUP8R+WFlf8oOkW1xB2+UbypXb00y0Nb aF19P7Y24GYz0Q4f97o0cUyjNmBWANzenGPKdRXqIS27VZOa67gy/DLHO3I+E4FimCX9 1rrXUG4JWBEM0Ps8MelnAkOtGCxxSExjrdcoVqbr89gRCx+e/pAwwb3Gw3LXnxZWypEC 1qqIIRPjIX1EhwGmE+peRXn8bVO1cLJRYmvcaC4YNxzFBOwXwzxgczqvpcGgrKxnCpey wbmA== X-Gm-Message-State: AOJu0YzHoCGu/lGXYmVUViVT0Fr1Fzcx5zrZHQ6x7LsQyKfCRgEkvnVs Iq1bSy3t550ciBeEc5c1Xn8CO+JiWwGDvKsTVrVfhKqEG1UVCmxDz8VsnyG3uRRS+fDxD7UApKe NphtSI4ZEOxLHrZi626D1pn4YYIn3k4IwNkNyxXE9BQL98prdCNaD/ksf/CNway75dYECIW59jU gN2SL5BmOvww== X-Received: by 2002:a05:6e02:216d:b0:3a3:41cf:f594 with SMTP id e9e14a558f8ab-3a3b5f72f0emr180905525ab.12.1729089837182; Wed, 16 Oct 2024 07:43:57 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGP+Ups9vWkORvuTsHelxeZQMyO6VvwAysbXXcZ/QxOePlO1dUxhi2Z7x7GL3vLiyokBacsAg== X-Received: by 2002:a05:6e02:216d:b0:3a3:41cf:f594 with SMTP id e9e14a558f8ab-3a3b5f72f0emr180905275ab.12.1729089836758; Wed, 16 Oct 2024 07:43:56 -0700 (PDT) Received: from localhost ([2601:441:8201:e8ff:574d:d195:6f49:7c30]) by smtp.gmail.com with ESMTPSA id e9e14a558f8ab-3a3d715e488sm8408315ab.83.2024.10.16.07.43.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Oct 2024 07:43:56 -0700 (PDT) From: Jacob Martin To: kernel-team@lists.ubuntu.com Subject: [SRU][N:nvidia][PATCH v2 3/8] net: mana: Fix race of mana_hwc_post_rx_wqe and new hwc response Date: Wed, 16 Oct 2024 09:43:46 -0500 Message-ID: <20241016144352.177011-4-jacob.martin@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241016144352.177011-1-jacob.martin@canonical.com> References: <20241016144352.177011-1-jacob.martin@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Haiyang Zhang BugLink: https://bugs.launchpad.net/bugs/2084598 The mana_hwc_rx_event_handler() / mana_hwc_handle_resp() calls complete(&ctx->comp_event) before posting the wqe back. It's possible that other callers, like mana_create_txq(), start the next round of mana_hwc_send_request() before the posting of wqe. And if the HW is fast enough to respond, it can hit no_wqe error on the HW channel, then the response message is lost. The mana driver may fail to create queues and open, because of waiting for the HW response and timed out. Sample dmesg: [ 528.610840] mana 39d4:00:02.0: HWC: Request timed out! [ 528.614452] mana 39d4:00:02.0: Failed to send mana message: -110, 0x0 [ 528.618326] mana 39d4:00:02.0 enP14804s2: Failed to create WQ object: -110 To fix it, move posting of rx wqe before complete(&ctx->comp_event). Cc: stable@vger.kernel.org Fixes: ca9c54d2d6a5 ("net: mana: Add a driver for Microsoft Azure Network Adapter (MANA)") Signed-off-by: Haiyang Zhang Reviewed-by: Long Li Signed-off-by: David S. Miller (cherry-picked from commit 8af174ea863c72f25ce31cee3baad8a301c0cf0f) Signed-off-by: Vinicius Peixoto Acked-by: Aaron Jauregui Acked-by: Thibault Ferrante Signed-off-by: John Cabaj (cherry picked from commit 40a4338c667f2c84e84b1fd5484e46ae3321e34f noble:linux-azure/master-next) Signed-off-by: Jacob Martin --- .../net/ethernet/microsoft/mana/hw_channel.c | 62 ++++++++++--------- 1 file changed, 34 insertions(+), 28 deletions(-) diff --git a/drivers/net/ethernet/microsoft/mana/hw_channel.c b/drivers/net/ethernet/microsoft/mana/hw_channel.c index 4dd43ac5a3cb..48b899834d0a 100644 --- a/drivers/net/ethernet/microsoft/mana/hw_channel.c +++ b/drivers/net/ethernet/microsoft/mana/hw_channel.c @@ -51,9 +51,33 @@ static int mana_hwc_verify_resp_msg(const struct hwc_caller_ctx *caller_ctx, return 0; } +static int mana_hwc_post_rx_wqe(const struct hwc_wq *hwc_rxq, + struct hwc_work_request *req) +{ + struct device *dev = hwc_rxq->hwc->dev; + struct gdma_sge *sge; + int err; + + sge = &req->sge; + sge->address = (u64)req->buf_sge_addr; + sge->mem_key = hwc_rxq->msg_buf->gpa_mkey; + sge->size = req->buf_len; + + memset(&req->wqe_req, 0, sizeof(struct gdma_wqe_request)); + req->wqe_req.sgl = sge; + req->wqe_req.num_sge = 1; + req->wqe_req.client_data_unit = 0; + + err = mana_gd_post_and_ring(hwc_rxq->gdma_wq, &req->wqe_req, NULL); + if (err) + dev_err(dev, "Failed to post WQE on HWC RQ: %d\n", err); + return err; +} + static void mana_hwc_handle_resp(struct hw_channel_context *hwc, u32 resp_len, - const struct gdma_resp_hdr *resp_msg) + struct hwc_work_request *rx_req) { + const struct gdma_resp_hdr *resp_msg = rx_req->buf_va; struct hwc_caller_ctx *ctx; int err; @@ -61,6 +85,7 @@ static void mana_hwc_handle_resp(struct hw_channel_context *hwc, u32 resp_len, hwc->inflight_msg_res.map)) { dev_err(hwc->dev, "hwc_rx: invalid msg_id = %u\n", resp_msg->response.hwc_msg_id); + mana_hwc_post_rx_wqe(hwc->rxq, rx_req); return; } @@ -74,30 +99,13 @@ static void mana_hwc_handle_resp(struct hw_channel_context *hwc, u32 resp_len, memcpy(ctx->output_buf, resp_msg, resp_len); out: ctx->error = err; - complete(&ctx->comp_event); -} - -static int mana_hwc_post_rx_wqe(const struct hwc_wq *hwc_rxq, - struct hwc_work_request *req) -{ - struct device *dev = hwc_rxq->hwc->dev; - struct gdma_sge *sge; - int err; - - sge = &req->sge; - sge->address = (u64)req->buf_sge_addr; - sge->mem_key = hwc_rxq->msg_buf->gpa_mkey; - sge->size = req->buf_len; - memset(&req->wqe_req, 0, sizeof(struct gdma_wqe_request)); - req->wqe_req.sgl = sge; - req->wqe_req.num_sge = 1; - req->wqe_req.client_data_unit = 0; + /* Must post rx wqe before complete(), otherwise the next rx may + * hit no_wqe error. + */ + mana_hwc_post_rx_wqe(hwc->rxq, rx_req); - err = mana_gd_post_and_ring(hwc_rxq->gdma_wq, &req->wqe_req, NULL); - if (err) - dev_err(dev, "Failed to post WQE on HWC RQ: %d\n", err); - return err; + complete(&ctx->comp_event); } static void mana_hwc_init_event_handler(void *ctx, struct gdma_queue *q_self, @@ -234,14 +242,12 @@ static void mana_hwc_rx_event_handler(void *ctx, u32 gdma_rxq_id, return; } - mana_hwc_handle_resp(hwc, rx_oob->tx_oob_data_size, resp); + mana_hwc_handle_resp(hwc, rx_oob->tx_oob_data_size, rx_req); - /* Do no longer use 'resp', because the buffer is posted to the HW - * in the below mana_hwc_post_rx_wqe(). + /* Can no longer use 'resp', because the buffer is posted to the HW + * in mana_hwc_handle_resp() above. */ resp = NULL; - - mana_hwc_post_rx_wqe(hwc_rxq, rx_req); } static void mana_hwc_tx_event_handler(void *ctx, u32 gdma_txq_id, From patchwork Wed Oct 16 14:43:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacob Martin X-Patchwork-Id: 1998105 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XTDHs6PjGz1xv6 for ; Thu, 17 Oct 2024 01:44:09 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1t15Fp-0005l1-EM; Wed, 16 Oct 2024 14:44:01 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1t15Fn-0005jC-Qu for kernel-team@lists.ubuntu.com; Wed, 16 Oct 2024 14:43:59 +0000 Received: from mail-io1-f70.google.com (mail-io1-f70.google.com [209.85.166.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id B9A2A3F2B8 for ; Wed, 16 Oct 2024 14:43:59 +0000 (UTC) Received: by mail-io1-f70.google.com with SMTP id ca18e2360f4ac-83a97d20200so152064239f.1 for ; Wed, 16 Oct 2024 07:43:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729089838; x=1729694638; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AlvG1ajzW+lnn+QBwQxXck5ifHYrq5/KijsgVhBOjb8=; b=b0Lqir5CsKTINXy3nPLZrnvNvtgEsI9f9gEICladsrO9jPDmpuQbPMtCEEanPRir0b 95JctaitRS53vfeMziXBKkgq3rNIMtNIaT7/tWIJQTXTFUpSaAa4jGMjxhANGm86CX7W oMo50Bqu4utUztneQVdQpC0k19OBfDD5Qxw1YekhWqiSfpFN/40tQ+1gJfzSY+pXQP2M 3XmcBAUp/s+Icb93ZOXoexq+w4iWbSx6z57bp6+5s3G2FGQMRc1nWsoJm5UutL00H4Ja SRTD0u6145pwg4OGdg1oHmWvo1cuh0vwABUzgB+fJzLPlySayGtAtqDmxVi09L5bq7Bo eBBw== X-Gm-Message-State: AOJu0YxnCXWSpumM1QWsFfRa6vLDG8599jNcPfN5i4VDRMXn9JaMqgV7 kQK9pXIc/ffeHu8bgymwjFms8/DjkXhiQDujAt0QGJCdf9qkwiZYRb9qnV0z1ZKQSkWzevFgp/P vaGL2vHRn5lxenM/Il0jCwnzO9QnYr+VFUx53o6Db6TP0QMjuKu0LGeXt+7klnYD0WTYqWNJdLE Vk3dwDkduj3A== X-Received: by 2002:a05:6602:2b13:b0:7f6:8303:ba80 with SMTP id ca18e2360f4ac-83a64d50245mr1702279439f.11.1729089838533; Wed, 16 Oct 2024 07:43:58 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGwWBVQoq1bZzf74E7p4xAJeifX2qyOUzzkwGnBffZOlcL2lji3ahbsfvshvGQudqWfsErqAg== X-Received: by 2002:a05:6602:2b13:b0:7f6:8303:ba80 with SMTP id ca18e2360f4ac-83a64d50245mr1702276439f.11.1729089838148; Wed, 16 Oct 2024 07:43:58 -0700 (PDT) Received: from localhost ([2601:441:8201:e8ff:574d:d195:6f49:7c30]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4dbec9e0997sm825599173.74.2024.10.16.07.43.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Oct 2024 07:43:57 -0700 (PDT) From: Jacob Martin To: kernel-team@lists.ubuntu.com Subject: [SRU][N:nvidia][PATCH v2 4/8] net: mana: Fix RX buf alloc_size alignment and atomic op panic Date: Wed, 16 Oct 2024 09:43:47 -0500 Message-ID: <20241016144352.177011-5-jacob.martin@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241016144352.177011-1-jacob.martin@canonical.com> References: <20241016144352.177011-1-jacob.martin@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Haiyang Zhang BugLink: https://bugs.launchpad.net/bugs/2084598 The MANA driver's RX buffer alloc_size is passed into napi_build_skb() to create SKB. skb_shinfo(skb) is located at the end of skb, and its alignment is affected by the alloc_size passed into napi_build_skb(). The size needs to be aligned properly for better performance and atomic operations. Otherwise, on ARM64 CPU, for certain MTU settings like 4000, atomic operations may panic on the skb_shinfo(skb)->dataref due to alignment fault. To fix this bug, add proper alignment to the alloc_size calculation. Sample panic info: [ 253.298819] Unable to handle kernel paging request at virtual address ffff000129ba5cce [ 253.300900] Mem abort info: [ 253.301760] ESR = 0x0000000096000021 [ 253.302825] EC = 0x25: DABT (current EL), IL = 32 bits [ 253.304268] SET = 0, FnV = 0 [ 253.305172] EA = 0, S1PTW = 0 [ 253.306103] FSC = 0x21: alignment fault Call trace: __skb_clone+0xfc/0x198 skb_clone+0x78/0xe0 raw6_local_deliver+0xfc/0x228 ip6_protocol_deliver_rcu+0x80/0x500 ip6_input_finish+0x48/0x80 ip6_input+0x48/0xc0 ip6_sublist_rcv_finish+0x50/0x78 ip6_sublist_rcv+0x1cc/0x2b8 ipv6_list_rcv+0x100/0x150 __netif_receive_skb_list_core+0x180/0x220 netif_receive_skb_list_internal+0x198/0x2a8 __napi_poll+0x138/0x250 net_rx_action+0x148/0x330 handle_softirqs+0x12c/0x3a0 Cc: stable@vger.kernel.org Fixes: 80f6215b450e ("net: mana: Add support for jumbo frame") Signed-off-by: Haiyang Zhang Reviewed-by: Long Li Signed-off-by: David S. Miller (cherry-picked from commit 32316f676b4ee87c0404d333d248ccf777f739bc) Signed-off-by: Vinicius Peixoto Acked-by: Thibault Ferrante Acked-by: John Cabaj Signed-off-by: John Cabaj (cherry picked from commit c682b8d0e81462d108d424d0f22097794589f691 noble:linux-azure/master-next) Signed-off-by: Jacob Martin --- drivers/net/ethernet/microsoft/mana/mana_en.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/microsoft/mana/mana_en.c b/drivers/net/ethernet/microsoft/mana/mana_en.c index 7ae5abf54016..fd857fd4bc80 100644 --- a/drivers/net/ethernet/microsoft/mana/mana_en.c +++ b/drivers/net/ethernet/microsoft/mana/mana_en.c @@ -599,7 +599,11 @@ static void mana_get_rxbuf_cfg(int mtu, u32 *datasize, u32 *alloc_size, else *headroom = XDP_PACKET_HEADROOM; - *alloc_size = mtu + MANA_RXBUF_PAD + *headroom; + *alloc_size = SKB_DATA_ALIGN(mtu + MANA_RXBUF_PAD + *headroom); + + /* Using page pool in this case, so alloc_size is PAGE_SIZE */ + if (*alloc_size < PAGE_SIZE) + *alloc_size = PAGE_SIZE; *datasize = mtu + ETH_HLEN; } From patchwork Wed Oct 16 14:43:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacob Martin X-Patchwork-Id: 1998108 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XTDHx1VWxz1xw5 for ; Thu, 17 Oct 2024 01:44:13 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1t15Ft-0005q7-6Z; Wed, 16 Oct 2024 14:44:05 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1t15Fp-0005kV-7a for kernel-team@lists.ubuntu.com; Wed, 16 Oct 2024 14:44:01 +0000 Received: from mail-il1-f198.google.com (mail-il1-f198.google.com [209.85.166.198]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id EA1B03F2B8 for ; Wed, 16 Oct 2024 14:44:00 +0000 (UTC) Received: by mail-il1-f198.google.com with SMTP id e9e14a558f8ab-3a3c9886eccso32884055ab.2 for ; Wed, 16 Oct 2024 07:44:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729089840; x=1729694640; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=j4CzUBxQigrbz7P+ZP3a5O6fUf4QRbm0Tau7YpRbg4s=; b=quSLaJqbTCxrDFUixwSYpXTYR8itVaD/0JP6j4N0y0DApAFghuNE4DbfnUTWLJJV7l e9zYDpSfTGQTw4CqXS9XBYLM1gqbRQwUPu3jH0kFxzly+RZlZ7wIvvo/R18W0izw4JjD udWwjEdxKm0POffnoqTkeIyjH3GO7CEzGr/Egb20FZbp269v+/XMcHAB65ftQmk/yjim 8YwBWwEIDLX/femjCHBsgcQCbW9qn+nMDiQ5NVd0UQNOrj7Nboi2Rimw8LH156GBN7v4 GU3wmAzxwOZd+xuKK7IzfJkjielRe4itrybzOsPBzK8K1HUxcO0Wj1SDA4rIZ0s5fQI3 PyMw== X-Gm-Message-State: AOJu0YzYwIu38q+rFAgbcAfl4mrIJsoQm+LCC5OFQj4bgn8f9oW3nyTv KAgD7dQoRVLw2bkDVdXYxaNsz/LtcUZKh+hcFsW89OlVndrV2EoXZfSkV7PzMEhGlfvIpvQjadn m8ph/ney4gcsArSCMGWUm1jTVf1B/tWYfSHSISMucI0EHxW30kdhEEX5hL78EVakDT08cL7zEAf OqpucMxx8lCg== X-Received: by 2002:a92:8710:0:b0:3a3:da4f:79f8 with SMTP id e9e14a558f8ab-3a3da4f7c7fmr45019515ab.5.1729089839823; Wed, 16 Oct 2024 07:43:59 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHDLD0vxERwEClsNZbyzy/9YVlf82EdbAC5oUg+Az8FrxrlmE5+Z5NtNitDbLK44nsem/NzQQ== X-Received: by 2002:a92:8710:0:b0:3a3:da4f:79f8 with SMTP id e9e14a558f8ab-3a3da4f7c7fmr45019335ab.5.1729089839470; Wed, 16 Oct 2024 07:43:59 -0700 (PDT) Received: from localhost ([2601:441:8201:e8ff:574d:d195:6f49:7c30]) by smtp.gmail.com with ESMTPSA id e9e14a558f8ab-3a3d70aed3fsm8381685ab.28.2024.10.16.07.43.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Oct 2024 07:43:59 -0700 (PDT) From: Jacob Martin To: kernel-team@lists.ubuntu.com Subject: [SRU][N:nvidia][PATCH v2 5/8] RDMA/mana_ib: use the correct page table index based on hardware page size Date: Wed, 16 Oct 2024 09:43:48 -0500 Message-ID: <20241016144352.177011-6-jacob.martin@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241016144352.177011-1-jacob.martin@canonical.com> References: <20241016144352.177011-1-jacob.martin@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Long Li BugLink: https://bugs.launchpad.net/bugs/2084598 MANA hardware uses 4k page size. When calculating the page table index, it should use the hardware page size, not the system page size. Cc: stable@vger.kernel.org Fixes: 0266a177631d ("RDMA/mana_ib: Add a driver for Microsoft Azure Network Adapter") Signed-off-by: Long Li Link: https://patch.msgid.link/1725030993-16213-1-git-send-email-longli@linuxonhyperv.com Signed-off-by: Leon Romanovsky (cherry picked from commit 9e517a8e9d9a303bf9bde35e5c5374795544c152) Signed-off-by: John Cabaj Signed-off-by: Jacob Martin --- drivers/infiniband/hw/mana/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/infiniband/hw/mana/main.c b/drivers/infiniband/hw/mana/main.c index 4524c6b80748..dfed1d97edfd 100644 --- a/drivers/infiniband/hw/mana/main.c +++ b/drivers/infiniband/hw/mana/main.c @@ -385,7 +385,7 @@ static int mana_ib_gd_create_dma_region(struct mana_ib_dev *dev, struct ib_umem create_req->length = umem->length; create_req->offset_in_page = ib_umem_dma_offset(umem, page_sz); - create_req->gdma_page_type = order_base_2(page_sz) - PAGE_SHIFT; + create_req->gdma_page_type = order_base_2(page_sz) - MANA_PAGE_SHIFT; create_req->page_count = num_pages_total; ibdev_dbg(&dev->ib_dev, "size_dma_region %lu num_pages_total %lu\n", From patchwork Wed Oct 16 14:43:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacob Martin X-Patchwork-Id: 1998107 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XTDHw6Xmtz1xw2 for ; Thu, 17 Oct 2024 01:44:12 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1t15Fs-0005ol-Lw; Wed, 16 Oct 2024 14:44:04 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1t15Fq-0005li-8c for kernel-team@lists.ubuntu.com; Wed, 16 Oct 2024 14:44:02 +0000 Received: from mail-io1-f70.google.com (mail-io1-f70.google.com [209.85.166.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 039423F2B8 for ; Wed, 16 Oct 2024 14:44:02 +0000 (UTC) Received: by mail-io1-f70.google.com with SMTP id ca18e2360f4ac-837f97fcc95so500811039f.3 for ; Wed, 16 Oct 2024 07:44:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729089841; x=1729694641; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JwBgM7eqTkGFxMEgY0qITJ9G28EWnMgI2724F+5cVmg=; b=YOzHL05owbiCqk18dHG2SgOXfWq9S2aIbmCNrRLC8ZmARcrY15fcyelfYxNN/ApQS1 pflxDr9C5eddnv7iSCtWW3R9Nf0Lac2AL6v8fkF9lXNIYaVLOP1qk5wT2Hq4iSZl0FIi BUve8vQIr5yIQg/8QzOExyCAqZYN6K4dDv86C2kaTlMAzsPZXyARa3mYEjqqswmaSZGh nSHN/2EUDNf/Q4sa48FTgcJDWRbcD/vTt9SRFJ3XD5hZ2UlzMtn1CsZcoeZY7G1juLdG 4Hwytwo5bJcE/us0IqciGDeY5Jz7fMv+iSF5gjBswTALKx7zW7qMGhi0cjM0dgKizx8o 70aA== X-Gm-Message-State: AOJu0Yy4cgCTYpzhAyEs1X/bXrSEQsnoLGgmhVc18vgDLV4iRJjwuKfi p1BzRd1XSvG+8odrhkCS9B3+AGh1AwcffI+M05c/QoxflmExqtoXW7FSaODjB0TWlaI11tU1Suv GhudBGpOZGgrQtmU0e+XWCuvGifh73dBiaAstNBqnCzmb/MnJ7ZyKdZYfB3Df+qcm7hCE3l2DxA R4lPF1LGtdaA== X-Received: by 2002:a05:6602:630c:b0:83a:a305:d9ee with SMTP id ca18e2360f4ac-83aa305da05mr208296039f.12.1729089840914; Wed, 16 Oct 2024 07:44:00 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGrF8Yrxe/2hLzOtlnOJX33s5mIk6jnZOEryThfXzuPdfSb3hPuSqrnHERYoUcirKxQSUnIEw== X-Received: by 2002:a05:6602:630c:b0:83a:a305:d9ee with SMTP id ca18e2360f4ac-83aa305da05mr208293839f.12.1729089840607; Wed, 16 Oct 2024 07:44:00 -0700 (PDT) Received: from localhost ([2601:441:8201:e8ff:574d:d195:6f49:7c30]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4dbec9b24fdsm826019173.68.2024.10.16.07.44.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Oct 2024 07:44:00 -0700 (PDT) From: Jacob Martin To: kernel-team@lists.ubuntu.com Subject: [SRU][N:nvidia][PATCH v2 6/8] RDMA/mana_ib: use the correct page size for mapping user-mode doorbell page Date: Wed, 16 Oct 2024 09:43:49 -0500 Message-ID: <20241016144352.177011-7-jacob.martin@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241016144352.177011-1-jacob.martin@canonical.com> References: <20241016144352.177011-1-jacob.martin@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Long Li BugLink: https://bugs.launchpad.net/bugs/2084598 When mapping doorbell page from user-mode, the driver should use the system page size as this memory is allocated via mmap() from user-mode. Cc: stable@vger.kernel.org Fixes: 0266a177631d ("RDMA/mana_ib: Add a driver for Microsoft Azure Network Adapter") Signed-off-by: Long Li Link: https://patch.msgid.link/1725030993-16213-2-git-send-email-longli@linuxonhyperv.com Signed-off-by: Leon Romanovsky (cherry picked from commit 4a3b99bc04e501b816db78f70064e26a01257910) Signed-off-by: John Cabaj Signed-off-by: Jacob Martin --- drivers/infiniband/hw/mana/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/infiniband/hw/mana/main.c b/drivers/infiniband/hw/mana/main.c index dfed1d97edfd..92673a166e33 100644 --- a/drivers/infiniband/hw/mana/main.c +++ b/drivers/infiniband/hw/mana/main.c @@ -513,13 +513,13 @@ int mana_ib_mmap(struct ib_ucontext *ibcontext, struct vm_area_struct *vma) PAGE_SHIFT; prot = pgprot_writecombine(vma->vm_page_prot); - ret = rdma_user_mmap_io(ibcontext, vma, pfn, gc->db_page_size, prot, + ret = rdma_user_mmap_io(ibcontext, vma, pfn, PAGE_SIZE, prot, NULL); if (ret) ibdev_dbg(ibdev, "can't rdma_user_mmap_io ret %d\n", ret); else - ibdev_dbg(ibdev, "mapped I/O pfn 0x%llx page_size %u, ret %d\n", - pfn, gc->db_page_size, ret); + ibdev_dbg(ibdev, "mapped I/O pfn 0x%llx page_size %lu, ret %d\n", + pfn, PAGE_SIZE, ret); return ret; } From patchwork Wed Oct 16 14:43:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacob Martin X-Patchwork-Id: 1998106 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XTDHw3WQNz1xv6 for ; Thu, 17 Oct 2024 01:44:12 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1t15Fs-0005pM-Tv; Wed, 16 Oct 2024 14:44:04 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1t15Fr-0005nI-FR for kernel-team@lists.ubuntu.com; Wed, 16 Oct 2024 14:44:03 +0000 Received: from mail-il1-f199.google.com (mail-il1-f199.google.com [209.85.166.199]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 3F55B3F17E for ; Wed, 16 Oct 2024 14:44:03 +0000 (UTC) Received: by mail-il1-f199.google.com with SMTP id e9e14a558f8ab-3a3bcae85a5so7524105ab.1 for ; Wed, 16 Oct 2024 07:44:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729089842; x=1729694642; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dpY/olI7vD4LfVuas27hix8K3LLkxPVCOg3bn2EWQ9k=; b=C/sus/zWsgiNMbiooBmQs8+F65rmOiqaLE2LPBvPZ/dIW/7YBAMvLyP2drrussTN0u MWIgW20OyZv2UY7yHSNY04YMu5Q8P4GUg3UogteuUF05QskbsqzEnf/r5Mn+DTlH14ZJ SFDLcDJ4SYu2oG+Irx0PJTqPIZqUc3r864s4lR9vYhXq6Aa8t2FEFL6mM/9rva66PajI /b92aagCUt2HY9AzeP/vMnv01gzbLeRLgl8x3lp1OGtyb1Isjp5l7gSMbI4n/fSG6PpX flltflCHhkzupQP4lrX8HG/FGn/2wmTyradxJiz0sFaNKiFPYNqXrKb9rYmEd5l4AxQ+ uI6w== X-Gm-Message-State: AOJu0YzZlC0OyPiQ6gWq6eMcIzlZnLJgOQ9jr4WRS9UDgKwdiTTsYnRd 1nt6CH5AqNctRvQ0PJvKHX0yzve6xw3eTbNF6vDz0q6XnomjWGfp41ygTbO7a7MFluTNYPEPOzA WOuvFH98wiEVJLsAfXep/PQiYcQUueSxYuagtRCR6BN6p9AxCBBWTS5QZ91kNZZVLHZR11kRlC9 Sh4e9DaUZdOQ== X-Received: by 2002:a92:194f:0:b0:39f:5def:a23d with SMTP id e9e14a558f8ab-3a3dbe7bd1bmr22858545ab.5.1729089841976; Wed, 16 Oct 2024 07:44:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEZLQtyjFGguzp82gYwbD/PpQ4/xWmqKskFRQGRSYq9D+ztI3PwtnCEGET/HLC32s6g2NE/EA== X-Received: by 2002:a92:194f:0:b0:39f:5def:a23d with SMTP id e9e14a558f8ab-3a3dbe7bd1bmr22858435ab.5.1729089841619; Wed, 16 Oct 2024 07:44:01 -0700 (PDT) Received: from localhost ([2601:441:8201:e8ff:574d:d195:6f49:7c30]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4dbecc4337dsm827055173.132.2024.10.16.07.44.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Oct 2024 07:44:01 -0700 (PDT) From: Jacob Martin To: kernel-team@lists.ubuntu.com Subject: [SRU][N:nvidia][PATCH v2 7/8] UBUNTU: [Config] nvidia: Enable MANA configs on x86 and arm64 Date: Wed, 16 Oct 2024 09:43:50 -0500 Message-ID: <20241016144352.177011-8-jacob.martin@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241016144352.177011-1-jacob.martin@canonical.com> References: <20241016144352.177011-1-jacob.martin@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/2084598 Set the following configs on x86 and arm64: CONFIG_MANA_INFINIBAND=m CONFIG_MICROSOFT_MANA=m Signed-off-by: Jacob Martin --- debian.nvidia/config/annotations | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian.nvidia/config/annotations b/debian.nvidia/config/annotations index 80cd22a1b0fc..680437669e9e 100644 --- a/debian.nvidia/config/annotations +++ b/debian.nvidia/config/annotations @@ -114,9 +114,15 @@ CONFIG_GPIO_AAEON note<'{Disable all Ubuntu ODM dr CONFIG_LEDS_AAEON policy<{'amd64': '-'}> CONFIG_LEDS_AAEON note<'{Disable all Ubuntu ODM drivers}'> +CONFIG_MANA_INFINIBAND policy<{'amd64': 'm', 'arm64': 'm'}> +CONFIG_MANA_INFINIBAND note<'LP: #2084598'> + CONFIG_MFD_AAEON policy<{'amd64': '-'}> CONFIG_MFD_AAEON note<'{Disable all Ubuntu ODM drivers}'> +CONFIG_MICROSOFT_MANA policy<{'amd64': 'm', 'arm64': 'm'}> +CONFIG_MICROSOFT_MANA note<'LP: #2084598'> + CONFIG_MTD policy<{'amd64': 'm', 'arm64': 'y'}> CONFIG_MTD note<'boot essential on arm'> From patchwork Wed Oct 16 14:43:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacob Martin X-Patchwork-Id: 1998109 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XTDHz6BM5z1xv6 for ; Thu, 17 Oct 2024 01:44:15 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1t15Fv-0005uZ-JO; Wed, 16 Oct 2024 14:44:07 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1t15Fs-0005or-Qv for kernel-team@lists.ubuntu.com; Wed, 16 Oct 2024 14:44:04 +0000 Received: from mail-io1-f72.google.com (mail-io1-f72.google.com [209.85.166.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 946133F17E for ; Wed, 16 Oct 2024 14:44:04 +0000 (UTC) Received: by mail-io1-f72.google.com with SMTP id ca18e2360f4ac-835439ecbd3so585141839f.1 for ; Wed, 16 Oct 2024 07:44:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729089843; x=1729694643; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Uw/IpL3mKPR1u1owDBlw9DD1+q+Yq9tqee0KxB9zwVI=; b=OyoW45ylK4VT1VSl1PKUV3I2y9qVTlGmGOewUiJfzqLnWzELAEhTC0BNoNA9I1huyH WUNN1HicyMJdiHyBiwG0L/WmhcjEMblvT14sR/INWH1k/dw3lptUvPbRRXp/QCgfhBOa 6LeiP/Nq0bEbKzX0qLMFJ7ZcDcrcTIhoGYXhqG2U3+qXRCE7C7mI8NI3O4zkI++vTiHI TRXlWMW5RXpi/GP5zrSCIcpYViDNUKG+tx1KqbFr5kYndf6saIlFNDYAMr93ahgeJVaR 6q4JYlYTtHz64dE/RNBIQ2ZBOuKp600OV2WKgD+q157rz5XeVqndqStA9MQCaVLan5Qr AssQ== X-Gm-Message-State: AOJu0Yy+Rgj+SleJy8QW37eroqPIvEPMd5U6aaH9yWeXGl3QaqFQfhPC Mozpj4RhwQGJhA20N5OWs8KOhIe+/6SRFCvE6GcqUsPxilNw1K+F/laxjY/qMFzQyGG+9SRKjBi juLQKmy54KS7Apv+DGpwolgghYFUuGbgroDAzfUp3G5KUUEzjFCcVi0Giruatsiak3rQhlC02SR u0IePh7SzuSw== X-Received: by 2002:a05:6602:640a:b0:83a:97f6:db4 with SMTP id ca18e2360f4ac-83a97f60e4amr487944639f.10.1729089843475; Wed, 16 Oct 2024 07:44:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGkRgFp2UnHBMShFySNn5ZUoJkcTiZkLGb6XH4AIgpT2EQwBUb5B/6IIfFnFeQvrFXZAn5L6A== X-Received: by 2002:a05:6602:640a:b0:83a:97f6:db4 with SMTP id ca18e2360f4ac-83a97f60e4amr487940939f.10.1729089842994; Wed, 16 Oct 2024 07:44:02 -0700 (PDT) Received: from localhost ([2601:441:8201:e8ff:574d:d195:6f49:7c30]) by smtp.gmail.com with ESMTPSA id ca18e2360f4ac-83a8b2aa28csm79778039f.12.2024.10.16.07.44.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Oct 2024 07:44:02 -0700 (PDT) From: Jacob Martin To: kernel-team@lists.ubuntu.com Subject: [SRU][N:nvidia][PATCH v2 8/8] UBUNTU: [Packaging] nvidia: Include mana.ko in linux-modules-ABIVER package Date: Wed, 16 Oct 2024 09:43:51 -0500 Message-ID: <20241016144352.177011-9-jacob.martin@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241016144352.177011-1-jacob.martin@canonical.com> References: <20241016144352.177011-1-jacob.martin@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/2084598 Include mana.ko in linux-modules-ABIVER, rather than linux-modules-extra-ABIVER. Signed-off-by: Jacob Martin --- debian.nvidia/control.d/nvidia.inclusion-list | 1 + 1 file changed, 1 insertion(+) diff --git a/debian.nvidia/control.d/nvidia.inclusion-list b/debian.nvidia/control.d/nvidia.inclusion-list index 31b1d207b3fa..e04d6d99e6a8 100644 --- a/debian.nvidia/control.d/nvidia.inclusion-list +++ b/debian.nvidia/control.d/nvidia.inclusion-list @@ -122,6 +122,7 @@ drivers/net/ethernet/intel/igbvf/igbvf.ko drivers/net/ethernet/intel/ixgbe/* drivers/net/ethernet/intel/ixgbevf/ixgbevf.ko drivers/net/ethernet/mellanox/* +drivers/net/ethernet/microsoft/mana/mana.ko drivers/net/ethernet/netronome/nfp/nfp.ko drivers/net/ethernet/realtek/8139cp.ko drivers/net/ethernet/realtek/8139too.ko