From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AB8JxZrgpmz5Vsohc2Y9cQpbxD/CAb3VOZgEBaYOSLVJ35YhkxFaAy+pkGKhp4N7fkI2D4YeBLmt ARC-Seal: i=1; a=rsa-sha256; t=1525716528; cv=none; d=google.com; s=arc-20160816; b=yBEKEjJmFl5JCabqfzkYJU6LeiC3M0xRAIBHNo/QU1Ws8TCJN8T/5LXKeDOIgKUJlA ovJk9v1K3Y1kDG5VPmNog65UuoslJUCTrgQ4smseUV69QyTalFcoOLCBMAn6rG3CWkUe +q/M7j2BI85rwmLSmbv9AsCjgbZ0W2LBG3PauVK/IUqd1u/y5lxGK+cbzAwJBHyyoUCV bg6FMZ0jP+7VhOPO08KIKMxLgjHNJlCQq0x0qVQSMUHVb3MaiAnINcRGNWK87R1j/oSl 3+p8hmmKiCS/1pSmFYGuW0hF73T5iURar6+Rc9eG02+OaR9Udcaf+81Z+M1F1MfBK+Ty MKyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:content-transfer-encoding:content-language:in-reply-to :mime-version:user-agent:date:from:references:cc:to:subject :arc-authentication-results; bh=8x4QReHkXCS1V6XpK16YHZc/nL2+Buv6qqKV5vj1zRM=; b=se7JOOAsuB2/dk0CeF+9/INK32ItIqn5/VldRikUR3QfoErDAXzRdAQ9H7afdLDV8R 93d1zrzIDhz+VqZpHM5+vK/iJ+Z1nrHrN1wKNVCYajDIyEeX/94VT6/lZvR9siWTOj+H zqqNAc+iuxLQX9bSW9Q9BkFcxbfZbwTvcsShDoY8krCWvTXU659S2qnMVEaCkoldBucJ rGSe4o+oSiNH0bgv50IFd2QTLVfaqhhYZnSOFk6TKKe1EfP4A9Coc6OH0bb8loETpnt2 rfjgJGG/C2B92S8+Qiez2H/26cHodKyZDczaMF2jCXMgLWVLNbBAc5BlCTjUMtgCuhY6 yUGQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of fbarrat@linux.ibm.com designates 148.163.158.5 as permitted sender) smtp.mailfrom=fbarrat@linux.ibm.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ibm.com Authentication-Results: mx.google.com; spf=pass (google.com: domain of fbarrat@linux.ibm.com designates 148.163.158.5 as permitted sender) smtp.mailfrom=fbarrat@linux.ibm.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ibm.com Subject: Re: [PATCH v2 5/7] ocxl: Expose the thread_id needed for wait on p9 To: "Alastair D'Silva" , linuxppc-dev@lists.ozlabs.org Cc: linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, mikey@neuling.org, vaibhav@linux.vnet.ibm.com, aneesh.kumar@linux.vnet.ibm.com, malat@debian.org, felix@linux.vnet.ibm.com, pombredanne@nexb.com, sukadev@linux.vnet.ibm.com, npiggin@gmail.com, gregkh@linuxfoundation.org, arnd@arndb.de, andrew.donnellan@au1.ibm.com, fbarrat@linux.vnet.ibm.com, corbet@lwn.net, "Alastair D'Silva" References: <20180417020950.21446-1-alastair@au1.ibm.com> <20180418010810.30937-1-alastair@au1.ibm.com> <20180418010810.30937-6-alastair@au1.ibm.com> From: Frederic Barrat Date: Mon, 7 May 2018 20:08:35 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <20180418010810.30937-6-alastair@au1.ibm.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 x-cbid: 18050718-0012-0000-0000-000005D3AD6F X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18050718-0013-0000-0000-00001950B86C Message-Id: <76dccd99-f98b-6c56-56dc-eefd929f3ad0@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2018-05-07_09:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=2 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1709140000 definitions=main-1805070181 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1597957549588354093?= X-GMAIL-MSGID: =?utf-8?q?1599829733667829772?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: Le 18/04/2018 à 03:08, Alastair D'Silva a écrit : > From: Alastair D'Silva > > In order to successfully issue as_notify, an AFU needs to know the TID > to notify, which in turn means that this information should be > available in userspace so it can be communicated to the AFU. > > Signed-off-by: Alastair D'Silva > --- > drivers/misc/ocxl/context.c | 5 +++- > drivers/misc/ocxl/file.c | 53 +++++++++++++++++++++++++++++++++++++++ > drivers/misc/ocxl/link.c | 36 ++++++++++++++++++++++++++ > drivers/misc/ocxl/ocxl_internal.h | 1 + > include/misc/ocxl.h | 9 +++++++ > include/uapi/misc/ocxl.h | 10 ++++++++ > 6 files changed, 113 insertions(+), 1 deletion(-) > > diff --git a/drivers/misc/ocxl/context.c b/drivers/misc/ocxl/context.c > index 909e8807824a..95f74623113e 100644 > --- a/drivers/misc/ocxl/context.c > +++ b/drivers/misc/ocxl/context.c > @@ -34,6 +34,8 @@ int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, > mutex_init(&ctx->xsl_error_lock); > mutex_init(&ctx->irq_lock); > idr_init(&ctx->irq_idr); > + ctx->tidr = 0; > + > /* > * Keep a reference on the AFU to make sure it's valid for the > * duration of the life of the context > @@ -65,6 +67,7 @@ int ocxl_context_attach(struct ocxl_context *ctx, u64 amr) > { > int rc; > > + // Locks both status & tidr > mutex_lock(&ctx->status_mutex); > if (ctx->status != OPENED) { > rc = -EIO; > @@ -72,7 +75,7 @@ int ocxl_context_attach(struct ocxl_context *ctx, u64 amr) > } > > rc = ocxl_link_add_pe(ctx->afu->fn->link, ctx->pasid, > - current->mm->context.id, 0, amr, current->mm, > + current->mm->context.id, ctx->tidr, amr, current->mm, > xsl_fault_error, ctx); > if (rc) > goto out; > diff --git a/drivers/misc/ocxl/file.c b/drivers/misc/ocxl/file.c > index 038509e5d031..eb409a469f21 100644 > --- a/drivers/misc/ocxl/file.c > +++ b/drivers/misc/ocxl/file.c > @@ -5,6 +5,8 @@ > #include > #include > #include > +#include > +#include > #include "ocxl_internal.h" > > > @@ -123,11 +125,55 @@ static long afu_ioctl_get_metadata(struct ocxl_context *ctx, > return 0; > } > > +#ifdef CONFIG_PPC64 > +static long afu_ioctl_enable_p9_wait(struct ocxl_context *ctx, > + struct ocxl_ioctl_p9_wait __user *uarg) > +{ > + struct ocxl_ioctl_p9_wait arg; > + > + memset(&arg, 0, sizeof(arg)); > + > + if (cpu_has_feature(CPU_FTR_P9_TIDR)) { > + enum ocxl_context_status status; > + > + // Locks both status & tidr > + mutex_lock(&ctx->status_mutex); > + if (!ctx->tidr) { > + if (set_thread_tidr(current)) > + return -ENOENT; > + > + ctx->tidr = current->thread.tidr; > + } Now that we don't have the TIDR limit problem, I'm wondering if we cannot relax our rule a bit and have: - first thread to enable will become the default thread and update the Process element - any subsequent enable would just allocate the TIDR for the calling thread. That way, more than one thread could be used for 'wait'. Thoughts? Fred > + > + status = ctx->status; > + mutex_unlock(&ctx->status_mutex); > + > + if (status == ATTACHED) { > + int rc; > + struct link *link = ctx->afu->fn->link; > + > + rc = ocxl_link_update_pe(link, ctx->pasid, ctx->tidr); > + if (rc) > + return rc; > + } > + > + arg.thread_id = ctx->tidr; > + } else > + return -ENOENT; > + > + if (copy_to_user(uarg, &arg, sizeof(arg))) > + return -EFAULT; > + > + return 0; > +} > +#endif > + > #define CMD_STR(x) (x == OCXL_IOCTL_ATTACH ? "ATTACH" : \ > x == OCXL_IOCTL_IRQ_ALLOC ? "IRQ_ALLOC" : \ > x == OCXL_IOCTL_IRQ_FREE ? "IRQ_FREE" : \ > x == OCXL_IOCTL_IRQ_SET_FD ? "IRQ_SET_FD" : \ > x == OCXL_IOCTL_GET_METADATA ? "GET_METADATA" : \ > + x == OCXL_IOCTL_ENABLE_P9_WAIT ? "ENABLE_P9_WAIT" : \ > "UNKNOWN") > > static long afu_ioctl(struct file *file, unsigned int cmd, > @@ -186,6 +232,13 @@ static long afu_ioctl(struct file *file, unsigned int cmd, > (struct ocxl_ioctl_metadata __user *) args); > break; > > +#ifdef CONFIG_PPC64 > + case OCXL_IOCTL_ENABLE_P9_WAIT: > + rc = afu_ioctl_enable_p9_wait(ctx, > + (struct ocxl_ioctl_p9_wait __user *) args); > + break; > +#endif > + > default: > rc = -EINVAL; > } > diff --git a/drivers/misc/ocxl/link.c b/drivers/misc/ocxl/link.c > index 656e8610eec2..88876ae8f330 100644 > --- a/drivers/misc/ocxl/link.c > +++ b/drivers/misc/ocxl/link.c > @@ -544,6 +544,42 @@ int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > } > EXPORT_SYMBOL_GPL(ocxl_link_add_pe); > > +int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid) > +{ > + struct link *link = (struct link *) link_handle; > + struct spa *spa = link->spa; > + struct ocxl_process_element *pe; > + int pe_handle, rc; > + > + if (pasid > SPA_PASID_MAX) > + return -EINVAL; > + > + pe_handle = pasid & SPA_PE_MASK; > + pe = spa->spa_mem + pe_handle; > + > + mutex_lock(&spa->spa_lock); > + > + pe->tid = tid; > + > + /* > + * The barrier makes sure the PE is updated > + * before we clear the NPU context cache below, so that the > + * old PE cannot be reloaded erroneously. > + */ > + mb(); > + > + /* > + * hook to platform code > + * On powerpc, the entry needs to be cleared from the context > + * cache of the NPU. > + */ > + rc = pnv_ocxl_spa_remove_pe_from_cache(link->platform_data, pe_handle); > + WARN_ON(rc); > + > + mutex_unlock(&spa->spa_lock); > + return rc; > +} > + > int ocxl_link_remove_pe(void *link_handle, int pasid) > { > struct link *link = (struct link *) link_handle; > diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h > index 5d421824afd9..6c6d4e61888e 100644 > --- a/drivers/misc/ocxl/ocxl_internal.h > +++ b/drivers/misc/ocxl/ocxl_internal.h > @@ -77,6 +77,7 @@ struct ocxl_context { > struct ocxl_xsl_error xsl_error; > struct mutex irq_lock; > struct idr irq_idr; > + __u16 tidr; // Thread ID used for P9 wait implementation > }; > > struct ocxl_process_element { > diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h > index 51ccf76db293..9ff6ddc28e22 100644 > --- a/include/misc/ocxl.h > +++ b/include/misc/ocxl.h > @@ -188,6 +188,15 @@ extern int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), > void *xsl_err_data); > > +/** > + * Update values within a Process Element > + * > + * link_handle: the link handle associated with the process element > + * pasid: the PASID for the AFU context > + * tid: the new thread id for the process element > + */ > +extern int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); > + > /* > * Remove a Process Element from the Shared Process Area for a link > */ > diff --git a/include/uapi/misc/ocxl.h b/include/uapi/misc/ocxl.h > index 0af83d80fb3e..8d2748e69c84 100644 > --- a/include/uapi/misc/ocxl.h > +++ b/include/uapi/misc/ocxl.h > @@ -48,6 +48,15 @@ struct ocxl_ioctl_metadata { > __u64 reserved[13]; // Total of 16*u64 > }; > > +struct ocxl_ioctl_p9_wait { > + __u16 thread_id; // The thread ID required to wake this thread > + __u16 reserved1; > + __u32 reserved2; > + __u64 reserved3[3]; > +}; > + > +}; > + > struct ocxl_ioctl_irq_fd { > __u64 irq_offset; > __s32 eventfd; > @@ -62,5 +71,6 @@ struct ocxl_ioctl_irq_fd { > #define OCXL_IOCTL_IRQ_FREE _IOW(OCXL_MAGIC, 0x12, __u64) > #define OCXL_IOCTL_IRQ_SET_FD _IOW(OCXL_MAGIC, 0x13, struct ocxl_ioctl_irq_fd) > #define OCXL_IOCTL_GET_METADATA _IOR(OCXL_MAGIC, 0x14, struct ocxl_ioctl_metadata) > +#define OCXL_IOCTL_ENABLE_P9_WAIT _IOR(OCXL_MAGIC, 0x15, struct ocxl_ioctl_p9_wait) > > #endif /* _UAPI_MISC_OCXL_H */ > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on archive.lwn.net X-Spam-Level: X-Spam-Status: No, score=-5.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham autolearn_force=no version=3.4.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by archive.lwn.net (Postfix) with ESMTP id 4DB857DE79 for ; Mon, 7 May 2018 18:08:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752660AbeEGSIr (ORCPT ); Mon, 7 May 2018 14:08:47 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:33018 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752656AbeEGSIq (ORCPT ); Mon, 7 May 2018 14:08:46 -0400 Received: from pps.filterd (m0098420.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w47I4PO9077761 for ; Mon, 7 May 2018 14:08:45 -0400 Received: from e06smtp13.uk.ibm.com (e06smtp13.uk.ibm.com [195.75.94.109]) by mx0b-001b2d01.pphosted.com with ESMTP id 2htumt8fnx-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 07 May 2018 14:08:45 -0400 Received: from localhost by e06smtp13.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 7 May 2018 19:08:43 +0100 Received: from b06cxnps4075.portsmouth.uk.ibm.com (9.149.109.197) by e06smtp13.uk.ibm.com (192.168.101.143) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 7 May 2018 19:08:39 +0100 Received: from d06av22.portsmouth.uk.ibm.com (d06av22.portsmouth.uk.ibm.com [9.149.105.58]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w47I8bZW65732670; Mon, 7 May 2018 18:08:38 GMT Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7F4414C058; Mon, 7 May 2018 19:00:40 +0100 (BST) Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 98EF14C05A; Mon, 7 May 2018 19:00:38 +0100 (BST) Received: from [9.167.245.55] (unknown [9.167.245.55]) by d06av22.portsmouth.uk.ibm.com (Postfix) with ESMTP; Mon, 7 May 2018 19:00:38 +0100 (BST) Subject: Re: [PATCH v2 5/7] ocxl: Expose the thread_id needed for wait on p9 To: "Alastair D'Silva" , linuxppc-dev@lists.ozlabs.org Cc: linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, mikey@neuling.org, vaibhav@linux.vnet.ibm.com, aneesh.kumar@linux.vnet.ibm.com, malat@debian.org, felix@linux.vnet.ibm.com, pombredanne@nexb.com, sukadev@linux.vnet.ibm.com, npiggin@gmail.com, gregkh@linuxfoundation.org, arnd@arndb.de, andrew.donnellan@au1.ibm.com, fbarrat@linux.vnet.ibm.com, corbet@lwn.net, "Alastair D'Silva" References: <20180417020950.21446-1-alastair@au1.ibm.com> <20180418010810.30937-1-alastair@au1.ibm.com> <20180418010810.30937-6-alastair@au1.ibm.com> From: Frederic Barrat Date: Mon, 7 May 2018 20:08:35 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <20180418010810.30937-6-alastair@au1.ibm.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 x-cbid: 18050718-0012-0000-0000-000005D3AD6F X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18050718-0013-0000-0000-00001950B86C Message-Id: <76dccd99-f98b-6c56-56dc-eefd929f3ad0@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2018-05-07_09:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=2 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1709140000 definitions=main-1805070181 Sender: linux-doc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-doc@vger.kernel.org Le 18/04/2018 à 03:08, Alastair D'Silva a écrit : > From: Alastair D'Silva > > In order to successfully issue as_notify, an AFU needs to know the TID > to notify, which in turn means that this information should be > available in userspace so it can be communicated to the AFU. > > Signed-off-by: Alastair D'Silva > --- > drivers/misc/ocxl/context.c | 5 +++- > drivers/misc/ocxl/file.c | 53 +++++++++++++++++++++++++++++++++++++++ > drivers/misc/ocxl/link.c | 36 ++++++++++++++++++++++++++ > drivers/misc/ocxl/ocxl_internal.h | 1 + > include/misc/ocxl.h | 9 +++++++ > include/uapi/misc/ocxl.h | 10 ++++++++ > 6 files changed, 113 insertions(+), 1 deletion(-) > > diff --git a/drivers/misc/ocxl/context.c b/drivers/misc/ocxl/context.c > index 909e8807824a..95f74623113e 100644 > --- a/drivers/misc/ocxl/context.c > +++ b/drivers/misc/ocxl/context.c > @@ -34,6 +34,8 @@ int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, > mutex_init(&ctx->xsl_error_lock); > mutex_init(&ctx->irq_lock); > idr_init(&ctx->irq_idr); > + ctx->tidr = 0; > + > /* > * Keep a reference on the AFU to make sure it's valid for the > * duration of the life of the context > @@ -65,6 +67,7 @@ int ocxl_context_attach(struct ocxl_context *ctx, u64 amr) > { > int rc; > > + // Locks both status & tidr > mutex_lock(&ctx->status_mutex); > if (ctx->status != OPENED) { > rc = -EIO; > @@ -72,7 +75,7 @@ int ocxl_context_attach(struct ocxl_context *ctx, u64 amr) > } > > rc = ocxl_link_add_pe(ctx->afu->fn->link, ctx->pasid, > - current->mm->context.id, 0, amr, current->mm, > + current->mm->context.id, ctx->tidr, amr, current->mm, > xsl_fault_error, ctx); > if (rc) > goto out; > diff --git a/drivers/misc/ocxl/file.c b/drivers/misc/ocxl/file.c > index 038509e5d031..eb409a469f21 100644 > --- a/drivers/misc/ocxl/file.c > +++ b/drivers/misc/ocxl/file.c > @@ -5,6 +5,8 @@ > #include > #include > #include > +#include > +#include > #include "ocxl_internal.h" > > > @@ -123,11 +125,55 @@ static long afu_ioctl_get_metadata(struct ocxl_context *ctx, > return 0; > } > > +#ifdef CONFIG_PPC64 > +static long afu_ioctl_enable_p9_wait(struct ocxl_context *ctx, > + struct ocxl_ioctl_p9_wait __user *uarg) > +{ > + struct ocxl_ioctl_p9_wait arg; > + > + memset(&arg, 0, sizeof(arg)); > + > + if (cpu_has_feature(CPU_FTR_P9_TIDR)) { > + enum ocxl_context_status status; > + > + // Locks both status & tidr > + mutex_lock(&ctx->status_mutex); > + if (!ctx->tidr) { > + if (set_thread_tidr(current)) > + return -ENOENT; > + > + ctx->tidr = current->thread.tidr; > + } Now that we don't have the TIDR limit problem, I'm wondering if we cannot relax our rule a bit and have: - first thread to enable will become the default thread and update the Process element - any subsequent enable would just allocate the TIDR for the calling thread. That way, more than one thread could be used for 'wait'. Thoughts? Fred > + > + status = ctx->status; > + mutex_unlock(&ctx->status_mutex); > + > + if (status == ATTACHED) { > + int rc; > + struct link *link = ctx->afu->fn->link; > + > + rc = ocxl_link_update_pe(link, ctx->pasid, ctx->tidr); > + if (rc) > + return rc; > + } > + > + arg.thread_id = ctx->tidr; > + } else > + return -ENOENT; > + > + if (copy_to_user(uarg, &arg, sizeof(arg))) > + return -EFAULT; > + > + return 0; > +} > +#endif > + > #define CMD_STR(x) (x == OCXL_IOCTL_ATTACH ? "ATTACH" : \ > x == OCXL_IOCTL_IRQ_ALLOC ? "IRQ_ALLOC" : \ > x == OCXL_IOCTL_IRQ_FREE ? "IRQ_FREE" : \ > x == OCXL_IOCTL_IRQ_SET_FD ? "IRQ_SET_FD" : \ > x == OCXL_IOCTL_GET_METADATA ? "GET_METADATA" : \ > + x == OCXL_IOCTL_ENABLE_P9_WAIT ? "ENABLE_P9_WAIT" : \ > "UNKNOWN") > > static long afu_ioctl(struct file *file, unsigned int cmd, > @@ -186,6 +232,13 @@ static long afu_ioctl(struct file *file, unsigned int cmd, > (struct ocxl_ioctl_metadata __user *) args); > break; > > +#ifdef CONFIG_PPC64 > + case OCXL_IOCTL_ENABLE_P9_WAIT: > + rc = afu_ioctl_enable_p9_wait(ctx, > + (struct ocxl_ioctl_p9_wait __user *) args); > + break; > +#endif > + > default: > rc = -EINVAL; > } > diff --git a/drivers/misc/ocxl/link.c b/drivers/misc/ocxl/link.c > index 656e8610eec2..88876ae8f330 100644 > --- a/drivers/misc/ocxl/link.c > +++ b/drivers/misc/ocxl/link.c > @@ -544,6 +544,42 @@ int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > } > EXPORT_SYMBOL_GPL(ocxl_link_add_pe); > > +int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid) > +{ > + struct link *link = (struct link *) link_handle; > + struct spa *spa = link->spa; > + struct ocxl_process_element *pe; > + int pe_handle, rc; > + > + if (pasid > SPA_PASID_MAX) > + return -EINVAL; > + > + pe_handle = pasid & SPA_PE_MASK; > + pe = spa->spa_mem + pe_handle; > + > + mutex_lock(&spa->spa_lock); > + > + pe->tid = tid; > + > + /* > + * The barrier makes sure the PE is updated > + * before we clear the NPU context cache below, so that the > + * old PE cannot be reloaded erroneously. > + */ > + mb(); > + > + /* > + * hook to platform code > + * On powerpc, the entry needs to be cleared from the context > + * cache of the NPU. > + */ > + rc = pnv_ocxl_spa_remove_pe_from_cache(link->platform_data, pe_handle); > + WARN_ON(rc); > + > + mutex_unlock(&spa->spa_lock); > + return rc; > +} > + > int ocxl_link_remove_pe(void *link_handle, int pasid) > { > struct link *link = (struct link *) link_handle; > diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h > index 5d421824afd9..6c6d4e61888e 100644 > --- a/drivers/misc/ocxl/ocxl_internal.h > +++ b/drivers/misc/ocxl/ocxl_internal.h > @@ -77,6 +77,7 @@ struct ocxl_context { > struct ocxl_xsl_error xsl_error; > struct mutex irq_lock; > struct idr irq_idr; > + __u16 tidr; // Thread ID used for P9 wait implementation > }; > > struct ocxl_process_element { > diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h > index 51ccf76db293..9ff6ddc28e22 100644 > --- a/include/misc/ocxl.h > +++ b/include/misc/ocxl.h > @@ -188,6 +188,15 @@ extern int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), > void *xsl_err_data); > > +/** > + * Update values within a Process Element > + * > + * link_handle: the link handle associated with the process element > + * pasid: the PASID for the AFU context > + * tid: the new thread id for the process element > + */ > +extern int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); > + > /* > * Remove a Process Element from the Shared Process Area for a link > */ > diff --git a/include/uapi/misc/ocxl.h b/include/uapi/misc/ocxl.h > index 0af83d80fb3e..8d2748e69c84 100644 > --- a/include/uapi/misc/ocxl.h > +++ b/include/uapi/misc/ocxl.h > @@ -48,6 +48,15 @@ struct ocxl_ioctl_metadata { > __u64 reserved[13]; // Total of 16*u64 > }; > > +struct ocxl_ioctl_p9_wait { > + __u16 thread_id; // The thread ID required to wake this thread > + __u16 reserved1; > + __u32 reserved2; > + __u64 reserved3[3]; > +}; > + > +}; > + > struct ocxl_ioctl_irq_fd { > __u64 irq_offset; > __s32 eventfd; > @@ -62,5 +71,6 @@ struct ocxl_ioctl_irq_fd { > #define OCXL_IOCTL_IRQ_FREE _IOW(OCXL_MAGIC, 0x12, __u64) > #define OCXL_IOCTL_IRQ_SET_FD _IOW(OCXL_MAGIC, 0x13, struct ocxl_ioctl_irq_fd) > #define OCXL_IOCTL_GET_METADATA _IOR(OCXL_MAGIC, 0x14, struct ocxl_ioctl_metadata) > +#define OCXL_IOCTL_ENABLE_P9_WAIT _IOR(OCXL_MAGIC, 0x15, struct ocxl_ioctl_p9_wait) > > #endif /* _UAPI_MISC_OCXL_H */ > -- To unsubscribe from this list: send the line "unsubscribe linux-doc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html