Received: by 2002:a25:e74b:0:0:0:0:0 with SMTP id e72csp1972329ybh; Tue, 14 Jul 2020 12:00:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw+SvpcZHkaudJFrru0stlY+U60arhrh859j2IA+8GoQm9NLIE+L3i5kF4H1HTuretezj/5 X-Received: by 2002:a17:906:6446:: with SMTP id l6mr6111570ejn.184.1594753244526; Tue, 14 Jul 2020 12:00:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594753244; cv=none; d=google.com; s=arc-20160816; b=JRJGl4VWlpAQAldamznvZhBaF7emgLp1vwkC69zNIaMf4ipsqHJ+bRU1J7CWEoi3Eb HF08xLPF77F+w6PbDPo0LaEaV72wtNhDSGVPunUvp5u6oUeXN49B3LRneDsJ6DhBzVAY Bq3Sc99+FmMLWo4eexwBBU/36wYuHQd5RjZscqjyUTmP+bJPRXwIXrENdo5hruLTcXUf Ci2NCfxV9FZc9Qm00pnJX4BviS7EqNMHvS/jVWx+KRqNkGN4r/FbA/dg7BwvigW+dFid sZu16jKxTMGHZBn7T90rYiFsd0R9dF4ldXqiaVMbRAEmQVeW/XLni3w2j9rLMy/OVe4z KrJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=MWB7krsJsO5Zk4qafSHgLcDBis+VmcEnnRioqmnJq1Q=; b=LJnmM6Utq9bFubx8iKLToHyVeyrWVz/4ET8aqeUUrzmWUUPeoJFwUVUeqy2+AX9/y3 2t5YdlsjNnGZ7BqQ3chqJyvaOYZGT/ACdrNakL3rc/wdpZQ4RLSbPsBSMYzE5q4zq+Ps RwoXHPYy5PJe9XTM+QEwf8fGCjgHjs1yCnwzIpqlwmLQhSxUVxjy77y+XQbBoaK6Cwds daLXsrbocMBD60BjgFmvJ3AmWBHlFZaL7e3fdziYKWkmJdurvhto2ydbSo2BAjRuNYlW vFSszVdfGJg/wGIQhAOKEAqwkN/FRatJNhi4vZ2s1uIgBmUkhZ0DDbAB9Kj1NRdaJgZX nNZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=omlI0mWt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id i26si10562763ejy.58.2020.07.14.12.00.21; Tue, 14 Jul 2020 12:00:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=omlI0mWt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731097AbgGNTAR (ORCPT + 99 others); Tue, 14 Jul 2020 15:00:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:59090 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730398AbgGNTAO (ORCPT ); Tue, 14 Jul 2020 15:00:14 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 77ECE22507; Tue, 14 Jul 2020 19:00:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594753214; bh=gT5151k0Ubtk/tBEyVBe8PhGWzMR8W2gtoTZ7OzRg98=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=omlI0mWt3ZXeEigMEm+ODmsxKGpycnzhvFhjvJc/uFJZMxvC4cDAHV1W0069yxmp1 0W4YjPRBGjgXNWUGI6wq0UklHdlMW5AXzNcxoBDbqHFK+AgNb/eEX9iYaB93oBcil4 oCRPU2vsDBbEw3P8wLeGUF91NEeUPNj23Gkke6F0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Christian Borntraeger , Gerald Schaefer , Janosch Frank , Heiko Carstens Subject: [PATCH 5.7 156/166] s390/mm: fix huge pte soft dirty copying Date: Tue, 14 Jul 2020 20:45:21 +0200 Message-Id: <20200714184123.293574193@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200714184115.844176932@linuxfoundation.org> References: <20200714184115.844176932@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 From: Janosch Frank commit 528a9539348a0234375dfaa1ca5dbbb2f8f8e8d2 upstream. If the pmd is soft dirty we must mark the pte as soft dirty (and not dirty). This fixes some cases for guest migration with huge page backings. Cc: # 4.8 Fixes: bc29b7ac1d9f ("s390/mm: clean up pte/pmd encoding") Reviewed-by: Christian Borntraeger Reviewed-by: Gerald Schaefer Signed-off-by: Janosch Frank Signed-off-by: Heiko Carstens Signed-off-by: Greg Kroah-Hartman --- arch/s390/mm/hugetlbpage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/s390/mm/hugetlbpage.c +++ b/arch/s390/mm/hugetlbpage.c @@ -117,7 +117,7 @@ static inline pte_t __rste_to_pte(unsign _PAGE_YOUNG); #ifdef CONFIG_MEM_SOFT_DIRTY pte_val(pte) |= move_set_bit(rste, _SEGMENT_ENTRY_SOFT_DIRTY, - _PAGE_DIRTY); + _PAGE_SOFT_DIRTY); #endif pte_val(pte) |= move_set_bit(rste, _SEGMENT_ENTRY_NOEXEC, _PAGE_NOEXEC);