From patchwork Fri Jan 19 17:19:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Thompson X-Patchwork-Id: 1888596 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 4TGmb62fKSz1yQ0 for ; Sat, 20 Jan 2024 04:20:18 +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 1rQsXG-0004pm-Lm; Fri, 19 Jan 2024 17:20:06 +0000 Received: from mail-bn8nam11on2041.outbound.protection.outlook.com ([40.107.236.41] helo=NAM11-BN8-obe.outbound.protection.outlook.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1rQsX6-0004oW-BY for kernel-team@lists.ubuntu.com; Fri, 19 Jan 2024 17:19:57 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HykUV6t77kfnOUDJ1M2W9uRHQUetQRqODuocvp588Tr/iDZ7sAN7Ge20TT9QFmZf20EWDxKjlpNPvl94YR67DZAO0sEUjEYt+OIGXoiuqQ0VnfC/RRXpeBcGBOfBvlLhBvfk+MLF3CnnkSsEUbj4FPgmdOJPLMSW45cPdqMVrcsF6o5jw/NehoqT6oIM5/rV5Jr82fmuWqkT3mRwZjCCu0mVde1j/I+B7GOUSLwLRoF/HW9MWqR5ypkmRrU5vB6s76gpbCy9VwUusJZJ3GTcMN3Sr9e1JOeWsV0MdRsdwxnVzbf9fAdzGathze67xwFHAJbjWic3TUUSkb2MwewzwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=lIJa2nfL3CE4U6DvFDPKGjFCMr/csn/zTdSPFxJ6hAE=; b=XbaPoRtk9bFEocRa+ucedk5d5bcQwIDxzJ0aTX3H3Tl9ZYlvWklWp/SHlktV5H55mUIObVRShJYBov+evd8Y3wthWTzxpiQh7FssNS1RwDoTa1eVu+4L8Kr1Lk94nSsd6pJAXVOgq4CM7DTeXq3HIq/cCVndamGwLcahP676AqdfvX5cNMGZ+2pEITAFRv308o8/gpN3RP8L04LR2qNiVCjkyxv6SlflMe719qccVyK4UhzbuCZLdN1D22hQzNy0UpVeUXJrzsaDyNi3mYIo7/bGU7WN7tKz+KFRlGBC5oNhbmchWqOj4uJ0d14RLZutUbw95Ss9vqja/ffVA9GQlg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=lists.ubuntu.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) Received: from DM6PR10CA0020.namprd10.prod.outlook.com (2603:10b6:5:60::33) by BY5PR12MB4854.namprd12.prod.outlook.com (2603:10b6:a03:1d1::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7202.24; Fri, 19 Jan 2024 17:19:48 +0000 Received: from DS1PEPF00017099.namprd05.prod.outlook.com (2603:10b6:5:60:cafe::54) by DM6PR10CA0020.outlook.office365.com (2603:10b6:5:60::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7202.24 via Frontend Transport; Fri, 19 Jan 2024 17:19:48 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by DS1PEPF00017099.mail.protection.outlook.com (10.167.18.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7202.16 via Frontend Transport; Fri, 19 Jan 2024 17:19:48 +0000 Received: from rnnvmail204.nvidia.com (10.129.68.6) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Fri, 19 Jan 2024 09:19:39 -0800 Received: from rnnvmail204.nvidia.com (10.129.68.6) by rnnvmail204.nvidia.com (10.129.68.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Fri, 19 Jan 2024 09:19:38 -0800 Received: from vdi.nvidia.com (10.127.8.9) by mail.nvidia.com (10.129.68.6) with Microsoft SMTP Server id 15.2.986.41 via Frontend Transport; Fri, 19 Jan 2024 09:19:38 -0800 From: David Thompson To: Subject: [SRU][J:linux-bluefield][PATCH v1 1/1] UBUNTU: SAUCE: mlxbf_gige: add RX_DMA disable to NAPI poll routine Date: Fri, 19 Jan 2024 12:19:05 -0500 Message-ID: <207cc7259a7de894bf457cfa4f5e67548339089e.1705684124.git.davthompson@nvidia.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: References: MIME-Version: 1.0 X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS1PEPF00017099:EE_|BY5PR12MB4854:EE_ X-MS-Office365-Filtering-Correlation-Id: 43df3d7e-15bb-4848-73d4-08dc1912d6cf X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9hwirwVFRzBNrN5XojCV+QZHBxgDx7nzuIwiLANz+TgjYkJsZSGuaVj+Bnwabov0TlTQ2kqWveopr+rlbedrk5r+YLCg7XwsSghRZRRVFGODiktH0gWQdI8XVNfRJssn5JYQwfc/h1q9oBeohagv4FI+BZ4sBM2mNj7nPZAvEOTswb6NdmZUxMBYP0dnzEN51n1EPZSD7eQp/TZny2mqHCv6l4r9wTtw7wjKXc2lqXskKyrJ7Ev46joIFXb5Y7rz0swIxj8WV8INDtDBiBRuVY+x2dFmFVLIPjbLsjurj1+ZqHDHk0PoMJOFe8Y6l7/OnrIRCY5BHYyeOlI8DV+coPVubaxus/XQbALmCAm4qCyoz9eBBAqY04YNOnEA46FTZDc8FJ/WWn7WOugoy5c0brHwfAOIRZqEhTq98VlKpPQmpXFvXUjd7N96Yk+ZeYd38C9oe80pVIfmOGaCXSt9Uj654NCdF7GeydCY9MyxrseBqq/+ajlPkr0gv6Wyfko+EKDF9DtjlTjtSCmWCJWKZtouPn1LKDEi/IIQVTcTW5KTVaOsujdZsa9VblItujEJJPwYvWcGK5/KoFgZkg+HXaEMfujwA1pldY62D4guzpFluqiKfXZwByJEiwUp09txYhxTGmIePMSwQ3G33Pn1lGKMnGF+Dzomqv/JAE/udI9HUimr4w3ZFmDOucRFQsZdO71xPJNhBgDTINie9TtCiCLriIo4ezLVgXCFr0E1hqFl9nKoOpUZKdOh81txCWOpiwcLLnRm8dNonCk4Z2E9nj3EGPuqu9nYB+TYG8iF4YU= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230031)(4636009)(136003)(39860400002)(346002)(396003)(376002)(230922051799003)(64100799003)(451199024)(186009)(1800799012)(82310400011)(40470700004)(46966006)(36840700001)(26005)(36756003)(478600001)(7636003)(356005)(86362001)(40460700003)(316002)(2616005)(40480700001)(2906002)(336012)(41300700001)(426003)(7696005)(107886003)(6666004)(966005)(5660300002)(54906003)(70586007)(70206006)(6916009)(82740400003)(47076005)(4326008)(8676002)(8936002)(36860700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jan 2024 17:19:48.2230 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 43df3d7e-15bb-4848-73d4-08dc1912d6cf X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DS1PEPF00017099.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4854 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: , Cc: asmaa@nvidia.com, davthompson@nvidia.com Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/2049930 After configuring many IP interfaces, including oob_net0 managed by mlxbf_gige driver, there are periodic connectivity problems to the oob_net0 IP address. This issue is a regression that started after including these two commits into the kernel: revert "UBUNTU: SAUCE: Fix OOB handling RX packets in heavy traffic" addition of upstream "mlxbf_gige: fix receive packet race condition" The fix is to modify the mlxbf_gige driver to include the RX_DMA disable logic in its NAPI poll routine. This logic was part of "UBUNTU: SAUCE: Fix OOB handling RX packets in heavy traffic" but not part of upstream "mlxbf_gige: fix receive packet race condition" Reviewed-by: Asmaa Mnebhi Signed-off-by: David Thompson --- drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_rx.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_rx.c b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_rx.c index 1a1eca08bfb9..a18fa860e5cc 100644 --- a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_rx.c +++ b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_rx.c @@ -308,6 +308,10 @@ int mlxbf_gige_poll(struct napi_struct *napi, int budget) mlxbf_gige_handle_tx_complete(priv); + data = readq(priv->base + MLXBF_GIGE_RX_DMA); + data &= ~MLXBF_GIGE_RX_DMA_EN; + writeq(data, priv->base + MLXBF_GIGE_RX_DMA); + do { remaining_pkts = mlxbf_gige_rx_packet(priv, &work_done); } while (remaining_pkts && work_done < budget); @@ -323,6 +327,10 @@ int mlxbf_gige_poll(struct napi_struct *napi, int budget) data = readq(priv->base + MLXBF_GIGE_INT_MASK); data &= ~MLXBF_GIGE_INT_MASK_RX_RECEIVE_PACKET; writeq(data, priv->base + MLXBF_GIGE_INT_MASK); + + data = readq(priv->base + MLXBF_GIGE_RX_DMA); + data |= MLXBF_GIGE_RX_DMA_EN; + writeq(data, priv->base + MLXBF_GIGE_RX_DMA); } return work_done;