Received: by 2002:a25:e74b:0:0:0:0:0 with SMTP id e72csp1967447ybh; Tue, 14 Jul 2020 11:54:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzv5jxka6BkQSKEvmGlhwCQz+HK5XeHqPFnIzDwCVahWR+WVEr+VEU26REEpxqKyTZkoPSw X-Received: by 2002:a17:906:b143:: with SMTP id bt3mr6249880ejb.134.1594752879484; Tue, 14 Jul 2020 11:54:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594752879; cv=none; d=google.com; s=arc-20160816; b=pq/7T7Aj7zQ9T9nHIOa/R148Ekj4FlBF9ugafugoEvNhPHrtOM8t76g8z70fjGVzby eWgQQgoDkBA/VF187eFXTT/dqtCUOsr5LTdswISOquSCRT8hI+kto91eSeAckmmF5nOV fRezETO1T5YOmHE4HraonlPcZUJ6NrMeLmagWemVEASGY203M8XeeUmBRxke0jdWy1Og fpYyAhZTXcLDtQXKsM6M7y9V/w3LtOug1dWdG8SZqhJ1JzluQB5IzaEzGXBssRX3Eh4P 5nn5PSCnU6UpmiXpL1eCE/u9y8ysC4DtBSOzm/rNoMlpXgxCoOZSAGtH+yI1osYyMyLj uHUQ== 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=sXEqKJ+2shVS8W08hLOb/K/xLK5ruNwqEz7qPqgjloyOQnPW/Hzua5euUSA6PDVUM/ invWqr4jFm22yPSrcTE6sKlfdm9glY6OSa4PEmNdD7RW0YgdOk4X0WP1CfzBTuCyofne 47nn3vWrM0P06X3BvT7oWdjGkesewFRqqDaz1JSq2nm75E2/KW6phuQNymgC29j6MDRm LoHsInDdhO1tkKI6Fz4/P3OWq618a3MfjFD47Rea46Nt4DJgiUlCUkaV/b1BHxFd+sKz P1wyhQ7tQ24eJl4TQfAfLqqoqowJstVWYUfKIHqnC+5C5If8sILAGZwpAKuhAiLFtKtX wGsw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=D+OA8eOZ; 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 z5si10445781eje.126.2020.07.14.11.54.16; Tue, 14 Jul 2020 11:54:39 -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=D+OA8eOZ; 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 S1729853AbgGNSwv (ORCPT + 99 others); Tue, 14 Jul 2020 14:52:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:49648 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730121AbgGNSws (ORCPT ); Tue, 14 Jul 2020 14:52:48 -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 9BA4A22B49; Tue, 14 Jul 2020 18:52:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594752768; bh=gT5151k0Ubtk/tBEyVBe8PhGWzMR8W2gtoTZ7OzRg98=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D+OA8eOZWIH/15mPwHA7Vud+sy8rexCE6jxg72VXH0sdb2sqlPtlV8mxo+OA94FwR j43mP0Fqf35Gb8JYaU9x/1Y7OTcMvfM10rjkNYfjXiJtkYISnbQJS4Z53hU70gFLPt I2wCe/vls+7L+bzW/T5RbSWgyQm0+2NOU0OXGOs0= 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.4 102/109] s390/mm: fix huge pte soft dirty copying Date: Tue, 14 Jul 2020 20:44:45 +0200 Message-Id: <20200714184110.439617850@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200714184105.507384017@linuxfoundation.org> References: <20200714184105.507384017@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);