* write RPC error properly */
#define OBD_CONNECT_GRANT_PARAM 0x100000000000ULL/* extra grant params used for
* finer space reservation */
-#define OBD_CONNECT_NANOSECOND_TIMES 0x200000000000ULL /* nanosec resolution
- * timestamps supported
- */
+#define OBD_CONNECT_NANOSEC_TIME 0x200000000000ULL /* nanosecond timestamps */
#define OBD_CONNECT_LVB_TYPE 0x400000000000ULL /* variable type of LVB */
-
/* XXX README XXX:
* Please DO NOT add flag values here before first ensuring that this same
* flag value is not in use on some other branch. Please clear any such
* and updates obd_connect_names[] for lprocfs_rd_connect_flags(), so it
* can be approved and landed easily to reserve the flag for future use. */
+/* The MNE_SWAB flag is overloading the MDS_MDS bit only for the MGS
+ * connection. It is a temporary bug fix for Imperative Recovery interop
+ * between 2.2 and 2.3 x86/ppc nodes, and can be removed when interop for
+ * 2.2 clients/servers is no longer needed. LU-1252/LU-1644. */
+#define OBD_CONNECT_MNE_SWAB OBD_CONNECT_MDS_MDS
+
#define OCD_HAS_FLAG(ocd, flg) \
(!!((ocd)->ocd_connect_flags & OBD_CONNECT_##flg))
OBD_CONNECT_EINPROGRESS | OBD_CONNECT_JOBSTATS)
#define ECHO_CONNECT_SUPPORTED (0)
#define MGS_CONNECT_SUPPORTED (OBD_CONNECT_VERSION | OBD_CONNECT_AT | \
- OBD_CONNECT_FULL20 | OBD_CONNECT_IMP_RECOV)
+ OBD_CONNECT_FULL20 | OBD_CONNECT_IMP_RECOV | \
+ OBD_CONNECT_MNE_SWAB)
/* Features required for this version of the client to work with server */
#define CLIENT_CONNECT_MDT_REQD (OBD_CONNECT_IBITS | OBD_CONNECT_FID | \
exp_libclient:1, /* liblustre client? */
/* client timed out and tried to reconnect,
* but couldn't because of active rpcs */
- exp_abort_active_req:1;
+ exp_abort_active_req:1,
+ /* if to swap nidtbl entries for 2.2 clients.
+ * Only used by the MGS to fix LU-1644. */
+ exp_need_mne_swab:1;
/* also protected by exp_lock */
enum lustre_sec_part exp_sp_peer;
struct sptlrpc_flavor exp_flvr; /* current */
imp_pingable:1, /* pingable */
imp_resend_replay:1, /* resend for replay */
imp_no_pinger_recover:1,/* disable normal recovery, for test only. */
+ imp_need_mne_swab:1, /* need IR MNE swab */
imp_force_reconnect:1; /* import must be reconnected instead of chouse new connection */
__u32 imp_connect_op;
struct obd_connect_data imp_connect_data;
struct obd_connect_data *data, *tmpdata;
int size, tmpsize;
lnet_nid_t *client_nid = NULL;
- ENTRY;
+ bool mne_swab_client_ver;
+ ENTRY;
OBD_RACE(OBD_FAIL_TGT_CONN_RACE);
if (rc)
GOTO(out, rc);
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 6, 50, 0)
+ /* Check if the client might be missing the LU-1252 fix to swab
+ * the IR mne_length entries. Do this as early as possible in case
+ * the version code is modified. See LU-1644 for details. */
+ mne_swab_client_ver = OBD_OCD_VERSION_MAJOR(data->ocd_version) == 2 &&
+ OBD_OCD_VERSION_MINOR(data->ocd_version) == 2 &&
+ OBD_OCD_VERSION_PATCH(data->ocd_version) < 55;
+#endif
+
if (lustre_msg_get_op_flags(req->rq_reqmsg) & MSG_CONNECT_LIBCLIENT) {
if (!data) {
DEBUG_REQ(D_WARNING, req, "Refusing old (unversioned) "
if (rc)
GOTO(out, rc);
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 6, 50, 0)
+ /* 2.2.0 clients always swab nidtbl entries due to a bug, so server
+ * will do the swabbing for if the client is using the same endianness.
+ *
+ * This fixup is version-limited, because we don't want to carry the
+ * OBD_CONNECT_MNE_SWAB flag around forever, just so long as we need
+ * interop with unpatched 2.2 clients. For newer clients, servers
+ * will never do MNE swabbing, let the client handle that. LU-1644 */
+ export->exp_need_mne_swab =
+ !(data->ocd_connect_flags & OBD_CONNECT_MNE_SWAB) &&
+ mne_swab_client_ver && !ptlrpc_req_need_swab(req);
+#else
+#warning "LU-1644: Remove old OBD_CONNECT_MNE_SWAB fixup and exp_need_mne_swab"
+#endif
+
LASSERT(target->u.obt.obt_magic == OBT_MAGIC);
data->ocd_instance = target->u.obt.obt_instance;
if (ocd == NULL)
GOTO(out_cleanup, rc = -ENOMEM);
- ocd->ocd_connect_flags = OBD_CONNECT_VERSION | OBD_CONNECT_FID |
- OBD_CONNECT_AT | OBD_CONNECT_VBR |
- OBD_CONNECT_FULL20;
-#ifdef LIBLUSTRE_POSIX_ACL
- ocd->ocd_connect_flags |= OBD_CONNECT_ACL;
-#endif
+ ocd->ocd_connect_flags = OBD_CONNECT_VERSION | OBD_CONNECT_AT |
+ OBD_CONNECT_FULL20;
ocd->ocd_version = LUSTRE_VERSION_CODE;
rc = obd_connect(NULL, &exp, obd, &mgc_uuid, ocd, NULL);
};
static int mgc_apply_recover_logs(struct obd_device *mgc,
- struct config_llog_data *cld,
- __u64 max_version,
- void *data, int datalen, int need_swab)
+ struct config_llog_data *cld,
+ __u64 max_version,
+ void *data, int datalen, bool mne_swab)
{
struct config_llog_instance *cfg = &cld->cld_cfg;
struct lustre_sb_info *lsi = s2lsi(cfg->cfg_sb);
if (datalen < entry_len) /* must have entry_len at least */
break;
- if (need_swab)
- lustre_swab_mgs_nidtbl_entry(entry);
- LASSERT(entry->mne_length <= CFS_PAGE_SIZE);
- if (entry->mne_length < entry_len)
- break;
+ /* Keep this swab for normal mixed endian handling. LU-1644 */
+ if (mne_swab)
+ lustre_swab_mgs_nidtbl_entry(entry);
+ if (entry->mne_length > CFS_PAGE_SIZE) {
+ CERROR("MNE too large (%u)\n", entry->mne_length);
+ break;
+ }
+
+ if (entry->mne_length < entry_len)
+ break;
off += entry->mne_length;
datalen -= entry->mne_length;
cfs_page_t **pages;
int nrpages;
bool eof = true;
+ bool mne_swab = false;
int i;
int ealen;
int rc;
GOTO(out, rc);
}
+ mne_swab = !!ptlrpc_rep_need_swab(req);
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 6, 50, 0)
+ /* This import flag means the server did an extra swab of IR MNE
+ * records (fixed in LU-1252), reverse it here if needed. LU-1644 */
+ if (unlikely(req->rq_import->imp_need_mne_swab))
+ mne_swab = !mne_swab;
+#else
+#warning "LU-1644: Remove old OBD_CONNECT_MNE_SWAB fixup and exp_need_mne_swab"
+#endif
+
for (i = 0; i < nrpages && ealen > 0; i++) {
int rc2;
void *ptr;
ptr = cfs_kmap(pages[i]);
rc2 = mgc_apply_recover_logs(obd, cld, res->mcr_offset, ptr,
- min_t(int, ealen, CFS_PAGE_SIZE),
- ptlrpc_rep_need_swab(req));
+ min_t(int, ealen, CFS_PAGE_SIZE),
+ mne_swab);
cfs_kunmap(pages[i]);
if (rc2 < 0) {
CWARN("Process recover log %s error %d\n",
* nidtbl entries will be packed in @pages by @unit_size units - entries
* shouldn't cross unit boundaries.
*/
-static int mgs_nidtbl_read(struct obd_device *unused, struct mgs_nidtbl *tbl,
+static int mgs_nidtbl_read(struct obd_export *exp, struct mgs_nidtbl *tbl,
struct mgs_config_res *res, cfs_page_t **pages,
int nrpages, int units_total, int unit_size)
{
/* check if we need to consume remaining bytes. */
if (last_in_unit != NULL && bytes_in_unit) {
- last_in_unit->mne_length += bytes_in_unit;
+#
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 6, 50, 0)
+ /* May need to swab back to update the length.*/
+ if (exp->exp_need_mne_swab)
+ lustre_swab_mgs_nidtbl_entry(last_in_unit);
+#endif
+ last_in_unit->mne_length += bytes_in_unit;
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 6, 50, 0)
+ if (exp->exp_need_mne_swab)
+ lustre_swab_mgs_nidtbl_entry(last_in_unit);
+#endif
rc += bytes_in_unit;
buf += bytes_in_unit;
last_in_unit = NULL;
memcpy(entry->u.nids, mti->mti_nids,
mti->mti_nid_count * sizeof(lnet_nid_t));
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 6, 50, 0)
+ /* For LU-1644, swab entry for 2.2 clients. */
+ if (exp->exp_need_mne_swab)
+ lustre_swab_mgs_nidtbl_entry(entry);
+#endif
+
version = tgt->mnt_version;
rc += entry_len;
buf += entry_len;
res->mcr_offset = body->mcb_offset;
unit_size = min_t(int, 1 << body->mcb_bits, CFS_PAGE_SIZE);
- bytes = mgs_nidtbl_read(obd, &fsdb->fsdb_nidtbl, res, pages, nrpages,
- bufsize / unit_size, unit_size);
+ bytes = mgs_nidtbl_read(req->rq_export, &fsdb->fsdb_nidtbl, res,
+ pages, nrpages, bufsize / unit_size, unit_size);
if (bytes < 0)
GOTO(out, rc = bytes);
if (rc)
/* nonfatal */
CWARN("can't set %s %d\n", KEY_INIT_RECOV_BACKUP, rc);
- /* We connect to the MGS at setup, and don't disconnect until cleanup */
- data->ocd_connect_flags = OBD_CONNECT_VERSION | OBD_CONNECT_FID |
- OBD_CONNECT_AT | OBD_CONNECT_FULL20 |
- OBD_CONNECT_IMP_RECOV;
+
+ /* We connect to the MGS at setup, and don't disconnect until cleanup */
+ data->ocd_connect_flags = OBD_CONNECT_VERSION | OBD_CONNECT_AT |
+ OBD_CONNECT_FULL20 | OBD_CONNECT_IMP_RECOV |
+ OBD_CONNECT_MNE_SWAB;
if (lmd_is_client(lsi->lsi_lmd) &&
lsi->lsi_lmd->lmd_flags & LMD_FLG_NOIR)
data->ocd_connect_flags &= ~OBD_CONNECT_IMP_RECOV;
newer : older, LUSTRE_VERSION_STRING);
}
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 6, 50, 0)
+ /* Check if server has LU-1252 fix applied to not always swab
+ * the IR MNE entries. Do this only once per connection. This
+ * fixup is version-limited, because we don't want to carry the
+ * OBD_CONNECT_MNE_SWAB flag around forever, just so long as we
+ * need interop with unpatched 2.2 servers. For newer servers,
+ * the client will do MNE swabbing only as needed. LU-1644 */
+ if (unlikely((ocd->ocd_connect_flags & OBD_CONNECT_VERSION) &&
+ !(ocd->ocd_connect_flags & OBD_CONNECT_MNE_SWAB) &&
+ OBD_OCD_VERSION_MAJOR(ocd->ocd_version) == 2 &&
+ OBD_OCD_VERSION_MINOR(ocd->ocd_version) == 2 &&
+ OBD_OCD_VERSION_PATCH(ocd->ocd_version) < 55 &&
+ strcmp(imp->imp_obd->obd_type->typ_name,
+ LUSTRE_MGC_NAME) == 0))
+ imp->imp_need_mne_swab = 1;
+ else /* clear if server was upgraded since last connect */
+ imp->imp_need_mne_swab = 0;
+#else
+#warning "LU-1644: Remove old OBD_CONNECT_MNE_SWAB fixup and exp_need_mne_swab"
+#endif
+
if (ocd->ocd_connect_flags & OBD_CONNECT_CKSUM) {
/* We sent to the server ocd_cksum_types with bits set
* for algorithms we understand. The server masked off
git://git.whamcloud.com / fs / lustre-release.git / commitdiff