Skip to content

Commit

Permalink
[SCSI] libfc: add fc_frame_sid() and fc_frame_did() functions
Browse files Browse the repository at this point in the history 
To pave the way for eliminating exchanges from incoming requests,
add simple inline fc_frame_sid() and fc_frame_did() functions
which get the FC_IDs from the frame header.  This can be almost
as efficient as getting them from the sequence/exchange.

Move ntohll, htonll, ntoh24 and hton24 to <scsi/fc_frame.h>
since we need them there and that's included by <scsi/libfc.h>

Signed-off-by: Joe Eykholt <jeykholt@cisco.com>
Signed-off-by: Robert Love <robert.w.love@intel.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
  • Loading branch information
Joe Eykholt authored and James Bottomley committed Jul 28, 2010
1 parent 079ecd8 commit 251748a
Show file tree
Hide file tree
Showing 4 changed files with 54 additions and 47 deletions.
12 changes: 4 additions & 8 deletions drivers/scsi/libfc/fc_lport.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -800,7 +800,6 @@ static void fc_lport_recv_flogi_req(struct fc_seq *sp_in,
struct fc_lport *lport)
{
struct fc_frame *fp;
struct fc_frame_header *fh;
struct fc_seq *sp;
struct fc_exch *ep;
struct fc_els_flogi *flp;
Expand All @@ -813,8 +812,7 @@ static void fc_lport_recv_flogi_req(struct fc_seq *sp_in,
FC_LPORT_DBG(lport, "Received FLOGI request while in state %s\n",
fc_lport_state(lport));

fh = fc_frame_header_get(rx_fp);
remote_fid = ntoh24(fh->fh_s_id);
remote_fid = fc_frame_sid(rx_fp);
flp = fc_frame_payload_get(rx_fp, sizeof(*flp));
if (!flp)
goto out;
Expand Down Expand Up @@ -910,7 +908,7 @@ static void fc_lport_recv_req(struct fc_lport *lport, struct fc_seq *sp,
recv = fc_lport_recv_flogi_req;
break;
case ELS_LOGO:
if (ntoh24(fh->fh_s_id) == FC_FID_FLOGI)
if (fc_frame_sid(fp) == FC_FID_FLOGI)
recv = fc_lport_recv_logo_req;
break;
case ELS_RSCN:
Expand Down Expand Up @@ -1468,7 +1466,6 @@ void fc_lport_flogi_resp(struct fc_seq *sp, struct fc_frame *fp,
void *lp_arg)
{
struct fc_lport *lport = lp_arg;
struct fc_frame_header *fh;
struct fc_els_flogi *flp;
u32 did;
u16 csp_flags;
Expand Down Expand Up @@ -1496,8 +1493,7 @@ void fc_lport_flogi_resp(struct fc_seq *sp, struct fc_frame *fp,
goto err;
}

fh = fc_frame_header_get(fp);
did = ntoh24(fh->fh_d_id);
did = fc_frame_did(fp);
if (fc_frame_payload_op(fp) == ELS_LS_ACC && did != 0) {
flp = fc_frame_payload_get(fp, sizeof(*flp));
if (flp) {
Expand All @@ -1523,7 +1519,7 @@ void fc_lport_flogi_resp(struct fc_seq *sp, struct fc_frame *fp,
"Port (%6.6x) entered "
"point-to-point mode\n",
lport->host->host_no, did);
fc_lport_ptp_setup(lport, ntoh24(fh->fh_s_id),
fc_lport_ptp_setup(lport, fc_frame_sid(fp),
get_unaligned_be64(
&flp->fl_wwpn),
get_unaligned_be64(
Expand Down
26 changes: 6 additions & 20 deletions drivers/scsi/libfc/fc_rport.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -747,13 +747,11 @@ static void fc_rport_recv_flogi_req(struct fc_lport *lport,
struct fc_rport_priv *rdata;
struct fc_frame *fp = rx_fp;
struct fc_exch *ep;
struct fc_frame_header *fh;
struct fc_seq_els_data rjt_data;
u32 sid, f_ctl;

rjt_data.fp = NULL;
fh = fc_frame_header_get(fp);
sid = ntoh24(fh->fh_s_id);
sid = fc_frame_sid(fp);

FC_RPORT_ID_DBG(lport, sid, "Received FLOGI request\n");

Expand Down Expand Up @@ -1430,17 +1428,14 @@ static void fc_rport_recv_els_req(struct fc_lport *lport,
struct fc_seq *sp, struct fc_frame *fp)
{
struct fc_rport_priv *rdata;
struct fc_frame_header *fh;
struct fc_seq_els_data els_data;

els_data.fp = NULL;
els_data.reason = ELS_RJT_UNAB;
els_data.explan = ELS_EXPL_PLOGI_REQD;

fh = fc_frame_header_get(fp);

mutex_lock(&lport->disc.disc_mutex);
rdata = lport->tt.rport_lookup(lport, ntoh24(fh->fh_s_id));
rdata = lport->tt.rport_lookup(lport, fc_frame_sid(fp));
if (!rdata) {
mutex_unlock(&lport->disc.disc_mutex);
goto reject;
Expand Down Expand Up @@ -1555,14 +1550,12 @@ static void fc_rport_recv_plogi_req(struct fc_lport *lport,
struct fc_rport_priv *rdata;
struct fc_frame *fp = rx_fp;
struct fc_exch *ep;
struct fc_frame_header *fh;
struct fc_els_flogi *pl;
struct fc_seq_els_data rjt_data;
u32 sid, f_ctl;

rjt_data.fp = NULL;
fh = fc_frame_header_get(fp);
sid = ntoh24(fh->fh_s_id);
sid = fc_frame_sid(fp);

FC_RPORT_ID_DBG(lport, sid, "Received PLOGI request\n");

Expand Down Expand Up @@ -1682,7 +1675,6 @@ static void fc_rport_recv_prli_req(struct fc_rport_priv *rdata,
struct fc_lport *lport = rdata->local_port;
struct fc_exch *ep;
struct fc_frame *fp;
struct fc_frame_header *fh;
struct {
struct fc_els_prli prli;
struct fc_els_spp spp;
Expand All @@ -1698,12 +1690,10 @@ static void fc_rport_recv_prli_req(struct fc_rport_priv *rdata,
u32 roles = FC_RPORT_ROLE_UNKNOWN;

rjt_data.fp = NULL;
fh = fc_frame_header_get(rx_fp);

FC_RPORT_DBG(rdata, "Received PRLI request while in state %s\n",
fc_rport_state(rdata));

len = fr_len(rx_fp) - sizeof(*fh);
len = fr_len(rx_fp) - sizeof(struct fc_frame_header);
pp = fc_frame_payload_get(rx_fp, sizeof(*pp));
if (!pp)
goto reject_len;
Expand Down Expand Up @@ -1817,7 +1807,6 @@ static void fc_rport_recv_prlo_req(struct fc_rport_priv *rdata,
struct fc_frame *rx_fp)
{
struct fc_lport *lport = rdata->local_port;
struct fc_frame_header *fh;
struct fc_exch *ep;
struct fc_frame *fp;
struct {
Expand All @@ -1832,12 +1821,11 @@ static void fc_rport_recv_prlo_req(struct fc_rport_priv *rdata,
struct fc_seq_els_data rjt_data;

rjt_data.fp = NULL;
fh = fc_frame_header_get(rx_fp);

FC_RPORT_DBG(rdata, "Received PRLO request while in state %s\n",
fc_rport_state(rdata));

len = fr_len(rx_fp) - sizeof(*fh);
len = fr_len(rx_fp) - sizeof(struct fc_frame_header);
pp = fc_frame_payload_get(rx_fp, sizeof(*pp));
if (!pp)
goto reject_len;
Expand Down Expand Up @@ -1901,14 +1889,12 @@ static void fc_rport_recv_logo_req(struct fc_lport *lport,
struct fc_seq *sp,
struct fc_frame *fp)
{
struct fc_frame_header *fh;
struct fc_rport_priv *rdata;
u32 sid;

lport->tt.seq_els_rsp_send(sp, ELS_LS_ACC, NULL);

fh = fc_frame_header_get(fp);
sid = ntoh24(fh->fh_s_id);
sid = fc_frame_sid(fp);

mutex_lock(&lport->disc.disc_mutex);
rdata = lport->tt.rport_lookup(lport, sid);
Expand Down
45 changes: 44 additions & 1 deletion include/scsi/fc_frame.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,23 @@

#include <linux/if_ether.h>

/* some helpful macros */

#define ntohll(x) be64_to_cpu(x)
#define htonll(x) cpu_to_be64(x)

static inline u32 ntoh24(const u8 *p)
{
return (p[0] << 16) | (p[1] << 8) | p[2];
}

static inline void hton24(u8 *p, u32 v)
{
p[0] = (v >> 16) & 0xff;
p[1] = (v >> 8) & 0xff;
p[2] = v & 0xff;
}

/*
* The fc_frame interface is used to pass frame data between functions.
* The frame includes the data buffer, length, and SOF / EOF delimiter types.
Expand Down Expand Up @@ -137,6 +154,16 @@ static inline int fc_frame_is_linear(struct fc_frame *fp)
return !skb_is_nonlinear(fp_skb(fp));
}

/*
* Get frame header from message in fc_frame structure.
* This version doesn't do a length check.
*/
static inline
struct fc_frame_header *__fc_frame_header_get(const struct fc_frame *fp)
{
return (struct fc_frame_header *)fr_hdr(fp);
}

/*
* Get frame header from message in fc_frame structure.
* This hides a cast and provides a place to add some checking.
Expand All @@ -145,7 +172,23 @@ static inline
struct fc_frame_header *fc_frame_header_get(const struct fc_frame *fp)
{
WARN_ON(fr_len(fp) < sizeof(struct fc_frame_header));
return (struct fc_frame_header *) fr_hdr(fp);
return __fc_frame_header_get(fp);
}

/*
* Get source FC_ID (S_ID) from frame header in message.
*/
static inline u32 fc_frame_sid(const struct fc_frame *fp)
{
return ntoh24(__fc_frame_header_get(fp)->fh_s_id);
}

/*
* Get destination FC_ID (D_ID) from frame header in message.
*/
static inline u32 fc_frame_did(const struct fc_frame *fp)
{
return ntoh24(__fc_frame_header_get(fp)->fh_d_id);
}

/*
Expand Down
18 changes: 0 additions & 18 deletions include/scsi/libfc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,24 +42,6 @@
#define FC_EX_TIMEOUT 1 /* Exchange timeout */
#define FC_EX_CLOSED 2 /* Exchange closed */

/* some helpful macros */

#define ntohll(x) be64_to_cpu(x)
#define htonll(x) cpu_to_be64(x)


static inline u32 ntoh24(const u8 *p)
{
return (p[0] << 16) | (p[1] << 8) | p[2];
}

static inline void hton24(u8 *p, u32 v)
{
p[0] = (v >> 16) & 0xff;
p[1] = (v >> 8) & 0xff;
p[2] = v & 0xff;
}

/**
* enum fc_lport_state - Local port states
* @LPORT_ST_DISABLED: Disabled
Expand Down

0 comments on commit 251748a

Please sign in to comment.