Skip to content

Commit

Permalink
Clang change
Browse files Browse the repository at this point in the history 
Change-Id: I31a0ab9fde1ac210b248e04fdfc2108dbe064a1a
  • Loading branch information
@mint570
mint570 committed Apr 9, 2024
1 parent 8220119 commit f263fcf
Show file tree
Hide file tree
Showing 82 changed files with 31,530 additions and 34,599 deletions.
4,548 changes: 2,324 additions & 2,224 deletions orchagent/p4orch/acl_rule_manager.cpp
View file

Large diffs are not rendered by default.

305 changes: 140 additions & 165 deletions orchagent/p4orch/acl_rule_manager.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,174 +14,149 @@
#include "return_code.h"
#include "vrforch.h"

extern "C" {
extern "C"
{
#include "sai.h"
}

namespace p4orch {
namespace test {
namespace p4orch
{
namespace test
{
class AclManagerTest;
} // namespace test

class AclRuleManager : public ObjectManagerInterface {
public:
explicit AclRuleManager(P4OidMapper* p4oidMapper, VRFOrch* vrfOrch,
CoppOrch* coppOrch,
ResponsePublisherInterface* publisher)
: m_p4OidMapper(p4oidMapper),
m_vrfOrch(vrfOrch),
m_publisher(publisher),
m_coppOrch(coppOrch),
m_countersDb(std::make_unique<swss::DBConnector>("COUNTERS_DB", 0)),
m_countersTable(std::make_unique<swss::Table>(
m_countersDb.get(), std::string(COUNTERS_TABLE) +
DEFAULT_KEY_SEPARATOR +
APP_P4RT_TABLE_NAME)) {
SWSS_LOG_ENTER();
assert(m_p4OidMapper != nullptr);
}
virtual ~AclRuleManager() = default;

void enqueue(const std::string& table_name,
const swss::KeyOpFieldsValuesTuple& entry) override;
void drain() override;
std::string verifyState(
const std::string& key,
const std::vector<swss::FieldValueTuple>& tuple) override;
ReturnCode getSaiObject(const std::string& json_key,
sai_object_type_t& object_type,
std::string& object_key) override;

// Update counters stats for every rule in each ACL table in COUNTERS_DB, if
// counters are enabled in rules.
void doAclCounterStatsTask();

private:
// Deserializes an entry in a dynamically created ACL table.
ReturnCodeOr<P4AclRuleAppDbEntry> deserializeAclRuleAppDbEntry(
const std::string& acl_table_name, const std::string& key,
const std::vector<swss::FieldValueTuple>& attributes);

// Validate an ACL rule APP_DB entry.
ReturnCode validateAclRuleAppDbEntry(const P4AclRuleAppDbEntry& app_db_entry);

// Get ACL rule by table name and rule key. Return nullptr if not found.
P4AclRule* getAclRule(const std::string& acl_table_name,
const std::string& acl_rule_key);

// Processes add operation for an ACL rule.
ReturnCode processAddRuleRequest(const std::string& acl_rule_key,
const P4AclRuleAppDbEntry& app_db_entry);

// Processes delete operation for an ACL rule.
ReturnCode processDeleteRuleRequest(const std::string& acl_table_name,
const std::string& acl_rule_key);

// Processes update operation for an ACL rule.
ReturnCode processUpdateRuleRequest(const P4AclRuleAppDbEntry& app_db_entry,
const P4AclRule& old_acl_rule);

// Set counters stats for an ACL rule in COUNTERS_DB.
ReturnCode setAclRuleCounterStats(const P4AclRule& acl_rule);

// Create an ACL rule.
ReturnCode createAclRule(P4AclRule& acl_rule);

// Create an ACL counter.
ReturnCode createAclCounter(const std::string& acl_table_name,
const std::string& counter_key,
const P4AclRule& acl_rule,
sai_object_id_t* counter_oid);

// Create an ACL meter.
ReturnCode createAclMeter(const P4AclMeter& p4_acl_meter,
const std::string& meter_key,
sai_object_id_t* meter_oid);

// Remove an ACL counter.
ReturnCode removeAclCounter(const std::string& acl_table_name,
const std::string& counter_key);

// Update ACL meter.
ReturnCode updateAclMeter(const P4AclMeter& new_acl_meter,
const P4AclMeter& old_acl_meter);

// Update ACL rule.
ReturnCode updateAclRule(const P4AclRule& new_acl_rule,
const P4AclRule& old_acl_rule,
std::vector<sai_attribute_t>& acl_entry_attrs,
std::vector<sai_attribute_t>& rollback_attrs);

// Remove an ACL meter.
ReturnCode removeAclMeter(const std::string& meter_key);

// Remove the ACL rule by key in the given ACL table.
ReturnCode removeAclRule(const std::string& acl_table_name,
const std::string& acl_rule_key);

// Set Meter value in ACL rule.
ReturnCode setMeterValue(const P4AclTableDefinition* acl_table,
const P4AclRuleAppDbEntry& app_db_entry,
P4AclMeter& acl_meter);

// Validate and set all match attributes in an ACL rule.
ReturnCode setAllMatchFieldValues(const P4AclRuleAppDbEntry& app_db_entry,
const P4AclTableDefinition* acl_table,
P4AclRule& acl_rules);

// Validate and set all action attributes in an ACL rule.
ReturnCode setAllActionFieldValues(const P4AclRuleAppDbEntry& app_db_entry,
const P4AclTableDefinition* acl_table,
P4AclRule& acl_rule);

// Validate and set a match attribute in an ACL rule.
ReturnCode setMatchValue(const acl_entry_attr_union_t attr_name,
const std::string& attr_value,
sai_attribute_value_t* value, P4AclRule* acl_rule,
const std::string& ip_type_bit_type = EMPTY_STRING);

// Validate and set an action attribute in an ACL rule.
ReturnCode setActionValue(const acl_entry_attr_union_t attr_name,
const std::string& attr_value,
sai_attribute_value_t* value, P4AclRule* acl_rule);

// Get port object id by name for redirect action.
ReturnCode getRedirectActionPortOid(const std::string& target,
sai_object_id_t* rediect_oid);

// Get next hop object id by name for redirect action.
ReturnCode getRedirectActionNextHopOid(const std::string& target,
sai_object_id_t* rediect_oid);

// Create user defined trap for each cpu queue/trap group and program user
// defined traps in hostif. Save the user defined trap oids in m_p4OidMapper
// and default ref count is 1.
ReturnCode setUpUserDefinedTraps();

// Clean up user defined traps created for cpu queues. Callers need to make
// sure ref count on user defined traps in m_userDefinedTraps are ones before
// clean up.
ReturnCode cleanUpUserDefinedTraps();

// Verifies internal cache for an entry.
std::string verifyStateCache(const P4AclRuleAppDbEntry& app_db_entry,
const P4AclRule* acl_rule);

// Verifies ASIC DB for an entry.
std::string verifyStateAsicDb(const P4AclRule* acl_rule);

P4OidMapper* m_p4OidMapper;
ResponsePublisherInterface* m_publisher;
P4AclRuleTables m_aclRuleTables;
VRFOrch* m_vrfOrch;
CoppOrch* m_coppOrch;
std::deque<swss::KeyOpFieldsValuesTuple> m_entries;
std::unique_ptr<swss::DBConnector> m_countersDb;
std::unique_ptr<swss::Table> m_countersTable;
std::vector<P4UserDefinedTrapHostifTableEntry> m_userDefinedTraps;

friend class AclTableManager;
friend class p4orch::test::AclManagerTest;
} // namespace test

class AclRuleManager : public ObjectManagerInterface
{
public:
explicit AclRuleManager(P4OidMapper *p4oidMapper, VRFOrch *vrfOrch, CoppOrch *coppOrch,
ResponsePublisherInterface *publisher)
: m_p4OidMapper(p4oidMapper), m_vrfOrch(vrfOrch), m_publisher(publisher), m_coppOrch(coppOrch),
m_countersDb(std::make_unique<swss::DBConnector>("COUNTERS_DB", 0)),
m_countersTable(std::make_unique<swss::Table>(
m_countersDb.get(), std::string(COUNTERS_TABLE) + DEFAULT_KEY_SEPARATOR + APP_P4RT_TABLE_NAME))
{
SWSS_LOG_ENTER();
assert(m_p4OidMapper != nullptr);
}
virtual ~AclRuleManager() = default;

void enqueue(const std::string &table_name, const swss::KeyOpFieldsValuesTuple &entry) override;
void drain() override;
std::string verifyState(const std::string &key, const std::vector<swss::FieldValueTuple> &tuple) override;
ReturnCode getSaiObject(const std::string &json_key, sai_object_type_t &object_type,
std::string &object_key) override;

// Update counters stats for every rule in each ACL table in COUNTERS_DB, if
// counters are enabled in rules.
void doAclCounterStatsTask();

private:
// Deserializes an entry in a dynamically created ACL table.
ReturnCodeOr<P4AclRuleAppDbEntry> deserializeAclRuleAppDbEntry(
const std::string &acl_table_name, const std::string &key,
const std::vector<swss::FieldValueTuple> &attributes);

// Validate an ACL rule APP_DB entry.
ReturnCode validateAclRuleAppDbEntry(const P4AclRuleAppDbEntry &app_db_entry);

// Get ACL rule by table name and rule key. Return nullptr if not found.
P4AclRule *getAclRule(const std::string &acl_table_name, const std::string &acl_rule_key);

// Processes add operation for an ACL rule.
ReturnCode processAddRuleRequest(const std::string &acl_rule_key, const P4AclRuleAppDbEntry &app_db_entry);

// Processes delete operation for an ACL rule.
ReturnCode processDeleteRuleRequest(const std::string &acl_table_name, const std::string &acl_rule_key);

// Processes update operation for an ACL rule.
ReturnCode processUpdateRuleRequest(const P4AclRuleAppDbEntry &app_db_entry, const P4AclRule &old_acl_rule);

// Set counters stats for an ACL rule in COUNTERS_DB.
ReturnCode setAclRuleCounterStats(const P4AclRule &acl_rule);

// Create an ACL rule.
ReturnCode createAclRule(P4AclRule &acl_rule);

// Create an ACL counter.
ReturnCode createAclCounter(const std::string &acl_table_name, const std::string &counter_key,
const P4AclRule &acl_rule, sai_object_id_t *counter_oid);

// Create an ACL meter.
ReturnCode createAclMeter(const P4AclMeter &p4_acl_meter, const std::string &meter_key, sai_object_id_t *meter_oid);

// Remove an ACL counter.
ReturnCode removeAclCounter(const std::string &acl_table_name, const std::string &counter_key);

// Update ACL meter.
ReturnCode updateAclMeter(const P4AclMeter &new_acl_meter, const P4AclMeter &old_acl_meter);

// Update ACL rule.
ReturnCode updateAclRule(const P4AclRule &new_acl_rule, const P4AclRule &old_acl_rule,
std::vector<sai_attribute_t> &acl_entry_attrs,
std::vector<sai_attribute_t> &rollback_attrs);

// Remove an ACL meter.
ReturnCode removeAclMeter(const std::string &meter_key);

// Remove the ACL rule by key in the given ACL table.
ReturnCode removeAclRule(const std::string &acl_table_name, const std::string &acl_rule_key);

// Set Meter value in ACL rule.
ReturnCode setMeterValue(const P4AclTableDefinition *acl_table, const P4AclRuleAppDbEntry &app_db_entry,
P4AclMeter &acl_meter);

// Validate and set all match attributes in an ACL rule.
ReturnCode setAllMatchFieldValues(const P4AclRuleAppDbEntry &app_db_entry, const P4AclTableDefinition *acl_table,
P4AclRule &acl_rules);

// Validate and set all action attributes in an ACL rule.
ReturnCode setAllActionFieldValues(const P4AclRuleAppDbEntry &app_db_entry, const P4AclTableDefinition *acl_table,
P4AclRule &acl_rule);

// Validate and set a match attribute in an ACL rule.
ReturnCode setMatchValue(const acl_entry_attr_union_t attr_name, const std::string &attr_value,
sai_attribute_value_t *value, P4AclRule *acl_rule,
const std::string &ip_type_bit_type = EMPTY_STRING);

// Validate and set an action attribute in an ACL rule.
ReturnCode setActionValue(const acl_entry_attr_union_t attr_name, const std::string &attr_value,
sai_attribute_value_t *value, P4AclRule *acl_rule);

// Get port object id by name for redirect action.
ReturnCode getRedirectActionPortOid(const std::string &target, sai_object_id_t *rediect_oid);

// Get next hop object id by name for redirect action.
ReturnCode getRedirectActionNextHopOid(const std::string &target, sai_object_id_t *rediect_oid);

// Create user defined trap for each cpu queue/trap group and program user
// defined traps in hostif. Save the user defined trap oids in m_p4OidMapper
// and default ref count is 1.
ReturnCode setUpUserDefinedTraps();

// Clean up user defined traps created for cpu queues. Callers need to make
// sure ref count on user defined traps in m_userDefinedTraps are ones before
// clean up.
ReturnCode cleanUpUserDefinedTraps();

// Verifies internal cache for an entry.
std::string verifyStateCache(const P4AclRuleAppDbEntry &app_db_entry, const P4AclRule *acl_rule);

// Verifies ASIC DB for an entry.
std::string verifyStateAsicDb(const P4AclRule *acl_rule);

P4OidMapper *m_p4OidMapper;
ResponsePublisherInterface *m_publisher;
P4AclRuleTables m_aclRuleTables;
VRFOrch *m_vrfOrch;
CoppOrch *m_coppOrch;
std::deque<swss::KeyOpFieldsValuesTuple> m_entries;
std::unique_ptr<swss::DBConnector> m_countersDb;
std::unique_ptr<swss::Table> m_countersTable;
std::vector<P4UserDefinedTrapHostifTableEntry> m_userDefinedTraps;

friend class AclTableManager;
friend class p4orch::test::AclManagerTest;
};

} // namespace p4orch
} // namespace p4orch
Loading

0 comments on commit f263fcf

Please sign in to comment.