Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp349110ybi; Fri, 7 Jun 2019 09:02:57 -0700 (PDT) X-Google-Smtp-Source: APXvYqxgqSs3xA3d4IBDQ3KdtNeJeO6gUKEm0EiU/42WqiiLAV7gs8Z3yzERyxANxemTavrDftNk X-Received: by 2002:a65:5202:: with SMTP id o2mr3202813pgp.199.1559923377691; Fri, 07 Jun 2019 09:02:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559923377; cv=none; d=google.com; s=arc-20160816; b=CnKXEu/fNUlI6ZrePUTPcp7AGjfEByKcpEahyUwlywkvgQ1rKnDp37hOz+3G2ZjNTP 0YG6/IAVMHYLPdlCarQWiTXUbKjXTV88UOwKUrkpj+d7XqGU6HvpVQqjQ+V8zvcnl+cH sbpRbqwnnRt31C73EbbB+m+m5wzITqTcDER0dlzbQ/EaNbPd8gpq8lRGVrVqmxCZZQI1 +o2j90UyUfdyA3qBPBtJ/Eedg9vEw7AP2h7riLUXB5Pw9m9NRHmZObOey7g8VOYCwdRw +AtOeFm5ebf93+i7GYTP5bujd/nbjgAmDrW8EvMG4azgxIE2zvqMILWFKNuu93mzDzNW olCA== 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=otVtbhOe0CKMIa5SPKNLR3847NE3tjyZYyf05HG58Oo=; b=wRYf8imBjulULCIKb4rQ9VOJtFAav2zf+kno/WivBN+hre/lHXxktUQaSaSEbTuNcQ zhDJw9XQFXjV8rozsVhwWEuUozQ5P6ODnmvASjU4neKCUUwkOlTEfvZB8c2yxmo2e488 YHIi0BK/Yw/6RG9Oz1fQieqTKkVIuGpwvKbER3Ob5Uzk9sVTiE81rQgAU29XqMNLEC8p di1S7kcNsUUX20I8oNaKFX+zlx8tQipmJbu+iBQM37vjK+O5rkgw7IuX0b5UswNhFHQH 3unQQ/EFLFEtODxEeJ2WwTMfIgdDC3oXR4rHXpqh468D/r1PIu9t8gesRS/KBe6QW1hw ilIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=d9YXAjFp; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m3si2417991pld.40.2019.06.07.09.02.40; Fri, 07 Jun 2019 09:02:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=d9YXAjFp; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730177AbfFGPk5 (ORCPT + 99 others); Fri, 7 Jun 2019 11:40:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:50378 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730171AbfFGPk4 (ORCPT ); Fri, 7 Jun 2019 11:40:56 -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 C7A372146F; Fri, 7 Jun 2019 15:40:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559922055; bh=LPrwfWoEtjOZcQQ3V6qTsG9X0ClXaj1tQXm/lMn4NSk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=d9YXAjFpIyio1h+TcEXbg2Hx/yzU/GrL6VrS/gHypxlT1C4xCw8hnZBMDB2Dy+TMw EWggJy4kBV9lDxX2reA8kzyjHf5gbpF3dHI4RnLgbAqZN6og5bVFkqJLWEpg0/jiy8 Ymh1hAzla5fo3Sjow2yJtx+xZqdwleSpV/tmJn2E= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Meelis Roos , James Clarke , "David S. Miller" Subject: [PATCH 4.14 21/69] sparc64: Fix regression in non-hypervisor TLB flush xcall Date: Fri, 7 Jun 2019 17:39:02 +0200 Message-Id: <20190607153850.958090082@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190607153848.271562617@linuxfoundation.org> References: <20190607153848.271562617@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: James Clarke commit d3c976c14ad8af421134c428b0a89ff8dd3bd8f8 upstream. Previously, %g2 would end up with the value PAGE_SIZE, but after the commit mentioned below it ends up with the value 1 due to being reused for a different purpose. We need it to be PAGE_SIZE as we use it to step through pages in our demap loop, otherwise we set different flags in the low 12 bits of the address written to, thereby doing things other than a nucleus page flush. Fixes: a74ad5e660a9 ("sparc64: Handle extremely large kernel TLB range flushes more gracefully.") Reported-by: Meelis Roos Tested-by: Meelis Roos Signed-off-by: James Clarke Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- arch/sparc/mm/ultra.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/arch/sparc/mm/ultra.S +++ b/arch/sparc/mm/ultra.S @@ -587,7 +587,7 @@ xcall_flush_tlb_kernel_range: /* 44 insn sub %g7, %g1, %g3 srlx %g3, 18, %g2 brnz,pn %g2, 2f - add %g2, 1, %g2 + sethi %hi(PAGE_SIZE), %g2 sub %g3, %g2, %g3 or %g1, 0x20, %g1 ! Nucleus 1: stxa %g0, [%g1 + %g3] ASI_DMMU_DEMAP @@ -751,7 +751,7 @@ __cheetah_xcall_flush_tlb_kernel_range: sub %g7, %g1, %g3 srlx %g3, 18, %g2 brnz,pn %g2, 2f - add %g2, 1, %g2 + sethi %hi(PAGE_SIZE), %g2 sub %g3, %g2, %g3 or %g1, 0x20, %g1 ! Nucleus 1: stxa %g0, [%g1 + %g3] ASI_DMMU_DEMAP