Received-SPF: pass (google.com: domain of linux-kernel+bounces-14285-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Precedence: bulk
MIME-Version: 1.0
References: <20240102055143.3889-1-quic_kriskura@quicinc.com>
 <CANP3RGeirg+f8cBbw_3YR5AvuB1ZxJC_9-wcn+Tb-GXf1ESKCQ@mail.gmail.com> <ad60f399-5c6a-4f16-8c28-f4d4e0fde1ff@quicinc.com>
In-Reply-To: <ad60f399-5c6a-4f16-8c28-f4d4e0fde1ff@quicinc.com>
From: =?UTF-8?Q?Maciej_=C5=BBenczykowski?= <maze@google.com>
Date: Tue, 2 Jan 2024 03:22:42 -0800
Message-ID: <CANP3RGf5dg14DNuKOn9pqWd4oSBDsPhwwBB7AJ0c3qHbDT0sBQ@mail.gmail.com>
Subject: Re: [PATCH] usb: gadget: ncm: Avoid dropping datagrams of properly
 parsed NTBs
To: Krishna Kurapati PSSNV <quic_kriskura@quicinc.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Hardik Gajjar <hgajjar@de.adit-jv.com>, 
	linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, 
	quic_ppratap@quicinc.com, quic_wcheng@quicinc.com, quic_jackp@quicinc.com
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Tue, Jan 2, 2024 at 2:48=E2=80=AFAM Krishna Kurapati PSSNV
<quic_kriskura@quicinc.com> wrote:
>
>
> >> It is observed sometimes when tethering is used over NCM with Windows =
11
> >> as host, at some instances, the gadget_giveback has one byte appended =
at
> >> the end of a proper NTB. When the NTB is parsed, unwrap call looks for
> >> any leftover bytes in SKB provided by u_ether and if there are any pen=
ding
> >> bytes, it treats them as a separate NTB and parses it. But in case the
> >> second NTB (as per unwrap call) is faulty/corrupt, all the datagrams t=
hat
> >> were parsed properly in the first NTB and saved in rx_list are dropped=
.
> >
> > I think this is likely Windows trying to avoid generating 0 length fram=
es.
> >
> > (usb max single datagram [frame?] size is 1024 bytes).
> >
> > My guess is this extra byte will only ever happen at the end of a
> > multiple of 1024 bytes,
> > and it will always be exactly one byte, and it will likely be a '0' pad=
 byte.
> >
>
> You are right. This happens only with packet sizes of 1024/2048/3072
> etc., and it is 0x00 only.
>
> > Could you check if a more specific test of this sort would make sense?
> > (ie. fix the problem)
> >
> > Something like
> >
> > if (to_process =3D=3D 1) && (current_offset & 1023 =3D=3D 0) && (*paylo=
ad =3D=3D 0)
> >    // extra 1 zero byte pad to prevent multiple of 1024 sized packet
> >    return
> > }
> >
>
> The above might work. But just wanted to check why this 1 byte would
> come actually ? Any reason for this ? ZLP must not give a 1 byte packet
> of 1 byte AFAIK.

I'm not a USB expert, but... my (possibly wrong) understanding is:
(note I may be using bad terminology... also the 1024/16384 constants
are USB3 specific, USB2 has afaik max 512 not 1024, I think USB1 is
even 64, but it's likely too old to matter, etc.)

USB3 payloads can be up to 16384 bytes in size,
on the wire they are split up into packets of between 0 and 1024 bytes.
[a Zero Length Packet is a ZLP]
A usb payload is terminated with a usb packet of < 1024 bytes.

So a 1524 byte payload would be sent as 2 packets 1024 + 500.
While a 2048 byte payload would be sent as 3 packets 1024 + 1024 + 0 (ie. Z=
LP)

A 16384 byte payload could be sent as 16 * 1024 + ZLP,
but since 16384 is the max you might be able to get away with just 16
* 1024 and skip the ZLP...

I think this is why the Linux usb code base has ZLP / NO_ZLP quirks.
[but do note I may be wrong, I haven't gone looking at what exactly
the zlp quirks do,
not even sure if they're receive or transmit side... or both]

Different hardware/usb chipsets/etc have different behaviour wrt. ZLPs.

In general it seems like what needs to happen is much clearer if you
just avoid the need for ZLPs entirely.
I think that's what windows is trying to do here: avoid ever sending a
usb payload with a multiple of 1024 bytes,
so it never has to send ZLPs. This seems easy enough to do...
limit max to 16383 (not 16384) and add 1 byte of zero pad if the
payload ends up being a multiple of 1024.

> > It seems a little dangerous to just blindly ignore arbitrary amounts
> > of trailing garbage...
>
> Yes. I agree, which is why I put a note in comment section of patch
> stating that this doesn't cover all cases, just the ones found in the
> testing so far. But the code suggestion you provided might actually work
> out. So something like the following ?
>
> if (to_process =3D=3D 1) && (block_len%1024 =3D=3D 0) && (*payload =3D=3D=
 0)

Assuming it compiles and works ;-) I wrote this without looking at the code=
.

I'm guessing this needs to be %512 for usb2...
Do we know if we're connected via usb2 or usb3?
[mayhaps there's some field that already stores this 1024 constant...]
If not... should we just check for %512 instead to support both usb2 and us=
b3?

>      // extra 1 zero byte pad to prevent multiple of 1024 sized packet
>      return
> } else if (to_process > 1) {

this should likely continue to be !=3D 0 or > 0

>      goto parse_ntb;
> }
>
> Just modified in current_offset with block_len and checked it with
> %1024. Let me know if it is fine and I will give the change to testing
> team. The issue is easily reproducible.
>
> Regards,
> Krishna,
>
> >>
> >> Adding a few custom traces showed the following:
> >>
> >> [002] d..1  7828.532866: dwc3_gadget_giveback: ep1out:
> >> req 000000003868811a length 1025/16384 zsI =3D=3D> 0
> >> [002] d..1  7828.532867: ncm_unwrap_ntb: K: ncm_unwrap_ntb toprocess: =
1025
> >> [002] d..1  7828.532867: ncm_unwrap_ntb: K: ncm_unwrap_ntb nth: 175199=
9342
> >> [002] d..1  7828.532868: ncm_unwrap_ntb: K: ncm_unwrap_ntb seq: 0xce67
> >> [002] d..1  7828.532868: ncm_unwrap_ntb: K: ncm_unwrap_ntb blk_len: 0x=
400
> >> [002] d..1  7828.532868: ncm_unwrap_ntb: K: ncm_unwrap_ntb ndp_len: 0x=
10
> >> [002] d..1  7828.532869: ncm_unwrap_ntb: K: Parsed NTB with 1 frames
> >>
> >> In this case, the giveback is of 1025 bytes and block length is 1024.
> >> The rest 1 byte (which is 0x00) won't be parsed resulting in drop of
> >> all datagrams in rx_list.
> >>
> >> Same is case with packets of size 2048:
> >> [002] d..1  7828.557948: dwc3_gadget_giveback: ep1out:
> >> req 0000000011dfd96e length 2049/16384 zsI =3D=3D> 0
> >> [002] d..1  7828.557949: ncm_unwrap_ntb: K: ncm_unwrap_ntb nth: 175199=
9342
> >> [002] d..1  7828.557950: ncm_unwrap_ntb: K: ncm_unwrap_ntb blk_len: 0x=
800
> >>
> >> Lecroy shows one byte coming in extra confirming that the byte is comi=
ng
> >> in from PC:
> >>
> >> Transfer 2959 - Bytes Transferred(1025)  Timestamp((18.524 843 590)
> >> - Transaction 8391 - Data(1025 bytes) Timestamp(18.524 843 590)
> >> --- Packet 4063861
> >>        Data(1024 bytes)
> >>        Duration(2.117us) Idle(14.700ns) Timestamp(18.524 843 590)
> >> --- Packet 4063863
> >>        Data(1 byte)
> >>        Duration(66.160ns) Time(282.000ns) Timestamp(18.524 845 722)
> >>
> >> Fix this by checking if the leftover bytes before parsing next NTB is =
of
> >> size more than the expected header.
> >>
> >> Fixes: 427694cfaafa ("usb: gadget: ncm: Handle decoding of multiple NT=
B's in unwrap call")
> >> Signed-off-by: Krishna Kurapati <quic_kriskura@quicinc.com>
> >> ---
> >> There could probably be cases where the first NTB is proper and the se=
cond
> >> NTB's header is proper but the NDP is corrupt, and in those cases too,=
 all
> >> the datagrams are dropped. But I haven't seen such case practically.
> >>
> >>   drivers/usb/gadget/function/f_ncm.c | 2 +-
> >>   1 file changed, 1 insertion(+), 1 deletion(-)
> >>
> >> diff --git a/drivers/usb/gadget/function/f_ncm.c b/drivers/usb/gadget/=
function/f_ncm.c
> >> index cc0ed29a4adc..a75b6dc8b0cb 100644
> >> --- a/drivers/usb/gadget/function/f_ncm.c
> >> +++ b/drivers/usb/gadget/function/f_ncm.c
> >> @@ -1325,7 +1325,7 @@ static int ncm_unwrap_ntb(struct gether *port,
> >>               "Parsed NTB with %d frames\n", dgram_counter);
> >>
> >>          to_process -=3D block_len;
> >> -       if (to_process !=3D 0) {
> >> +       if (to_process > opts->nth_size) {
> >
> > shouldn't this check actually be >=3D not > ?
> >
>
> Yes. But what is header is present and no data further ? Just to fix
> another harmless corner case, I added the "=3D".
>
> Regards,
> Krishna,