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=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 23261C48BD4 for ; Tue, 25 Jun 2019 04:42:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EDA0620665 for ; Tue, 25 Jun 2019 04:42:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="pFMn6N6p" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726587AbfFYEme (ORCPT ); Tue, 25 Jun 2019 00:42:34 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:35489 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726421AbfFYEme (ORCPT ); Tue, 25 Jun 2019 00:42:34 -0400 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 45Xtn14wLWz9s3l; Tue, 25 Jun 2019 14:42:29 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1561437750; bh=UwC/SycKxBQXXOVo9JjVApfMRk/59lAz9BuN8MV+DhE=; h=Date:From:To:Cc:Subject:From; b=pFMn6N6pIU/IW0vD7eVGwM4yUznddhg/UvqqdTAG+OKRuCBo/kTrfyQyxKcRbRCah X/wP4GzBvpkZes5gxoG6vaKNrBaTHSLfgHza+FjcNWIBK0oswMq7yoavazH2am0CdD NhlBTwHSuxQLALWX+EAmNwjEi7Tw7JCDKaiE9pSIYKsy/EeOaRbieyD8vqCtILClMz rXolte8LRIRw5iWkrdrYM0dKxCLul+bqXq7avHlwRc0iNY71aysVQA/kFWgI/0+HqL Iv5U5sO4XYw7GgkShAc7QzR11+6gWkGkLcqj1Lz5Tj1hLIAkGvP1xzYdv0HfaGTAeI uh85cBQ6acUhw== Date: Tue, 25 Jun 2019 14:42:26 +1000 From: Stephen Rothwell To: Jens Axboe , Jonathan Corbet Cc: Linux Next Mailing List , Linux Kernel Mailing List , Mauro Carvalho Chehab , Akinobu Mita , Christoph Hellwig Subject: linux-next: manual merge of the block tree with the jc_docs tree Message-ID: <20190625144226.48fff697@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/wg5WgkPrM1OmU2xmNq0nrD5"; protocol="application/pgp-signature" Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/wg5WgkPrM1OmU2xmNq0nrD5 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the block tree got a conflict in: Documentation/fault-injection/nvme-fault-injection.txt between commit: 10ffebbed550 ("docs: fault-injection: convert docs to ReST and rename to = *.rst") from the jc_docs tree and commit: 7e31d8215fd8 ("Documentation: nvme: add an example for nvme fault injecti= on") from the block tree. I fixed it up (I removed the file and applied the following patch) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. From: Stephen Rothwell Date: Tue, 25 Jun 2019 14:39:46 +1000 Subject: [PATCH] Documentation: nvme: fix for change to rst Signed-off-by: Stephen Rothwell --- .../fault-injection/nvme-fault-injection.rst | 58 +++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/Documentation/fault-injection/nvme-fault-injection.rst b/Docum= entation/fault-injection/nvme-fault-injection.rst index bbb1bf3e8650..cdb2e829228e 100644 --- a/Documentation/fault-injection/nvme-fault-injection.rst +++ b/Documentation/fault-injection/nvme-fault-injection.rst @@ -118,3 +118,61 @@ Message from dmesg:: cpu_startup_entry+0x6f/0x80 start_secondary+0x187/0x1e0 secondary_startup_64+0xa5/0xb0 + +Example 3: Inject an error into the 10th admin command +------------------------------------------------------ + +:: + + echo 100 > /sys/kernel/debug/nvme0/fault_inject/probability + echo 10 > /sys/kernel/debug/nvme0/fault_inject/space + echo 1 > /sys/kernel/debug/nvme0/fault_inject/times + nvme reset /dev/nvme0 + +Expected Result:: + + After NVMe controller reset, the reinitialization may or may not succeed. + It depends on which admin command is actually forced to fail. + +Message from dmesg:: + + nvme nvme0: resetting controller + FAULT_INJECTION: forcing a failure. + name fault_inject, interval 1, probability 100, space 1, times 1 + CPU: 0 PID: 0 Comm: swapper/0 Not tainted 5.2.0-rc2+ #2 + Hardware name: MSI MS-7A45/B150M MORTAR ARCTIC (MS-7A45), BIOS 1.50 04/2= 5/2017 + Call Trace: + + dump_stack+0x63/0x85 + should_fail+0x14a/0x170 + nvme_should_fail+0x38/0x80 [nvme_core] + nvme_irq+0x129/0x280 [nvme] + ? blk_mq_end_request+0xb3/0x120 + __handle_irq_event_percpu+0x84/0x1a0 + handle_irq_event_percpu+0x32/0x80 + handle_irq_event+0x3b/0x60 + handle_edge_irq+0x7f/0x1a0 + handle_irq+0x20/0x30 + do_IRQ+0x4e/0xe0 + common_interrupt+0xf/0xf + + RIP: 0010:cpuidle_enter_state+0xc5/0x460 + Code: ff e8 8f 5f 86 ff 80 7d c7 00 74 17 9c 58 0f 1f 44 00 00 f6 c4 02 = 0f 85 69 03 00 00 31 ff e8 62 aa 8c ff fb 66 0f 1f 44 00 00 <45> 85 ed 0f 8= 8 37 03 00 00 4c 8b 45 d0 4c 2b 45 b8 48 ba cf f7 53 + RSP: 0018:ffffffff88c03dd0 EFLAGS: 00000246 ORIG_RAX: ffffffffffffffdc + RAX: ffff9dac25a2ac80 RBX: ffffffff88d53760 RCX: 000000000000001f + RDX: 0000000000000000 RSI: 000000002d958403 RDI: 0000000000000000 + RBP: ffffffff88c03e18 R08: fffffff75e35ffb7 R09: 00000a49a56c0b48 + R10: ffffffff88c03da0 R11: 0000000000001b0c R12: ffff9dac25a34d00 + R13: 0000000000000006 R14: 0000000000000006 R15: ffffffff88d53760 + cpuidle_enter+0x2e/0x40 + call_cpuidle+0x23/0x40 + do_idle+0x201/0x280 + cpu_startup_entry+0x1d/0x20 + rest_init+0xaa/0xb0 + arch_call_rest_init+0xe/0x1b + start_kernel+0x51c/0x53b + x86_64_start_reservations+0x24/0x26 + x86_64_start_kernel+0x74/0x77 + secondary_startup_64+0xa4/0xb0 + nvme nvme0: Could not set queue count (16385) + nvme nvme0: IO queues not created --=20 2.20.1 --=20 Cheers, Stephen Rothwell --Sig_/wg5WgkPrM1OmU2xmNq0nrD5 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl0RpjIACgkQAVBC80lX 0GyP9Af/U/hEpDvFinFPf840PORSHcwXp4ZtgYcfphgo11XxxKMzUTW97ddlzPbX S7ucLB36Kpv2e4k9PYsl4OiOf7CxTfbVAxPV9VqyXct5pU/Yd7N4FiaKMS3niZAW QvdaMDH198XuCGwAgB15QWIeGHFrKmZDBAqvedrwrPtr73NQmzYEekaKjz6N2Rf0 O5jFfGucNhXHV/uWi4Oqi4jwmOkji0Z1TjNNyPTr6jBbKVnF5w6M0pNdSVv1ANdM 841Ehpq0GApTq3eMZnNLruRNlIPEmZ10SbMG6fdh9bto4Tt7gVSo/3NWw/qoP4qt 6e/X28mNGhaLdbPZ5W4RPRUulSKVhw== =oM6k -----END PGP SIGNATURE----- --Sig_/wg5WgkPrM1OmU2xmNq0nrD5--