From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EEFC31B4F1C; Mon, 14 Oct 2024 03:59:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728878384; cv=none; b=GjCM7B/3v4R0d+TLU65n27rltheZo0giTo1NesHiVBATRKf98J78xQG0ALo+2RyBJulC+3bqnPQrPl3JkfP7RPrkVlxNlaRBDQdZ4ncoVnQqJOaZ69XSXtuAoyJnSSwO25Jz04YKm99m/GZFXgcPLuBpyUd/7u8NTAjPrMnyi78= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728878384; c=relaxed/simple; bh=QTR0CRfXu565b3TZb6i93dknuSTDm8kh5n74AzLYZyE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oNp0xonsA0WdtroKGXpQRqloojKFSFBQ9GYwczy3m5P3zECTT1dAQRy7PBDSxuAdyNq6Z/RosdHI21V3S9UUVsjl9dQfUgal7/lfxCF2KnQK/b1ZIfftkVeOdGt1cV6akDsuWENmRYmWa/A/xc24MpJ0UdAd17S3h4ZfTyyaH7U= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=bIIG0+6j; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="bIIG0+6j" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AED7BC4CEC3; Mon, 14 Oct 2024 03:59:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1728878383; bh=QTR0CRfXu565b3TZb6i93dknuSTDm8kh5n74AzLYZyE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bIIG0+6jELSuJOikZCW1j41ipfflzJcIb5aBDZ4FrN3ZLqoB5jt9JKR4DMHbeg5LU kTa/EGS2BQjpNn2d+xctLDF8bR/MzNeiTKjuxp0Z+zq3Fk9oi+wFbSB2q3aMBfEhc2 phHeGP1oLCOtIZZMuU8ccuClZs5IPN9RLYluRmMZw4OIAFBB5MlRvpfJGld1YdjS9s gm0rq6J1S6Q2RvvktZEzGVjbkOGdIREC63QtMuSxOOXHO45CGhKDE4Zwgz2CnLGouZ aKSmAP/sxvjozPRUqvbOV9QQuAe+k+L0oYoYrAO6NnYK46wQX17/jCsSIXAUMGbwkc MZi8ChjrnEsGg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dimitri Sivanich , Linus Torvalds , Sasha Levin , dimitri.sivanich@hpe.com, gregkh@linuxfoundation.org Subject: [PATCH AUTOSEL 5.15 8/8] misc: sgi-gru: Don't disable preemption in GRU driver Date: Sun, 13 Oct 2024 23:59:23 -0400 Message-ID: <20241014035929.2251266-8-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241014035929.2251266-1-sashal@kernel.org> References: <20241014035929.2251266-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.15.167 Content-Transfer-Encoding: 8bit From: Dimitri Sivanich [ Upstream commit b983b271662bd6104d429b0fd97af3333ba760bf ] Disabling preemption in the GRU driver is unnecessary, and clashes with sleeping locks in several code paths. Remove preempt_disable and preempt_enable from the GRU driver. Signed-off-by: Dimitri Sivanich Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- drivers/misc/sgi-gru/grukservices.c | 2 -- drivers/misc/sgi-gru/grumain.c | 4 ---- drivers/misc/sgi-gru/grutlbpurge.c | 2 -- 3 files changed, 8 deletions(-) diff --git a/drivers/misc/sgi-gru/grukservices.c b/drivers/misc/sgi-gru/grukservices.c index 0ea923fe6371b..e2bdba4742930 100644 --- a/drivers/misc/sgi-gru/grukservices.c +++ b/drivers/misc/sgi-gru/grukservices.c @@ -258,7 +258,6 @@ static int gru_get_cpu_resources(int dsr_bytes, void **cb, void **dsr) int lcpu; BUG_ON(dsr_bytes > GRU_NUM_KERNEL_DSR_BYTES); - preempt_disable(); bs = gru_lock_kernel_context(-1); lcpu = uv_blade_processor_id(); *cb = bs->kernel_cb + lcpu * GRU_HANDLE_STRIDE; @@ -272,7 +271,6 @@ static int gru_get_cpu_resources(int dsr_bytes, void **cb, void **dsr) static void gru_free_cpu_resources(void *cb, void *dsr) { gru_unlock_kernel_context(uv_numa_blade_id()); - preempt_enable(); } /* diff --git a/drivers/misc/sgi-gru/grumain.c b/drivers/misc/sgi-gru/grumain.c index 3a16eb8e03f73..9b8bdd57ec854 100644 --- a/drivers/misc/sgi-gru/grumain.c +++ b/drivers/misc/sgi-gru/grumain.c @@ -941,10 +941,8 @@ vm_fault_t gru_fault(struct vm_fault *vmf) again: mutex_lock(>s->ts_ctxlock); - preempt_disable(); if (gru_check_context_placement(gts)) { - preempt_enable(); mutex_unlock(>s->ts_ctxlock); gru_unload_context(gts, 1); return VM_FAULT_NOPAGE; @@ -953,7 +951,6 @@ vm_fault_t gru_fault(struct vm_fault *vmf) if (!gts->ts_gru) { STAT(load_user_context); if (!gru_assign_gru_context(gts)) { - preempt_enable(); mutex_unlock(>s->ts_ctxlock); set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(GRU_ASSIGN_DELAY); /* true hack ZZZ */ @@ -969,7 +966,6 @@ vm_fault_t gru_fault(struct vm_fault *vmf) vma->vm_page_prot); } - preempt_enable(); mutex_unlock(>s->ts_ctxlock); return VM_FAULT_NOPAGE; diff --git a/drivers/misc/sgi-gru/grutlbpurge.c b/drivers/misc/sgi-gru/grutlbpurge.c index 10921cd2608df..1107dd3e2e9fa 100644 --- a/drivers/misc/sgi-gru/grutlbpurge.c +++ b/drivers/misc/sgi-gru/grutlbpurge.c @@ -65,7 +65,6 @@ static struct gru_tlb_global_handle *get_lock_tgh_handle(struct gru_state struct gru_tlb_global_handle *tgh; int n; - preempt_disable(); if (uv_numa_blade_id() == gru->gs_blade_id) n = get_on_blade_tgh(gru); else @@ -79,7 +78,6 @@ static struct gru_tlb_global_handle *get_lock_tgh_handle(struct gru_state static void get_unlock_tgh_handle(struct gru_tlb_global_handle *tgh) { unlock_tgh_handle(tgh); - preempt_enable(); } /* -- 2.43.0