From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EE573C2D0BF for ; Tue, 10 Dec 2019 21:34:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B9E6D208C3 for ; Tue, 10 Dec 2019 21:34:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576013657; bh=SRxD/UdSUIhXNsk1VgfV48n5LlcaWg5Vpie+dxeAzck=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=VjoFVWJajlNH2fMr8DVm+/kfSBPZCGi457Jtj5+PjfkUw98BShW0EGFvswg7dYnYw M+LoGoDcENCcLfRF5czD/m5klpeUY0bfnDDbfMwMWkDMA5AcG6bXZYi/W0TaEokJud kXl9dnWJsWy54rx1xEEZe0PPfyhYE+bzOnXZp6RI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729432AbfLJVeQ (ORCPT ); Tue, 10 Dec 2019 16:34:16 -0500 Received: from mail.kernel.org ([198.145.29.99]:39230 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729981AbfLJVeP (ORCPT ); Tue, 10 Dec 2019 16:34:15 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C923D22464; Tue, 10 Dec 2019 21:34:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576013654; bh=SRxD/UdSUIhXNsk1VgfV48n5LlcaWg5Vpie+dxeAzck=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DTO5BI+nvC2fIynjNcgFS59EE0rvhBEIygay8H9RAtXlnt9Ia62DxUzQ+kfzVaLK0 Em/WpwxRn67WwnFoQ1XRel0p47Q9znZqZnuMf/91Z/X0N6Z1AbqdaWJfqpF9YmgmKf g6s5kSgUkKvmK9dBHvMagnUuKN2FTAiNlmVBuQV8= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jiri Slaby , Jens Axboe , linux-ide@vger.kernel.org, Sergei Shtylyov , Sasha Levin Subject: [PATCH AUTOSEL 4.19 093/177] ata: sata_mv, avoid trigerrable BUG_ON Date: Tue, 10 Dec 2019 16:30:57 -0500 Message-Id: <20191210213221.11921-93-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191210213221.11921-1-sashal@kernel.org> References: <20191210213221.11921-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org From: Jiri Slaby [ Upstream commit e9f691d899188679746eeb96e6cb520459eda9b4 ] There are several reports that the BUG_ON on unsupported command in mv_qc_prep can be triggered under some circumstances: https://bugzilla.suse.com/show_bug.cgi?id=1110252 https://serverfault.com/questions/888897/raid-problems-after-power-outage https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1652185 https://bugs.centos.org/view.php?id=14998 Let sata_mv handle the failure gracefully: warn about that incl. the failed command number and return an AC_ERR_INVALID error. We can do that now thanks to the previous patch. Remove also the long-standing FIXME. [v2] use %.2x as commands are defined as hexa. Signed-off-by: Jiri Slaby Cc: Jens Axboe Cc: linux-ide@vger.kernel.org Cc: Sergei Shtylyov Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- drivers/ata/sata_mv.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c index 73ba8e134ca9a..bb6c0220e2aca 100644 --- a/drivers/ata/sata_mv.c +++ b/drivers/ata/sata_mv.c @@ -2111,12 +2111,10 @@ static void mv_qc_prep(struct ata_queued_cmd *qc) * non-NCQ mode are: [RW] STREAM DMA and W DMA FUA EXT, none * of which are defined/used by Linux. If we get here, this * driver needs work. - * - * FIXME: modify libata to give qc_prep a return value and - * return error here. */ - BUG_ON(tf->command); - break; + ata_port_err(ap, "%s: unsupported command: %.2x\n", __func__, + tf->command); + return AC_ERR_INVALID; } mv_crqb_pack_cmd(cw++, tf->nsect, ATA_REG_NSECT, 0); mv_crqb_pack_cmd(cw++, tf->hob_lbal, ATA_REG_LBAL, 0); -- 2.20.1