net/smc: handle incoming CDC validation message (b286a065) · Commits · 戴 / test

net/smc/smc.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -188,12 +188,14 @@ struct smc_connection {
	spinlock_t acurs_lock; /* protect cursors */		spinlock_t acurs_lock; /* protect cursors */
	#endif		#endif
	struct work_struct close_work; /* peer sent some closing */		struct work_struct close_work; /* peer sent some closing */
			struct work_struct abort_work; /* abort the connection */
	struct tasklet_struct rx_tsklet; /* Receiver tasklet for SMC-D */		struct tasklet_struct rx_tsklet; /* Receiver tasklet for SMC-D */
	u8 rx_off; /* receive offset:		u8 rx_off; /* receive offset:
	* 0 for SMC-R, 32 for SMC-D		* 0 for SMC-R, 32 for SMC-D
	*/		*/
	u64 peer_token; /* SMC-D token of peer */		u64 peer_token; /* SMC-D token of peer */
	u8 killed : 1; /* abnormal termination */		u8 killed : 1; /* abnormal termination */
			u8 out_of_sync : 1; /* out of sync with peer */
	};		};

	struct smc_sock { /* smc sock container */		struct smc_sock { /* smc sock container */

net/smc/smc_cdc.c

+31 −6

Original line number	Original line	Diff line number	Diff line
	@@ -282,6 +282,28 @@ static void smc_cdc_handle_urg_data_arrival(struct smc_sock *smc,
	sk_send_sigurg(&smc->sk);		sk_send_sigurg(&smc->sk);
	}		}

			static void smc_cdc_msg_validate(struct smc_sock smc, struct smc_cdc_msg cdc,
			struct smc_link *link)
			{
			struct smc_connection *conn = &smc->conn;
			u16 recv_seq = ntohs(cdc->seqno);
			s16 diff;

			/* check that seqnum was seen before */
			diff = conn->local_rx_ctrl.seqno - recv_seq;
			if (diff < 0) { /* diff larger than 0x7fff */
			/* drop connection */
			conn->out_of_sync = 1; /* prevent any further receives */
			spin_lock_bh(&conn->send_lock);
			conn->local_tx_ctrl.conn_state_flags.peer_conn_abort = 1;
			conn->lnk = link;
			spin_unlock_bh(&conn->send_lock);
			sock_hold(&smc->sk); /* sock_put in abort_work */
			if (!schedule_work(&conn->abort_work))
			sock_put(&smc->sk);
			}
			}

	static void smc_cdc_msg_recv_action(struct smc_sock *smc,		static void smc_cdc_msg_recv_action(struct smc_sock *smc,
	struct smc_cdc_msg *cdc)		struct smc_cdc_msg *cdc)
	{		{
	@@ -412,16 +434,19 @@ static void smc_cdc_rx_handler(struct ib_wc wc, void buf)
	read_lock_bh(&lgr->conns_lock);		read_lock_bh(&lgr->conns_lock);
	conn = smc_lgr_find_conn(ntohl(cdc->token), lgr);		conn = smc_lgr_find_conn(ntohl(cdc->token), lgr);
	read_unlock_bh(&lgr->conns_lock);		read_unlock_bh(&lgr->conns_lock);
	if (!conn)		if (!conn \|\| conn->out_of_sync)
	return;		return;
	smc = container_of(conn, struct smc_sock, conn);		smc = container_of(conn, struct smc_sock, conn);

	if (!cdc->prod_flags.failover_validation) {		if (cdc->prod_flags.failover_validation) {
			smc_cdc_msg_validate(smc, cdc, link);
			return;
			}
	if (smc_cdc_before(ntohs(cdc->seqno),		if (smc_cdc_before(ntohs(cdc->seqno),
	conn->local_rx_ctrl.seqno))		conn->local_rx_ctrl.seqno))
	/* received seqno is old */		/* received seqno is old */
	return;		return;
	}
	smc_cdc_msg_recv(smc, cdc);		smc_cdc_msg_recv(smc, cdc);
	}		}

net/smc/smc_core.c

+15 −0

Original line number	Original line	Diff line number	Diff line
	@@ -615,6 +615,8 @@ void smc_conn_free(struct smc_connection *conn)
	tasklet_kill(&conn->rx_tsklet);		tasklet_kill(&conn->rx_tsklet);
	} else {		} else {
	smc_cdc_tx_dismiss_slots(conn);		smc_cdc_tx_dismiss_slots(conn);
			if (current_work() != &conn->abort_work)
			cancel_work_sync(&conn->abort_work);
	}		}
	if (!list_empty(&lgr->list)) {		if (!list_empty(&lgr->list)) {
	smc_lgr_unregister_conn(conn);		smc_lgr_unregister_conn(conn);
	@@ -996,6 +998,18 @@ void smc_smcr_terminate_all(struct smc_ib_device *smcibdev)
	}		}
	}		}

			/* abort connection, abort_work scheduled from tasklet context */
			static void smc_conn_abort_work(struct work_struct *work)
			{
			struct smc_connection *conn = container_of(work,
			struct smc_connection,
			abort_work);
			struct smc_sock *smc = container_of(conn, struct smc_sock, conn);

			smc_conn_kill(conn, true);
			sock_put(&smc->sk); /* sock_hold done by schedulers of abort_work */
			}

	/* link is up - establish alternate link if applicable */		/* link is up - establish alternate link if applicable */
	static void smcr_link_up(struct smc_link_group *lgr,		static void smcr_link_up(struct smc_link_group *lgr,
	struct smc_ib_device *smcibdev, u8 ibport)		struct smc_ib_device *smcibdev, u8 ibport)
	@@ -1302,6 +1316,7 @@ create:
	conn->local_tx_ctrl.common.type = SMC_CDC_MSG_TYPE;		conn->local_tx_ctrl.common.type = SMC_CDC_MSG_TYPE;
	conn->local_tx_ctrl.len = SMC_WR_TX_SIZE;		conn->local_tx_ctrl.len = SMC_WR_TX_SIZE;
	conn->urg_state = SMC_URG_READ;		conn->urg_state = SMC_URG_READ;
			INIT_WORK(&smc->conn.abort_work, smc_conn_abort_work);
	if (ini->is_smcd) {		if (ini->is_smcd) {
	conn->rx_off = sizeof(struct smcd_cdc_msg);		conn->rx_off = sizeof(struct smcd_cdc_msg);
	smcd_cdc_rx_init(conn); /* init tasklet for this conn */		smcd_cdc_rx_init(conn); /* init tasklet for this conn */

Admin message