mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-22 17:01:14 +00:00
![Linus Torvalds](/assets/img/avatar_default.png)
This is mostly update of the usual drivers: qla2xxx, hpsa, lpfc, ufs, mpt3sas, ibmvscsi, megaraid_sas, bnx2fc and hisi_sas as well as the removal of the osst driver (I heard from Willem privately that he would like the driver removed because all his test hardware has failed). Plus number of minor changes, spelling fixes and other trivia. Signed-off-by: James E.J. Bottomley <jejb@linux.ibm.com> -----BEGIN PGP SIGNATURE----- iJwEABMIAEQWIQTnYEDbdso9F2cI+arnQslM7pishQUCXSTl4yYcamFtZXMuYm90 dG9tbGV5QGhhbnNlbnBhcnRuZXJzaGlwLmNvbQAKCRDnQslM7pishdcxAQDCJVbd fPUX76/V1ldupunF97+3DTharxxbst+VnkOnCwD8D4c0KFFFOI9+F36cnMGCPegE fjy17dQLvsJ4GsidHy8= =aS5B -----END PGP SIGNATURE----- Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi Pull SCSI updates from James Bottomley: "This is mostly update of the usual drivers: qla2xxx, hpsa, lpfc, ufs, mpt3sas, ibmvscsi, megaraid_sas, bnx2fc and hisi_sas as well as the removal of the osst driver (I heard from Willem privately that he would like the driver removed because all his test hardware has failed). Plus number of minor changes, spelling fixes and other trivia. The big merge conflict this time around is the SPDX licence tags. Following discussion on linux-next, we believe our version to be more accurate than the one in the tree, so the resolution is to take our version for all the SPDX conflicts" Note on the SPDX license tag conversion conflicts: the SCSI tree had done its own SPDX conversion, which in some cases conflicted with the treewide ones done by Thomas & co. In almost all cases, the conflicts were purely syntactic: the SCSI tree used the old-style SPDX tags ("GPL-2.0" and "GPL-2.0+") while the treewide conversion had used the new-style ones ("GPL-2.0-only" and "GPL-2.0-or-later"). In these cases I picked the new-style one. In a few cases, the SPDX conversion was actually different, though. As explained by James above, and in more detail in a pre-pull-request thread: "The other problem is actually substantive: In the libsas code Luben Tuikov originally specified gpl 2.0 only by dint of stating: * This file is licensed under GPLv2. In all the libsas files, but then muddied the water by quoting GPLv2 verbatim (which includes the or later than language). So for these files Christoph did the conversion to v2 only SPDX tags and Thomas converted to v2 or later tags" So in those cases, where the spdx tag substantially mattered, I took the SCSI tree conversion of it, but then also took the opportunity to turn the old-style "GPL-2.0" into a new-style "GPL-2.0-only" tag. Similarly, when there were whitespace differences or other differences to the comments around the copyright notices, I took the version from the SCSI tree as being the more specific conversion. Finally, in the spdx conversions that had no conflicts (because the treewide ones hadn't been done for those files), I just took the SCSI tree version as-is, even if it was old-style. The old-style conversions are perfectly valid, even if the "-only" and "-or-later" versions are perhaps more descriptive. * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (185 commits) scsi: qla2xxx: move IO flush to the front of NVME rport unregistration scsi: qla2xxx: Fix NVME cmd and LS cmd timeout race condition scsi: qla2xxx: on session delete, return nvme cmd scsi: qla2xxx: Fix kernel crash after disconnecting NVMe devices scsi: megaraid_sas: Update driver version to 07.710.06.00-rc1 scsi: megaraid_sas: Introduce various Aero performance modes scsi: megaraid_sas: Use high IOPS queues based on IO workload scsi: megaraid_sas: Set affinity for high IOPS reply queues scsi: megaraid_sas: Enable coalescing for high IOPS queues scsi: megaraid_sas: Add support for High IOPS queues scsi: megaraid_sas: Add support for MPI toolbox commands scsi: megaraid_sas: Offload Aero RAID5/6 division calculations to driver scsi: megaraid_sas: RAID1 PCI bandwidth limit algorithm is applicable for only Ventura scsi: megaraid_sas: megaraid_sas: Add check for count returned by HOST_DEVICE_LIST DCMD scsi: megaraid_sas: Handle sequence JBOD map failure at driver level scsi: megaraid_sas: Don't send FPIO to RL Bypass queue scsi: megaraid_sas: In probe context, retry IOC INIT once if firmware is in fault scsi: megaraid_sas: Release Mutex lock before OCR in case of DCMD timeout scsi: megaraid_sas: Call disable_irq from process IRQ poll scsi: megaraid_sas: Remove few debug counters from IO path ...
126 lines
3.8 KiB
C
126 lines
3.8 KiB
C
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
|
/*
|
|
* iSCSI over TCP/IP Data-Path lib
|
|
*
|
|
* Copyright (C) 2008 Mike Christie
|
|
* Copyright (C) 2008 Red Hat, Inc. All rights reserved.
|
|
* maintained by open-iscsi@googlegroups.com
|
|
*/
|
|
|
|
#ifndef LIBISCSI_TCP_H
|
|
#define LIBISCSI_TCP_H
|
|
|
|
#include <scsi/libiscsi.h>
|
|
|
|
struct iscsi_tcp_conn;
|
|
struct iscsi_segment;
|
|
struct sk_buff;
|
|
struct ahash_request;
|
|
|
|
typedef int iscsi_segment_done_fn_t(struct iscsi_tcp_conn *,
|
|
struct iscsi_segment *);
|
|
|
|
struct iscsi_segment {
|
|
unsigned char *data;
|
|
unsigned int size;
|
|
unsigned int copied;
|
|
unsigned int total_size;
|
|
unsigned int total_copied;
|
|
|
|
struct ahash_request *hash;
|
|
unsigned char padbuf[ISCSI_PAD_LEN];
|
|
unsigned char recv_digest[ISCSI_DIGEST_SIZE];
|
|
unsigned char digest[ISCSI_DIGEST_SIZE];
|
|
unsigned int digest_len;
|
|
|
|
struct scatterlist *sg;
|
|
void *sg_mapped;
|
|
unsigned int sg_offset;
|
|
bool atomic_mapped;
|
|
|
|
iscsi_segment_done_fn_t *done;
|
|
};
|
|
|
|
/* Socket connection receive helper */
|
|
struct iscsi_tcp_recv {
|
|
struct iscsi_hdr *hdr;
|
|
struct iscsi_segment segment;
|
|
|
|
/* Allocate buffer for BHS + AHS */
|
|
uint32_t hdr_buf[64];
|
|
|
|
/* copied and flipped values */
|
|
int datalen;
|
|
};
|
|
|
|
struct iscsi_tcp_conn {
|
|
struct iscsi_conn *iscsi_conn;
|
|
void *dd_data;
|
|
int stop_stage; /* conn_stop() flag: *
|
|
* stop to recover, *
|
|
* stop to terminate */
|
|
/* control data */
|
|
struct iscsi_tcp_recv in; /* TCP receive context */
|
|
/* CRC32C (Rx) LLD should set this is they do not offload */
|
|
struct ahash_request *rx_hash;
|
|
};
|
|
|
|
struct iscsi_tcp_task {
|
|
uint32_t exp_datasn; /* expected target's R2TSN/DataSN */
|
|
int data_offset;
|
|
struct iscsi_r2t_info *r2t; /* in progress solict R2T */
|
|
struct iscsi_pool r2tpool;
|
|
struct kfifo r2tqueue;
|
|
void *dd_data;
|
|
spinlock_t pool2queue;
|
|
spinlock_t queue2pool;
|
|
};
|
|
|
|
enum {
|
|
ISCSI_TCP_SEGMENT_DONE, /* curr seg has been processed */
|
|
ISCSI_TCP_SKB_DONE, /* skb is out of data */
|
|
ISCSI_TCP_CONN_ERR, /* iscsi layer has fired a conn err */
|
|
ISCSI_TCP_SUSPENDED, /* conn is suspended */
|
|
};
|
|
|
|
extern void iscsi_tcp_hdr_recv_prep(struct iscsi_tcp_conn *tcp_conn);
|
|
extern int iscsi_tcp_recv_skb(struct iscsi_conn *conn, struct sk_buff *skb,
|
|
unsigned int offset, bool offloaded, int *status);
|
|
extern void iscsi_tcp_cleanup_task(struct iscsi_task *task);
|
|
extern int iscsi_tcp_task_init(struct iscsi_task *task);
|
|
extern int iscsi_tcp_task_xmit(struct iscsi_task *task);
|
|
|
|
/* segment helpers */
|
|
extern int iscsi_tcp_recv_segment_is_hdr(struct iscsi_tcp_conn *tcp_conn);
|
|
extern int iscsi_tcp_segment_done(struct iscsi_tcp_conn *tcp_conn,
|
|
struct iscsi_segment *segment, int recv,
|
|
unsigned copied);
|
|
extern void iscsi_tcp_segment_unmap(struct iscsi_segment *segment);
|
|
|
|
extern void iscsi_segment_init_linear(struct iscsi_segment *segment,
|
|
void *data, size_t size,
|
|
iscsi_segment_done_fn_t *done,
|
|
struct ahash_request *hash);
|
|
extern int
|
|
iscsi_segment_seek_sg(struct iscsi_segment *segment,
|
|
struct scatterlist *sg_list, unsigned int sg_count,
|
|
unsigned int offset, size_t size,
|
|
iscsi_segment_done_fn_t *done,
|
|
struct ahash_request *hash);
|
|
|
|
/* digest helpers */
|
|
extern void iscsi_tcp_dgst_header(struct ahash_request *hash, const void *hdr,
|
|
size_t hdrlen,
|
|
unsigned char digest[ISCSI_DIGEST_SIZE]);
|
|
extern struct iscsi_cls_conn *
|
|
iscsi_tcp_conn_setup(struct iscsi_cls_session *cls_session, int dd_data_size,
|
|
uint32_t conn_idx);
|
|
extern void iscsi_tcp_conn_teardown(struct iscsi_cls_conn *cls_conn);
|
|
|
|
/* misc helpers */
|
|
extern int iscsi_tcp_r2tpool_alloc(struct iscsi_session *session);
|
|
extern void iscsi_tcp_r2tpool_free(struct iscsi_session *session);
|
|
extern int iscsi_tcp_set_max_r2t(struct iscsi_conn *conn, char *buf);
|
|
extern void iscsi_tcp_conn_get_stats(struct iscsi_cls_conn *cls_conn,
|
|
struct iscsi_stats *stats);
|
|
#endif /* LIBISCSI_TCP_H */
|