Commit 943189f1 authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

cnic: Refactor and fix cnic_ready_to_close(). 



Combine RESET_RECEIVED and RESET_COMP logic and fix race condition
between these 2 events and cnic_cm_close().  In particular, we need
to (test_and_clear_bit(SK_F_OFFLD_COMPLETE, &csk->flags)) before we
update csk->state.

Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarEddie Wai <waie@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a1e621bf

drivers/net/cnic.c

+10 −16
Original line number Diff line number Diff line
@@ -3198,26 +3198,20 @@ static int cnic_cm_alloc_mem(struct cnic_dev *dev) 


static int cnic_ready_to_close(struct cnic_sock *csk, u32 opcode)

{

	if (opcode == L4_KCQE_OPCODE_VALUE_RESET_RECEIVED) {

		if (test_and_clear_bit(SK_F_OFFLD_COMPLETE, &csk->flags))

	if (test_and_clear_bit(SK_F_OFFLD_COMPLETE, &csk->flags)) {

		/* Unsolicited RESET_COMP or RESET_RECEIVED */

		opcode = L4_KCQE_OPCODE_VALUE_RESET_RECEIVED;

		csk->state = opcode;

	}

	if ((opcode == csk->state) ||

	    (opcode == L4_KCQE_OPCODE_VALUE_RESET_RECEIVED &&

	     csk->state == L4_KCQE_OPCODE_VALUE_CLOSE_COMP)) {

		if (!test_and_set_bit(SK_F_CLOSING, &csk->flags))

			return 1;

	}

	/* 57710+ only  workaround to handle unsolicited RESET_COMP

	 * which will be treated like a RESET RCVD notification

	 * which triggers the clean up procedure



	/* 1. If event opcode matches the expected event in csk->state

	 * 2. If the expected event is CLOSE_COMP, we accept any event

	 */

	else if (opcode == L4_KCQE_OPCODE_VALUE_RESET_COMP) {

		if (!test_and_set_bit(SK_F_CLOSING, &csk->flags)) {

			csk->state = L4_KCQE_OPCODE_VALUE_RESET_RECEIVED;

	if (opcode == csk->state ||

	     csk->state == L4_KCQE_OPCODE_VALUE_CLOSE_COMP) {

		if (!test_and_set_bit(SK_F_CLOSING, &csk->flags))

			return 1;

	}

	}

	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE