netdev - Re: [PATCH 2/5] ucc_geth: Word align Ethernet RX data

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Wed, 3 Oct 2012 15:17:18 +0200
From:	Joakim Tjernlund <joakim.tjernlund@...nsmode.se>
To:	unlisted-recipients:; (no To-header on input)
Cc:	netdev@...r.kernel.org
Subject: Re: [PATCH 2/5] ucc_geth: Word align Ethernet RX data

Ping? Got no comments and I can see it in net or net-next trees either.

Joakim Tjernlund <Joakim.Tjernlund@...nsmode.se> wrote on 2012/09/18 18:56:22:

> From: Joakim Tjernlund <Joakim.Tjernlund@...nsmode.se>
> To: netdev@...r.kernel.org,
> Cc: Joakim Tjernlund <Joakim.Tjernlund@...nsmode.se>
> Date: 2012/09/18 18:56
> Subject: [PATCH 2/5] ucc_geth: Word align Ethernet RX data
>
> UCC controller can shift received Ethernet frames 2 bytes into the buffer,
> making IP data word aligned, this patch enables that feature.
>
> Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@...nsmode.se>
> ---
>  drivers/net/ethernet/freescale/ucc_geth.c |   19 +++++++++++--------
>  drivers/net/ethernet/freescale/ucc_geth.h |    1 +
>  2 files changed, 12 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/net/ethernet/freescale/ucc_geth.c b/drivers/net/ethernet/freescale/ucc_geth.c
> index e609c93..5f1460a 100644
> --- a/drivers/net/ethernet/freescale/ucc_geth.c
> +++ b/drivers/net/ethernet/freescale/ucc_geth.c
> @@ -160,6 +160,7 @@ static struct ucc_geth_info ugeth_primary_info = {
>     .numThreadsRx = UCC_GETH_NUM_OF_THREADS_1,
>     .riscTx = QE_RISC_ALLOCATION_RISC1_AND_RISC2,
>     .riscRx = QE_RISC_ALLOCATION_RISC1_AND_RISC2,
> +   .ipAddressAlignment = 1,
>  };
>
>  static struct ucc_geth_info ugeth_info[8];
> @@ -211,12 +212,13 @@ static struct sk_buff *get_new_skb(struct ucc_geth_private *ugeth,
>        u8 __iomem *bd)
>  {
>     struct sk_buff *skb = NULL;
> +   u16 buf_len = ugeth->ug_info->uf_info.max_rx_buf_length +
> +      UCC_GETH_RX_DATA_BUF_ALIGNMENT +
> +      UCC_GETH_RX_IP_ALIGNMENT;
>
>     skb = __skb_dequeue(&ugeth->rx_recycle);
>     if (!skb)
> -      skb = netdev_alloc_skb(ugeth->ndev,
> -                  ugeth->ug_info->uf_info.max_rx_buf_length +
> -                  UCC_GETH_RX_DATA_BUF_ALIGNMENT);
> +      skb = netdev_alloc_skb(ugeth->ndev, buf_len);
>     if (skb == NULL)
>        return NULL;
>
> @@ -231,10 +233,9 @@ static struct sk_buff *get_new_skb(struct ucc_geth_private *ugeth,
>     out_be32(&((struct qe_bd __iomem *)bd)->buf,
>              dma_map_single(ugeth->dev,
>                   skb->data,
> -                 ugeth->ug_info->uf_info.max_rx_buf_length +
> -                 UCC_GETH_RX_DATA_BUF_ALIGNMENT,
> +                 buf_len,
>                   DMA_FROM_DEVICE));
> -
> +   skb_reserve(skb, UCC_GETH_RX_IP_ALIGNMENT);
>     out_be32((u32 __iomem *)bd,
>           (R_E | R_I | (in_be32((u32 __iomem*)bd) & R_W)));
>
> @@ -1877,7 +1878,8 @@ static void ucc_geth_free_rx(struct ucc_geth_private *ugeth)
>                    in_be32(&((struct qe_bd __iomem *)bd)->buf),
>                    ugeth->ug_info->
>                    uf_info.max_rx_buf_length +
> -                  UCC_GETH_RX_DATA_BUF_ALIGNMENT,
> +                  UCC_GETH_RX_DATA_BUF_ALIGNMENT +
> +                  UCC_GETH_RX_IP_ALIGNMENT,
>                    DMA_FROM_DEVICE);
>                 dev_kfree_skb_any(
>                    ugeth->rx_skbuff[i][j]);
> @@ -3352,7 +3354,8 @@ static int ucc_geth_tx(struct net_device *dev, u8 txQ)
>        if (skb_queue_len(&ugeth->rx_recycle) < RX_BD_RING_LEN &&
>                skb_recycle_check(skb,
>                  ugeth->ug_info->uf_info.max_rx_buf_length +
> -                UCC_GETH_RX_DATA_BUF_ALIGNMENT))
> +                UCC_GETH_RX_DATA_BUF_ALIGNMENT +
> +                UCC_GETH_RX_IP_ALIGNMENT))
>           __skb_queue_head(&ugeth->rx_recycle, skb);
>        else
>           dev_kfree_skb(skb);
> diff --git a/drivers/net/ethernet/freescale/ucc_geth.h b/drivers/net/ethernet/freescale/ucc_geth.h
> index f71b3e7..aeb743c 100644
> --- a/drivers/net/ethernet/freescale/ucc_geth.h
> +++ b/drivers/net/ethernet/freescale/ucc_geth.h
> @@ -855,6 +855,7 @@ struct ucc_geth_hardware_statistics {
>  #define UCC_GETH_RX_BD_RING_SIZE_ALIGNMENT   4
>  #define UCC_GETH_TX_BD_RING_SIZE_MEMORY_ALIGNMENT   32
>  #define UCC_GETH_RX_DATA_BUF_ALIGNMENT      64
> +#define UCC_GETH_RX_IP_ALIGNMENT      2 /* IP word alignment */
>
>  #define UCC_GETH_TAD_EF                         0x80
>  #define UCC_GETH_TAD_V                          0x40
> --
> 1.7.8.6
>

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html