From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
To: Ian Munsie <imunsie@au1.ibm.com>, mpe <mpe@ellerman.id.au>
Cc: cbe-oss-dev <cbe-oss-dev@lists.ozlabs.org>,
mikey <mikey@neuling.org>, arnd <arnd@arndb.de>,
greg <greg@kroah.com>,
linux-kernel <linux-kernel@vger.kernel.org>,
linuxppc-dev <linuxppc-dev@ozlabs.org>, anton <anton@samba.org>,
imunsie <imunsie@au1.ibm.com>, jk <jk@ozlabs.org>
Subject: Re: [PATCH v2 4/4] CXL: Fix PSL error due to duplicate segment table entries
Date: Tue, 28 Oct 2014 13:46:37 +0530 [thread overview]
Message-ID: <874muoy5ga.fsf@linux.vnet.ibm.com> (raw)
In-Reply-To: <1414466730-15591-5-git-send-email-imunsie@au.ibm.com>
Ian Munsie <imunsie@au1.ibm.com> writes:
> From: Ian Munsie <imunsie@au1.ibm.com>
>
> In certain circumstances the PSL (Power Service Layer, which provides
> translation services for CXL hardware) can send an interrupt for a
> segment miss that the kernel has already handled. This can happen if
> multiple translations for the same segment are queued in the PSL before
> the kernel has restarted the first translation.
>
> The CXL driver does not expect this situation and does not check if a
> segment had already been handled. This could cause a duplicate segment
> table entry which in turn caused a PSL error taking down the card.
>
> This patch fixes the issue by checking for existing entries in the
> segment table that match the segment it is trying to insert to avoid
> inserting duplicate entries.
>
> This patch requires "powerpc/copro: Use appropriate ESID mask in
> copro_calculate_slb" for the sste_matches function to operate correctly.
>
> Signed-off-by: Ian Munsie <imunsie@au1.ibm.com>
Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
> ---
> drivers/misc/cxl/fault.c | 28 ++++++++++++++++++++++------
> 1 file changed, 22 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/misc/cxl/fault.c b/drivers/misc/cxl/fault.c
> index cb4f323..c99e896 100644
> --- a/drivers/misc/cxl/fault.c
> +++ b/drivers/misc/cxl/fault.c
> @@ -21,11 +21,20 @@
>
> #include "cxl.h"
>
> -/* This finds a free SSTE for the given SLB */
> +static bool sste_matches(struct cxl_sste *sste, struct copro_slb
> *slb)
inline ?
> +{
> + return ((sste->vsid_data == cpu_to_be64(slb->vsid)) &&
> + (sste->esid_data == cpu_to_be64(slb->esid)));
why comparing converting to big endian ? The natural way is to do it
other way right ?.
(be64_to_cpu(sste->vsid_data) == slb->vsid)
> +}
> +
> +/*
> + * This finds a free SSTE for the given SLB, or returns NULL if it's already in
> + * the segment table.
> + */
> static struct cxl_sste* find_free_sste(struct cxl_context *ctx,
> struct copro_slb *slb)
> {
> - struct cxl_sste *primary, *sste;
> + struct cxl_sste *primary, *sste, *ret = NULL;
> unsigned int mask = (ctx->sst_size >> 7) - 1; /* SSTP0[SegTableSize] */
> unsigned int entry;
> unsigned int hash;
> @@ -38,15 +47,19 @@ static struct cxl_sste* find_free_sste(struct cxl_context *ctx,
> primary = ctx->sstp + (hash << 3);
>
> for (entry = 0, sste = primary; entry < 8; entry++, sste++) {
> - if (!(be64_to_cpu(sste->esid_data) & SLB_ESID_V))
> - return sste;
> + if (!ret && !(be64_to_cpu(sste->esid_data) & SLB_ESID_V))
> + ret = sste;
> + if (sste_matches(sste, slb))
> + return NULL;
> }
> + if (ret)
> + return ret;
>
> /* Nothing free, select an entry to cast out */
> - sste = primary + ctx->sst_lru;
> + ret = primary + ctx->sst_lru;
> ctx->sst_lru = (ctx->sst_lru + 1) & 0x7;
>
> - return sste;
> + return ret;
> }
>
> static void cxl_load_segment(struct cxl_context *ctx, struct copro_slb *slb)
> @@ -57,12 +70,15 @@ static void cxl_load_segment(struct cxl_context *ctx, struct copro_slb *slb)
>
> spin_lock_irqsave(&ctx->sste_lock, flags);
> sste = find_free_sste(ctx, slb);
> + if (!sste)
> + goto out_unlock;
>
> pr_devel("CXL Populating SST[%li]: %#llx %#llx\n",
> sste - ctx->sstp, slb->vsid, slb->esid);
>
> sste->vsid_data = cpu_to_be64(slb->vsid);
> sste->esid_data = cpu_to_be64(slb->esid);
> +out_unlock:
> spin_unlock_irqrestore(&ctx->sste_lock, flags);
> }
>
> --
> 2.1.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
WARNING: multiple messages have this Message-ID (diff)
From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
To: Ian Munsie <imunsie@au1.ibm.com>, mpe <mpe@ellerman.id.au>
Cc: greg <greg@kroah.com>, arnd <arnd@arndb.de>,
benh <benh@kernel.crashing.org>, mikey <mikey@neuling.org>,
anton <anton@samba.org>,
linux-kernel <linux-kernel@vger.kernel.org>,
linuxppc-dev <linuxppc-dev@ozlabs.org>, jk <jk@ozlabs.org>,
imunsie <imunsie@au1.ibm.com>,
cbe-oss-dev <cbe-oss-dev@lists.ozlabs.org>
Subject: Re: [PATCH v2 4/4] CXL: Fix PSL error due to duplicate segment table entries
Date: Tue, 28 Oct 2014 13:46:37 +0530 [thread overview]
Message-ID: <874muoy5ga.fsf@linux.vnet.ibm.com> (raw)
In-Reply-To: <1414466730-15591-5-git-send-email-imunsie@au.ibm.com>
Ian Munsie <imunsie@au1.ibm.com> writes:
> From: Ian Munsie <imunsie@au1.ibm.com>
>
> In certain circumstances the PSL (Power Service Layer, which provides
> translation services for CXL hardware) can send an interrupt for a
> segment miss that the kernel has already handled. This can happen if
> multiple translations for the same segment are queued in the PSL before
> the kernel has restarted the first translation.
>
> The CXL driver does not expect this situation and does not check if a
> segment had already been handled. This could cause a duplicate segment
> table entry which in turn caused a PSL error taking down the card.
>
> This patch fixes the issue by checking for existing entries in the
> segment table that match the segment it is trying to insert to avoid
> inserting duplicate entries.
>
> This patch requires "powerpc/copro: Use appropriate ESID mask in
> copro_calculate_slb" for the sste_matches function to operate correctly.
>
> Signed-off-by: Ian Munsie <imunsie@au1.ibm.com>
Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
> ---
> drivers/misc/cxl/fault.c | 28 ++++++++++++++++++++++------
> 1 file changed, 22 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/misc/cxl/fault.c b/drivers/misc/cxl/fault.c
> index cb4f323..c99e896 100644
> --- a/drivers/misc/cxl/fault.c
> +++ b/drivers/misc/cxl/fault.c
> @@ -21,11 +21,20 @@
>
> #include "cxl.h"
>
> -/* This finds a free SSTE for the given SLB */
> +static bool sste_matches(struct cxl_sste *sste, struct copro_slb
> *slb)
inline ?
> +{
> + return ((sste->vsid_data == cpu_to_be64(slb->vsid)) &&
> + (sste->esid_data == cpu_to_be64(slb->esid)));
why comparing converting to big endian ? The natural way is to do it
other way right ?.
(be64_to_cpu(sste->vsid_data) == slb->vsid)
> +}
> +
> +/*
> + * This finds a free SSTE for the given SLB, or returns NULL if it's already in
> + * the segment table.
> + */
> static struct cxl_sste* find_free_sste(struct cxl_context *ctx,
> struct copro_slb *slb)
> {
> - struct cxl_sste *primary, *sste;
> + struct cxl_sste *primary, *sste, *ret = NULL;
> unsigned int mask = (ctx->sst_size >> 7) - 1; /* SSTP0[SegTableSize] */
> unsigned int entry;
> unsigned int hash;
> @@ -38,15 +47,19 @@ static struct cxl_sste* find_free_sste(struct cxl_context *ctx,
> primary = ctx->sstp + (hash << 3);
>
> for (entry = 0, sste = primary; entry < 8; entry++, sste++) {
> - if (!(be64_to_cpu(sste->esid_data) & SLB_ESID_V))
> - return sste;
> + if (!ret && !(be64_to_cpu(sste->esid_data) & SLB_ESID_V))
> + ret = sste;
> + if (sste_matches(sste, slb))
> + return NULL;
> }
> + if (ret)
> + return ret;
>
> /* Nothing free, select an entry to cast out */
> - sste = primary + ctx->sst_lru;
> + ret = primary + ctx->sst_lru;
> ctx->sst_lru = (ctx->sst_lru + 1) & 0x7;
>
> - return sste;
> + return ret;
> }
>
> static void cxl_load_segment(struct cxl_context *ctx, struct copro_slb *slb)
> @@ -57,12 +70,15 @@ static void cxl_load_segment(struct cxl_context *ctx, struct copro_slb *slb)
>
> spin_lock_irqsave(&ctx->sste_lock, flags);
> sste = find_free_sste(ctx, slb);
> + if (!sste)
> + goto out_unlock;
>
> pr_devel("CXL Populating SST[%li]: %#llx %#llx\n",
> sste - ctx->sstp, slb->vsid, slb->esid);
>
> sste->vsid_data = cpu_to_be64(slb->vsid);
> sste->esid_data = cpu_to_be64(slb->esid);
> +out_unlock:
> spin_unlock_irqrestore(&ctx->sste_lock, flags);
> }
>
> --
> 2.1.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
next prev parent reply other threads:[~2014-10-28 8:16 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-28 3:25 [PATCH v2] CXL: Fix PSL error due to duplicate segment table entries Ian Munsie
2014-10-28 3:25 ` Ian Munsie
2014-10-28 3:25 ` [PATCH v2 1/4] CXL: Disable secondary hash in segment table Ian Munsie
2014-10-28 3:25 ` Ian Munsie
2014-10-28 8:12 ` Aneesh Kumar K.V
2014-10-28 8:12 ` Aneesh Kumar K.V
2014-10-28 3:25 ` [PATCH v2 2/4] CXL: Refactor cxl_load_segment and find_free_sste Ian Munsie
2014-10-28 3:25 ` Ian Munsie
2014-10-28 8:13 ` Aneesh Kumar K.V
2014-10-28 8:13 ` Aneesh Kumar K.V
2014-10-28 3:25 ` [PATCH v2 3/4] powerpc/copro: Use appropriate ESID mask in copro_calculate_slb Ian Munsie
2014-10-28 3:25 ` Ian Munsie
2014-10-28 8:13 ` Aneesh Kumar K.V
2014-10-28 8:13 ` Aneesh Kumar K.V
2014-10-28 3:25 ` [PATCH v2 4/4] CXL: Fix PSL error due to duplicate segment table entries Ian Munsie
2014-10-28 3:25 ` Ian Munsie
2014-10-28 8:16 ` Aneesh Kumar K.V [this message]
2014-10-28 8:16 ` Aneesh Kumar K.V
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=874muoy5ga.fsf@linux.vnet.ibm.com \
--to=aneesh.kumar@linux.vnet.ibm.com \
--cc=anton@samba.org \
--cc=arnd@arndb.de \
--cc=cbe-oss-dev@lists.ozlabs.org \
--cc=greg@kroah.com \
--cc=imunsie@au1.ibm.com \
--cc=jk@ozlabs.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@ozlabs.org \
--cc=mikey@neuling.org \
--cc=mpe@ellerman.id.au \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.