From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1451573-1517181140-3-12681584783002141830 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.001, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES unknown, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1517181139; b=CFA9JkQLyE3LPq7QjBSfeeYjQX0b/K8M/lhECidQOnvZlnu C7j/9iAY4UPk/PLSiTygRLQKDSX8lAV+64IyLTxxSHYrdWCs+u39M4aRZ9PgapRS cHJmQldfG+kADAdL3h7pksSoDqjZDbsFMuFZO61hjWryGSojd4GZEF+hKQMwy2jM bvhCnCuKgmbLmig/lbK5xFIp31/XPnqDElmrEanfrBR5YwShntyRn/QJ9Swv6Va8 9NtGS4nnvk1yHKG5X02pHMSWXNp1uzyl7J4zAfhWKE6g6hR/dCZ6j228pgYyZhJo Lgm7YdoZM7DX6VrF+mX0O8R1cO3PySZiSStVZKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1517181139; bh=NewwXM c2WIPJgSc8gze1uCJ6NNLmPklenOWyKeCE9K0=; b=MnZZKtcx3468IWRi39BPHd ZnB8yn0CYZy1VlLUvlz23VW+aiyfNi/CJuSiOIBLGAiMqJab56J2ZUWbfKIxwOwt yuxWcrFs+84wG5ZJTMlLDWn+oTLBzHe0t3bTYAKJkgTsPKF6cGOkeAqhaymBxaYx Pg9mfLwUAcYMcp7gzI0F8+clQQXlA5bffY4mp0UdLRyJ3p0sj6RmZ/9M8/04kBZZ LTTA2rBs3CVmxf6UyUlrDLDNQjRvIV5z9J5Ppdheht+HD/3YctdvbqQTuvctzt0R JMnoAiTFnavt0rno1zBel1RjfTDCFykj/Qe1yvMCsRtGeRPI+H1NNHeqn/X22Zjw == ARC-Authentication-Results: i=1; mx3.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=bvkzeP9R x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx3.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=bvkzeP9R x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753212AbeA1XMC (ORCPT ); Sun, 28 Jan 2018 18:12:02 -0500 Received: from mail-by2nam03hn0247.outbound.protection.outlook.com ([104.47.42.247]:62936 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753206AbeA1W0z (ORCPT ); Sun, 28 Jan 2018 17:26:55 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Shaohua Li , Sasha Levin Subject: [PATCH AUTOSEL for 4.14 040/100] md/raid1/10: add missed blk plug Thread-Topic: [PATCH AUTOSEL for 4.14 040/100] md/raid1/10: add missed blk plug Thread-Index: AQHTmIcHX63QUo0AzUiQSo0xaMc5iw== Date: Sun, 28 Jan 2018 22:26:24 +0000 Message-ID: <20180128222547.7398-40-alexander.levin@microsoft.com> References: <20180128222547.7398-1-alexander.levin@microsoft.com> In-Reply-To: <20180128222547.7398-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;MWHSPR01MB344;6:DitnT+t0lQwEAn2Znv2+Yfww9TKpkA5lJAzALfnite4iYrYggCdnXbo/AfXablp3mkuCGaYmAL+neAZsXIwSdw0JVnCcxPX2x0L3jRT8L6A7qZabS1jFcRIHMYk//RNiQ4zNP5GwT6XBaSfjWvJKzv84oLrDLZWvImWxJchIdZJj1uVVlZG1MnirvVSpQ4OK7m1SOq3xfwlXBFCP6ZU9WEIIBPRhdVALQ8IgV2fvRekcP/gYpDl97XtXK7O7CnLmxaSnButEREpMbR+jQ5yrwF/mISKIyIKUm+0YYJnbm7NzxLaKSeePH+FrbKyKS/CXEu+rQEdJG+wn6P3dGNmg2hW4g1e51uvoV2bhzA9XpVj8/fI5WrX4N3L2q1e1/QZV0v3/a+iEeMiLQiyAij3Rvw==;5:HtxrvqopB7pSuhRQnIgGh099+uplxVhoFmSwbDB2dk9q4vkT4HF94NlkGFDaKee1O/ZvZtZnMgvvtCTW30TaVtRuDsBh3etDFVZLFfT3oQKXLpJUl0+CKjlfIPKArX+ZtigBRfsS6VR6fnJyaNO15BNRfvqf5nsdMJuLiU6cBrw=;24:Qo+j05cIk74A9kEY4hkIwuGV1Na9odUkSrs4NnKC9u7SwNlhiG0kTLB6bLsTgs/Oz/7ZtDuN/4UupCj2H5K1KA==;7:Wy9LcnZAgl452n/mKQnkjnBvgFQdYDPpV8YK0eEd2YdxoKZG45IVpxVwohs69Y8Op3vpVnOEXQ6LySDrsac1qeYJJMXzZ4W3dz6jAPjPiuG62gcpArm3XNeMYDrTc9s8JbjiRC2KdAGfN1VlJUVx+Q+p1AR6mNqh0CB496BVDFAv6ewwnT18ZDf+OtvzcJwutKtYBcbDwLbIDF/CWecDdWvxHPqgCMYZtQU8WoIAdanu+mByG1OwcMBGWf1S0NIB x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 5eeb928d-3e6b-49dd-a451-08d5669e3c12 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MWHSPR01MB344; x-ms-traffictypediagnostic: MWHSPR01MB344: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(67672495146484); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(61425038)(6040501)(2401047)(8121501046)(5005006)(93006095)(93001095)(3002001)(10201501046)(3231101)(944501161)(6055026)(61426038)(61427038)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(20161123560045)(6072148)(201708071742011);SRVR:MWHSPR01MB344;BCL:0;PCL:0;RULEID:;SRVR:MWHSPR01MB344; x-forefront-prvs: 05669A7924 x-forefront-antispam-report: SFV:SPM;SFS:(10019020)(346002)(39860400002)(366004)(396003)(376002)(39380400002)(189003)(199004)(10090500001)(86362001)(36756003)(99286004)(2900100001)(6486002)(6512007)(7736002)(1076002)(6436002)(3846002)(76176011)(575784001)(2906002)(8676002)(86612001)(81156014)(105586002)(316002)(5250100002)(81166006)(66066001)(102836004)(478600001)(3280700002)(6116002)(14454004)(2501003)(4326008)(110136005)(10290500003)(26005)(54906003)(107886003)(53936002)(6666003)(186003)(25786009)(59450400001)(68736007)(6506007)(305945005)(5660300001)(106356001)(22452003)(2950100002)(8936002)(97736004)(3660700001)(72206003)(22906009)(217873001)(473944003)(414714003);DIR:OUT;SFP:1501;SCL:5;SRVR:MWHSPR01MB344;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; x-microsoft-antispam-message-info: lVvIlXgNuf9jMBgOme0lJZsGMCWfW/EYM/T2tTtplBi9Sz87ZJjIFqidYY9nezuNrbynmuCY3jusu4AJogxWdw== spamdiagnosticoutput: 1:22 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5eeb928d-3e6b-49dd-a451-08d5669e3c12 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2018 22:26:24.2899 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHSPR01MB344 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Shaohua Li [ Upstream commit 18022a1bd3709b74ca31ef0b28fccd52bcd6c504 ] flush_pending_writes isn't always called with block plug, so add it, and pl= ug works in nested way. Signed-off-by: Shaohua Li Signed-off-by: Sasha Levin --- drivers/md/raid1.c | 4 ++++ drivers/md/raid10.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index 5a8216b50e38..788fc0800465 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c @@ -810,11 +810,15 @@ static void flush_pending_writes(struct r1conf *conf) spin_lock_irq(&conf->device_lock); =20 if (conf->pending_bio_list.head) { + struct blk_plug plug; struct bio *bio; + bio =3D bio_list_get(&conf->pending_bio_list); conf->pending_count =3D 0; spin_unlock_irq(&conf->device_lock); + blk_start_plug(&plug); flush_bio_list(conf, bio); + blk_finish_plug(&plug); } else spin_unlock_irq(&conf->device_lock); } diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c index 374df5796649..0d18d3b95201 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c @@ -890,10 +890,13 @@ static void flush_pending_writes(struct r10conf *conf= ) spin_lock_irq(&conf->device_lock); =20 if (conf->pending_bio_list.head) { + struct blk_plug plug; struct bio *bio; + bio =3D bio_list_get(&conf->pending_bio_list); conf->pending_count =3D 0; spin_unlock_irq(&conf->device_lock); + blk_start_plug(&plug); /* flush any pending bitmap writes to disk * before proceeding w/ I/O */ bitmap_unplug(conf->mddev->bitmap); @@ -914,6 +917,7 @@ static void flush_pending_writes(struct r10conf *conf) generic_make_request(bio); bio =3D next; } + blk_finish_plug(&plug); } else spin_unlock_irq(&conf->device_lock); } --=20 2.11.0