Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7;
Date:   Wed, 11 Oct 2023 23:53:28 +0200
From:   Thierry Reding <thierry.reding@gmail.com>
To:     =?utf-8?B?TWljaGHFgiBNaXJvc8WCYXc=?= <mirq-linux@rere.qmqm.pl>
Cc:     Peter Geis <pgwipeout@gmail.com>,
        Dmitry Osipenko <digetx@gmail.com>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Peter Chen <peter.chen@kernel.org>,
        Thierry Reding <treding@nvidia.com>,
        linux-kernel@vger.kernel.org, linux-tegra@vger.kernel.org,
        linux-usb@vger.kernel.org
Subject: Re: [PATCH v2 2/3] usb: chipidea: Simplify Tegra DMA alignment code
Message-ID: <ZScZWFJCCMr7oWwX@orome.fritz.box>
References: <cover.1695934946.git.mirq-linux@rere.qmqm.pl>
 <a0d917d492b1f91ee0019e68b8e8bca9c585393f.1695934946.git.mirq-linux@rere.qmqm.pl>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
        protocol="application/pgp-signature"; boundary="/ARsLMUmfva5Ak1M"
Content-Disposition: inline
In-Reply-To: <a0d917d492b1f91ee0019e68b8e8bca9c585393f.1695934946.git.mirq-linux@rere.qmqm.pl>
User-Agent: Mutt/2.2.12 (2023-09-09)
Precedence: bulk


--/ARsLMUmfva5Ak1M
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Thu, Sep 28, 2023 at 11:06:03PM +0200, Micha=C5=82 Miros=C5=82aw wrote:
> The USB host on Tegra3 works with 32-bit alignment. Previous code tried
> to align the buffer, but it did align the wrapper struct instead, so
> the buffer was at a constant offset of 8 bytes (two pointers) from
> expected alignment.  Since kmalloc() guarantees at least 8-byte
> alignment already, the alignment-extending is removed.
>=20
> Fixes: fc53d5279094 ("usb: chipidea: tegra: Support host mode")
> Signed-off-by: Micha=C5=82 Miros=C5=82aw <mirq-linux@rere.qmqm.pl>
> ---
>  drivers/usb/chipidea/host.c | 45 +++++++++++++++----------------------
>  1 file changed, 18 insertions(+), 27 deletions(-)
>=20
> diff --git a/drivers/usb/chipidea/host.c b/drivers/usb/chipidea/host.c
> index abddd39d1ff1..0cce19208370 100644
> --- a/drivers/usb/chipidea/host.c
> +++ b/drivers/usb/chipidea/host.c
> @@ -30,8 +30,7 @@ struct ehci_ci_priv {
>  };
> =20
>  struct ci_hdrc_dma_aligned_buffer {
> -	void *kmalloc_ptr;
> -	void *old_xfer_buffer;
> +	void *original_buffer;
>  	u8 data[];
>  };
> =20
> @@ -380,60 +379,52 @@ static int ci_ehci_bus_suspend(struct usb_hcd *hcd)
>  	return 0;
>  }
> =20
> -static void ci_hdrc_free_dma_aligned_buffer(struct urb *urb)
> +static void ci_hdrc_free_dma_aligned_buffer(struct urb *urb, bool copy_b=
ack)
>  {
>  	struct ci_hdrc_dma_aligned_buffer *temp;
> -	size_t length;
> =20
>  	if (!(urb->transfer_flags & URB_ALIGNED_TEMP_BUFFER))
>  		return;
> +	urb->transfer_flags &=3D ~URB_ALIGNED_TEMP_BUFFER;

This threw me off a bit until I realized it was already there
previously, just in a different place. Is there a particular reason why
this is moved?

Regardless, this looks fine, so:

Acked-by: Thierry Reding <treding@nvidia.com>

> =20
>  	temp =3D container_of(urb->transfer_buffer,
>  			    struct ci_hdrc_dma_aligned_buffer, data);
> +	urb->transfer_buffer =3D temp->original_buffer;
> +
> +	if (copy_back && usb_urb_dir_in(urb)) {
> +		size_t length;
> =20
> -	if (usb_urb_dir_in(urb)) {
>  		if (usb_pipeisoc(urb->pipe))
>  			length =3D urb->transfer_buffer_length;
>  		else
>  			length =3D urb->actual_length;
> =20
> -		memcpy(temp->old_xfer_buffer, temp->data, length);
> +		memcpy(temp->original_buffer, temp->data, length);
>  	}
> -	urb->transfer_buffer =3D temp->old_xfer_buffer;
> -	kfree(temp->kmalloc_ptr);
> =20
> -	urb->transfer_flags &=3D ~URB_ALIGNED_TEMP_BUFFER;
> +	kfree(temp);
>  }
> =20
>  static int ci_hdrc_alloc_dma_aligned_buffer(struct urb *urb, gfp_t mem_f=
lags)
>  {
> -	struct ci_hdrc_dma_aligned_buffer *temp, *kmalloc_ptr;
> -	const unsigned int ci_hdrc_usb_dma_align =3D 32;
> -	size_t kmalloc_size;
> +	struct ci_hdrc_dma_aligned_buffer *temp;
> =20
>  	if (urb->num_sgs || urb->sg || urb->transfer_buffer_length =3D=3D 0)
>  		return 0;
> -	if (!((uintptr_t)urb->transfer_buffer & (ci_hdrc_usb_dma_align - 1)) &&=
 !(urb->transfer_buffer_length & 3))
> +	if (IS_ALIGNED((uintptr_t)urb->transfer_buffer, 4)
> +	    && IS_ALIGNED(urb->transfer_buffer_length, 4))
>  		return 0;
> =20
> -	/* Allocate a buffer with enough padding for alignment */
> -	kmalloc_size =3D ALIGN(urb->transfer_buffer_length, 4) +
> -		       sizeof(struct ci_hdrc_dma_aligned_buffer) +
> -		       ci_hdrc_usb_dma_align - 1;
> -
> -	kmalloc_ptr =3D kmalloc(kmalloc_size, mem_flags);
> -	if (!kmalloc_ptr)
> +	temp =3D kmalloc(sizeof(*temp) + ALIGN(urb->transfer_buffer_length, 4),=
 mem_flags);
> +	if (!temp)
>  		return -ENOMEM;
> =20
> -	/* Position our struct dma_aligned_buffer such that data is aligned */
> -	temp =3D PTR_ALIGN(kmalloc_ptr + 1, ci_hdrc_usb_dma_align) - 1;
> -	temp->kmalloc_ptr =3D kmalloc_ptr;
> -	temp->old_xfer_buffer =3D urb->transfer_buffer;
>  	if (usb_urb_dir_out(urb))
>  		memcpy(temp->data, urb->transfer_buffer,
>  		       urb->transfer_buffer_length);
> +
> +	temp->original_buffer =3D urb->transfer_buffer;
>  	urb->transfer_buffer =3D temp->data;
> -
>  	urb->transfer_flags |=3D URB_ALIGNED_TEMP_BUFFER;
> =20
>  	return 0;
> @@ -450,7 +441,7 @@ static int ci_hdrc_map_urb_for_dma(struct usb_hcd *hc=
d, struct urb *urb,
> =20
>  	ret =3D usb_hcd_map_urb_for_dma(hcd, urb, mem_flags);
>  	if (ret)
> -		ci_hdrc_free_dma_aligned_buffer(urb);
> +		ci_hdrc_free_dma_aligned_buffer(urb, false);
> =20
>  	return ret;
>  }
> @@ -458,7 +449,7 @@ static int ci_hdrc_map_urb_for_dma(struct usb_hcd *hc=
d, struct urb *urb,
>  static void ci_hdrc_unmap_urb_for_dma(struct usb_hcd *hcd, struct urb *u=
rb)
>  {
>  	usb_hcd_unmap_urb_for_dma(hcd, urb);
> -	ci_hdrc_free_dma_aligned_buffer(urb);
> +	ci_hdrc_free_dma_aligned_buffer(urb, true);
>  }
> =20
>  #ifdef CONFIG_PM_SLEEP
> --=20
> 2.39.2
>=20

--/ARsLMUmfva5Ak1M
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAABCAAdFiEEiOrDCAFJzPfAjcif3SOs138+s6EFAmUnGVgACgkQ3SOs138+
s6GlQxAAs20l59FM+iP1WLLvyZghQ+/JR+8K027PE1dn0I5fXFgEopON1ZJeAPgO
SaCW6ZWeCUYSaGwrBhmaKrs6cgRIVu4UuIdpAnErTsztL7eZIz5+uEP0/gFAJHrn
8VNQG4Pe22rvRZkaKlGgN5G5sD8E+amQdVWJH/8gLGefjybKP7xwOYKGB0itjx78
wnaKT/2Av3Kjqdm2JIA1WzmSYPvDGl5OSmImtw6Plpi7OYrjfElX0ena+ONR75YR
utcL/LJmDvQ54vUiYqjW4E16nInpeMEYfTyS5ohP7HucLZMPIJEbSAPeFIDf2ONV
LQfA7Fo3QDcrc1H5q3Q1Hecv/LRE3DJMQ2e7JCNFfmvs1qcZ8uj63xf/2aiPqeaO
Hpw4AV/StGUjbuz/swkA3bodcJkxfGdja8DNKGZOGTwu6kRW2g/donM8cclgEYpz
Y6Dw62w7exHf+1n/fGnBYomLJW8LviX7kKzeXQCFl6iWRDjHrElmhK/5x4k/HeeL
FGIpyO29RU7FvvNYKT6rCnPHEXDlyvv/qPIgW1/JMvTcOFZHlhRy1FTB5b919Oc+
lfo9Elh4YwELcUrlT+Dz3P0GsNwmegbTw+SpsayEXVdtpCXF0Nfl3F716ws0j9wg
a2ZVTwrpnUC9q/fA8OYLW4+8lIxXI6u8LLjsQfAOm8spclhaXYY=
=go0n
-----END PGP SIGNATURE-----

--/ARsLMUmfva5Ak1M--