From patchwork Wed Oct 16 13:36:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacob Martin X-Patchwork-Id: 1998080 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 4XTBpn6gH2z1xvV for ; Thu, 17 Oct 2024 00:37:21 +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 1t14D9-0005Fr-OR; Wed, 16 Oct 2024 13:37:11 +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 1t14D7-0005FU-TH for kernel-team@lists.ubuntu.com; Wed, 16 Oct 2024 13:37:09 +0000 Received: from mail-il1-f197.google.com (mail-il1-f197.google.com [209.85.166.197]) (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 BED093F2D4 for ; Wed, 16 Oct 2024 13:37:09 +0000 (UTC) Received: by mail-il1-f197.google.com with SMTP id e9e14a558f8ab-3a3c70e58bfso27302625ab.3 for ; Wed, 16 Oct 2024 06:37:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729085828; x=1729690628; 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=XOhNlkMQXAdB8vfdXqLmKjltiz5IVRQpkj34t/acU0+96/7Y7B6Hg/7mAs/xy81i1f 1f5oL2ZY/FZKq0um36vdhAoYsz0Hk/96aPKHPgTGJ8SVymlN2S9qhaY5qlq7AC14gKQg 3GciQd40bL1C3UHxsA/L5bBdtlW0dPpQIFQMNqVp9iNDRCQllO72M9IsBE6leJB27tcd GIg0EhRsLm4+S9r0udrlUvK31/6wE6BttdCFxqohdZQjPjHvaU+bpjowG1F2jA1zmKgP x8cbe1jmt75fS9RCH/BrXgEvuygqoQKI4xhBgrgQptQo8C1aSc8SQOxlnGutorHYzQpc QqYQ== X-Gm-Message-State: AOJu0YwMDshZX8fqlGlSmXfLSCvvt2vj0kMNILXb4LZfbpFg04BpVWGm O/cNYaSc5MaVQOmr3ZYg0Dk/gaGI7zNnTgPB6Vd5hMAshXbaJc0eMjyu0KimOW6hG2Xbq2e2KWA AqE5N4g6m7EYpFpR77L4Pia9qHIFQxdo4IYLIQVHppX/AO5Q0RfeM+D2uAc7otmwXr90aJJJCiL R2R6dXDuxYlw== X-Received: by 2002:a05:6e02:12c5:b0:3a0:4a91:224f with SMTP id e9e14a558f8ab-3a3bcd9847dmr120208915ab.1.1729085828612; Wed, 16 Oct 2024 06:37:08 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF0i5UmiJP3fbLNudZORc9AfGvuuAvT4T4LYTKeYVnizT3y1ctbQqSljrrjsILVimrbZlKiBA== X-Received: by 2002:a05:6e02:12c5:b0:3a0:4a91:224f with SMTP id e9e14a558f8ab-3a3bcd9847dmr120208575ab.1.1729085828124; Wed, 16 Oct 2024 06:37:08 -0700 (PDT) Received: from localhost ([2601:441:8201:e8ff:574d:d195:6f49:7c30]) by smtp.gmail.com with ESMTPSA id e9e14a558f8ab-3a3d70cd21bsm8219825ab.45.2024.10.16.06.37.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Oct 2024 06:37:07 -0700 (PDT) From: Jacob Martin To: kernel-team@lists.ubuntu.com Subject: [SRU][N:nvidia][PATCH 1/8] net: mana: Enable MANA driver on ARM64 with 4K page size Date: Wed, 16 Oct 2024 08:36:59 -0500 Message-ID: <20241016133706.173515-2-jacob.martin@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241016133706.173515-1-jacob.martin@canonical.com> References: <20241016133706.173515-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 13:37:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacob Martin X-Patchwork-Id: 1998083 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 4XTBpq425Kz1xw2 for ; Thu, 17 Oct 2024 00:37:23 +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 1t14DD-0005Hf-0n; Wed, 16 Oct 2024 13:37:15 +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 1t14DB-0005Gr-IN for kernel-team@lists.ubuntu.com; Wed, 16 Oct 2024 13:37:13 +0000 Received: from mail-il1-f197.google.com (mail-il1-f197.google.com [209.85.166.197]) (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 D8C433F129 for ; Wed, 16 Oct 2024 13:37:12 +0000 (UTC) Received: by mail-il1-f197.google.com with SMTP id e9e14a558f8ab-3a3bcae85a5so6950115ab.1 for ; Wed, 16 Oct 2024 06:37:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729085829; x=1729690629; 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=HkQEdfGGwiM+bXiPezLUIsWDGs81x4ggJkRXcH88eAU=; b=Qne8dPXEvRGxS/lV+yMtCfN5ysTlPI/9ymGsfRy+HX3/VzAvkKtghav+PQTnKxQUpS FS1ZqySoFanNGdQJDh7ffX1JpzKJbxp4ESP5/pp5B5s2574cL8WUsO3msmIxfuUH0NTK dXuHqVg7PJ2khSiUru6GHLb5RkMItAqJJAsRUar1wjFmmOozb3F54+RaJNglmr1KTrvs v5IhZ5l361Rfee5fVn2aHZvgq18D3lXU5bDMeZbvmKos5gGFIyu6MMazHlvvPILUMMpg B7zZn3aKSeH9ZaPfToqufxTaYDpWoh4N5O0bKKuukGgMXnZFCra1T1RDfDtPfLtVNVuO YrlQ== X-Gm-Message-State: AOJu0YyCACiOkBg086iAY5vnJlQi69GK2Pk07WK+8+5cQs1JzH/4Kdwz i1dVdfO2H4xS3Oj1tpgG5j1J7W9JjVrCP0sA+CcT0I3vY6qZoqARncO6tA/WfbY5ezWk6d3uCcH XB66Mb/3O3XmBKRQJol8o18NrFMtEgcxNrEUO9E+NOAMtW8nF1k4in8IA9XB0b+QlK2IVUl2CT1 s1plkbkZwwvw== X-Received: by 2002:a05:6e02:1389:b0:3a2:6d54:33df with SMTP id e9e14a558f8ab-3a3dbe7bcc1mr30653495ab.4.1729085829633; Wed, 16 Oct 2024 06:37:09 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG5NKEZM8mo5JoHFc5ANZly5hfRWWTSL3cls1gjwGwVmhkPdsjoHt0SARczkR0fo1EPJU/ZKg== X-Received: by 2002:a05:6e02:1389:b0:3a2:6d54:33df with SMTP id e9e14a558f8ab-3a3dbe7bcc1mr30653365ab.4.1729085829227; Wed, 16 Oct 2024 06:37:09 -0700 (PDT) Received: from localhost ([2601:441:8201:e8ff:574d:d195:6f49:7c30]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4dbecc6a786sm796154173.177.2024.10.16.06.37.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Oct 2024 06:37:08 -0700 (PDT) From: Jacob Martin To: kernel-team@lists.ubuntu.com Subject: [SRU][N:nvidia][PATCH 2/8] net: mana: Add support for page sizes other than 4KB on ARM64 Date: Wed, 16 Oct 2024 08:37:00 -0500 Message-ID: <20241016133706.173515-3-jacob.martin@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241016133706.173515-1-jacob.martin@canonical.com> References: <20241016133706.173515-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 linux-next) 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 13:37:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacob Martin X-Patchwork-Id: 1998082 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 4XTBpp6gR6z1xvV for ; Thu, 17 Oct 2024 00:37:22 +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 1t14DD-0005Hq-6y; Wed, 16 Oct 2024 13:37:15 +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 1t14DB-0005Gs-JD for kernel-team@lists.ubuntu.com; Wed, 16 Oct 2024 13:37:13 +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 0EA173F5B5 for ; Wed, 16 Oct 2024 13:37:13 +0000 (UTC) Received: by mail-il1-f198.google.com with SMTP id e9e14a558f8ab-3a3c24f3111so34066245ab.1 for ; Wed, 16 Oct 2024 06:37:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729085831; x=1729690631; 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=Dcx0KQne/pyAOkYBUrxEfuhg2r+iGXG8RDaovtJJtPM=; b=vfH9nkMy0Z9sCG/LlDyolPT8p0G/QbcnAr4iKNwqRyB5z5O4NNnhOXerAQ9Tk/nUJA /v9iL5HtuEDOxWCaXTMnyQkbcz7U2T6LVFgdyOnzuGaLSfF0SuZ6fEJN8OFRwHCMSkPf 8BEMkfuZUeYiw/8Bofhrk2VdW1LJlg6Bu8IJ02uGrXrUS3XGWFPyQwslN6FCxVoqZd7E 7fZ58IJ6ha6tWhgV1l41gLEHxMNLh+AdFc8ySMhbotylpBHl2W7m/7Vyx14Ak0uCVpLk /f0ztIz3B5hm0mvIcivBaM1eAtR6B9dfo7TG0ADxMmm2Lg086HR3SBqXRgCOQV63gtTu dVZA== X-Gm-Message-State: AOJu0YzdN94/VFPI4UeK+B/De4bFMmQwv39N7CKg7kst5sCSnqEv6cYc 8WtxyTaOXwdyOZnC/l4CPhiN2/ZWroLy1j5CjcZyUjdoFr7UHz1BloELaj0wCBR9Rs31dr55SF0 goMSaUI9CMoJv9lnDbQ2l7Rj6rY3aRGKkXsUbLmBxjMrgHCnPAb/tyIaV7i4bFRkgwSWvpQYRHp P3vIDtUL7/bQ== X-Received: by 2002:a05:6e02:20e9:b0:3a3:5fad:77b4 with SMTP id e9e14a558f8ab-3a3b5f233d6mr184743525ab.3.1729085830815; Wed, 16 Oct 2024 06:37:10 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH9cosbkGgnL3zKDi7EeVxYyqwF+Tge0kPwCH7tGSUbVgLhbjcjuwrvGX7Z101liDjGi+abZw== X-Received: by 2002:a05:6e02:20e9:b0:3a3:5fad:77b4 with SMTP id e9e14a558f8ab-3a3b5f233d6mr184743135ab.3.1729085830324; Wed, 16 Oct 2024 06:37:10 -0700 (PDT) Received: from localhost ([2601:441:8201:e8ff:574d:d195:6f49:7c30]) by smtp.gmail.com with ESMTPSA id e9e14a558f8ab-3a3d70cd192sm8200545ab.46.2024.10.16.06.37.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Oct 2024 06:37:10 -0700 (PDT) From: Jacob Martin To: kernel-team@lists.ubuntu.com Subject: [SRU][N:nvidia][PATCH 3/8] net: mana: Fix race of mana_hwc_post_rx_wqe and new hwc response Date: Wed, 16 Oct 2024 08:37:01 -0500 Message-ID: <20241016133706.173515-4-jacob.martin@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241016133706.173515-1-jacob.martin@canonical.com> References: <20241016133706.173515-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 netdev) 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 13:37:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacob Martin X-Patchwork-Id: 1998088 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 4XTBpw0V59z1xvV for ; Thu, 17 Oct 2024 00:37:28 +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 1t14DI-0005Q2-GP; Wed, 16 Oct 2024 13:37:20 +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 1t14DC-0005HF-4s for kernel-team@lists.ubuntu.com; Wed, 16 Oct 2024 13:37:14 +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 8358E3F6B0 for ; Wed, 16 Oct 2024 13:37:13 +0000 (UTC) Received: by mail-io1-f70.google.com with SMTP id ca18e2360f4ac-83542e22fd7so539280439f.0 for ; Wed, 16 Oct 2024 06:37:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729085832; x=1729690632; 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=IWI9n67C4U3yGl+fLRjOH+JaHpxwCLBF7EzehaaPbD1WVKJg5BaRElrQoskSBZCfnS SK16/+qnBTqhT7Ay3VHHmL61hu1p9oHZhF6tyQ1td91Sd5oW2rKYbNoo5pv6zXlYML9C X1nohh8nv+2FkAIPypBA+SQQu11i/av4lTfkdOLy0ReTBlCDXDjo2oiT6EYhH1AcaJVM +reS2sM2Kpj4ElMs16bnWTmI9nfjCopTOvdsohKkqAkRF/nYmJhjKqzChGTF0NM4vhvC ZUg8ucTg5oqHD0+3UoSBOK4WTlQl9kBZGXrmOfPHimaxwGA2RDxmG3R67mFq9aaHeAih g4PQ== X-Gm-Message-State: AOJu0YyR8VlMS8807telZWpHdftGSHVyJAHND3O23Waj0f3qL8asno8z rzJDjsCuTik8AiSpSnRp9HIpqxranCCvzxpWyvGJWCc6v125KBDonXs/lj0qL9r3YHYcslfzRoG ryZ8HYF+6KjaOqL+9j1zpqwhHRzKpioChcpHkZSeG9KtW7BfSzseU5439ckia6YT1FZYF30i2cm n+4Ng4cg5Aiw== X-Received: by 2002:a05:6602:2d93:b0:83a:ac93:f94d with SMTP id ca18e2360f4ac-83aac93f9c9mr40883039f.3.1729085831850; Wed, 16 Oct 2024 06:37:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF1uKOoTQt5dR/umxHdeOdZ/6cw9N7hhcGKyujUankHEfBqn5YB6R6PgtZnYSsN+V17QcRFDw== X-Received: by 2002:a05:6602:2d93:b0:83a:ac93:f94d with SMTP id ca18e2360f4ac-83aac93f9c9mr40879239f.3.1729085831444; Wed, 16 Oct 2024 06:37:11 -0700 (PDT) Received: from localhost ([2601:441:8201:e8ff:574d:d195:6f49:7c30]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4dbec9632a3sm804364173.7.2024.10.16.06.37.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Oct 2024 06:37:11 -0700 (PDT) From: Jacob Martin To: kernel-team@lists.ubuntu.com Subject: [SRU][N:nvidia][PATCH 4/8] net: mana: Fix RX buf alloc_size alignment and atomic op panic Date: Wed, 16 Oct 2024 08:37:02 -0500 Message-ID: <20241016133706.173515-5-jacob.martin@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241016133706.173515-1-jacob.martin@canonical.com> References: <20241016133706.173515-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 13:37:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacob Martin X-Patchwork-Id: 1998084 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 4XTBpr5yFwz1xvV for ; Thu, 17 Oct 2024 00:37:24 +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 1t14DE-0005Jn-Iw; Wed, 16 Oct 2024 13:37:16 +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 1t14DC-0005HV-Nn for kernel-team@lists.ubuntu.com; Wed, 16 Oct 2024 13:37:14 +0000 Received: from mail-io1-f69.google.com (mail-io1-f69.google.com [209.85.166.69]) (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 714743F129 for ; Wed, 16 Oct 2024 13:37:14 +0000 (UTC) Received: by mail-io1-f69.google.com with SMTP id ca18e2360f4ac-832160abde4so57037539f.1 for ; Wed, 16 Oct 2024 06:37:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729085833; x=1729690633; 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=X/IQvnl70tyyrILQr4apKg95hLQ4URZej2CrtOEU0u0C2tXiMXXCvnEcm3q/cJgDQx hqLqAAnIKfY/U7RCxBjtJaB7/CsLWev6nuaw0sWPE6JhD+owVPny8+i3u3x4vlptEpWS hYTbXC28X/Uehq3KXAw7wvH+3w+EImWZ90gEiiOZW09z8JZlG+UcqVWc4BXQ7jG/Svjm Yfpab0Qqg64kTuelrOi9JZ9ea9p1FieFysYDghHm/VQYedHJ9aZo23Q8XjatRAbKKpwb hpxZqVCDcl6ISqPYwlwIXhCC/yGX9ZxEogqjYLbJF98oEIs43FBN8HV6JZJQ1u0v1ZMs Arzw== X-Gm-Message-State: AOJu0YwkZ/6j3njvYTF9oiS6yqG9ZNiUAi1MKzKo1EeQh0X61Z0VFXvf jcC/sYbxF82JquzL1RDDNlnW1yMCdYNK3cXEVwcfkL5S/gPkNVGJ/Qa3PtKgXUKcwa9RPwahsgX /E9/mjJ5xsgG9H2x18hKkhwPLOHszr2h/OQJfN2nqSjBCy6dxXWZ4eRCLyWepHkIumeSom7FzGb SVukgHNffd1Q== X-Received: by 2002:a05:6602:4286:b0:835:394a:d784 with SMTP id ca18e2360f4ac-83a942d0737mr295055139f.7.1729085833230; Wed, 16 Oct 2024 06:37:13 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF/xm65i3/m9r2ltiOcPZuazk0II8w7HsZAJmsn+wbcrs+LwMDHrElILYBIG/6cu964DiGevg== X-Received: by 2002:a05:6602:4286:b0:835:394a:d784 with SMTP id ca18e2360f4ac-83a942d0737mr295053239f.7.1729085832766; Wed, 16 Oct 2024 06:37:12 -0700 (PDT) Received: from localhost ([2601:441:8201:e8ff:574d:d195:6f49:7c30]) by smtp.gmail.com with ESMTPSA id ca18e2360f4ac-83aac152cf2sm5570039f.49.2024.10.16.06.37.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Oct 2024 06:37:12 -0700 (PDT) From: Jacob Martin To: kernel-team@lists.ubuntu.com Subject: [SRU][N:nvidia][PATCH 5/8] RDMA/mana_ib: use the correct page table index based on hardware page size Date: Wed, 16 Oct 2024 08:37:03 -0500 Message-ID: <20241016133706.173515-6-jacob.martin@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241016133706.173515-1-jacob.martin@canonical.com> References: <20241016133706.173515-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 13:37:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacob Martin X-Patchwork-Id: 1998086 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 4XTBpt6qmyz1xw2 for ; Thu, 17 Oct 2024 00:37:26 +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 1t14DG-0005MK-P8; Wed, 16 Oct 2024 13:37:18 +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 1t14DD-0005Ia-LX for kernel-team@lists.ubuntu.com; Wed, 16 Oct 2024 13:37:15 +0000 Received: from mail-il1-f197.google.com (mail-il1-f197.google.com [209.85.166.197]) (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 811303F2D4 for ; Wed, 16 Oct 2024 13:37:15 +0000 (UTC) Received: by mail-il1-f197.google.com with SMTP id e9e14a558f8ab-3a3c9886eccso32231755ab.2 for ; Wed, 16 Oct 2024 06:37:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729085834; x=1729690634; 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=Xa28GuYbk6HnLXlKu3ptuDobQKG68pV6fvUc+PCnGr77y5qJ7uFoPqBzC1fNnTuw/O DoMsV8zdlg+ILNiwZ4tkKOOiuwyqvZJqp50bn1S6GDG8HsjM2lcr7fAKwMM7FyTnVVvk kmYoaoSzQ3Oc4aYQuatYlaAO0eDsLUbrWscVheuzy0Ly5UaSI3cELMUSdMNzmc5/1ans /unTijW1g4P8EML35LZBPeXXEf/oaBozWiO9vDl+zMSUIeLrI7xQG9YDTnVIxrxEnTW6 0ldHDUeVplpMF6Z5OMAqvQ8T2dQIaFK+ihcV702c4phhTa91Wr2e95hIh9+ddws5hQIc 6j6A== X-Gm-Message-State: AOJu0Yy6io9XJLTHDS7J2/k6VsvbGlEJVSClJKrsJ4ZgeQqIcsRrWBkk 4F3HBmuzzufknCqF5W1odIBZGHUd21you97DTqqF+/cRQNyDujcaq+CMU0waMAS8gQPZTs6326l ZbqKWeeEcIWDsJG3Z+7qAigb7BHjXmQWLDjPFRg+fvpeOp0OJM8HBSxqCySeb+DXNKUpmfZHWDQ 6w0lFErL0gOQ== X-Received: by 2002:a05:6602:3f91:b0:837:7e21:1677 with SMTP id ca18e2360f4ac-837929fd68fmr1734854939f.4.1729085834229; Wed, 16 Oct 2024 06:37:14 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHprxrgYA4k5aNenLA0+/BmedMPy0GPlzLJ2M/Pz13gcUtZNUc2CD3gvYklZOw5W7LTPbHmvA== X-Received: by 2002:a05:6602:3f91:b0:837:7e21:1677 with SMTP id ca18e2360f4ac-837929fd68fmr1734852339f.4.1729085833928; Wed, 16 Oct 2024 06:37:13 -0700 (PDT) Received: from localhost ([2601:441:8201:e8ff:574d:d195:6f49:7c30]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4dbec9632a3sm804380173.7.2024.10.16.06.37.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Oct 2024 06:37:13 -0700 (PDT) From: Jacob Martin To: kernel-team@lists.ubuntu.com Subject: [SRU][N:nvidia][PATCH 6/8] RDMA/mana_ib: use the correct page size for mapping user-mode doorbell page Date: Wed, 16 Oct 2024 08:37:04 -0500 Message-ID: <20241016133706.173515-7-jacob.martin@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241016133706.173515-1-jacob.martin@canonical.com> References: <20241016133706.173515-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 13:37:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacob Martin X-Patchwork-Id: 1998085 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 4XTBpt6007z1xvV for ; Thu, 17 Oct 2024 00:37:26 +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 1t14DH-0005N3-3F; Wed, 16 Oct 2024 13:37:19 +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 1t14DE-0005KF-Sr for kernel-team@lists.ubuntu.com; Wed, 16 Oct 2024 13:37:16 +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-1.canonical.com (Postfix) with ESMTPS id BD3343F2D4 for ; Wed, 16 Oct 2024 13:37:16 +0000 (UTC) Received: by mail-io1-f71.google.com with SMTP id ca18e2360f4ac-8354a877867so525176139f.3 for ; Wed, 16 Oct 2024 06:37:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729085836; x=1729690636; 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=kg5FSWPvQC47aLV87GgaloPimcBaou6/sBmWsglH3bWIK7zmNGRSXjhxo+PSra9Apx Ji2Okv8xST9Y92vfgBaN3JijHupQN6ua9hqFhET4DkQ98QBOlohGe0qIMURGD3KR5dKX gg+j0IUXLIColHQxLaXEnadatybUn1MgMVpU5m8tzTy85JykWkzpSVMmCjAEbVvxR3al BfwF7N/G1yQTqYsr+eRRQn7dv9kd9JD+8rD4zD9f/ZUwsNH3KjgTItFhtyiIKTHL4RyT Fz9eHITwK9z5x6zc/ZISa7ld89EywwJo/yiBReXHbfrrG2o6IB6bw0PGC0jurBdq0HOU enlQ== X-Gm-Message-State: AOJu0YxUG6vG9Y6cVFnl4X51IIVyLEOnOIhXsU0RtBP5iGvBeyGwGaRK mc+5LlprCdRlzGikAaEH6SqmPSldN45JxDoARPatDRbe9IjELg3/sQQTBDT3L7arFJq3VIf5iU4 Qec2qg/af1J9/UW4j6qgw0dgFW1DLTWS8vGJp6o9CxtmqDNGPbYxOhf84BN/Zrtiblc4CtkY+eI kOsG3RPDT0/w== X-Received: by 2002:a05:6602:2d94:b0:838:9b6:46a3 with SMTP id ca18e2360f4ac-83a94711dedmr340252239f.15.1729085835689; Wed, 16 Oct 2024 06:37:15 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF3gQC+vjvdD8/vXfdUo3rKIWFV/wd1DBACeG/1FhctG5LN76VdHK6rkOhnF9AHDazO8m43nA== X-Received: by 2002:a05:6602:2d94:b0:838:9b6:46a3 with SMTP id ca18e2360f4ac-83a94711dedmr340250039f.15.1729085835265; Wed, 16 Oct 2024 06:37:15 -0700 (PDT) Received: from localhost ([2601:441:8201:e8ff:574d:d195:6f49:7c30]) by smtp.gmail.com with ESMTPSA id ca18e2360f4ac-83a8b53cc1csm78403139f.48.2024.10.16.06.37.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Oct 2024 06:37:14 -0700 (PDT) From: Jacob Martin To: kernel-team@lists.ubuntu.com Subject: [SRU][N:nvidia][PATCH 7/8] UBUNTU: [Config] nvidia: Enable MANA configs on x86 and arm64 Date: Wed, 16 Oct 2024 08:37:05 -0500 Message-ID: <20241016133706.173515-8-jacob.martin@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241016133706.173515-1-jacob.martin@canonical.com> References: <20241016133706.173515-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 13:37:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacob Martin X-Patchwork-Id: 1998087 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 4XTBpv2ndnz1xw5 for ; Thu, 17 Oct 2024 00:37:27 +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 1t14DH-0005Nf-AQ; Wed, 16 Oct 2024 13:37:19 +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 1t14DF-0005L8-T8 for kernel-team@lists.ubuntu.com; Wed, 16 Oct 2024 13:37:17 +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 A36563F129 for ; Wed, 16 Oct 2024 13:37:17 +0000 (UTC) Received: by mail-io1-f70.google.com with SMTP id ca18e2360f4ac-837f97fcc95so491811439f.3 for ; Wed, 16 Oct 2024 06:37:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729085836; x=1729690636; 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=Kaij28snWNSRykW8GwWJMm/y2ra0U0/DxN7zAvlKWq9q/v4KlWlmi6zQ4LarLtCdaq rqraZAsXEr+sWC9GWb2LBUXlGzZJD9xlGKxlyTrTpsUXognkp/lvasEdzgqkq1Ef9U42 uNRDHDCj26wY5qD9Yy3EKGuMDn84CNpoa/cjEIDMsiz4ntqh0I+eJiyPN+JfV9stAHTJ MCX6nKU2yozsGcOisYgqg5dic8Mf3zyRsNRI/B6pmNus4pPpUh5bmcAc4KjYpF4UQBsO o+m0s2i0K6m/FDNpzYo9v/RzKi+CJ+YaH2CifS8DoFPGb95f/xHetXm8l0bGXKtAc39U RTRw== X-Gm-Message-State: AOJu0YwkpzqzWdtwDxOvnffE7+BsqvkCRRz5pY6omKcKxmF1A3pcLYKy wFC1Lt2GRojFwLDggZkgXbBbv44OIuqXfTEn5Jg7q79adPPdAfmZnVbHmU5bUE0RWbp9ltoNw6L Pf9tGRAnzLdOGw7tcqxYhQ+d2uy5irVhYVA4ZVC1Y+Dk/o5wRNqxDSQA6L29FCxhM0HgWnI1ZJ2 GnfPQwg5J0iQ== X-Received: by 2002:a05:6602:3d1:b0:835:4b2a:e52b with SMTP id ca18e2360f4ac-83a64d5f185mr1682202439f.10.1729085836596; Wed, 16 Oct 2024 06:37:16 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE5Kd5I4IOBawh7mZPvNfaptVumWId0otAOZvKoHorTYdsXNpb8EkuitdHUxOIsJgtP++Bvzw== X-Received: by 2002:a05:6602:3d1:b0:835:4b2a:e52b with SMTP id ca18e2360f4ac-83a64d5f185mr1682199239f.10.1729085836278; Wed, 16 Oct 2024 06:37:16 -0700 (PDT) Received: from localhost ([2601:441:8201:e8ff:574d:d195:6f49:7c30]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4dbecc6a77bsm808181173.172.2024.10.16.06.37.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Oct 2024 06:37:16 -0700 (PDT) From: Jacob Martin To: kernel-team@lists.ubuntu.com Subject: [SRU][N:nvidia][PATCH 8/8] UBUNTU: [Packaging] nvidia: Include mana.ko in linux-modules-ABIVER package Date: Wed, 16 Oct 2024 08:37:06 -0500 Message-ID: <20241016133706.173515-9-jacob.martin@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241016133706.173515-1-jacob.martin@canonical.com> References: <20241016133706.173515-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