From nobody Sun Feb 8 09:32:53 2026 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8EA8031AF25 for ; Sun, 25 Jan 2026 12:18:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769343537; cv=none; b=gwolQ2YJIqmBknwU7gBn3gHGzWjcekIQeEHcu94+fu8bhsMYg2Du24RhHBbhS+p7olzgEJOx43mOW16G+PF0TfBJjnnFoIbcN77YSXPEvv2Im0FAva/RQQzmdCT3AWsxBSVc4Zwg6UX+7IF9vehyjzaZiPOJyZzSBKnZCnW9ovo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769343537; c=relaxed/simple; bh=cL2WwYEYrOj2TIZHpzBc+McaMibair9DAj52Xdpsq3M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FyYdgNQkJ9fMqH+dnXTbSmQqADIT3+/Q9XqzIokccj483lz4+g+wj+d6oekPMIObJW1TYNgLv7HBD7w1QhxA4CbE5XOKKcY2gMlbF8NbOMR0f6wlWdhB8GVlNpBVA4fbmTe6H1wPPI9e9YPeZBYxk0x7gi8lGwm4bGm2No0CinE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=gft9xM8d; arc=none smtp.client-ip=209.85.214.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="gft9xM8d" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-2a0fe77d141so20786155ad.1 for ; Sun, 25 Jan 2026 04:18:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769343536; x=1769948336; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=nQLEjpoaTZ5WPWDSuakk1TbfMfDUPRk42g1n/YO4vJY=; b=gft9xM8d1utFQDpmnImZ6sRTVC9GMHyFosJ0nSwuOjtQprGg7Dg66S8af4u1b5mwg8 4mOWgSsQSNRQQTOtBITICFXgqtNT9g8GEyqHnw2tg0Xz/NUG6uUrXd2G9ZaqRhCEP8tj DVm6Sa8T8CLJyk/hDheSMa9vqfVTyUfLqefIX/te7nU4L+ZVdUvvpHAXAcrF1mVRsqn7 ffH+I52hT1SnF8XoGjm5o+dd7VfqtDLE5WLRchngYFZLW5KAXEKDLKJnAeB+39AYS0t8 VDW+G8bHO3m+ps1DRMEqpXpvExxovhOXnPMOmPhE4nixVtUz1yjJE5XeTybxHJklCgBV Hm6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769343536; x=1769948336; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=nQLEjpoaTZ5WPWDSuakk1TbfMfDUPRk42g1n/YO4vJY=; b=f4NW0TneyywlN0gLmHg8kTrOi1aygmSCj06OXmfd4lvuu24RPhQrDL87wnW6FIJLGH d8naQ701J9G1SvlaU5yYYKmHh2w3Cag/E658CSh8D3RD/A4ip0tGP+cLLNIGjE//pxMI r+VgVwrVtY4O4r6/yRn4mGLWsXrX9Js5QTCcsuHzrrsGg3J53PYxJcYiIQ1gFmo2/jnG xb3RpKq/t4O+R9xWprBIjUY38cZnuGJWhSQMNS+R2HryFRx3jU1eb8td2aDBHv2dtAa7 x0NOPJX5v2ZdDxC2mX1scdd53uN22R339AFJ9piCcgqP1jsR1xI4UpTOgzIMYu9wEmWH JR/w== X-Forwarded-Encrypted: i=1; AJvYcCVhHnYfjrD77BzZYeo9MU6D7X3JNLe6ZmtzLtuxrhRimf9sTrS9FJ3dhDusgBS8bAG9NCgzgWGfj6+LuBc=@vger.kernel.org X-Gm-Message-State: AOJu0Yx5RkiwBPCJMJ4SEIv5F4q5lCeiAAPgpAcHgYXqzvTw2/+LwYIb C5J7bS1ZaptTsweL745zy6+FhZZvzXq6OM3mQOFZ/f6HFLCN+JLSvmgA X-Gm-Gg: AZuq6aLKGq/mZE5axxYnisSRYCfgH/EfeBCUY6qFa2ARkKmOGi7/LHADxtgQVvZtMuz PHczK7JtiJT+JCbJFRclDk6Rz1fn4I7EB6TAwF/LO7hGaM+Z1zeztyipfIPxOpfTUy5/HWFTYeU 8Bm4WdxDGKqTS4tEJdFdSJgJcPDDieLeIeAgJrYBVnDBkcA3muAQhjxdBOeJOv4RKpSWHpfzgBv JqVysZ1Psig2wTUmclZrDtqxlU5axuN7ECvddHKAGnMq/mA79DCWukhyBdwJKGknachZpufoIjG bac31OoT/biWgQIg/viyDf41/eHh3rL6MZW4RH2fd9qfRLXTutPlHxcItOShTKOsmUveo8URyC2 sy0tAvbJ8541pBzeuQBE20n4GhKQhWt5Y6W5dcuWfBRR8+KdifsaGkKEQey+0C0jefcVDHofeRV f6SdXKmqFNYf4/hOvj9iul3NsnygtUAvRRJ16ngEvR X-Received: by 2002:a17:903:285:b0:2a1:10f6:3c1 with SMTP id d9443c01a7336-2a84524a14emr16781685ad.26.1769343535861; Sun, 25 Jan 2026 04:18:55 -0800 (PST) Received: from localhost.localdomain ([113.218.252.97]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a802f974d8sm66774625ad.63.2026.01.25.04.18.51 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 25 Jan 2026 04:18:55 -0800 (PST) From: chengkaitao To: kashyap.desai@broadcom.com, sumit.saxena@broadcom.com, shivasharan.srikanteshwara@broadcom.com, chandrakanth.patil@broadcom.com, James.Bottomley@HansenPartnership.com, martin.petersen@oracle.com Cc: megaraidlinux.pdl@broadcom.com, linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, Chengkaitao Subject: [RFC 1/2] megaraid: Fix the issue of erroneous reset of Words in reply_desc Date: Sun, 25 Jan 2026 20:18:41 +0800 Message-ID: <20260125121842.79839-2-pilgrimtao@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260125121842.79839-1-pilgrimtao@gmail.com> References: <20260125121842.79839-1-pilgrimtao@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Chengkaitao The following panic occurred on kernel 6.6 (arch: loongarch): Call Trace: complete_cmd_fusion+0x180/0x7c8 [megaraid_sas] megasas_isr_fusion+0xd4/0xf0 [megaraid_sas] __handle_irq_event_percpu+0x70/0x228 handle_irq_event+0x44/0xf8 handle_edge_irq+0xe8/0x328 avecintc_irq_dispatch+0x68/0x120 handle_irq_desc+0x5c/0x78 handle_cpu_irq+0x6c/0xa8 handle_loongarch_irq+0x2c/0x48 do_vint+0x7c/0xd0 sched_update_worker+0x8/0x90 worker_thread+0x218/0x480 kthread+0xf0/0xf8 ret_from_kernel_thread+0x28/0xc8 ret_from_kernel_thread_asm+0xc/0xa0 Observed symptoms during the issue: complete_cmd_fusion(struct megasas_instance *instance, u32 MSIxIndex, struct megasas_irq_context *irq_context) { ****** while (d_val.u.low !=3D cpu_to_le32(UINT_MAX) && d_val.u.high !=3D cpu_to_le32(UINT_MAX)) { /** When the issue occurs: d_val.u.low =3D=3D 60293120 d_val.u.high =3D=3D 0 reply_desc->SMID =3D=3D 0xffff **/ smid =3D le16_to_cpu(reply_desc->SMID); cmd_fusion =3D fusion->cmd_list[smid - 1]; scsi_io_req =3D (struct MPI2_RAID_SCSI_IO_REQUEST *) cmd_fusion->io_request; /** cmd_fusion becomes an invalid pointer **/ ****** } In the complete_cmd_fusion function, the following assignment exists: d_val.word =3D desc->Words; Thus, reply_desc->SMID =3D=3D 0xffff may be caused by a concurrency-related corruption. Reproduction probability is very low. After code review, I suspect the following race condition scenario: interrupt(complete_cmd_fusion) cpu1(megasas_reset_reply_desc) while (d_val.u.low !=3D *****) { scsi_io_req =3D cmd_fusion->io_request; d_val.word =3D desc->Words; reply_desc->Words =3D cpu_to_le64(ULLONG_MAX); } Note: This is a proposed patch for discussion only. It has not been verified to resolve the issue. If you have alternative suggestions, please join the discussion. Signed-off-by: Chengkaitao --- drivers/scsi/megaraid/megaraid_sas_fusion.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/meg= araid/megaraid_sas_fusion.c index a6794f49e9fa..3d3480b19734 100644 --- a/drivers/scsi/megaraid/megaraid_sas_fusion.c +++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c @@ -4282,16 +4282,23 @@ void megasas_reset_reply_desc(struct megasas_insta= nce *instance) int i, j, count; struct fusion_context *fusion; union MPI2_REPLY_DESCRIPTORS_UNION *reply_desc; + struct megasas_irq_context *irq_context; =20 fusion =3D instance->ctrl_context; count =3D instance->msix_vectors > 0 ? instance->msix_vectors : 1; count +=3D instance->iopoll_q_count; =20 for (i =3D 0 ; i < count ; i++) { + irq_context =3D &instance->irq_context[i]; + while (!access_irq_context(irq_context)) + cpu_relax(); + fusion->last_reply_idx[i] =3D 0; reply_desc =3D fusion->reply_frames_desc[i]; for (j =3D 0 ; j < fusion->reply_q_depth; j++, reply_desc++) reply_desc->Words =3D cpu_to_le64(ULLONG_MAX); + + release_irq_context(irq_context); } } =20 --=20 2.50.1 (Apple Git-155) From nobody Sun Feb 8 09:32:53 2026 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0F1D631985D for ; Sun, 25 Jan 2026 12:19:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769343542; cv=none; b=SDWFna7tSWrkjI0tymGv/LwQED6jZPZKxclPmcHI6dcF/8G+Y4IhARYj4MSySwb8EKGNR7lCbznlxOth3YUFTwJapm/IDwsT3Jig04315mX2aqtk2yAR+2VhI5Fa/k1QyjzyF7xEG8RMgrZdAdbW37x5vC+/hKHeX2K8qkxw3EM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769343542; c=relaxed/simple; bh=UfZLTG3BY76eQmvrJZoKh2ydo53KYQ7gI/Q5BDw5Gns=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iYXMF4Jc5YYj4GOW1wWq6tRJJikMbNo5N2myh/RW1HWGcrE93gt1GqihA87bg6UEFS+nf5W6N84MfPBYtNjnJOVCA/zb1sARqd+uERk5rpvUWbzHFvE50zTEroiZm9izLqlQFwJviXtTJBRtTEfH81iQ5LicXI1+xK/gOMXyCIk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=lzlsmVyx; arc=none smtp.client-ip=209.85.214.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="lzlsmVyx" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-2a102494058so22490215ad.0 for ; Sun, 25 Jan 2026 04:19:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769343540; x=1769948340; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fqrS1FqBluHn0sbWWyJsNAR0qxaXDS+eOYJqNFFyYfA=; b=lzlsmVyxhpx9vgXBNVrmFYsusgOG+Lqmc1mRJne+FFZgo+i69YMXD/U+EVTNvtBZKk aA2ItMqFsiDkr2ZMQTOcSN7TSphrpAzqyGnuTZV+gHDMpmas8lJ5Ptas8D5W6oWg3JUl 8ZkqzEmY9EijZ6wqFGudqByWMYsZ6iTu9V9vsHyRLmYZzIBf9D3JMrcPtjfpallqL8WO xkucBu1soJv4WGSXUg38y1ufDbv7rDFdA8eZP/w9NdXzPnXNOFn7zg0LPyi8gK3bPo1H eD8zJUwECDWKSDh8RtHNXvNEKkmmE08BjWz+n8cf25p9C7nVLtaigA72ZrQBzgqEaCYY 3kZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769343540; x=1769948340; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=fqrS1FqBluHn0sbWWyJsNAR0qxaXDS+eOYJqNFFyYfA=; b=aEzfpRQunOAz83RzJdORjbCctBd1kjQAshtWBC5za6YFfBwxmSiO1mqrqu9Q4EnLOe jtYltMbB8I1KqUmwuVlvCkS+Du/SnimefTAeOyf+CzFZfgIwGPz1Uz9Ci0TMNRLvnGn/ WwTDCiX0OKKh9ZiXxorxswTg+FaqIK630CSseeLVkJNC60iemUSsejaTdrecIp68ROu9 Pxs78YwbYPoMJgaFtIICvsZ/lzeSY08ImoTCN7vLJcHyUIY9F3XGwTJ1pSjSwVRqdJnR yhd3xqvPLmrBeEd8LlljD/kZq7Rav5DoVHUl+6aKqAJU68238hSJVsxqDXNAkW2Kbomo h+0A== X-Forwarded-Encrypted: i=1; AJvYcCV/BK7+k2kKi9bmjhBpWITQiYDUhw4S3QdvI0osifub27zGC4EMmBFhKZjfIBuM/yfGqaQfCuAlo/lzHfA=@vger.kernel.org X-Gm-Message-State: AOJu0YxtjQ0mnE02yLV5L3JlU44oAAuyleXqtdkX9zDm/UtkQYQrS/oE XBXQ2tddruO9t2Qsg+17M7GoehFVhO58ETj146GFm8ZhBtIh3IEI1pOi X-Gm-Gg: AZuq6aL7qMDLKWzXL5DoN2VRdE2S434gbkaqVHX1U9D4t1QtftTXVMGjY5huI6mozvp BFdHwVYShGH9sZFFEMaQqQC3zTTxFrW5tWdV9IxQQGv0jehCDxyBNJ7iZMawmViIJhZ/0e2ndAV zJbn6jalUW8ZxAB1yPuTsWmQ/TFJLrNZov3vBxhEjaToeuziLoOkY6t1vi/8z9fMVX8EWCvSFea dkLHFxxRiWIWAE1H7ZFDRUG8vLbJySdorzu+dBMYzQ7tZ5rpZHRNJT5rWdbiGalVzyNY+YVJb6Q CukbkIw0XHsXjW2iVG1hkK3u0GhU7ovO5eHZR6jboInarqmQ8eyjDFylN/52Aa86RBBqjBGdoPA ZRCRRKd+etXslb7HGD68wnROb4CJ7SSqDhWCxtJ2yMuK8Une1opFC4WAZVr4s63sEoNikPHVNT3 ziTB6NYmBW70m93NL6m2UIIQvO4oWNXOde4OMoqXfL X-Received: by 2002:a17:903:2347:b0:2a0:fb1c:144e with SMTP id d9443c01a7336-2a8454deb18mr14023355ad.7.1769343540309; Sun, 25 Jan 2026 04:19:00 -0800 (PST) Received: from localhost.localdomain ([113.218.252.97]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a802f974d8sm66774625ad.63.2026.01.25.04.18.56 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 25 Jan 2026 04:19:00 -0800 (PST) From: chengkaitao To: kashyap.desai@broadcom.com, sumit.saxena@broadcom.com, shivasharan.srikanteshwara@broadcom.com, chandrakanth.patil@broadcom.com, James.Bottomley@HansenPartnership.com, martin.petersen@oracle.com Cc: megaraidlinux.pdl@broadcom.com, linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, Chengkaitao Subject: [RFC 2/2] megaraid: replacing fusion->busy_mq_poll[*] with irq_context->in_used in megasas_blk_mq_poll Date: Sun, 25 Jan 2026 20:18:42 +0800 Message-ID: <20260125121842.79839-3-pilgrimtao@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260125121842.79839-1-pilgrimtao@gmail.com> References: <20260125121842.79839-1-pilgrimtao@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Chengkaitao The following two types of kernel panics occur on the 4.19 kernel: Call Trace: complete_cmd_fusion+0x448/0x6a0 [megaraid_sas] megasas_blk_mq_poll+0xa8/0x110 [megaraid_sas] scsi_mq_poll+0x38/0x50 blk_mq_poll+0x198/0x2d8 blk_poll+0x60/0x70 swap_readpage+0x1b0/0x260 read_swap_cache_async+0x5c/0x78 swap_cluster_readahead+0x1e0/0x2b0 swapin_readahead+0x100/0x4c0 do_swap_page+0x244/0xb40 __handle_mm_fault+0x4b0/0x560 handle_mm_fault+0x114/0x280 do_page_fault+0x1f8/0x4c0 do_translation_fault+0xa8/0xbc do_mem_abort+0x50/0xe0 el1_da+0x20/0x94 Call trace: complete_cmd_fusion+0x448/0x6a0 [megaraid_sas] megasas_isr_fusion+0x98/0xa8 [megaraid_sas] __handle_irq_event_percpu+0x64/0x260 handle_irq_event_percpu+0x28/0x60 handle_irq_event+0x50/0xf8 handle_fasteoi_edge_irq+0x190/0x208 generic_handle_irq+0x3c/0x58 __handle_domain_irq+0x68/0xc0 gic_handle_irq+0x78/0x180 el1_irq+0xb8/0x140 Later, we applied commit 9650b453a3d4 ("block: ignore RWF_HIPRI hint for sync dio"), and the issue disappeared. Although most of the mq-poll paths have been removed upstream, io-uring related calls still remain. We cannot completely rule out the possibility of [patch 1/2] causing the issue. I still suspect a concurrency/race condition between megasas_blk_mq_poll and megasas_isr_fusion. Although historical patch commit logs mention that interrupts are disabled when polling is used, I haven't found code evidence to confirm it. Replacing fusion->busy_mq_poll[*] with irq_context->in_used serves two purposes: To handle synchronization issues between mq-poll and megasas_isr_fusion To handle synchronization between mq-poll and megasas_reset_reply_desc Note: This is a proposed patch for discussion only. It has not been verified to resolve the issue. If you have alternative suggestions, please join the discussion. Signed-off-by: Chengkaitao --- drivers/scsi/megaraid/megaraid_sas_fusion.c | 11 +++-------- drivers/scsi/megaraid/megaraid_sas_fusion.h | 2 -- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/meg= araid/megaraid_sas_fusion.c index 3d3480b19734..b647bec7115b 100644 --- a/drivers/scsi/megaraid/megaraid_sas_fusion.c +++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c @@ -1871,9 +1871,6 @@ megasas_init_adapter_fusion(struct megasas_instance *= instance) MEGASAS_FUSION_IOCTL_CMDS); sema_init(&instance->ioctl_sem, MEGASAS_FUSION_IOCTL_CMDS); =20 - for (i =3D 0; i < MAX_MSIX_QUEUES_FUSION; i++) - atomic_set(&fusion->busy_mq_poll[i], 0); - if (megasas_alloc_ioc_init_frame(instance)) return 1; =20 @@ -3731,6 +3728,7 @@ int megasas_blk_mq_poll(struct Scsi_Host *shost, unsi= gned int queue_num) struct megasas_instance *instance; int num_entries =3D 0; struct fusion_context *fusion; + struct megasas_irq_context *irq_context; =20 instance =3D (struct megasas_instance *)shost->hostdata; =20 @@ -3738,11 +3736,8 @@ int megasas_blk_mq_poll(struct Scsi_Host *shost, uns= igned int queue_num) =20 queue_num =3D queue_num + instance->low_latency_index_start; =20 - if (!atomic_add_unless(&fusion->busy_mq_poll[queue_num], 1, 1)) - return 0; - - num_entries =3D complete_cmd_fusion(instance, queue_num, NULL); - atomic_dec(&fusion->busy_mq_poll[queue_num]); + irq_context =3D &instance->irq_context[queue_num]; + num_entries =3D complete_cmd_fusion(instance, queue_num, irq_context); =20 return num_entries; } diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.h b/drivers/scsi/meg= araid/megaraid_sas_fusion.h index ddeea0ee2834..70679f53bf9d 100644 --- a/drivers/scsi/megaraid/megaraid_sas_fusion.h +++ b/drivers/scsi/megaraid/megaraid_sas_fusion.h @@ -1313,8 +1313,6 @@ struct fusion_context { u8 *sense; dma_addr_t sense_phys_addr; =20 - atomic_t busy_mq_poll[MAX_MSIX_QUEUES_FUSION]; - dma_addr_t reply_frames_desc_phys[MAX_MSIX_QUEUES_FUSION]; union MPI2_REPLY_DESCRIPTORS_UNION *reply_frames_desc[MAX_MSIX_QUEUES_FUS= ION]; struct rdpq_alloc_detail rdpq_tracker[RDPQ_MAX_CHUNK_COUNT]; --=20 2.50.1 (Apple Git-155)