| 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
| ||
|
Date: Thu, 9 May 2024 08:58:37 +0000
From: Justin Lai <justinlai0215@...ltek.com>
To: Ratheesh Kannoth <rkannoth@...vell.com>
CC: "kuba@...nel.org" <kuba@...nel.org>,
"davem@...emloft.net"
<davem@...emloft.net>,
"edumazet@...gle.com" <edumazet@...gle.com>,
"pabeni@...hat.com" <pabeni@...hat.com>,
"linux-kernel@...r.kernel.org"
<linux-kernel@...r.kernel.org>,
"netdev@...r.kernel.org"
<netdev@...r.kernel.org>,
"andrew@...n.ch" <andrew@...n.ch>,
"jiri@...nulli.us" <jiri@...nulli.us>,
"horms@...nel.org" <horms@...nel.org>,
Ping-Ke Shih <pkshih@...ltek.com>, Larry Chiu <larry.chiu@...ltek.com>
Subject: RE: [PATCH net-next v18 02/13] rtase: Implement the .ndo_open function
>
> On 2024-05-08 at 18:09:34, Justin Lai (justinlai0215@...ltek.com) wrote:
> >
> > +static int rtase_alloc_desc(struct rtase_private *tp) {
> > + struct pci_dev *pdev = tp->pdev;
> > + u32 i;
> > +
> > + /* rx and tx descriptors needs 256 bytes alignment.
> > + * dma_alloc_coherent provides more.
> > + */
> > + for (i = 0; i < tp->func_tx_queue_num; i++) {
> > + tp->tx_ring[i].desc =
> > + dma_alloc_coherent(&pdev->dev,
> > +
> RTASE_TX_RING_DESC_SIZE,
> > +
> &tp->tx_ring[i].phy_addr,
> > + GFP_KERNEL);
> > + if (!tp->tx_ring[i].desc)
> You have handled errors gracefully very where else. why not here ?
I would like to ask you, are you referring to other places where there are
error description messages, but not here?
> > + return -ENOMEM;
> > + }
> > +
> > + for (i = 0; i < tp->func_rx_queue_num; i++) {
> > + tp->rx_ring[i].desc =
> > + dma_alloc_coherent(&pdev->dev,
> > +
> RTASE_RX_RING_DESC_SIZE,
> > +
> &tp->rx_ring[i].phy_addr,
> > + GFP_KERNEL);
> > + if (!tp->rx_ring[i].desc)
> > + return -ENOMEM;
> > + }
> > +
> > + return 0;
> > +}
> > +
> > +static void rtase_free_desc(struct rtase_private *tp) {
> > + struct pci_dev *pdev = tp->pdev;
> > + u32 i;
> > +
> > + for (i = 0; i < tp->func_tx_queue_num; i++) {
> > + if (!tp->tx_ring[i].desc)
> > + continue;
> > +
> > + dma_free_coherent(&pdev->dev,
> RTASE_TX_RING_DESC_SIZE,
> > + tp->tx_ring[i].desc,
> > + tp->tx_ring[i].phy_addr);
> > + tp->tx_ring[i].desc = NULL;
> > + }
> > +
> > + for (i = 0; i < tp->func_rx_queue_num; i++) {
> > + if (!tp->rx_ring[i].desc)
> > + continue;
> > +
> > + dma_free_coherent(&pdev->dev,
> RTASE_RX_RING_DESC_SIZE,
> > + tp->rx_ring[i].desc,
> > + tp->rx_ring[i].phy_addr);
> > + tp->rx_ring[i].desc = NULL;
> > + }
> > +}
> > +
> > +static void rtase_mark_to_asic(union rtase_rx_desc *desc, u32
> > +rx_buf_sz) {
> > + u32 eor = le32_to_cpu(desc->desc_cmd.opts1) & RTASE_RING_END;
> > +
> > + desc->desc_status.opts2 = 0;
> desc->desc_cmd.addr to be written before desc->desc_status.opts2 ? Just
> desc->a question
> whether below dma_wmb() suffice for both ?
Thank you for your suggestion, this seems feasible,
I will modify it again.
> > + /* force memory writes to complete before releasing descriptor */
> > + dma_wmb();
> > + WRITE_ONCE(desc->desc_cmd.opts1,
> > + cpu_to_le32(RTASE_DESC_OWN | eor | rx_buf_sz)); }
> > +
> > +static void rtase_tx_desc_init(struct rtase_private *tp, u16 idx) {
> > + struct rtase_ring *ring = &tp->tx_ring[idx];
> > + struct rtase_tx_desc *desc;
> > + u32 i;
> > +
> > + memset(ring->desc, 0x0, RTASE_TX_RING_DESC_SIZE);
> > + memset(ring->skbuff, 0x0, sizeof(ring->skbuff));
> > + ring->cur_idx = 0;
> > + ring->dirty_idx = 0;
> > + ring->index = idx;
> > +
> > + for (i = 0; i < RTASE_NUM_DESC; i++) {
> > + ring->mis.len[i] = 0;
> > + if ((RTASE_NUM_DESC - 1) == i) {
> > + desc = ring->desc + sizeof(struct rtase_tx_desc) *
> i;
> > + desc->opts1 = cpu_to_le32(RTASE_RING_END);
> > + }
> > + }
> > +
> > + ring->ring_handler = tx_handler;
> > + if (idx < 4) {
> > + ring->ivec = &tp->int_vector[idx];
> > + list_add_tail(&ring->ring_entry,
> > + &tp->int_vector[idx].ring_list);
> > + } else {
> > + ring->ivec = &tp->int_vector[0];
> > + list_add_tail(&ring->ring_entry,
> &tp->int_vector[0].ring_list);
> > + }
> > +}
> > +
> > +static void rtase_map_to_asic(union rtase_rx_desc *desc, dma_addr_t
> mapping,
> > + u32 rx_buf_sz) {
> > + desc->desc_cmd.addr = cpu_to_le64(mapping);
> > + /* make sure the physical address has been updated */
> > + wmb();
> why not dma_wmb();
dma_wmb() is already done in rtase_mark_to_asic(), so I will remove wmb().
> > + rtase_mark_to_asic(desc, rx_buf_sz); }
> > +
> > +static void rtase_make_unusable_by_asic(union rtase_rx_desc *desc) {
> > + desc->desc_cmd.addr = cpu_to_le64(RTK_MAGIC_NUMBER);
> > + desc->desc_cmd.opts1 &= ~cpu_to_le32(RTASE_DESC_OWN |
> > +RSVD_MASK); }
> > +
> > +static int rtase_alloc_rx_skb(const struct rtase_ring *ring,
> > + struct sk_buff **p_sk_buff,
> > + union rtase_rx_desc *desc,
> > + dma_addr_t *rx_phy_addr, u8 in_intr) {
> > + struct rtase_int_vector *ivec = ring->ivec;
> > + const struct rtase_private *tp = ivec->tp;
> > + struct sk_buff *skb = NULL;
> > + dma_addr_t mapping;
> > + struct page *page;
> > + void *buf_addr;
> > + int ret = 0;
> > +
> > + page = page_pool_dev_alloc_pages(tp->page_pool);
> > + if (!page) {
> > + netdev_err(tp->dev, "failed to alloc page\n");
> > + goto err_out;
> > + }
> > +
> > + buf_addr = page_address(page);
> > + mapping = page_pool_get_dma_addr(page);
> > +
> > + skb = build_skb(buf_addr, PAGE_SIZE);
> > + if (!skb) {
> > + page_pool_put_full_page(tp->page_pool, page, true);
> > + netdev_err(tp->dev, "failed to build skb\n");
> > + goto err_out;
> > + }
> Did you mark the skb for recycle ? Hmm ... did i miss to find the code ?
>
We have done this part when using the skb and before finally releasing
the skb resource. Do you think it would be better to do this part of the
process when allocating the skb?
> > +
> > + *p_sk_buff = skb;
> > + *rx_phy_addr = mapping;
> > + rtase_map_to_asic(desc, mapping, tp->rx_buf_sz);
> > +
> > + return ret;
> > +
> > +err_out:
> > + if (skb)
> > + dev_kfree_skb(skb);
> > +
> > + ret = -ENOMEM;
> > + rtase_make_unusable_by_asic(desc);
> > +
> > + return ret;
> > +}
> > +
> > +
> > +
> > +static int rtase_open(struct net_device *dev) {
> > + struct rtase_private *tp = netdev_priv(dev);
> > + const struct pci_dev *pdev = tp->pdev;
> > + struct rtase_int_vector *ivec;
> > + u16 i = 0, j;
> > + int ret;
> > +
> > + ivec = &tp->int_vector[0];
> > + tp->rx_buf_sz = RTASE_RX_BUF_SIZE;
> > +
> > + ret = rtase_alloc_desc(tp);
> > + if (ret)
> > + goto err_free_all_allocated_mem;
> > +
> > + ret = rtase_init_ring(dev);
> > + if (ret)
> > + goto err_free_all_allocated_mem;
> > +
> > + rtase_hw_config(dev);
> > +
> > + if (tp->sw_flag & RTASE_SWF_MSIX_ENABLED) {
> > + ret = request_irq(ivec->irq, rtase_interrupt, 0,
> > + dev->name, ivec);
> > + if (ret)
> > + goto err_free_all_allocated_irq;
> > +
> > + /* request other interrupts to handle multiqueue */
> > + for (i = 1; i < tp->int_nums; i++) {
> > + ivec = &tp->int_vector[i];
> > + snprintf(ivec->name, sizeof(ivec->name),
> "%s_int%i",
> > + tp->dev->name, i);
> > + ret = request_irq(ivec->irq, rtase_q_interrupt, 0,
> > + ivec->name, ivec);
> > + if (ret)
> > + goto err_free_all_allocated_irq;
> > + }
> > + } else {
> > + ret = request_irq(pdev->irq, rtase_interrupt, 0, dev->name,
> > + ivec);
> > + if (ret)
> > + goto err_free_all_allocated_mem;
> > + }
> > +
> > + rtase_hw_start(dev);
> > +
> > + for (i = 0; i < tp->int_nums; i++) {
> > + ivec = &tp->int_vector[i];
> > + napi_enable(&ivec->napi);
> > + }
> > +
> > + netif_carrier_on(dev);
> > + netif_wake_queue(dev);
> > +
> > + return 0;
> > +
> > +err_free_all_allocated_irq:
> You are allocating from i = 1, but freeing from j = 0;
Hi Ratheesh,
I have done request_irq() once before the for loop,
so there should be no problem starting free from j=0 here.
> > + for (j = 0; j < i; j++)
> > + free_irq(tp->int_vector[j].irq, &tp->int_vector[j]);
> > +
> > +err_free_all_allocated_mem:
> > + rtase_free_desc(tp);
> > +
> > + return ret;
> > +}
> > +
> >
Powered by blists - more mailing lists