linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Marc Kleine-Budde <mkl@pengutronix.de>
To: Dario Binacchi <dariobin@libero.it>
Cc: linux-kernel@vger.kernel.org,
	Gianluca Falavigna <gianluca.falavigna@inwind.it>,
	Andrew Lunn <andrew@lunn.ch>,
	"David S. Miller" <davem@davemloft.net>,
	Jakub Kicinski <kuba@kernel.org>,
	Oliver Hartkopp <socketcan@hartkopp.net>,
	Vincent Mailhol <mailhol.vincent@wanadoo.fr>,
	Wolfgang Grandegger <wg@grandegger.com>,
	linux-can@vger.kernel.org, netdev@vger.kernel.org
Subject: Re: [RESEND PATCH 4/4] can: c_can: cache frames to operate as a true FIFO
Date: Wed, 4 Aug 2021 11:45:15 +0200	[thread overview]
Message-ID: <20210804094515.ariv7d24t2i4hic5@pengutronix.de> (raw)
In-Reply-To: <20210725161150.11801-5-dariobin@libero.it>

[-- Attachment #1: Type: text/plain, Size: 2820 bytes --]

On 25.07.2021 18:11:50, Dario Binacchi wrote:
> diff --git a/drivers/net/can/c_can/c_can.h b/drivers/net/can/c_can/c_can.h
> index 8fe7e2138620..fc499a70b797 100644
> --- a/drivers/net/can/c_can/c_can.h
> +++ b/drivers/net/can/c_can/c_can.h
> @@ -200,6 +200,7 @@ struct c_can_priv {
>  	atomic_t sie_pending;
>  	unsigned long tx_dir;
>  	int last_status;
> +	spinlock_t tx_lock;

What does the spin lock protect?

>  	struct c_can_tx_ring tx;
>  	u16 (*read_reg)(const struct c_can_priv *priv, enum reg index);
>  	void (*write_reg)(const struct c_can_priv *priv, enum reg index, u16 val);
> @@ -236,4 +237,9 @@ static inline u8 c_can_get_tx_tail(const struct c_can_tx_ring *ring)
>  	return ring->tail & (ring->obj_num - 1);
>  }
>  
> +static inline u8 c_can_get_tx_free(const struct c_can_tx_ring *ring)
> +{
> +	return ring->obj_num - (ring->head - ring->tail);
> +}
> +
>  #endif /* C_CAN_H */
> diff --git a/drivers/net/can/c_can/c_can_main.c b/drivers/net/can/c_can/c_can_main.c
> index 451ac9a9586a..4c061fef002c 100644
> --- a/drivers/net/can/c_can/c_can_main.c
> +++ b/drivers/net/can/c_can/c_can_main.c
> @@ -427,20 +427,6 @@ static void c_can_setup_receive_object(struct net_device *dev, int iface,
>  	c_can_object_put(dev, iface, obj, IF_COMM_RCV_SETUP);
>  }
>  
> -static u8 c_can_get_tx_free(const struct c_can_tx_ring *ring)
> -{
> -	u8 head = c_can_get_tx_head(ring);
> -	u8 tail = c_can_get_tx_tail(ring);
> -
> -	/* This is not a FIFO. C/D_CAN sends out the buffers
> -	 * prioritized. The lowest buffer number wins.
> -	 */
> -	if (head < tail)
> -		return 0;
> -
> -	return ring->obj_num - head;
> -}
> -
>  static bool c_can_tx_busy(const struct c_can_priv *priv,
>  			  const struct c_can_tx_ring *tx_ring)
>  {
> @@ -470,7 +456,7 @@ static netdev_tx_t c_can_start_xmit(struct sk_buff *skb,
>  	struct can_frame *frame = (struct can_frame *)skb->data;
>  	struct c_can_priv *priv = netdev_priv(dev);
>  	struct c_can_tx_ring *tx_ring = &priv->tx;
> -	u32 idx, obj;
> +	u32 idx, obj, cmd = IF_COMM_TX;
>  
>  	if (can_dropped_invalid_skb(dev, skb))
>  		return NETDEV_TX_OK;
> @@ -483,7 +469,11 @@ static netdev_tx_t c_can_start_xmit(struct sk_buff *skb,
>  	if (c_can_get_tx_free(tx_ring) == 0)
>  		netif_stop_queue(dev);
>  
> -	obj = idx + priv->msg_obj_tx_first;
> +	spin_lock_bh(&priv->tx_lock);

What does the spin_lock protect? The ndo_start_xmit function is properly
serialized by the networking core.

Otherwise the patch looks good!

Marc

-- 
Pengutronix e.K.                 | Marc Kleine-Budde           |
Embedded Linux                   | https://www.pengutronix.de  |
Vertretung West/Dortmund         | Phone: +49-231-2826-924     |
Amtsgericht Hildesheim, HRA 2686 | Fax:   +49-5121-206917-5555 |

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

  parent reply	other threads:[~2021-08-04  9:45 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-25 16:11 [RESEND PATCH 0/4] " Dario Binacchi
2021-07-25 16:11 ` [RESEND PATCH 1/4] can: c_can: remove struct c_can_priv::priv field Dario Binacchi
2021-07-25 16:11 ` [RESEND PATCH 2/4] can: c_can: exit c_can_do_tx() early if no frames have been sent Dario Binacchi
2021-07-25 16:11 ` [RESEND PATCH 3/4] can: c_can: support tx ring algorithm Dario Binacchi
2021-08-04  9:37   ` Marc Kleine-Budde
2021-07-25 16:11 ` [RESEND PATCH 4/4] can: c_can: cache frames to operate as a true FIFO Dario Binacchi
2021-08-04  9:34   ` Marc Kleine-Budde
2021-08-05 20:12     ` Dario Binacchi
2021-08-06  7:52       ` Marc Kleine-Budde
2021-08-04  9:45   ` Marc Kleine-Budde [this message]
2021-08-05 20:16     ` Dario Binacchi
2021-08-06  9:25       ` Marc Kleine-Budde
2021-08-07 12:36         ` Dario Binacchi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210804094515.ariv7d24t2i4hic5@pengutronix.de \
    --to=mkl@pengutronix.de \
    --cc=andrew@lunn.ch \
    --cc=dariobin@libero.it \
    --cc=davem@davemloft.net \
    --cc=gianluca.falavigna@inwind.it \
    --cc=kuba@kernel.org \
    --cc=linux-can@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mailhol.vincent@wanadoo.fr \
    --cc=netdev@vger.kernel.org \
    --cc=socketcan@hartkopp.net \
    --cc=wg@grandegger.com \
    --subject='Re: [RESEND PATCH 4/4] can: c_can: cache frames to operate as a true FIFO' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).