Commit a89c72ff authored by Johannes Berg's avatar Johannes Berg Committed by Luca Coelho
Browse files

iwlwifi: pcie: allocate smaller dev_cmd for TX headers 



As noted in the previous commit, due to the way we allocate the
dev_cmd headers with 324 byte size, and 4/8 byte alignment, the
part we use of them (bytes 20..40-68) could still cross a page
and thus 2^32 boundary.

Address this by using alignment to ensure that the allocation
cannot cross a page boundary, on hardware that's affected. To
make that not cause more memory consumption, reduce the size of
the allocations to the necessary size - we go from 324 bytes in
each allocation to 60/68 on gen2 depending on family, and ~120
or so on gen1 (so on gen1 it's a pure reduction in size, since
we don't need alignment there).

To avoid size and clearing issues, add a new structure that's
just the header, and use kmem_cache_zalloc().

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent c5a4e8eb

drivers/net/wireless/intel/iwlwifi/dvm/tx.c

+1 −2
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ int iwlagn_tx_skb(struct iwl_priv *priv, 
	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);

	struct iwl_station_priv *sta_priv = NULL;

	struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];

	struct iwl_device_cmd *dev_cmd;

	struct iwl_device_tx_cmd *dev_cmd;

	struct iwl_tx_cmd *tx_cmd;

	__le16 fc;

	u8 hdr_len;
@@ -348,7 +348,6 @@ int iwlagn_tx_skb(struct iwl_priv *priv, 
	if (unlikely(!dev_cmd))

		goto drop_unlock_priv;



	memset(dev_cmd, 0, sizeof(*dev_cmd));

	dev_cmd->hdr.cmd = REPLY_TX;

	tx_cmd = (struct iwl_tx_cmd *) dev_cmd->payload;

drivers/net/wireless/intel/iwlwifi/iwl-trans.c

+5 −5
Original line number Diff line number Diff line
@@ -66,7 +66,9 @@ 


struct iwl_trans *iwl_trans_alloc(unsigned int priv_size,

				  struct device *dev,

				  const struct iwl_trans_ops *ops)

				  const struct iwl_trans_ops *ops,

				  unsigned int cmd_pool_size,

				  unsigned int cmd_pool_align)

{

	struct iwl_trans *trans;

#ifdef CONFIG_LOCKDEP
@@ -90,10 +92,8 @@ struct iwl_trans *iwl_trans_alloc(unsigned int priv_size, 
		 "iwl_cmd_pool:%s", dev_name(trans->dev));

	trans->dev_cmd_pool =

		kmem_cache_create(trans->dev_cmd_pool_name,

				  sizeof(struct iwl_device_cmd),

				  sizeof(void *),

				  SLAB_HWCACHE_ALIGN,

				  NULL);

				  cmd_pool_size, cmd_pool_align,

				  SLAB_HWCACHE_ALIGN, NULL);

	if (!trans->dev_cmd_pool)

		return NULL;

drivers/net/wireless/intel/iwlwifi/iwl-trans.h

+20 −6
Original line number Diff line number Diff line
@@ -193,6 +193,18 @@ struct iwl_device_cmd { 
	};

} __packed;



/**

 * struct iwl_device_tx_cmd - buffer for TX command

 * @hdr: the header

 * @payload: the payload placeholder

 *

 * The actual structure is sized dynamically according to need.

 */

struct iwl_device_tx_cmd {

	struct iwl_cmd_header hdr;

	u8 payload[];

} __packed;



#define TFD_MAX_PAYLOAD_SIZE (sizeof(struct iwl_device_cmd))



/*
@@ -544,7 +556,7 @@ struct iwl_trans_ops { 
	int (*send_cmd)(struct iwl_trans *trans, struct iwl_host_cmd *cmd);



	int (*tx)(struct iwl_trans *trans, struct sk_buff *skb,

		  struct iwl_device_cmd *dev_cmd, int queue);

		  struct iwl_device_tx_cmd *dev_cmd, int queue);

	void (*reclaim)(struct iwl_trans *trans, int queue, int ssn,

			struct sk_buff_head *skbs);
@@ -948,22 +960,22 @@ iwl_trans_dump_data(struct iwl_trans *trans, u32 dump_mask) 
	return trans->ops->dump_data(trans, dump_mask);

}



static inline struct iwl_device_cmd *

static inline struct iwl_device_tx_cmd *

iwl_trans_alloc_tx_cmd(struct iwl_trans *trans)

{

	return kmem_cache_alloc(trans->dev_cmd_pool, GFP_ATOMIC);

	return kmem_cache_zalloc(trans->dev_cmd_pool, GFP_ATOMIC);

}



int iwl_trans_send_cmd(struct iwl_trans *trans, struct iwl_host_cmd *cmd);



static inline void iwl_trans_free_tx_cmd(struct iwl_trans *trans,

					 struct iwl_device_cmd *dev_cmd)

					 struct iwl_device_tx_cmd *dev_cmd)

{

	kmem_cache_free(trans->dev_cmd_pool, dev_cmd);

}



static inline int iwl_trans_tx(struct iwl_trans *trans, struct sk_buff *skb,

			       struct iwl_device_cmd *dev_cmd, int queue)

			       struct iwl_device_tx_cmd *dev_cmd, int queue)

{

	if (unlikely(test_bit(STATUS_FW_ERROR, &trans->status)))

		return -EIO;
@@ -1271,7 +1283,9 @@ static inline bool iwl_trans_dbg_ini_valid(struct iwl_trans *trans) 
 *****************************************************/

struct iwl_trans *iwl_trans_alloc(unsigned int priv_size,

				  struct device *dev,

				  const struct iwl_trans_ops *ops);

				  const struct iwl_trans_ops *ops,

				  unsigned int cmd_pool_size,

				  unsigned int cmd_pool_align);

void iwl_trans_free(struct iwl_trans *trans);



/*****************************************************

drivers/net/wireless/intel/iwlwifi/mvm/tx.c

+5 −10
Original line number Diff line number Diff line
@@ -490,13 +490,13 @@ static void iwl_mvm_set_tx_cmd_crypto(struct iwl_mvm *mvm, 
/*

 * Allocates and sets the Tx cmd the driver data pointers in the skb

 */

static struct iwl_device_cmd *

static struct iwl_device_tx_cmd *

iwl_mvm_set_tx_params(struct iwl_mvm *mvm, struct sk_buff *skb,

		      struct ieee80211_tx_info *info, int hdrlen,

		      struct ieee80211_sta *sta, u8 sta_id)

{

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;

	struct iwl_device_cmd *dev_cmd;

	struct iwl_device_tx_cmd *dev_cmd;

	struct iwl_tx_cmd *tx_cmd;



	dev_cmd = iwl_trans_alloc_tx_cmd(mvm->trans);
@@ -504,11 +504,6 @@ iwl_mvm_set_tx_params(struct iwl_mvm *mvm, struct sk_buff *skb, 
	if (unlikely(!dev_cmd))

		return NULL;



	/* Make sure we zero enough of dev_cmd */

	BUILD_BUG_ON(sizeof(struct iwl_tx_cmd_gen2) > sizeof(*tx_cmd));

	BUILD_BUG_ON(sizeof(struct iwl_tx_cmd_gen3) > sizeof(*tx_cmd));



	memset(dev_cmd, 0, sizeof(dev_cmd->hdr) + sizeof(*tx_cmd));

	dev_cmd->hdr.cmd = TX_CMD;



	if (iwl_mvm_has_new_tx_api(mvm)) {
@@ -597,7 +592,7 @@ out: 
}



static void iwl_mvm_skb_prepare_status(struct sk_buff *skb,

				       struct iwl_device_cmd *cmd)

				       struct iwl_device_tx_cmd *cmd)

{

	struct ieee80211_tx_info *skb_info = IEEE80211_SKB_CB(skb);
@@ -716,7 +711,7 @@ int iwl_mvm_tx_skb_non_sta(struct iwl_mvm *mvm, struct sk_buff *skb) 
{

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;

	struct ieee80211_tx_info info;

	struct iwl_device_cmd *dev_cmd;

	struct iwl_device_tx_cmd *dev_cmd;

	u8 sta_id;

	int hdrlen = ieee80211_hdrlen(hdr->frame_control);

	__le16 fc = hdr->frame_control;
@@ -1078,7 +1073,7 @@ static int iwl_mvm_tx_mpdu(struct iwl_mvm *mvm, struct sk_buff *skb, 
{

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;

	struct iwl_mvm_sta *mvmsta;

	struct iwl_device_cmd *dev_cmd;

	struct iwl_device_tx_cmd *dev_cmd;

	__le16 fc;

	u16 seq_number = 0;

	u8 tid = IWL_MAX_TID_COUNT;

drivers/net/wireless/intel/iwlwifi/pcie/internal.h

+3 −3
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ struct iwl_cmd_meta { 
#define IWL_FIRST_TB_SIZE_ALIGN ALIGN(IWL_FIRST_TB_SIZE, 64)



struct iwl_pcie_txq_entry {

	struct iwl_device_cmd *cmd;

	void *cmd;

	struct sk_buff *skb;

	/* buffer to free after command completes */

	const void *free_buf;
@@ -688,7 +688,7 @@ void iwl_trans_pcie_txq_set_shared_mode(struct iwl_trans *trans, u32 txq_id, 
void iwl_trans_pcie_log_scd_error(struct iwl_trans *trans,

				  struct iwl_txq *txq);

int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb,

		      struct iwl_device_cmd *dev_cmd, int txq_id);

		      struct iwl_device_tx_cmd *dev_cmd, int txq_id);

void iwl_pcie_txq_check_wrptrs(struct iwl_trans *trans);

int iwl_trans_pcie_send_hcmd(struct iwl_trans *trans, struct iwl_host_cmd *cmd);

void iwl_pcie_cmdq_reclaim(struct iwl_trans *trans, int txq_id, int idx);
@@ -1107,7 +1107,7 @@ int iwl_trans_pcie_dyn_txq_alloc(struct iwl_trans *trans, 
				 unsigned int timeout);

void iwl_trans_pcie_dyn_txq_free(struct iwl_trans *trans, int queue);

int iwl_trans_pcie_gen2_tx(struct iwl_trans *trans, struct sk_buff *skb,

			   struct iwl_device_cmd *dev_cmd, int txq_id);

			   struct iwl_device_tx_cmd *dev_cmd, int txq_id);

int iwl_trans_pcie_gen2_send_hcmd(struct iwl_trans *trans,

				  struct iwl_host_cmd *cmd);

void iwl_trans_pcie_gen2_stop_device(struct iwl_trans *trans);

CRA Git | Maintained and supported by SUSTech CRA and CCSE