On Sat, 17 Dec 2022 16:21:05 -0800
Ira Weiny <ira.weiny@xxxxxxxxx> wrote:
> On Sat, Dec 17, 2022 at 04:38:50PM +0000, Jonathan Cameron wrote:
> > On Fri, 16 Dec 2022 13:54:01 -0800
> > Ira Weiny <ira.weiny@xxxxxxxxx> wrote:
> >
> > > On Fri, Dec 16, 2022 at 03:39:39PM +0000, Jonathan Cameron wrote:
> > > > On Sun, 11 Dec 2022 23:06:20 -0800
> > > > ira.weiny@xxxxxxxxx wrote:
> > > >
> > > > > From: Ira Weiny <ira.weiny@xxxxxxxxx>
> > > > >
> > > > > CXL devices have multiple event logs which can be queried for CXL event
> > > > > records. Devices are required to support the storage of at least one
> > > > > event record in each event log type.
> > > > >
> > > > > Devices track event log overflow by incrementing a counter and tracking
> > > > > the time of the first and last overflow event seen.
> > > > >
> > > > > Software queries events via the Get Event Record mailbox command; CXL
> > > > > rev 3.0 section 8.2.9.2.2 and clears events via CXL rev 3.0 section
> > > > > 8.2.9.2.3 Clear Event Records mailbox command.
> > > > >
> > > > > If the result of negotiating CXL Error Reporting Control is OS control,
> > > > > read and clear all event logs on driver load.
> > > > >
> > > > > Ensure a clean slate of events by reading and clearing the events on
> > > > > driver load.
> > > > >
> > > > > The status register is not used because a device may continue to trigger
> > > > > events and the only requirement is to empty the log at least once. This
> > > > > allows for the required transition from empty to non-empty for interrupt
> > > > > generation. Handling of interrupts is in a follow on patch.
> > > > >
> > > > > The device can return up to 1MB worth of event records per query.
> > > > > Allocate a shared large buffer to handle the max number of records based
> > > > > on the mailbox payload size.
> > > > >
> > > > > This patch traces a raw event record and leaves specific event record
> > > > > type tracing to subsequent patches. Macros are created to aid in
> > > > > tracing the common CXL Event header fields.
> > > > >
> > > > > Each record is cleared explicitly. A clear all bit is specified but is
> > > > > only valid when the log overflows.
> > > > >
> > > > > Signed-off-by: Ira Weiny <ira.weiny@xxxxxxxxx>
> > > >
> > > > A few things noticed inline. I've tightened the QEMU code to reject the
> > > > case of the input payload claims to be bigger than the mailbox size
> > > > and hacked the size down to 256 bytes so it triggers the problem
> > > > highlighted below.
> > >
> > > I'm not sure what you did here.
> >
> > Nor am I. I think this might have been a case of chasing the undersized
> > length bug in QEMU because it was the CXL 3.0 issue and misunderstanding
> > one of the debug prints I got.
> >
> > Friday silliness. Sorry about that!
>
> NP but you did have me going. I've vowed to actually understand the spec
> better going forward! :-D
>
> >
> > However, the over sized payload communicated to the hardware is still
> > a potential problem. See below.
>
> I don't see where there is an oversized payload used either...
We write a payload size into the mailbox register that includes much more
than the payload we are sending.
>
> >
> > >
> > > >
> > > > >
> > > > > ---
> > > > > Changes from V3:
> > > > > Dan
> > > > > Split off _OSC pcie bits
> > > > > Use existing style for host bridge flag in that
> > > > > patch
> > > > > Clean up event processing loop
> > > > > Use dev_err_ratelimited()
> > > > > Clean up version change log
> > > > > Delete 'EVENT LOG OVERFLOW'
> > > > > Remove cxl_clear_event_logs()
> > > > > Add comment for native cxl control
> > > > > Fail driver load on event buf allocation failure
> > > > > Comment why events are not processed without _OSC flag
> > > > > ---
> > > > > drivers/cxl/core/mbox.c | 136 +++++++++++++++++++++++++++++++++++++++
> > > > > drivers/cxl/core/trace.h | 120 ++++++++++++++++++++++++++++++++++
> > > > > drivers/cxl/cxl.h | 12 ++++
> > > > > drivers/cxl/cxlmem.h | 84 ++++++++++++++++++++++++
> > > > > drivers/cxl/pci.c | 40 ++++++++++++
> > > > > 5 files changed, 392 insertions(+)
> > > > >
> > > > > diff --git a/drivers/cxl/core/mbox.c b/drivers/cxl/core/mbox.c
> > > > > index b03fba212799..9fb327370e08 100644
> > > > > --- a/drivers/cxl/core/mbox.c
> > > > > +++ b/drivers/cxl/core/mbox.c
> > > >
> > > > > +static int cxl_clear_event_record(struct cxl_dev_state *cxlds,
> > > > > + enum cxl_event_log_type log,
> > > > > + struct cxl_get_event_payload *get_pl)
> > > > > +{
> > > > > + struct cxl_mbox_clear_event_payload payload = {
> > > > > + .event_log = log,
> > > > > + };
> > > > > + u16 total = le16_to_cpu(get_pl->record_count);
> > > > > + u8 max_handles = CXL_CLEAR_EVENT_MAX_HANDLES;
> > > > > + size_t pl_size = sizeof(payload);
>
> This line ensures the payload is only ever the size of the definition per the
> 3.0 spec.
It doesn't (see later). It ensures it is the size of the maximum payload.
The size should be 6 + 2 * total (truncated as necesxary) as that's the
actual payload size.
>
> > > > > + struct cxl_mbox_cmd mbox_cmd;
> > > > > + u16 cnt;
> > > > > + int rc;
> > > > > + int i;
> > > > > +
> > > > > + /* Payload size may limit the max handles */
> > > > > + if (pl_size > cxlds->payload_size) {
> > > > > + max_handles = CXL_CLEAR_EVENT_LIMIT_HANDLES(cxlds->payload_size);
> >
> > Definition of that is more complex than it needs to be - see below.
>
> Then this ensures it is truncated if needed.
>
> >
> > > > > + pl_size = cxlds->payload_size;
> > >
> > > pl_size is only the max size possible if that size was smaller than the size of
> > > the record [sizeof(payload) above].
> >
> > Sorry. For some reason my eyes skipped over this completely.
> > So we are fine for all my comments on overflowing. On plus side
> > will now check if that happens in QEMU and return an error which we
> > weren't doing before.
> >
> > >
> > > > > + }
> > > > > +
> > > > > + mbox_cmd = (struct cxl_mbox_cmd) {
> > > > > + .opcode = CXL_MBOX_OP_CLEAR_EVENT_RECORD,
> > > > > + .payload_in = &payload,
> > > > > + .size_in = pl_size,
> > > >
> > > > This payload size should be whatever we need to store the records,
> > > > not the max size possible. Particularly as that size is currently
> > > > bigger than the mailbox might be.
> > >
> > > But the above check and set ensures that does not happen.
> > >
> > > >
> > > > It shouldn't fail (I think) simply because a later version of the spec might
> > > > add more to this message and things should still work, but definitely not
> > > > good practice to tell the hardware this is much longer than it actually is.
> > >
> > > I don't follow.
> > >
> > > The full payload is going to be sent even if we are just clearing 1 record
> > > which is inefficient but it should never overflow the hardware because it is
> > > limited by the check above.
> > >
> > > So why would this be a problem?
> > I'm struggling to find a clear spec statement on if this allowed, so the following
> > is a thought experiment. There is language in definition of the "invalid payload length"
> > error code "The input payload length is not valid for the specified command", but it
> > doesn't go into what counts as valid.
>
> I think the only thing which makes sense is if the payload length is smaller
> than:
>
> Header + nr_recs * 2
>
> Anything up to
>
> header + (0xff * 2) should be fine per the 3.0 spec.
nr_recs is in the structure, so the it could check that (the whole argument about
future specs is to say that the device shouldn't enforce that limit even though
it can know the structure is longer than expected).
>
> >
> > What you have looks fine because a device can't fail on the basis it's told the
> > payload is longer than it expects, because you might be sending a CXL 4.0 spec
> > payload that is backwards compatible with CXL 3.0 - hence the fact the sizes
> > don't match up with that expected can't be considered an error.
> > So far so good... However, we may have a situation not dissimilar to the
> > change in record length for the set event interrupt policy payload between CXL 2.0
> > and CXL 3.0. The only way the endpoint knows what version of message it got is because the
> > record is 4 bytes or 5 bytes. If we have extra stuff on the end of this record
> > in future the end point can assume that it is a new version of the spec and interpret
> > what is in that payload space.
> >
> > Say the future structure looks like
> >
> > struct cxl_mbox_clear_event_payload_future {
> > u8 event_log; /* enum cxl_event_log_type */
> > u8 clear_flags;
> > u8 nr_recs;
> > u8 reserved[3];
> > __le16 handle[nr_recs];
> > __le16 otherdata[nr_recs];
>
> otherdata should be ignored by a 3.0 device.
>
> a theoretical 4.0 device should handle otherdata not being there per some flag
> in the flags field I would suppose... That would have to be determined if this
> payload were extended. Otherwise this software will fail no matter what.
A flag isn't required though obviously nice to have. Length should be enough.
We already have a version of this with you sending a CXL 2.0 command to
a potentially CXL 3.0 device and not checking if DCD is supported before
doing so (which I think is fine).
>
> Other mailbox commands do not 0 out from the command size to 1M either.
>
> > }
> >
> > Endpoint receiving your 'overly long payload' will assume all those otherdata fields
> > are 0, not necessarily the same as non present.
>
> But it is not 'overly long'. It is only the length of the current spec. See
> above.
This is where we disagree. The current spec says:
Table 8-36: Input payload size for Clear Event Records is 8+
(the size for when you are clearing one record)
- Side note this is potentially wrong as a clear all wouldn't have event
record handles, so I think it should be 6+.
Table 8-51 has
* Number of event record handles
* Event record handles
and no defined reserved space after that Event Record handles.
Hence the size is precisely Header + nr_records * 2, not more.
Not directly relevant but any record handles that are 0 are treated as
invalid handles (error returned).
(this also aligns with what Jonny raised)
>
> > For the set event interrupt policy, if we sent an overlong payload like you've done here
> > with assumption of the CXL 2.0 spec we would be turning off the DCD interrupt rather
> > that doing nothing (unlikely to be a problem in that particularly case as that one
> > doesn't have a FW Interrupt option - but that's more luck than design).
> >
> > I'm not sure why we'd have extra stuff for this payload, but it 'might' happen'.
>
> I'll have to check but I don't think I set the payload long in that message.
> It too should be sizeof(<set event int policy>)
You haven't. the illustration there was about the fact that it is 4 bytes in your implementation
(which is fine as that is the CXL 2.0 message) and 5 bytes in CXL 3.0 which you'll
upgrade to when you add DCD support.
>
> >
> > > >
> > >
> > > >
> > > >
> > > > > + };
> > > > > +
> > > > > + /*
> > > > > + * Clear Event Records uses u8 for the handle cnt while Get Event
> > > > > + * Record can return up to 0xffff records.
> > > > > + */
> > > > > + i = 0;
> > > > > + for (cnt = 0; cnt < total; cnt++) {
> > > > > + payload.handle[i++] = get_pl->records[cnt].hdr.handle;
> > > > > + dev_dbg(cxlds->dev, "Event log '%d': Clearing %u\n",
> > > > > + log, le16_to_cpu(payload.handle[i]));
> > > > > +
> > > > > + if (i == max_handles) {
> > > > > + payload.nr_recs = i;
> > > > > + rc = cxl_internal_send_cmd(cxlds, &mbox_cmd);
> > > > > + if (rc)
> > > > > + return rc;
> > > > > + i = 0;
> > > > > + }
> > > > > + }
> > > > > +
> > > > > + /* Clear what is left if any */
> > > > > + if (i) {
> > > > > + payload.nr_recs = i;
> > > > > + rc = cxl_internal_send_cmd(cxlds, &mbox_cmd);
> > > > > + if (rc)
> > > > > + return rc;
> > > > > + }
> > > > > +
> > > > > + return 0;
> > > > > +}
> > > >
> > > >
> > > > ...
> > > >
> > > > > diff --git a/drivers/cxl/cxlmem.h b/drivers/cxl/cxlmem.h
> > > > > index ab138004f644..dd9aa3dd738e 100644
> > > > > --- a/drivers/cxl/cxlmem.h
> > > > > +++ b/drivers/cxl/cxlmem.h
> > > >
> > > > ...
> > > >
> > > > > +
> > > > > +/*
> > > > > + * Clear Event Records input payload
> > > > > + * CXL rev 3.0 section 8.2.9.2.3; Table 8-51
> > > > > + */
> > > > > +#define CXL_CLEAR_EVENT_MAX_HANDLES (0xff)
> > > > > +struct cxl_mbox_clear_event_payload {
> > > > > + u8 event_log; /* enum cxl_event_log_type */
> > > > > + u8 clear_flags;
> > > > > + u8 nr_recs;
> > > > > + u8 reserved[3];
> > > > > + __le16 handle[CXL_CLEAR_EVENT_MAX_HANDLES];
> > > >
> > > > Doesn't fit in the smallest possible payload buffer.
> > > > It's 526 bytes long. Payload buffer might be 256 bytes in total.
> > > > (8.2.8.4.3 Mailbox capabilities)
> > > >
> > > > Lazy approach, make this smaller and do more loops when clearing.
> > > > If we want to optimize this later can expand it to this size.
> > >
> > > I agree but the code already checks for and adjusts this on the fly based on
> > > cxlds->payload_size?
> > >
> > > + /* Payload size may limit the max handles */
> > > + if (pl_size > cxlds->payload_size) {
> > > + max_handles = CXL_CLEAR_EVENT_LIMIT_HANDLES(cxlds->payload_size);
> > > + pl_size = cxlds->payload_size;
> > > + }
> > >
> > > Why is this not ok? [Other than being potentially inefficient.]
> > >
> > > Do you have a patch to qemu which causes this?
> >
> > Two issues crossing I think on my side and me thinking this one was obviously
> > the problem when it wasn't.
>
> My fault also for not at least throwing my Qemu test code out there. I've been
> busy with some things today. I'll try and get those changes cleaned up and at
> least another RFC set out ASAP.
>
> >
> > >
> > > Ira
> > >
> > > > > +} __packed;
> > > > > +#define CXL_CLEAR_EVENT_LIMIT_HANDLES(payload_size) \
> > > > > + (((payload_size) - \
> > > > > + (sizeof(struct cxl_mbox_clear_event_payload) - \
> > > > > + (sizeof(__le16) * CXL_CLEAR_EVENT_MAX_HANDLES))) / \
> >
> > Could use offsetof() to simplify this
>
> True. How about I submit a clean up patch to follow? I don't think this is
> broken.
I think you'll be changing the patch anyway - so might as well fix this up too :)
Jonathan
>
> Ira
>
> >
> > > > > + sizeof(__le16))
> > > > > +
> > > >
> > > > ...
> > > >
> >
