From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg Kroah-Hartman Subject: [PATCH 5.1 279/405] block: avoid to break XEN by multi-page bvec Date: Wed, 29 May 2019 20:04:37 -0700 Message-ID: <20190530030555.005862356@linuxfoundation.org> References: <20190530030540.291644921@linuxfoundation.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hWBTo-0001ZX-9J for xen-devel@lists.xenproject.org; Thu, 30 May 2019 03:11:48 +0000 In-Reply-To: <20190530030540.291644921@linuxfoundation.org> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: linux-kernel@vger.kernel.org Cc: Juergen Gross , Jens Axboe , Sasha Levin , Greg Kroah-Hartman , stable@vger.kernel.org, Omar Sandoval , xen-devel@lists.xenproject.org, ris Ostrovsky , Ming Lei , Christoph Hellwig List-Id: xen-devel@lists.xenproject.org WyBVcHN0cmVhbSBjb21taXQgZGI1ZWJkNmVkZDI2MjdkN2U4MWEwMzE2NDNjZjQzNTg3ZjYzZTY2 YyBdCgpYRU4gaGFzIHNwZWNpYWwgcGFnZSBtZXJnZSByZXF1aXJlbWVudCwgc2VlIHhlbl9iaW92 ZWNfcGh5c19tZXJnZWFibGUoKS4KV2UgY2FuJ3QgbWVyZ2UgcGFnZXMgaW50byBvbmUgYnZlYyBz aW1wbHkgZm9yIFhFTi4KClNvIG1vdmUgWEVOJ3Mgc3BlY2lmaWMgY2hlY2sgb24gcGFnZSBtZXJn ZSBpbnRvIF9fYmlvX3RyeV9tZXJnZV9wYWdlKCksCnRoZW4gYWJ2b2lkIHRvIGJyZWFrIFhFTiBi eSBtdWx0aS1wYWdlIGJ2ZWMuCgpDYzogcmlzIE9zdHJvdnNreSA8Ym9yaXMub3N0cm92c2t5QG9y YWNsZS5jb20+CkNjOiB4ZW4tZGV2ZWxAbGlzdHMueGVucHJvamVjdC5vcmcKQ2M6IE9tYXIgU2Fu ZG92YWwgPG9zYW5kb3ZAZmIuY29tPgpDYzogQ2hyaXN0b3BoIEhlbGx3aWcgPGhjaEBsc3QuZGU+ ClJldmlld2VkLWJ5OiBKdWVyZ2VuIEdyb3NzIDxqZ3Jvc3NAc3VzZS5jb20+ClNpZ25lZC1vZmYt Ynk6IE1pbmcgTGVpIDxtaW5nLmxlaUByZWRoYXQuY29tPgpTaWduZWQtb2ZmLWJ5OiBKZW5zIEF4 Ym9lIDxheGJvZUBrZXJuZWwuZGs+ClNpZ25lZC1vZmYtYnk6IFNhc2hhIExldmluIDxzYXNoYWxA a2VybmVsLm9yZz4KLS0tCiBibG9jay9iaW8uYyB8IDIgKysKIDEgZmlsZSBjaGFuZ2VkLCAyIGlu c2VydGlvbnMoKykKCmRpZmYgLS1naXQgYS9ibG9jay9iaW8uYyBiL2Jsb2NrL2Jpby5jCmluZGV4 IDcxNjUxMGVjZDdmZmEuLmEzYzgwYTZjMWZlNTEgMTAwNjQ0Ci0tLSBhL2Jsb2NrL2Jpby5jCisr KyBiL2Jsb2NrL2Jpby5jCkBAIC03NzYsNiArNzc2LDggQEAgYm9vbCBfX2Jpb190cnlfbWVyZ2Vf cGFnZShzdHJ1Y3QgYmlvICpiaW8sIHN0cnVjdCBwYWdlICpwYWdlLAogCiAJCWlmICh2ZWNfZW5k X2FkZHIgKyAxICE9IHBhZ2VfYWRkciArIG9mZikKIAkJCXJldHVybiBmYWxzZTsKKwkJaWYgKHhl bl9kb21haW4oKSAmJiAheGVuX2Jpb3ZlY19waHlzX21lcmdlYWJsZShidiwgcGFnZSkpCisJCQly ZXR1cm4gZmFsc2U7CiAJCWlmIChzYW1lX3BhZ2UgJiYgKHZlY19lbmRfYWRkciAmIFBBR0VfTUFT SykgIT0gcGFnZV9hZGRyKQogCQkJcmV0dXJuIGZhbHNlOwogCi0tIAoyLjIwLjEKCgoKCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWls aW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3JnCmh0dHBzOi8vbGlzdHMueGVu cHJvamVjdC5vcmcvbWFpbG1hbi9saXN0aW5mby94ZW4tZGV2ZWw= 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=-8.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,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 7A530C28CC2 for ; Thu, 30 May 2019 03:12:20 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 52AA1244C4 for ; Thu, 30 May 2019 03:12:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="VA4AA1Jq" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 52AA1244C4 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hWBTp-0001Zh-DV; Thu, 30 May 2019 03:11:49 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hWBTo-0001ZX-9J for xen-devel@lists.xenproject.org; Thu, 30 May 2019 03:11:48 +0000 X-Inumbo-ID: a8afe43f-8288-11e9-8980-bc764e045a96 Received: from mail.kernel.org (unknown [198.145.29.99]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id a8afe43f-8288-11e9-8980-bc764e045a96; Thu, 30 May 2019 03:11:47 +0000 (UTC) Received: from localhost (ip67-88-213-2.z213-88-67.customer.algx.net [67.88.213.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8EDB624502; Thu, 30 May 2019 03:11:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559185906; bh=XMg1VJPFU8dRxGPVBd3Y/ZFiH2pYiUvj9KpvL6JtE/c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VA4AA1Jqb2pOj+SdtoiO1joQ8Bgw1JA9QTHFYOA7IN4vEtxQ5igRGsSei+ovEsOTt ZozCH9uneWHWi5YczIitWGI2O+Bqqh2K+LPy10BGjj2AMd+aJWhYO0nR1fFZ2wYejJ 7KWbR+qefySQ9zaoaWEBXlv6f77mKFZaEs0cTKqQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Date: Wed, 29 May 2019 20:04:37 -0700 Message-Id: <20190530030555.005862356@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190530030540.291644921@linuxfoundation.org> References: <20190530030540.291644921@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Subject: [Xen-devel] [PATCH 5.1 279/405] block: avoid to break XEN by multi-page bvec X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Juergen Gross , Jens Axboe , Sasha Levin , Greg Kroah-Hartman , stable@vger.kernel.org, Omar Sandoval , xen-devel@lists.xenproject.org, ris Ostrovsky , Ming Lei , Christoph Hellwig Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: base64 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Message-ID: <20190530030437.iQCEQUOCMSfF75hPKPQTzcZkkR3JlPGHcwWGgl3gZho@z> WyBVcHN0cmVhbSBjb21taXQgZGI1ZWJkNmVkZDI2MjdkN2U4MWEwMzE2NDNjZjQzNTg3ZjYzZTY2 YyBdCgpYRU4gaGFzIHNwZWNpYWwgcGFnZSBtZXJnZSByZXF1aXJlbWVudCwgc2VlIHhlbl9iaW92 ZWNfcGh5c19tZXJnZWFibGUoKS4KV2UgY2FuJ3QgbWVyZ2UgcGFnZXMgaW50byBvbmUgYnZlYyBz aW1wbHkgZm9yIFhFTi4KClNvIG1vdmUgWEVOJ3Mgc3BlY2lmaWMgY2hlY2sgb24gcGFnZSBtZXJn ZSBpbnRvIF9fYmlvX3RyeV9tZXJnZV9wYWdlKCksCnRoZW4gYWJ2b2lkIHRvIGJyZWFrIFhFTiBi eSBtdWx0aS1wYWdlIGJ2ZWMuCgpDYzogcmlzIE9zdHJvdnNreSA8Ym9yaXMub3N0cm92c2t5QG9y YWNsZS5jb20+CkNjOiB4ZW4tZGV2ZWxAbGlzdHMueGVucHJvamVjdC5vcmcKQ2M6IE9tYXIgU2Fu ZG92YWwgPG9zYW5kb3ZAZmIuY29tPgpDYzogQ2hyaXN0b3BoIEhlbGx3aWcgPGhjaEBsc3QuZGU+ ClJldmlld2VkLWJ5OiBKdWVyZ2VuIEdyb3NzIDxqZ3Jvc3NAc3VzZS5jb20+ClNpZ25lZC1vZmYt Ynk6IE1pbmcgTGVpIDxtaW5nLmxlaUByZWRoYXQuY29tPgpTaWduZWQtb2ZmLWJ5OiBKZW5zIEF4 Ym9lIDxheGJvZUBrZXJuZWwuZGs+ClNpZ25lZC1vZmYtYnk6IFNhc2hhIExldmluIDxzYXNoYWxA a2VybmVsLm9yZz4KLS0tCiBibG9jay9iaW8uYyB8IDIgKysKIDEgZmlsZSBjaGFuZ2VkLCAyIGlu c2VydGlvbnMoKykKCmRpZmYgLS1naXQgYS9ibG9jay9iaW8uYyBiL2Jsb2NrL2Jpby5jCmluZGV4 IDcxNjUxMGVjZDdmZmEuLmEzYzgwYTZjMWZlNTEgMTAwNjQ0Ci0tLSBhL2Jsb2NrL2Jpby5jCisr KyBiL2Jsb2NrL2Jpby5jCkBAIC03NzYsNiArNzc2LDggQEAgYm9vbCBfX2Jpb190cnlfbWVyZ2Vf cGFnZShzdHJ1Y3QgYmlvICpiaW8sIHN0cnVjdCBwYWdlICpwYWdlLAogCiAJCWlmICh2ZWNfZW5k X2FkZHIgKyAxICE9IHBhZ2VfYWRkciArIG9mZikKIAkJCXJldHVybiBmYWxzZTsKKwkJaWYgKHhl bl9kb21haW4oKSAmJiAheGVuX2Jpb3ZlY19waHlzX21lcmdlYWJsZShidiwgcGFnZSkpCisJCQly ZXR1cm4gZmFsc2U7CiAJCWlmIChzYW1lX3BhZ2UgJiYgKHZlY19lbmRfYWRkciAmIFBBR0VfTUFT SykgIT0gcGFnZV9hZGRyKQogCQkJcmV0dXJuIGZhbHNlOwogCi0tIAoyLjIwLjEKCgoKCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWls aW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3JnCmh0dHBzOi8vbGlzdHMueGVu cHJvamVjdC5vcmcvbWFpbG1hbi9saXN0aW5mby94ZW4tZGV2ZWw= 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=-9.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,T_DKIMWL_WL_HIGH,URIBL_BLOCKED,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 824ACC072B1 for ; Thu, 30 May 2019 04:29:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 52B9B25589 for ; Thu, 30 May 2019 04:29:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559190594; bh=XMg1VJPFU8dRxGPVBd3Y/ZFiH2pYiUvj9KpvL6JtE/c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=jVYdHv6Cmbv9LO2hpkaerAyrHm7IB9J7PdeCru9mugZ+jizrxPptd6DWRM3jJRgdk yuSHyUIvTGNvpFULDhN4O2krpKpCzPHivbLQwY2h59s+3Vg8fnfYTxFXG8PQuiOas7 PlAzEZZfoLd13lLmD4ecHXyKQaT/YSuv+vP9TGUk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729660AbfE3DN7 (ORCPT ); Wed, 29 May 2019 23:13:59 -0400 Received: from mail.kernel.org ([198.145.29.99]:52180 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728676AbfE3DLr (ORCPT ); Wed, 29 May 2019 23:11:47 -0400 Received: from localhost (ip67-88-213-2.z213-88-67.customer.algx.net [67.88.213.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8EDB624502; Thu, 30 May 2019 03:11:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559185906; bh=XMg1VJPFU8dRxGPVBd3Y/ZFiH2pYiUvj9KpvL6JtE/c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VA4AA1Jqb2pOj+SdtoiO1joQ8Bgw1JA9QTHFYOA7IN4vEtxQ5igRGsSei+ovEsOTt ZozCH9uneWHWi5YczIitWGI2O+Bqqh2K+LPy10BGjj2AMd+aJWhYO0nR1fFZ2wYejJ 7KWbR+qefySQ9zaoaWEBXlv6f77mKFZaEs0cTKqQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, ris Ostrovsky , xen-devel@lists.xenproject.org, Omar Sandoval , Christoph Hellwig , Juergen Gross , Ming Lei , Jens Axboe , Sasha Levin Subject: [PATCH 5.1 279/405] block: avoid to break XEN by multi-page bvec Date: Wed, 29 May 2019 20:04:37 -0700 Message-Id: <20190530030555.005862356@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190530030540.291644921@linuxfoundation.org> References: <20190530030540.291644921@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ Upstream commit db5ebd6edd2627d7e81a031643cf43587f63e66c ] XEN has special page merge requirement, see xen_biovec_phys_mergeable(). We can't merge pages into one bvec simply for XEN. So move XEN's specific check on page merge into __bio_try_merge_page(), then abvoid to break XEN by multi-page bvec. Cc: ris Ostrovsky Cc: xen-devel@lists.xenproject.org Cc: Omar Sandoval Cc: Christoph Hellwig Reviewed-by: Juergen Gross Signed-off-by: Ming Lei Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- block/bio.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/block/bio.c b/block/bio.c index 716510ecd7ffa..a3c80a6c1fe51 100644 --- a/block/bio.c +++ b/block/bio.c @@ -776,6 +776,8 @@ bool __bio_try_merge_page(struct bio *bio, struct page *page, if (vec_end_addr + 1 != page_addr + off) return false; + if (xen_domain() && !xen_biovec_phys_mergeable(bv, page)) + return false; if (same_page && (vec_end_addr & PAGE_MASK) != page_addr) return false; -- 2.20.1