From patchwork Tue Apr 15 23:29:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Nelson X-Patchwork-Id: 14052941 X-Patchwork-Delegate: kuba@kernel.org Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2089.outbound.protection.outlook.com [40.107.244.89]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1814328DEF7; Tue, 15 Apr 2025 23:30:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.244.89 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744759806; cv=fail; b=FyPOjHypJHdnZmqPTBgcQGTVWqA+PaIfYH7wBMvTv12Q2fbLb/H1REtxllpQMVeoLFKlGwF05IzlR6tsbgvaSvjovuamrLKDbF1imFiM40lZwPWJgvfYedwhS7rFFmiykU1gl6WrDo6dp8vHv+3XTb0b7uefZj2O6mjvptkUF5I= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744759806; c=relaxed/simple; bh=jpQHxQaY8VQdeivAMX5f+jDbUr09TpuwO79u4ekMR3I=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=VivbPYZUvvQopiesC5GtCgcw28qRFcE3MV0XEHTJweLeniK27B0P/+ZNlDknA7zHNunUT9ijKurpOtv6K+28+ZYSBWsohSoKJvYN4a/27EbTI87Grrsz+W3uL5sb7b3uSXyqYrUBptesR7xlWP5/nG/Az7ge5RqQzzHfJkGiKf8= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=vUXKfNAA; arc=fail smtp.client-ip=40.107.244.89 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="vUXKfNAA" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=quGCwRLr5aHVPVQBvmhjAFlgWv6bL90cmnpvZnItAkOjsZ/7nTEwI4t6EuaHuKApynKVizvXo7dIKCmIZMKYui2SrEpDbALZ64/HM5bG53P11cUag/i51wZRZ7s8A3pXkGE8j9YnxVW8q9dy9mtqeY7ql76LnlyD4k8zkf0auTcqI/kedswUt51fG0hY+/hUvln6NHMvPQUwQKFekVcNQ3LaEFuYAZCUg1/5joxtdxgEk/mTPUbMkGCLGL8H7m9k5YPfBx2EEBSO0IoXfieKGBrdeuyBPhQjkk7OiYDwZR/B6J2PbbqN3+hxm1qtiQn8r8C8Hjt8qTImrryhhHxGeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=BJbEixpyW5F27jTSxxh1MHL7fmxvgSogQ9tuFoJyR2E=; b=FMAxSjrdBJgCmcME7IGrWpyxvul1wBz3cmegUtL2eMtQxiQO/fzV2DgsUSCJQWSkcP8oEfAq/GJCA6xwpmae68OVl23jh8MO/xN/zmhSJFrCe6zMUq9BTzNyllTlKuIzNpyGuT2Alct+dHoUwBnsuD/WZ1vBDH/FlLsRPxyzDtds6vLkLXstuxXzY/WJDkT4IpaoJhIuIx01/zTjW38YDwF/r6usX9BFb3Q7g7UBkcsmM2mHEgvTCrODmiNpoqKi4hgneAR89j19ayBWqAVkmX117I7XK/W9jqtd8nzQZ0MeFlGaWOGymoQLTB6scLtiKQmjU2jDSil6AYf+0/qPAQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lunn.ch smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BJbEixpyW5F27jTSxxh1MHL7fmxvgSogQ9tuFoJyR2E=; b=vUXKfNAAQDo7CNOuG0wwMJH1m6eeOha53Ix8Kikf0bFNmQaxKvdKz0F5ikB9vzoHrhEUQLr3uKHYY6pky8vboZT8+/XktE+Bfs3/NajeCCDINA2xkmvcgXxg9nKWSgCTBX8s9BYn1dmRJxpYGDu7ENpH2IrC4ygi8j9xpIyerqw= Received: from SJ0PR05CA0070.namprd05.prod.outlook.com (2603:10b6:a03:332::15) by IA0PR12MB7580.namprd12.prod.outlook.com (2603:10b6:208:43b::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8632.32; Tue, 15 Apr 2025 23:29:58 +0000 Received: from SA2PEPF000015C8.namprd03.prod.outlook.com (2603:10b6:a03:332:cafe::94) by SJ0PR05CA0070.outlook.office365.com (2603:10b6:a03:332::15) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8632.26 via Frontend Transport; Tue, 15 Apr 2025 23:29:57 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SA2PEPF000015C8.mail.protection.outlook.com (10.167.241.198) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8655.12 via Frontend Transport; Tue, 15 Apr 2025 23:29:57 +0000 Received: from driver-dev1.pensando.io (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Tue, 15 Apr 2025 18:29:56 -0500 From: Shannon Nelson To: , , , , , , , , , CC: Shannon Nelson Subject: [PATCH v3 net 1/4] pds_core: Prevent possible adminq overflow/stuck condition Date: Tue, 15 Apr 2025 16:29:28 -0700 Message-ID: <20250415232931.59693-2-shannon.nelson@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20250415232931.59693-1-shannon.nelson@amd.com> References: <20250415232931.59693-1-shannon.nelson@amd.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA2PEPF000015C8:EE_|IA0PR12MB7580:EE_ X-MS-Office365-Filtering-Correlation-Id: fc9fc1cd-e387-4741-b04c-08dd7c756f3f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|1800799024|376014|82310400026|921020; X-Microsoft-Antispam-Message-Info: qka+Th4cl3PKbinDGglghvY5GlKmFUDnndl4nCw6iSlMTUeYyPPlOJv2snZBgjUc7gBv/nE409z1lEtqaVF0hpjgK//effkJhxp5q/uF9G94kQcTWOwsiWMh6SuB19M0ubiaNokIJaO4MYg/uz8ySuNETtFhCZg4rrM7/tkkM+MANSqA5fEpj+DLEl7mwAuTZJ/RFhgUBsMoPrie/yANqc7B9/WBbjGrc5AJh7GCTp7n0xTNtnn/VF+fSCd5h4klyeclUpNiaB9Q8KDKBQAq2KiMLornpZpVgX1AQEIG16j1MZInVqzORFkxul8JRYnMRlWECIghAQFTNrl/+qpyCkqEh7zXss75aCzBPtTaWhF/+RT9tRIjmFmreF1hObg4ANMFWUhAgHKVNsIvz97uEWDmVwguctodQfB4NeXWBfwd4B72+XU3+KHf9xmlCVvLY6GC5qDoXd1L343WjKRl3V9kdoqLIoS3v5oZBedbFEToPMOokh0tTGJZbeEW7+HWeK5Eh89mFaLl4hq0bGd+fJaM0Trh3190B3LPEBSWNjevt3rjY6m3WIO0VUS034GlNK+OkGuN/xnX1rs4ONQ6Y+91qTw9YDFPImeYfR4sv+3Z0aViRQqxaiqHW0buAQuV6Q5BYegycsDPNFDarmTH79PfE24GPDRjGgNU8tMaXctsTT07F3I/SFxjgCRWb55BrhMuC11+Xif6zP86F5GPHjSIEQ0Ic51SYNp0Ux/VcGQ9YG/iORI6MFXPbINhzr62HdSkmpDwUSQPa1E2wYrlcay7uqyHftY6eGXZunk/YygddEfnvQfOHlVH8OaVICTowZIzPst1IC0fFmbrdnOJE5SK9LDRLcFvj0Dg8XoyrfQY8V+S2v8WfrkjLMm5omAQy1RLQ+aR8+Lc60aXmitUduP+vlRElH94HWwnB9GKzDy+02CjCA20Zw8+v5L3WrNr1U1wNlyfRMFF3Lpy3bdJwwJJMwaZWclNx2njf0BH/Js98h+PJtJOaffGiHK/cTJZkao81PRzhp+3ArH7GgCe6ZBP87XdGFDcqR2EnR/vh0COfrRL9mpl2C68xYkjZGtjZgw/Ry7DBU0BLGKxQJc6f1DmIimSsa79BSPv4tHoGF9FjfOo3OWHDHB/eg5gjVfv25E39alsfN0pyi9FDLByM4CNgqnloRK03MjcMEbKbChtok+azK25vRDhLDok62qppTqPpABEwfZy+Nkw2RxWS8eV5KuI7jGSwV9ScGlmyBVHTJgoiZWtam4hij9RH2/NlOtGWJkzplA0Tq7/DSNAnK5opjW3Iv/j+LcUMQyGuPf0euYOlPzD7mZtOb2qSkaH75o0ejf8vlgeWMAmrSOhB+eB8WOr7+7bEyOQ2MS2mpQLaE2WEcvcRhjJVaWMuquv3o38seZKYFwHLRhSbory1OhuZlJYAyQffGE5jMZ4KmGA3qQiCjoZEcepY/EutMF3jJSi2jPv323OlQXGI441xz91iC+Rh1qtTL0Lwgj4yh3zKTqrfIA07C7N76f2/nouiRUzf2MVc1Sxj0sdfee2eQ== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(36860700013)(1800799024)(376014)(82310400026)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Apr 2025 23:29:57.5316 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fc9fc1cd-e387-4741-b04c-08dd7c756f3f X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SA2PEPF000015C8.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR12MB7580 X-Patchwork-Delegate: kuba@kernel.org From: Brett Creeley The pds_core's adminq is protected by the adminq_lock, which prevents more than 1 command to be posted onto it at any one time. This makes it so the client drivers cannot simultaneously post adminq commands. However, the completions happen in a different context, which means multiple adminq commands can be posted sequentially and all waiting on completion. On the FW side, the backing adminq request queue is only 16 entries long and the retry mechanism and/or overflow/stuck prevention is lacking. This can cause the adminq to get stuck, so commands are no longer processed and completions are no longer sent by the FW. As an initial fix, prevent more than 16 outstanding adminq commands so there's no way to cause the adminq from getting stuck. This works because the backing adminq request queue will never have more than 16 pending adminq commands, so it will never overflow. This is done by reducing the adminq depth to 16. Fixes: 45d76f492938 ("pds_core: set up device and adminq") Reviewed-by: Michal Swiatkowski Reviewed-by: Simon Horman Signed-off-by: Brett Creeley Signed-off-by: Shannon Nelson --- drivers/net/ethernet/amd/pds_core/core.c | 5 +---- drivers/net/ethernet/amd/pds_core/core.h | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/amd/pds_core/core.c b/drivers/net/ethernet/amd/pds_core/core.c index 1eb0d92786f7..55163457f12b 100644 --- a/drivers/net/ethernet/amd/pds_core/core.c +++ b/drivers/net/ethernet/amd/pds_core/core.c @@ -325,10 +325,7 @@ static int pdsc_core_init(struct pdsc *pdsc) size_t sz; int err; - /* Scale the descriptor ring length based on number of CPUs and VFs */ - numdescs = max_t(int, PDSC_ADMINQ_MIN_LENGTH, num_online_cpus()); - numdescs += 2 * pci_sriov_get_totalvfs(pdsc->pdev); - numdescs = roundup_pow_of_two(numdescs); + numdescs = PDSC_ADMINQ_MAX_LENGTH; err = pdsc_qcq_alloc(pdsc, PDS_CORE_QTYPE_ADMINQ, 0, "adminq", PDS_CORE_QCQ_F_CORE | PDS_CORE_QCQ_F_INTR, numdescs, diff --git a/drivers/net/ethernet/amd/pds_core/core.h b/drivers/net/ethernet/amd/pds_core/core.h index 0bf320c43083..199473112c29 100644 --- a/drivers/net/ethernet/amd/pds_core/core.h +++ b/drivers/net/ethernet/amd/pds_core/core.h @@ -16,7 +16,7 @@ #define PDSC_WATCHDOG_SECS 5 #define PDSC_QUEUE_NAME_MAX_SZ 16 -#define PDSC_ADMINQ_MIN_LENGTH 16 /* must be a power of two */ +#define PDSC_ADMINQ_MAX_LENGTH 16 /* must be a power of two */ #define PDSC_NOTIFYQ_LENGTH 64 /* must be a power of two */ #define PDSC_TEARDOWN_RECOVERY false #define PDSC_TEARDOWN_REMOVING true From patchwork Tue Apr 15 23:29:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Nelson X-Patchwork-Id: 14052942 X-Patchwork-Delegate: kuba@kernel.org Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2068.outbound.protection.outlook.com [40.107.93.68]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 20CE82D86BD; Tue, 15 Apr 2025 23:30:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.93.68 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744759807; cv=fail; b=qJiD0r8Q8WZCxAo8WW+BYNJ+gfGZ30an+sLF+kqKFOGdau4Jgbf234ePJtk0R+jqb5uPnvMaThaWSskilMMANqZZpOjhG0/3msf1KM0m003Mabt/ldczcnyUR2DFF8hFmuPQ9Bmxyq0HgLHYRDN5igYQXBcveY+FeGsHMsJ1W/w= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744759807; c=relaxed/simple; bh=HF8QcBNRxc22CaNKsHz6LG0wnnDqToVHiM1ltIlREbc=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=debxPS55fwmkR5Q0TS6+mEaJZEuSmyzgmdX96Fl6DTqHGcbv0x4XaxEj8Fi3ajmTkKMn1xNdbX73O27KIq3Zlr8kvblIrzGEi/JPXt1KBRwV0MeURHYztvr4GiEc3HDW4bNt9PLKX0aO3pWcp7NBNJOgrOHDSr61nH0eBponSg8= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=G8iH0Q4O; arc=fail smtp.client-ip=40.107.93.68 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="G8iH0Q4O" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Mmfh565nhTeEmbBw4CJ9MD/YoLwP9iJQARxaZmQd51hKmFc2afwf11E0kd2fzvLNxmXP6ynZR1HGn8vbue9LACIsRlXmBrE6swqfnQU+ZoWPZDg9+qogWSc4lQIb9fw0JuGO5qPwdHLyJaBZP1xuXg6BP+y8fFBl8yNlXlMx5CesWgnqVyTkRglInVtZVxIFYfEiwFsH7DSdcuHSIckD9lZaj/lr8WsGQpOS/rk+OoIYdorG+mMOwY0qnUOMri0ksserP4mKlz5CqdqjpTxz/kz4JI41gLJ9Zq22QXoOoZnVDusy0VgFKILgF5iKGB9+6aWp78UKGTbCttlAGJ3rag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=sWVWsskrMQPb1bDZokTXUYW3U5OGmbN6kXjhoCC1dTA=; b=FLXAyCphflN/0nnCVdA3rbSYS+hzXhLTsh4j8JH8CREHNXDTyS4eUvJcrxUhTUzm4XL34RUGQBIJpoF+SjH32wjuAZ53B0dZa6D1UwqJ6BVRXUqyaRTG8L5at6pw7Hy9dDnkoqk60O5QKXqrmvcDYCSfp7HLT+Emrk5CE1/sATwcoBvoxBcjgVRxU0OcGiXf5OE0DaWPlSQslsab7/VvpFLLSHSOe+ZF9EHTmVxJdw5elJDrrdqyj0u3YMHTOEiJoaO9jgu/eHxD1ph/fTlevV6JBI8/96Gjb9206889ccTCK26n6aQCOEUs1I5pfovAcIOljAlAy46wg58oCQrWlA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lunn.ch smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=sWVWsskrMQPb1bDZokTXUYW3U5OGmbN6kXjhoCC1dTA=; b=G8iH0Q4OIGyBgxWfoLwkSERVRyCb0w3jfGw42y7yOdir8HccBESw3ptUM9RpqiDVMZKnE9RgRprdUzpQteYUCC1zPqkI/RquqWixPsGreubNGTlOdKwhYAkzK1YbpuCqYHdPxKsrGCQZB4cbQSx5NxZv21SqnO2swIeVrYE9mgQ= Received: from SJ0PR05CA0069.namprd05.prod.outlook.com (2603:10b6:a03:332::14) by DS7PR12MB8231.namprd12.prod.outlook.com (2603:10b6:8:db::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8655.22; Tue, 15 Apr 2025 23:30:00 +0000 Received: from SA2PEPF000015C8.namprd03.prod.outlook.com (2603:10b6:a03:332:cafe::60) by SJ0PR05CA0069.outlook.office365.com (2603:10b6:a03:332::14) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8655.12 via Frontend Transport; Tue, 15 Apr 2025 23:29:59 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SA2PEPF000015C8.mail.protection.outlook.com (10.167.241.198) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8655.12 via Frontend Transport; Tue, 15 Apr 2025 23:29:59 +0000 Received: from driver-dev1.pensando.io (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Tue, 15 Apr 2025 18:29:57 -0500 From: Shannon Nelson To: , , , , , , , , , CC: Shannon Nelson Subject: [PATCH v3 net 2/4] pds_core: handle unsupported PDS_CORE_CMD_FW_CONTROL result Date: Tue, 15 Apr 2025 16:29:29 -0700 Message-ID: <20250415232931.59693-3-shannon.nelson@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20250415232931.59693-1-shannon.nelson@amd.com> References: <20250415232931.59693-1-shannon.nelson@amd.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA2PEPF000015C8:EE_|DS7PR12MB8231:EE_ X-MS-Office365-Filtering-Correlation-Id: 3a8280e3-d4ac-43b3-0617-08dd7c757059 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|82310400026|36860700013|921020; X-Microsoft-Antispam-Message-Info: ZxX0i6LsmdYHP4t8vaNW+WDgI/tIKXHnHvI5q+JHnLTCwlXZaeCgNP1HPo8tb6zpoYef3XeHe62AGCoLjNlbtCKMC4akikRTOnaBthZq7Y/MR0PRc1WcNYOLyzFJddL2n6Pn9g6r2U4nSWxgsEcepF3gS5NNBpCfs5NIZunB06DOoYQGAJtKMPyiKWGMBo07v9ISesmXa+tF9BecXXOpM8CLkAtqnzUse2uNHmH81FPa65wkyx3UgPo5EKAhvGegXi3EHB1AUQs83DvhH+49VJqnQQmFUwmXJAOSoatLdpoamMjiMsL7bj5Qxvz3yV71KrNTnz7pOMr+UPBtUYLooCwic3K8Lwg3XYdtQBWuZhe6GAOb7ZAG5DhpW7UcS1JGGeZti5sQ4NHnm8pT/UgQFacw9cLBVi1fQxlAvfIz+53xG+MsxFq8q9RsNIqEuTJwuufHM1TY9Ua8Tzu7ftK1SFTwWsNwL7UloUX5OJLXE5QDv4sB0i2pEpMo4LXoBT0zssk6jt0Vu/PW7QX+dgLMZozS9HTmbRUB3tir1lArWBm1t1EIsx3NFUJ4M/uklUbG0zaoM8q84c838jzGWi5v37xaikqQXDyk44eVCnb8T2d+o25Ig84wJWtPkbM803qnyKrPUl5ufazOt+GKSZPuUu7IGiMQcn2W3VXzh6JQI3JEzymM4VEmT9D77WBGHmcMmCBhXcg75UOlW8wfJzTHPi8dBDp556m/LGRtMvQya2eRz0c2pOcKgFqTg3s16vbm/LXajyPWlsdFEAiw64jbbLApyWcjhGnB97Zz9aqeC55wDb1i7PNClm7CexUXuzFRBiz794gk1VPBwXCpXgntdDoYtcjJ40UxhQXJQ99UF1pRMfCNa9mzN61is3Yx12J2winsF3+NUgAkTt3Fz2ewMv0tg15Gg3PK+eEpcOa43KxDc5jEEZ8+3Q3Pw+gD+NL0n+lVQH26sBqDjuh/aNzeKqTd2OeygEd3MjbkDBuXx56VAbcNBcYsFhgQMox9Q5TyJtBgbwRIcyQSeHUjHniz3kuylKapw8thgHWWnJpyNQEAeZRy7wW4HE4MetFttMA7svDvIj464Rmnp8B0qp0vQjhF6mDHaAqwI+zNeCAZ8rP3T4c4m/aMv1wu3sO3H6kI1dbfAKN2IxG0F1/652vgChem10srysRCqoakDhff+2xgOB9XG35ptTMcjDnu76YfhDhPwzX8L8MHYTMcPy60+WJRJtK4zsk3jbZzd61qD/oE01XXJIUBtzghS2wDwoiIwWrZFZIA1f3ZneIrrDiktLmg32oq5nrE0J5CaEKzTNTgvdTVCN8zoNBaNwTG64h03G13QK3X1uS9LrTGzM0GFSV87YRFh5slzQes7ua+pPGmrF2ZF3UzDtmnzD3eujdzLtJ5gr4c3g7MajSym3utaEJ5JSJKO6RigfSZyjNKCCMWZIiNqH1kya9wxv7mvhSVC6qSRL9UVTTk/aNnS/GxYcK+69NkzOyVMNiq4qTR3QFc/Gt0cM0+8jj9aBo4MAx/x0C+bDA6rGg1fDHciDt27A== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(376014)(82310400026)(36860700013)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Apr 2025 23:29:59.3753 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3a8280e3-d4ac-43b3-0617-08dd7c757059 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SA2PEPF000015C8.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB8231 X-Patchwork-Delegate: kuba@kernel.org From: Brett Creeley If the FW doesn't support the PDS_CORE_CMD_FW_CONTROL command the driver might at the least print garbage and at the worst crash when the user runs the "devlink dev info" devlink command. This happens because the stack variable fw_list is not 0 initialized which results in fw_list.num_fw_slots being a garbage value from the stack. Then the driver tries to access fw_list.fw_names[i] with i >= ARRAY_SIZE and runs off the end of the array. Fix this by initializing the fw_list and by not failing completely if the devcmd fails because other useful information is printed via devlink dev info even if the devcmd fails. Fixes: 45d76f492938 ("pds_core: set up device and adminq") Signed-off-by: Brett Creeley Reviewed-by: Simon Horman Signed-off-by: Shannon Nelson --- drivers/net/ethernet/amd/pds_core/devlink.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/net/ethernet/amd/pds_core/devlink.c b/drivers/net/ethernet/amd/pds_core/devlink.c index c5c787df61a4..d8dc39da4161 100644 --- a/drivers/net/ethernet/amd/pds_core/devlink.c +++ b/drivers/net/ethernet/amd/pds_core/devlink.c @@ -105,7 +105,7 @@ int pdsc_dl_info_get(struct devlink *dl, struct devlink_info_req *req, .fw_control.opcode = PDS_CORE_CMD_FW_CONTROL, .fw_control.oper = PDS_CORE_FW_GET_LIST, }; - struct pds_core_fw_list_info fw_list; + struct pds_core_fw_list_info fw_list = {}; struct pdsc *pdsc = devlink_priv(dl); union pds_core_dev_comp comp; char buf[32]; @@ -118,8 +118,6 @@ int pdsc_dl_info_get(struct devlink *dl, struct devlink_info_req *req, if (!err) memcpy_fromio(&fw_list, pdsc->cmd_regs->data, sizeof(fw_list)); mutex_unlock(&pdsc->devcmd_lock); - if (err && err != -EIO) - return err; listlen = min(fw_list.num_fw_slots, ARRAY_SIZE(fw_list.fw_names)); for (i = 0; i < listlen; i++) { From patchwork Tue Apr 15 23:29:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Nelson X-Patchwork-Id: 14052943 X-Patchwork-Delegate: kuba@kernel.org Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2084.outbound.protection.outlook.com [40.107.100.84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A77842918F5; Tue, 15 Apr 2025 23:30:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.100.84 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744759808; cv=fail; b=ReeAhcE6pP+AaFss6MzUFjlhVZdgQ07tdBOs24sDixcQG8M5wog4pAazmwcxLmhSCEKLfVm5f3Ct2PoPPO44ODoaowz9PCfYe391xa09pJP0sFooEEhTDAuTD3owTxBJcsddlrRM4gBltWaOmSZguh4+bJrI9HPRT1e77ZqryE0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744759808; c=relaxed/simple; bh=eGzmJB4g5nECEEF6KArKV5x/OFxuEw9FG0qhVtqYK8Q=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=G8FNNeW8XMsrPmEwbtBo71GWpwZHwV3XwSpcUsjVVNXvHkUNz33wpGZWqc0wXbGCRGhcuF58Pel/xoCJhqIB/KxrXu0qL5D7AASlFetKw2uSLP0X4+e9Q4pyxl26TErJ3vrQg0CUEX4obcpBFzMANMFHHyXG2j4hghiF8UiUoJs= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=msKHurw4; arc=fail smtp.client-ip=40.107.100.84 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="msKHurw4" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=w/57KGmYZSqFn33ROoaH8PIMR5gFB/SBG+XjBUzKAPXeU1cR3zsWG7/DMwGdUFYnJ9g/e/VQZ2vbMSt8BJJZRv8YK4uNUXVPkKg/4fs1w7untFz7mNFcxg7MEDEUp5swC+zT5uf+908Oj5+GMSrU55lTy+5MMlogVwpVOiH+FMKVV26MGqEFdfV9VbpOX3BYY/DLDAJeF8kFGrXMxOGb/M79nO4ddkPKju9aJB0Fc7igGn3vrZzUQOW0NUCwvskwrMajE0v23nbfSg09jOMj6WJnZWF4MJSkqJ21tsdbZnlYJsrB3AM5cQdzZHjFxjnXU0gjdb99PLQStWSonWCyww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=JGxwFUZ634Dmp2Dk5tj3RZGSC+63BKGDM954huSvkRs=; b=gVlbpJ4gDQ/dFuQPXi1O29dNYvuxCM0G+tvcv5sIDPMHBNP/SpN0TNVuPaHFCdsDhyCol+bGWgvpFJyn1atctSCKSTKFz2f8WrOccJvD+bE429+pdzroGE3NOX565FgNaFnpsFaUaPJmEAo5ml+SPSliTWYkbDeibNmoXa3V5F8k4GX7u8kVzY0IrjjvE2nHRuTPdNMdO5mquIhGvzdYqriGDwen1kS7ZbRmEg7+N1OpPXDbIgy5vOdhj2tuehwuqmz31o0ulcSD/HWwNbWXANXYjvGkBC0sBqB0YuJY+HJBgHKtXCyeTPYZdyiuO1RN67h2X7+ZwSMG+PvwhmxvIQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lunn.ch smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=JGxwFUZ634Dmp2Dk5tj3RZGSC+63BKGDM954huSvkRs=; b=msKHurw4LvoyUGpFhZwxu7hyC5zdG+QeEiPcrUsA8jOHUSl60Pb8EUlS75jpxcWzDbh8zXk/r9DG0XtOKcTbaNsgmv//MlOHsPo4odMmPbfSdEtd6rZyqyYgnGWXOAOBkUcSSxQ8NducS6Z+m01rVeuDIQNC2FOz6BM3RluLuYw= Received: from SJ0PR05CA0075.namprd05.prod.outlook.com (2603:10b6:a03:332::20) by CY8PR12MB7612.namprd12.prod.outlook.com (2603:10b6:930:9c::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8632.35; Tue, 15 Apr 2025 23:30:01 +0000 Received: from SA2PEPF000015C8.namprd03.prod.outlook.com (2603:10b6:a03:332:cafe::85) by SJ0PR05CA0075.outlook.office365.com (2603:10b6:a03:332::20) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8655.18 via Frontend Transport; Tue, 15 Apr 2025 23:30:00 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SA2PEPF000015C8.mail.protection.outlook.com (10.167.241.198) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8655.12 via Frontend Transport; Tue, 15 Apr 2025 23:30:00 +0000 Received: from driver-dev1.pensando.io (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Tue, 15 Apr 2025 18:29:58 -0500 From: Shannon Nelson To: , , , , , , , , , CC: Shannon Nelson Subject: [PATCH v3 net 3/4] pds_core: Remove unnecessary check in pds_client_adminq_cmd() Date: Tue, 15 Apr 2025 16:29:30 -0700 Message-ID: <20250415232931.59693-4-shannon.nelson@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20250415232931.59693-1-shannon.nelson@amd.com> References: <20250415232931.59693-1-shannon.nelson@amd.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA2PEPF000015C8:EE_|CY8PR12MB7612:EE_ X-MS-Office365-Filtering-Correlation-Id: fbf5f112-d6fc-464c-37d3-08dd7c75712d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|1800799024|376014|82310400026|921020; X-Microsoft-Antispam-Message-Info: h4Tch5O0njlOHLV/+VLSptd8hFwlji+rz2T9hqvBSVRLYpH17gEBOzxZqZNjwwpqRQXrWcfQRMTDgpzv194rKvexS75TcnJESCbaxxNCOAgTUSuAM7ADloCRhis3sfahcKMH0y8KNTwXUrWFvFpRBXPoxqTRmWJz1FZEQv5UYzgKh3F/C9quLAafmFrdHmyoQi77kHjEQZL+fPdl/UFxAkkeEwDAshH67+1ns4//LmMBsm+tyRDLS7Er0rioSn2T3orvUXGEvkDtWT+jXZrkW5u561Wf7lpbxjIxYO72quNNEvAUI3HzeYMRiCmWkCNhKA/niyPy9C/wUYSpvvEoIK/z4ABYRBpObqLX+DDeohXDgk2aGG6hje4KnP0yivygQG+h8X4uMQriesXSgshXx2k2ExTH45y5Wd45hWWMbvW0NsettCR4D0AFnuDRznMAGsPDx7mFYiwFbDn/bkVB75C6S9rHsXSt+JThS5ns1k5sFlfasmvK8dUsHVCM9kA6Zt9M2tAn9iTn23P8JbohYkPTLYyv9nbOVY42OfBD3vINbq3zRsWGAUa7rpEx7HDciXtuJLxuI+FKA2iHzozgdPZ8wIICFCnJkz/EiM44BeJPip55p1H25Lqv9MC+38lKUKaJRnlwMaFNbulBqC11DYGjupJxC6YlGxuwec/gTaV35Og4wgzoZ1wD0CqF0T1tttgA2FGr3+r60ZHi7NeJFUvE0B/u71ZuRD0d1CQKTH9ZQHfAMBCzauAZAqfcb86bi6uabjbNouNZsJ6Fx7JYmPCMrFoZjbUbY1ro76Jr86XMybURhV52WnG3gMMKp+jYrmCIKXuZ7mP8GrV1hpdnbs/9YJvD96ygEt3KjJ9L09zhiR6tni0v9r1PvohTLPtzcD5MzTVAX/AjQbD/PQ9yMda1no8BzXqORoG8o3e1n15NL1Pu+9Sz8fkRPnMtGs360jkQpbKUTR/wGd1VJUptqqOdJHI6hBJc9/9mLNhb9EpVTAWIkKWpWQnS35Dj7TlISd6Sj74M668xpr7MmjTbaBKokqoCanmWLhZnctYf6HM7O8WnarMjKig/mryfAoD89MP9iUBFETMoPDBQGzRiQRbOWoMvCn5oWI7pXvK5XH1hWCWlyqOJX5IkwUwBQ4OrUq1b813zxgCfMhAPGXfE+422ykhwblyQIHtmEXKfaGIjT74NczBmXOLWTr4ukfaTpu529SCDXhvV2RI6o0LAFg3yw3UGO3oIMVSUw685N4MJ52z3BO9hLR+EdTWkqgJ9S1MGmQUlngKpxGD8nVpG9ZkMBTojL3YAgFoeikUCqEu5cr7Dg12RmUFxScM0u0I3ql90/vjnvcQaVDfEx1Ocoy7a4eVFxPS0uDIGnzLqwLPL33ylfh+oDlxMRQUI6BuOyhjRvp+NGW4jC8NnFYnFEQr7HeQfHxXVKQPV0aG9wa/O75DCXGRUTpD4toLHzntR7Z6v5sp21lvfkT/haZNYPd0jKQWYEfSRYDGh9hblhVhrpLrXEtsIhPsvCY09TVCgyEPYRhWndzZzIiQxhAFcHw== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(36860700013)(1800799024)(376014)(82310400026)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Apr 2025 23:30:00.7503 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fbf5f112-d6fc-464c-37d3-08dd7c75712d X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SA2PEPF000015C8.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB7612 X-Patchwork-Delegate: kuba@kernel.org From: Brett Creeley When the pds_core driver was first created there were some race conditions around using the adminq, especially for client drivers. To reduce the possibility of a race condition there's a check against pf->state in pds_client_adminq_cmd(). This is problematic for a couple of reasons: 1. The PDSC_S_INITING_DRIVER bit is set during probe, but not cleared until after everything in probe is complete, which includes creating the auxiliary devices. For pds_fwctl this means it can't make any adminq commands until after pds_core's probe is complete even though the adminq is fully up by the time pds_fwctl's auxiliary device is created. 2. The race conditions around using the adminq have been fixed and this path is already protected against client drivers calling pds_client_adminq_cmd() if the adminq isn't ready, i.e. see pdsc_adminq_post() -> pdsc_adminq_inc_if_up(). Fix this by removing the pf->state check in pds_client_adminq_cmd() because invalid accesses to pds_core's adminq is already handled by pdsc_adminq_post()->pdsc_adminq_inc_if_up(). Fixes: 10659034c622 ("pds_core: add the aux client API") Reviewed-by: Simon Horman Signed-off-by: Brett Creeley Signed-off-by: Shannon Nelson --- drivers/net/ethernet/amd/pds_core/auxbus.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/net/ethernet/amd/pds_core/auxbus.c b/drivers/net/ethernet/amd/pds_core/auxbus.c index eeb72b1809ea..c9aac27883a3 100644 --- a/drivers/net/ethernet/amd/pds_core/auxbus.c +++ b/drivers/net/ethernet/amd/pds_core/auxbus.c @@ -107,9 +107,6 @@ int pds_client_adminq_cmd(struct pds_auxiliary_dev *padev, dev_dbg(pf->dev, "%s: %s opcode %d\n", __func__, dev_name(&padev->aux_dev.dev), req->opcode); - if (pf->state) - return -ENXIO; - /* Wrap the client's request */ cmd.client_request.opcode = PDS_AQ_CMD_CLIENT_CMD; cmd.client_request.client_id = cpu_to_le16(padev->client_id); From patchwork Tue Apr 15 23:29:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Nelson X-Patchwork-Id: 14052944 X-Patchwork-Delegate: kuba@kernel.org Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2059.outbound.protection.outlook.com [40.107.220.59]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 022D92957D5; Tue, 15 Apr 2025 23:30:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.220.59 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744759808; cv=fail; b=bF74vPVhcCZDdondeYROUiMzOurbLCAAxHk+koa2EBwgpej7/nqzG2uBNqLjqNpA5HljeYnUHXKS8kQSDqOI7TVXSqNQDP8EhbmLuE+8BPYupBgUYbDKcSz7jO2lgVNh+5om2i1FXUvTkSL2I5YCSTghnLQIeeKsSPshPfUobis= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744759808; c=relaxed/simple; bh=Xl5CxA2KahM9UQTmF87lPXPekYu6kKPOD9zR02bKDJI=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=qO9rlp/MrU5tY96GVfZL8KSxM/GeyVolLdD5IXfqiHxMO9Bo5SzXnbYhASfdcD8uwyyuUM8uTfOdbfnlQkVVf0mUbKzFJJqfHVR63ojyrasppC4/8B2hu5hbuPD6OcXDVtsX1jJOKOItRvf2jsLuqylMWCddx+z35e+fX6Z9ZSw= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=t1B33wOE; arc=fail smtp.client-ip=40.107.220.59 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="t1B33wOE" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=nvZ5d27DzgIYlMHsNUffxrinlhI25FB4xwwGHmO7jUPGxIOk70OMgyIFyXj5p6DnbFndJOxKdIEO5o4yv5sTUkw/5a3Pk5XjF8QXeKneuM1nsNaeHllaT0KFUub87LqwLGA2v3QfrUAX837wS6sZBW26qRU+jWdI34Ld3UaKPGbJZttDY61G3bENYFikH1tnUjWP44+OeDRiIIOSxroJAX9q5EvqTFTYtnYtpfxlY8W3nmFMdNMOMoPtf67IDN4qFL7kk4/IgHNzCncJQE9qhb0bX4z2jzEHBRDkakOMyTwwhbQySPwViPUJ0age/1Z8r+idJ6XwvANPjLOkn1Tn7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=j927mxE6lkJ6neG8DDki8hJvPmQwMaRuI/AfSDrrhr0=; b=iEptq1J7WcAMlIZaFU2ND/kYYD0hAJCFytABzV/nJH1EFHNO4aFUMlEuM1Gqm0CZUlOUaVGYFb/419rmdTDLEE4PE12SrBzGaaPJ3DQrzM0sNFHGED6WmyBmmVncKyKjyU7fM1XT39EuzEi0nX+v/Z0qz4vt9siNw1ifE/+9Re80uCq0cUK/CEg38OEAc0eCMIt7Mi/NgpxxRka6Ieb5GOlwe/TDPNmBgU/ioMsJVvgaMrx1TREIviu3oVrixHX+lU9r05aie+P+CDI6NUvpybabcFrxBgQ3VvGyK89h3h+o9+h3n73ec00bGaKwUMnE2bIrXrAXzXX0MfqT3dRBdA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lunn.ch smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=j927mxE6lkJ6neG8DDki8hJvPmQwMaRuI/AfSDrrhr0=; b=t1B33wOEh8kJqXVXOJANKpjsROOG7hnuPIeDyFiA7DGT9arkLPUYLjYW1PZhVmAKpjOV8QmUAVd39Vdsj3wBdm+4Ty9C1uOnrfWzxrDxA1QNMH+32hRvEBEukSbHLkL3+vT+XgzgQ376lP3eShnmZcCh47pIRmD0BSXODF65peg= Received: from SJ0PR05CA0065.namprd05.prod.outlook.com (2603:10b6:a03:332::10) by PH7PR12MB7940.namprd12.prod.outlook.com (2603:10b6:510:275::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8632.32; Tue, 15 Apr 2025 23:30:01 +0000 Received: from SA2PEPF000015C8.namprd03.prod.outlook.com (2603:10b6:a03:332:cafe::36) by SJ0PR05CA0065.outlook.office365.com (2603:10b6:a03:332::10) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8655.8 via Frontend Transport; Tue, 15 Apr 2025 23:30:01 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SA2PEPF000015C8.mail.protection.outlook.com (10.167.241.198) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8655.12 via Frontend Transport; Tue, 15 Apr 2025 23:30:01 +0000 Received: from driver-dev1.pensando.io (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Tue, 15 Apr 2025 18:29:59 -0500 From: Shannon Nelson To: , , , , , , , , , CC: Shannon Nelson Subject: [PATCH v3 net 4/4] pds_core: make wait_context part of q_info Date: Tue, 15 Apr 2025 16:29:31 -0700 Message-ID: <20250415232931.59693-5-shannon.nelson@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20250415232931.59693-1-shannon.nelson@amd.com> References: <20250415232931.59693-1-shannon.nelson@amd.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA2PEPF000015C8:EE_|PH7PR12MB7940:EE_ X-MS-Office365-Filtering-Correlation-Id: 291dbca8-0e5f-4ccb-94a6-08dd7c7571ab X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|82310400026|36860700013|376014|921020; X-Microsoft-Antispam-Message-Info: Jc4XoEg7Ak2FrPexUw7Q4S0FsmtLefdgfAQQqLvZZ0bGeBXpw8Gg7eqWZL+n1fg/wFtN3eoMpN/Sf0SjDSl3sack+QckHu1wMySzaxCKgOT4QtmWIO43z6is809c4+TvqUTAHf5Xs6dAouBhMGkmUCl/wThc2kKzobhzEOo84T2x2lgB7eDNdUFs1fnChoySxDAkGRqTxJqecsE5dDtLCyAJnjoY06eKRhUbgepDPs5SoQD2DzRwSxn0ju8XswOoppz5qK8X5TfIMJ1NwZh1XWibJI2GvJpbWBiqaZJUIebGnzNe/XpqMC1T5fRu026qNxIdnzX/eo5+/9cFYHkVuzGl9GLRY8g8SuntitzuoGC6Y08gh6fhNm9w7+XT6rQjywzSQC/tDUb1es8HpT8J423YgZlVgqj2OKn2Sq8aVbdbKfIS/2nwWdoEgTh6H2aFC16CmfkLJz+GoXzB5QR1TJmjxoy/qtDCQmYNDvwgAqJ4co+65pyCbVBqaWGIy0vjgLpgwPaLoF69z5WiaMcGl7KSSmXwA3aNKtKo0s50rCDzOLDiIJDfcwvulfE5spyQRophYbS2aivEy9YBeI9h8u8QH6HSuJ2sMEVmLoCIEkkQQSxH6VAP817ckIEWZXVucnPbrWDclOaVmLDN5zrgzC5FobHLvrnp46OJIiYtLG/qT0hYFQuTVusly2nUSgcedRldDMLnd1etZ2NWgflq86xzFbLvxIa9yelSRNklBweqlbE0+OEWV1h/y2UcFrwtXeFjp3S39SK2tZwntkFuPS74gYqVhWCAOr4EUGx31UAgER9uyLyBwZ3vyWpygzZkPQLeVRJDckMVxsMTQl5jiL+mydQ2uMo36N2SJuQ7HOsVsHJBxmmRmtbQ6U04hj4hKihA5IHQoLrHaqMEmpW/TxYH593tsmLKwp52KTLP9ve9uWtFk4iaiE9vaZy8ZBvsVV4f8r5vWiJjbgt3cLBm3qE+X6TrxAKkF/ek/m9UXAYhgy14CGsXz3RzjNLR0lxcUIiu9oIG3oLi+wc4Mx+wJpe9U/pV44BrzadIh2z1XDoaTyaTIxN3KDdWKBYCBrCnuUt2jd0AmzAdP9Kh9p3hjcVOzBiHpcbwSJctLDOlgq9zUFlCQYBulD38kznoX038UgNVvoaphnOagNRFOrxE5B2tB18nRD7mFWbjzpKuQa3PVVxeX2jZXbVyfTP6hPTQJZPh9I36YNsEcuqsrwYM01/aftyCbKypgz1yOXiwo4F/6wIr2FH9WWV+QbUYQZVPvyLdqxI4KKaZDTplYyDZUMULpb22IqBLKQpx9W6ORT2nEALxTYnJzuXPcXWwvExFqkLKZX2w+fK5au+BeuWtacOqjvyUoKHd+q1dczkEi40zAU2dI3UoU0l6wVADjlazueBbz/HsiPI4L1RhQu23aM/muDTcdqoIKZeDl1RNxV53rHJd0WdU2xzeZVB4w/wmXC6E4+rHvhSv8td/c92FsXx4VR3YAMY/7jTNtT1sRIGxkZchTpFPnQiqYdix39AnbWOG/uBgwHS1MyihdcrJkA== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(82310400026)(36860700013)(376014)(921020);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Apr 2025 23:30:01.5941 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 291dbca8-0e5f-4ccb-94a6-08dd7c7571ab X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SA2PEPF000015C8.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB7940 X-Patchwork-Delegate: kuba@kernel.org Make the wait_context a full part of the q_info struct rather than a stack variable that goes away after pdsc_adminq_post() is done so that the context is still available after the wait loop has given up. There was a case where a slow development firmware caused the adminq request to time out, but then later the FW finally finished the request and sent the interrupt. The handler tried to complete_all() the completion context that had been created on the stack in pdsc_adminq_post() but no longer existed. This caused bad pointer usage, kernel crashes, and much wailing and gnashing of teeth. Fixes: 01ba61b55b20 ("pds_core: Add adminq processing and commands") Reviewed-by: Simon Horman Signed-off-by: Shannon Nelson --- drivers/net/ethernet/amd/pds_core/adminq.c | 23 +++++++--------------- drivers/net/ethernet/amd/pds_core/core.h | 7 ++++++- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/drivers/net/ethernet/amd/pds_core/adminq.c b/drivers/net/ethernet/amd/pds_core/adminq.c index c83a0a80d533..9bc246a4a9d8 100644 --- a/drivers/net/ethernet/amd/pds_core/adminq.c +++ b/drivers/net/ethernet/amd/pds_core/adminq.c @@ -5,11 +5,6 @@ #include "core.h" -struct pdsc_wait_context { - struct pdsc_qcq *qcq; - struct completion wait_completion; -}; - static int pdsc_process_notifyq(struct pdsc_qcq *qcq) { union pds_core_notifyq_comp *comp; @@ -112,7 +107,7 @@ void pdsc_process_adminq(struct pdsc_qcq *qcq) /* Copy out the completion data */ memcpy(q_info->dest, comp, sizeof(*comp)); - complete_all(&q_info->wc->wait_completion); + complete_all(&q_info->wc.wait_completion); if (cq->tail_idx == cq->num_descs - 1) cq->done_color = !cq->done_color; @@ -162,8 +157,7 @@ irqreturn_t pdsc_adminq_isr(int irq, void *data) static int __pdsc_adminq_post(struct pdsc *pdsc, struct pdsc_qcq *qcq, union pds_core_adminq_cmd *cmd, - union pds_core_adminq_comp *comp, - struct pdsc_wait_context *wc) + union pds_core_adminq_comp *comp) { struct pdsc_queue *q = &qcq->q; struct pdsc_q_info *q_info; @@ -205,7 +199,6 @@ static int __pdsc_adminq_post(struct pdsc *pdsc, /* Post the request */ index = q->head_idx; q_info = &q->info[index]; - q_info->wc = wc; q_info->dest = comp; memcpy(q_info->desc, cmd, sizeof(*cmd)); @@ -231,11 +224,8 @@ int pdsc_adminq_post(struct pdsc *pdsc, union pds_core_adminq_comp *comp, bool fast_poll) { - struct pdsc_wait_context wc = { - .wait_completion = - COMPLETION_INITIALIZER_ONSTACK(wc.wait_completion), - }; unsigned long poll_interval = 1; + struct pdsc_wait_context *wc; unsigned long poll_jiffies; unsigned long time_limit; unsigned long time_start; @@ -250,19 +240,20 @@ int pdsc_adminq_post(struct pdsc *pdsc, return -ENXIO; } - wc.qcq = &pdsc->adminqcq; - index = __pdsc_adminq_post(pdsc, &pdsc->adminqcq, cmd, comp, &wc); + index = __pdsc_adminq_post(pdsc, &pdsc->adminqcq, cmd, comp); if (index < 0) { err = index; goto err_out; } + wc = &pdsc->adminqcq.q.info[index].wc; + wc->wait_completion = COMPLETION_INITIALIZER_ONSTACK(wc->wait_completion); time_start = jiffies; time_limit = time_start + HZ * pdsc->devcmd_timeout; do { /* Timeslice the actual wait to catch IO errors etc early */ poll_jiffies = msecs_to_jiffies(poll_interval); - remaining = wait_for_completion_timeout(&wc.wait_completion, + remaining = wait_for_completion_timeout(&wc->wait_completion, poll_jiffies); if (remaining) break; diff --git a/drivers/net/ethernet/amd/pds_core/core.h b/drivers/net/ethernet/amd/pds_core/core.h index 199473112c29..84fd814d7904 100644 --- a/drivers/net/ethernet/amd/pds_core/core.h +++ b/drivers/net/ethernet/amd/pds_core/core.h @@ -88,6 +88,11 @@ struct pdsc_buf_info { u32 len; }; +struct pdsc_wait_context { + struct pdsc_qcq *qcq; + struct completion wait_completion; +}; + struct pdsc_q_info { union { void *desc; @@ -96,7 +101,7 @@ struct pdsc_q_info { unsigned int bytes; unsigned int nbufs; struct pdsc_buf_info bufs[PDS_CORE_MAX_FRAGS]; - struct pdsc_wait_context *wc; + struct pdsc_wait_context wc; void *dest; };