Commit 69cb7dc0 authored by Hans Wippel's avatar Hans Wippel Committed by David S. Miller
Browse files

net/smc: add common buffer size in send and receive buffer descriptors 



In addition to the buffer references, SMC currently stores the sizes of
the receive and send buffers in each connection as separate variables.
This patch introduces a buffer length variable in the common buffer
descriptor and uses this length instead.

Signed-off-by: default avatarHans Wippel <hwippel@linux.ibm.com>
Signed-off-by: default avatarUrsula Braun <ubraun@linux.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d6830519

net/smc/af_smc.c

+1 −1
Original line number Diff line number Diff line
@@ -1421,7 +1421,7 @@ static int smc_ioctl(struct socket *sock, unsigned int cmd, 
		/* output queue size (not send + not acked) */

		if (smc->sk.sk_state == SMC_LISTEN)

			return -EINVAL;

		answ = smc->conn.sndbuf_size -

		answ = smc->conn.sndbuf_desc->len -

					atomic_read(&smc->conn.sndbuf_space);

		break;

	case SIOCOUTQNSD:

net/smc/smc.h

+0 −2
Original line number Diff line number Diff line
@@ -126,9 +126,7 @@ struct smc_connection { 
	int			rtoken_idx;	/* idx to peer RMB rkey/addr */



	struct smc_buf_desc	*sndbuf_desc;	/* send buffer descriptor */

	int			sndbuf_size;	/* sndbuf size <== sock wmem */

	struct smc_buf_desc	*rmb_desc;	/* RMBE descriptor */

	int			rmbe_size;	/* RMBE size <== sock rmem */

	int			rmbe_size_short;/* compressed notation */

	int			rmbe_update_limit;

						/* lower limit for consumer

net/smc/smc_cdc.c

+4 −4
Original line number Diff line number Diff line
@@ -44,13 +44,13 @@ static void smc_cdc_tx_handler(struct smc_wr_tx_pend_priv *pnd_snd, 
	smc = container_of(cdcpend->conn, struct smc_sock, conn);

	bh_lock_sock(&smc->sk);

	if (!wc_status) {

		diff = smc_curs_diff(cdcpend->conn->sndbuf_size,

		diff = smc_curs_diff(cdcpend->conn->sndbuf_desc->len,

				     &cdcpend->conn->tx_curs_fin,

				     &cdcpend->cursor);

		/* sndbuf_space is decreased in smc_sendmsg */

		smp_mb__before_atomic();

		atomic_add(diff, &cdcpend->conn->sndbuf_space);

		/* guarantee 0 <= sndbuf_space <= sndbuf_size */

		/* guarantee 0 <= sndbuf_space <= sndbuf_desc->len */

		smp_mb__after_atomic();

		smc_curs_write(&cdcpend->conn->tx_curs_fin,

			       smc_curs_read(&cdcpend->cursor, cdcpend->conn),
@@ -198,13 +198,13 @@ static void smc_cdc_msg_recv_action(struct smc_sock *smc, 
		smp_mb__after_atomic();

	}



	diff_prod = smc_curs_diff(conn->rmbe_size, &prod_old,

	diff_prod = smc_curs_diff(conn->rmb_desc->len, &prod_old,

				  &conn->local_rx_ctrl.prod);

	if (diff_prod) {

		/* bytes_to_rcv is decreased in smc_recvmsg */

		smp_mb__before_atomic();

		atomic_add(diff_prod, &conn->bytes_to_rcv);

		/* guarantee 0 <= bytes_to_rcv <= rmbe_size */

		/* guarantee 0 <= bytes_to_rcv <= rmb_desc->len */

		smp_mb__after_atomic();

		smc->sk.sk_data_ready(&smc->sk);

	} else if ((conn->local_rx_ctrl.prod_flags.write_blocked) ||

net/smc/smc_core.c

+2 −6
Original line number Diff line number Diff line
@@ -236,15 +236,12 @@ static int smc_lgr_create(struct smc_sock *smc, 


static void smc_buf_unuse(struct smc_connection *conn)

{

	if (conn->sndbuf_desc) {

	if (conn->sndbuf_desc)

		conn->sndbuf_desc->used = 0;

		conn->sndbuf_size = 0;

	}

	if (conn->rmb_desc) {

		if (!conn->rmb_desc->regerr) {

			conn->rmb_desc->reused = 1;

			conn->rmb_desc->used = 0;

			conn->rmbe_size = 0;

		} else {

			/* buf registration failed, reuse not possible */

			struct smc_link_group *lgr = conn->lgr;
@@ -616,6 +613,7 @@ static struct smc_buf_desc *smc_new_buf_create(struct smc_link_group *lgr, 
		}

	}



	buf_desc->len = bufsize;

	return buf_desc;

}
@@ -675,14 +673,12 @@ static int __smc_buf_create(struct smc_sock *smc, bool is_rmb) 


	if (is_rmb) {

		conn->rmb_desc = buf_desc;

		conn->rmbe_size = bufsize;

		conn->rmbe_size_short = bufsize_short;

		smc->sk.sk_rcvbuf = bufsize * 2;

		atomic_set(&conn->bytes_to_rcv, 0);

		conn->rmbe_update_limit = smc_rmb_wnd_update_limit(bufsize);

	} else {

		conn->sndbuf_desc = buf_desc;

		conn->sndbuf_size = bufsize;

		smc->sk.sk_sndbuf = bufsize * 2;

		atomic_set(&conn->sndbuf_space, bufsize);

	}

net/smc/smc_core.h

+1 −0
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ struct smc_buf_desc { 
	struct list_head	list;

	void			*cpu_addr;	/* virtual address of buffer */

	struct page		*pages;

	int			len;		/* length of buffer */

	struct sg_table		sgt[SMC_LINKS_PER_LGR_MAX];/* virtual buffer */

	struct ib_mr		*mr_rx[SMC_LINKS_PER_LGR_MAX];

						/* for rmb only: memory region