linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Michael Neuling <mikey@neuling.org>
To: mpe@ellerman.id.au, benh@kernel.crashing.org
Cc: imunsie@au.ibm.com, linuxppc-dev@ozlabs.org, mikey@neuling.org,
	Daniel Axtens <dja@axtens.net>,
	"Matthew R. Ochs" <mrochs@linux.vnet.ibm.com>,
	"Manoj N. Kumar" <manoj@linux.vnet.ibm.com>,
	brking@linux.vnet.ibm.com
Subject: [PATCH v3 17/24] cxl: Only check pid for userspace contexts
Date: Wed, 27 May 2015 16:07:11 +1000	[thread overview]
Message-ID: <1432706838-20794-18-git-send-email-mikey@neuling.org> (raw)
In-Reply-To: <1432706838-20794-1-git-send-email-mikey@neuling.org>

We only need to check the pid attached to this context for userspace contexts.
Kernel contexts can skip this check.

Signed-off-by: Michael Neuling <mikey@neuling.org>
Acked-by: Ian Munsie <imunsie@au1.ibm.com>
---
 drivers/misc/cxl/fault.c | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/drivers/misc/cxl/fault.c b/drivers/misc/cxl/fault.c
index 5286b8b..25a5418 100644
--- a/drivers/misc/cxl/fault.c
+++ b/drivers/misc/cxl/fault.c
@@ -172,8 +172,8 @@ void cxl_handle_fault(struct work_struct *fault_work)
 		container_of(fault_work, struct cxl_context, fault_work);
 	u64 dsisr = ctx->dsisr;
 	u64 dar = ctx->dar;
-	struct task_struct *task;
-	struct mm_struct *mm;
+	struct task_struct *task = NULL;
+	struct mm_struct *mm = NULL;
 
 	if (cxl_p2n_read(ctx->afu, CXL_PSL_DSISR_An) != dsisr ||
 	    cxl_p2n_read(ctx->afu, CXL_PSL_DAR_An) != dar ||
@@ -194,17 +194,19 @@ void cxl_handle_fault(struct work_struct *fault_work)
 	pr_devel("CXL BOTTOM HALF handling fault for afu pe: %i. "
 		"DSISR: %#llx DAR: %#llx\n", ctx->pe, dsisr, dar);
 
-	if (!(task = get_pid_task(ctx->pid, PIDTYPE_PID))) {
-		pr_devel("cxl_handle_fault unable to get task %i\n",
-			 pid_nr(ctx->pid));
-		cxl_ack_ae(ctx);
-		return;
-	}
-	if (!(mm = get_task_mm(task))) {
-		pr_devel("cxl_handle_fault unable to get mm %i\n",
-			 pid_nr(ctx->pid));
-		cxl_ack_ae(ctx);
-		goto out;
+	if (!ctx->kernel) {
+		if (!(task = get_pid_task(ctx->pid, PIDTYPE_PID))) {
+			pr_devel("cxl_handle_fault unable to get task %i\n",
+				 pid_nr(ctx->pid));
+			cxl_ack_ae(ctx);
+			return;
+		}
+		if (!(mm = get_task_mm(task))) {
+			pr_devel("cxl_handle_fault unable to get mm %i\n",
+				 pid_nr(ctx->pid));
+			cxl_ack_ae(ctx);
+			goto out;
+		}
 	}
 
 	if (dsisr & CXL_PSL_DSISR_An_DS)
@@ -214,9 +216,11 @@ void cxl_handle_fault(struct work_struct *fault_work)
 	else
 		WARN(1, "cxl_handle_fault has nothing to handle\n");
 
-	mmput(mm);
+	if (mm)
+		mmput(mm);
 out:
-	put_task_struct(task);
+	if (task)
+		put_task_struct(task);
 }
 
 static void cxl_prefault_one(struct cxl_context *ctx, u64 ea)
-- 
2.1.0

  parent reply	other threads:[~2015-05-27  6:07 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-27  6:06 [PATCH v3 00/24] cxl: Add AFU virtual PHB and in kernel API Michael Neuling
2015-05-27  6:06 ` [PATCH v3 01/24] powerpc/copro: Fix faulting kernel segments Michael Neuling
2015-05-27  6:06 ` [PATCH v3 02/24] powerpc/pci: Export symbols for CXL Michael Neuling
2015-05-27  6:06 ` [PATCH v3 03/24] powerpc/pci: Add release_device() hook to phb ops Michael Neuling
2015-05-27  6:06 ` [PATCH v3 04/24] powerpc: Add cxl context to device archdata Michael Neuling
2015-05-27  6:06 ` [PATCH v3 05/24] powerpc/pci: Add shutdown hook to pci_controller_ops Michael Neuling
2015-05-27  6:07 ` [PATCH v3 06/24] powerpc/pci: Add pcibios_disable_device() hook Michael Neuling
2015-05-27  6:07 ` [PATCH v3 07/24] cxl: Document external user of existing API Michael Neuling
2015-05-27  6:07 ` [PATCH v3 08/24] cxl: Add shutdown hook Michael Neuling
2015-05-27  6:07 ` [PATCH v3 09/24] cxl: Remove unnecessarily verbose print in cxl_remove() Michael Neuling
2015-05-27  6:07 ` [PATCH v3 10/24] cxl: Re-order card init to check the VSEC earlier Michael Neuling
2015-05-27  6:07 ` [PATCH v3 11/24] cxl: Fix error path on probe Michael Neuling
2015-05-27  6:07 ` [PATCH v3 12/24] cxl: Dump debug info on the AFU configuration record Michael Neuling
2015-05-27  6:07 ` [PATCH v3 13/24] cxl: Add cookie parameter to afu_release_irqs() Michael Neuling
2015-05-27  6:07 ` [PATCH v3 14/24] cxl: Rework detach context functions Michael Neuling
2015-05-27  6:07 ` [PATCH v3 15/24] cxl: cxl_afu_reset() -> __cxl_afu_reset() Michael Neuling
2015-05-27  6:07 ` [PATCH v3 16/24] cxl: Export some symbols Michael Neuling
2015-05-27  6:07 ` Michael Neuling [this message]
2015-05-27  6:07 ` [PATCH v3 18/24] cxl: Split afu_register_irqs() function Michael Neuling
2015-05-27  6:07 ` [PATCH v3 19/24] cxl: Configure PSL for kernel contexts and merge code Michael Neuling
2015-05-27  6:07 ` [PATCH v3 20/24] cxl: Rework context lifetimes Michael Neuling
2015-05-27  6:07 ` [PATCH v3 21/24] cxl: Cleanup Makefile Michael Neuling
2015-05-27  6:07 ` [PATCH v3 22/24] cxl: Move include file cxl.h -> cxl-base.h Michael Neuling
2015-05-27  6:07 ` [PATCH v3 23/24] cxl: Export file ops for use by API Michael Neuling
2015-05-27  6:07 ` [PATCH v3 24/24] cxl: Add AFU virtual PHB and kernel API Michael Neuling

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1432706838-20794-18-git-send-email-mikey@neuling.org \
    --to=mikey@neuling.org \
    --cc=benh@kernel.crashing.org \
    --cc=brking@linux.vnet.ibm.com \
    --cc=dja@axtens.net \
    --cc=imunsie@au.ibm.com \
    --cc=linuxppc-dev@ozlabs.org \
    --cc=manoj@linux.vnet.ibm.com \
    --cc=mpe@ellerman.id.au \
    --cc=mrochs@linux.vnet.ibm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).